avoid extra include dir, now cross-compile and native compile is possible. add acl example file

45 files changed, 428 insertions, 6 deletions

diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 2ed4be6de..783a63870 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.9
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		220c3dbb05a1bae1e6ad0bec4a6ac331
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
@@ -25,13 +25,16 @@ PKGSS_KRB5_CLIENT:=	libkrb5 libncurses libss libcom-err
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-signed.tar
 WRKSRC=			${WRKDIST}/src
 
+ifeq ($(ADK_NATIVE),y)
+NM:=nm
+endif
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KRB5_CLIENT,krb5-client,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_CLIENT},${PKGSD_KRB5_CLIENT},${PKGSC_KRB5_CLIENT}))
 $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5}))
 
-TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/et
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-profiled \
 			--with-system-ss \
@@ -55,6 +58,7 @@ krb5-server-install:
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb
 	${INSTALL_DATA} ./files/kdc.conf ${IDIR_KRB5_SERVER}/etc/krb5kdc
+	${INSTALL_DATA} ./files/kadm5.acl ${IDIR_KRB5_SERVER}/etc/krb5kdc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/{ktutil,kadmin} \
 		${IDIR_KRB5_SERVER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/{kdb5_util,krb5kdc,kadmind,kadmin.local} \
diff --git a/package/krb5/files/kadm5.acl b/package/krb5/files/kadm5.acl
new file mode 100644
index 000000000..a6d0368ea
--- /dev/null
+++ b/package/krb5/files/kadm5.acl
@@ -0,0 +1 @@
+*/admin@MY.REALM  *
diff --git a/package/krb5/files/kadmind.acl b/package/krb5/files/kadmind.acl
deleted file mode 100644
index e5da87fb5..000000000
--- a/package/krb5/files/kadmind.acl
+++ /dev/null
@@ -1 +0,0 @@
-#principal       [priv1,priv2,...]       [glob-pattern]
diff --git a/package/krb5/files/kdc.conf b/package/krb5/files/kdc.conf
index a27228694..4044051e2 100644
--- a/package/krb5/files/kdc.conf
+++ b/package/krb5/files/kdc.conf
@@ -3,6 +3,7 @@
 
 [realms]
 	MY.REALM = {
+		acl_file = /etc/krb5kdc/kadm5.acl
 		kdc_ports = 750,88
 		max_life = 10h 0m 0s
 		max_renewable_life = 7d 0h 0m 0s
diff --git a/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c b/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c
new file mode 100644
index 000000000..034e80bcc
--- /dev/null
+++ b/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/appl/sample/sclient/sclient.c	2009-11-24 18:46:45.000000000 +0100
++++ krb5-1.9/src/appl/sample/sclient/sclient.c	2011-01-31 14:42:12.000000000 +0100
+@@ -31,7 +31,7 @@
+  */
+ 
+ #include "krb5.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ 
+ #include <stdio.h>
+ #include <string.h>
diff --git a/package/krb5/patches/patch-src_appl_sample_sserver_sserver_c b/package/krb5/patches/patch-src_appl_sample_sserver_sserver_c
new file mode 100644
index 000000000..bcfe38acf
--- /dev/null
+++ b/package/krb5/patches/patch-src_appl_sample_sserver_sserver_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/appl/sample/sserver/sserver.c	2009-11-24 18:46:45.000000000 +0100
++++ krb5-1.9/src/appl/sample/sserver/sserver.c	2011-01-31 14:42:29.000000000 +0100
+@@ -39,7 +39,6 @@
+  */
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ 
+ #include <stdio.h>
+ #include <string.h>
diff --git a/package/krb5/patches/patch-src_appl_simple_client_sim_client_c b/package/krb5/patches/patch-src_appl_simple_client_sim_client_c
new file mode 100644
index 000000000..03cbd6890
--- /dev/null
+++ b/package/krb5/patches/patch-src_appl_simple_client_sim_client_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/appl/simple/client/sim_client.c	2009-11-24 18:46:45.000000000 +0100
++++ krb5-1.9/src/appl/simple/client/sim_client.c	2011-01-31 14:49:49.000000000 +0100
+@@ -39,7 +39,6 @@
+ #include <errno.h>
+ 
+ #include <k5-int.h>
+-#include "com_err.h"
+ 
+ #include "simple.h"
+ 
diff --git a/package/krb5/patches/patch-src_appl_simple_server_sim_server_c b/package/krb5/patches/patch-src_appl_simple_server_sim_server_c
new file mode 100644
index 000000000..76f6f7e35
--- /dev/null
+++ b/package/krb5/patches/patch-src_appl_simple_server_sim_server_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/appl/simple/server/sim_server.c	2010-04-24 21:24:36.000000000 +0200
++++ krb5-1.9/src/appl/simple/server/sim_server.c	2011-01-31 14:56:28.000000000 +0100
+@@ -42,7 +42,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
+-#include "com_err.h"
++#include <et/com_err.h>
+ 
+ #include "simple.h"
+ 
diff --git a/package/krb5/patches/patch-src_appl_user_user_client_c b/package/krb5/patches/patch-src_appl_user_user_client_c
new file mode 100644
index 000000000..61fd8b156
--- /dev/null
+++ b/package/krb5/patches/patch-src_appl_user_user_client_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/appl/user_user/client.c	2009-11-24 18:46:45.000000000 +0100
++++ krb5-1.9/src/appl/user_user/client.c	2011-01-31 15:04:15.000000000 +0100
+@@ -38,7 +38,6 @@
+ #include <errno.h>
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ 
+ int main (int argc, char *argv[])
+ {
diff --git a/package/krb5/patches/patch-src_appl_user_user_server_c b/package/krb5/patches/patch-src_appl_user_user_server_c
new file mode 100644
index 000000000..314804002
--- /dev/null
+++ b/package/krb5/patches/patch-src_appl_user_user_server_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/appl/user_user/server.c	2009-11-24 18:46:45.000000000 +0100
++++ krb5-1.9/src/appl/user_user/server.c	2011-01-31 15:04:26.000000000 +0100
+@@ -41,7 +41,6 @@
+ 
+ #include "port-sockets.h"
+ #include "k5-int.h"
+-#include "com_err.h"
+ 
+ /* fd 0 is a tcp socket used to talk to the client */
+ 
diff --git a/package/krb5/patches/patch-src_clients_kdestroy_kdestroy_c b/package/krb5/patches/patch-src_clients_kdestroy_kdestroy_c
new file mode 100644
index 000000000..fd0f19712
--- /dev/null
+++ b/package/krb5/patches/patch-src_clients_kdestroy_kdestroy_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/clients/kdestroy/kdestroy.c	2009-11-03 04:27:56.000000000 +0100
++++ krb5-1.9/src/clients/kdestroy/kdestroy.c	2011-01-31 14:22:03.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ #include "autoconf.h"
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ #include <string.h>
+ #include <stdio.h>
+ #ifdef HAVE_UNISTD_H
diff --git a/package/krb5/patches/patch-src_clients_kinit_kinit_c b/package/krb5/patches/patch-src_clients_kinit_kinit_c
new file mode 100644
index 000000000..4517cd7e1
--- /dev/null
+++ b/package/krb5/patches/patch-src_clients_kinit_kinit_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/clients/kinit/kinit.c	2010-12-03 01:05:44.000000000 +0100
++++ krb5-1.9/src/clients/kinit/kinit.c	2011-01-31 14:03:02.000000000 +0100
+@@ -36,7 +36,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ #ifdef GETOPT_LONG
+ #include <getopt.h>
diff --git a/package/krb5/patches/patch-src_clients_klist_klist_c b/package/krb5/patches/patch-src_clients_klist_klist_c
new file mode 100644
index 000000000..274f87972
--- /dev/null
+++ b/package/krb5/patches/patch-src_clients_klist_klist_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/clients/klist/klist.c	2010-12-03 01:05:44.000000000 +0100
++++ krb5-1.9/src/clients/klist/klist.c	2011-01-31 13:56:44.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ #include "autoconf.h"
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/package/krb5/patches/patch-src_clients_ksu_ksu_h b/package/krb5/patches/patch-src_clients_ksu_ksu_h
new file mode 100644
index 000000000..164f53750
--- /dev/null
+++ b/package/krb5/patches/patch-src_clients_ksu_ksu_h
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/clients/ksu/ksu.h	2009-10-31 01:48:38.000000000 +0100
++++ krb5-1.9/src/clients/ksu/ksu.h	2011-01-31 14:28:47.000000000 +0100
+@@ -29,7 +29,6 @@
+ #include "k5-int.h"
+ #include "k5-util.h"
+ #include <stdio.h>
+-#include "com_err.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <pwd.h>
diff --git a/package/krb5/patches/patch-src_clients_kvno_kvno_c b/package/krb5/patches/patch-src_clients_kvno_kvno_c
new file mode 100644
index 000000000..23bdbe6e3
--- /dev/null
+++ b/package/krb5/patches/patch-src_clients_kvno_kvno_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/clients/kvno/kvno.c	2009-10-31 01:48:38.000000000 +0100
++++ krb5-1.9/src/clients/kvno/kvno.c	2011-01-31 14:35:33.000000000 +0100
+@@ -53,7 +53,7 @@ static void do_v5_kvno (int argc, char *
+                         char *sname, int canon, int unknown,
+                         char *for_user, int proxy);
+ 
+-#include <com_err.h>
++#include <et/com_err.h>
+ static void extended_com_err_fn (const char *, errcode_t, const char *,
+                                  va_list);
+ 
diff --git a/package/krb5/patches/patch-src_include_k5-int_h b/package/krb5/patches/patch-src_include_k5-int_h
new file mode 100644
index 000000000..dfc1eb832
--- /dev/null
+++ b/package/krb5/patches/patch-src_include_k5-int_h
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/include/k5-int.h	2010-12-03 01:05:44.000000000 +0100
++++ krb5-1.9/src/include/k5-int.h	2011-01-30 22:39:25.000000000 +0100
+@@ -1345,7 +1345,7 @@ void KRB5_CALLCONV krb5_free_iakerb_fini
+                                              krb5_iakerb_finished *);
+ 
+ /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
+-#include "com_err.h"
++#include <et/com_err.h>
+ #include "k5-plugin.h"
+ 
+ #include <krb5/authdata_plugin.h>
diff --git a/package/krb5/patches/patch-src_kadmin_dbutil_dump_c b/package/krb5/patches/patch-src_kadmin_dbutil_dump_c
new file mode 100644
index 000000000..37cd8b43d
--- /dev/null
+++ b/package/krb5/patches/patch-src_kadmin_dbutil_dump_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/kadmin/dbutil/dump.c	2010-07-06 23:53:23.000000000 +0200
++++ krb5-1.9/src/kadmin/dbutil/dump.c	2011-01-31 13:32:19.000000000 +0100
+@@ -37,7 +37,6 @@
+ #include <kadm5/admin.h>
+ #include <kadm5/server_internal.h>
+ #include <kdb.h>
+-#include <com_err.h>
+ #include "kdb5_util.h"
+ #if defined(HAVE_REGEX_H) && defined(HAVE_REGCOMP)
+ #include <regex.h>
diff --git a/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c b/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c
new file mode 100644
index 000000000..2aaebb5dd
--- /dev/null
+++ b/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/kadmin/dbutil/kdb5_destroy.c	2009-11-03 04:27:56.000000000 +0100
++++ krb5-1.9/src/kadmin/dbutil/kdb5_destroy.c	2011-01-31 13:18:24.000000000 +0100
+@@ -32,7 +32,6 @@
+ 
+ #include "k5-int.h"
+ #include <stdio.h>
+-#include "com_err.h"
+ #include <kadm5/admin.h>
+ #include <kdb.h>
+ #include "kdb5_util.h"
diff --git a/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c b/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c
new file mode 100644
index 000000000..bca55f9ce
--- /dev/null
+++ b/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/kadmin/dbutil/kdb5_stash.c	2010-06-22 15:09:58.000000000 +0200
++++ krb5-1.9/src/kadmin/dbutil/kdb5_stash.c	2011-01-31 13:26:20.000000000 +0100
+@@ -55,7 +55,6 @@
+  */
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ #include <kadm5/admin.h>
+ #include <stdio.h>
+ #include "kdb5_util.h"
diff --git a/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_c b/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_c
new file mode 100644
index 000000000..cad21e871
--- /dev/null
+++ b/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/kadmin/ktutil/ktutil.c	2010-06-08 19:53:19.000000000 +0200
++++ krb5-1.9/src/kadmin/ktutil/ktutil.c	2011-01-31 13:38:18.000000000 +0100
+@@ -29,7 +29,6 @@
+ 
+ #include "k5-int.h"
+ #include "ktutil.h"
+-#include <com_err.h>
+ #include "adm_proto.h"
+ #include <ss/ss.h>
+ #include <stdio.h>
diff --git a/package/krb5/patches/patch-src_kdc_do_as_req_c b/package/krb5/patches/patch-src_kdc_do_as_req_c
new file mode 100644
index 000000000..de4b83147
--- /dev/null
+++ b/package/krb5/patches/patch-src_kdc_do_as_req_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/kdc/do_as_req.c	2010-10-01 19:12:41.000000000 +0200
++++ krb5-1.9/src/kdc/do_as_req.c	2011-01-31 13:06:33.000000000 +0100
+@@ -57,7 +57,6 @@
+  */
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ 
+ #include <syslog.h>
+ #ifdef HAVE_NETINET_IN_H
diff --git a/package/krb5/patches/patch-src_kdc_main_c b/package/krb5/patches/patch-src_kdc_main_c
new file mode 100644
index 000000000..433249448
--- /dev/null
+++ b/package/krb5/patches/patch-src_kdc_main_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/kdc/main.c	2010-12-01 22:37:25.000000000 +0100
++++ krb5-1.9/src/kdc/main.c	2011-01-31 13:12:23.000000000 +0100
+@@ -64,7 +64,6 @@
+ #include <sys/wait.h>
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ #include "adm.h"
+ #include "adm_proto.h"
+ #include "kdc_util.h"
diff --git a/package/krb5/patches/patch-src_lib_crypto_krb_prng_prng_c b/package/krb5/patches/patch-src_lib_crypto_krb_prng_prng_c
index f0879d58d..e7686248f 100644
--- a/package/krb5/patches/patch-src_lib_crypto_krb_prng_prng_c
+++ b/package/krb5/patches/patch-src_lib_crypto_krb_prng_prng_c
@@ -1,6 +1,6 @@
---- krb5-1.9.orig/src/lib/crypto/krb/prng/prng.c
-+++ krb5-1.9/src/lib/crypto/krb/prng/prng.c
-@@ -168,7 +168,7 @@
+--- krb5-1.9.orig/src/lib/crypto/krb/prng/prng.c	2010-10-05 05:18:22.000000000 +0200
++++ krb5-1.9/src/lib/crypto/krb/prng/prng.c	2011-01-30 22:37:36.000000000 +0100
+@@ -168,7 +168,7 @@ krb5_c_random_os_entropy(krb5_context co
         we have both /dev/random and /dev/urandom.  We want the strong
         data included in the reseed so we get it first.*/
      if (strong) {
diff --git a/package/krb5/patches/patch-src_lib_gssapi_generic_disp_com_err_status_c b/package/krb5/patches/patch-src_lib_gssapi_generic_disp_com_err_status_c
new file mode 100644
index 000000000..7fae48bc4
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_gssapi_generic_disp_com_err_status_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/lib/gssapi/generic/disp_com_err_status.c	2009-12-08 01:04:48.000000000 +0100
++++ krb5-1.9/src/lib/gssapi/generic/disp_com_err_status.c	2011-01-30 23:14:27.000000000 +0100
+@@ -26,7 +26,7 @@
+  */
+ 
+ #include "gssapiP_generic.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ 
+ /* XXXX internationalization!! */
+ 
diff --git a/package/krb5/patches/patch-src_lib_gssapi_krb5_disp_status_c b/package/krb5/patches/patch-src_lib_gssapi_krb5_disp_status_c
new file mode 100644
index 000000000..e26d8ee34
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_gssapi_krb5_disp_status_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/lib/gssapi/krb5/disp_status.c	2009-12-08 01:04:48.000000000 +0100
++++ krb5-1.9/src/lib/gssapi/krb5/disp_status.c	2011-01-30 23:18:34.000000000 +0100
+@@ -22,7 +22,7 @@
+  */
+ 
+ #include "gssapiP_krb5.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ 
+ /* XXXX internationalization!! */
+ 
diff --git a/package/krb5/patches/patch-src_lib_kadm5_admin_h b/package/krb5/patches/patch-src_lib_kadm5_admin_h
new file mode 100644
index 000000000..0fcb38b2c
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_kadm5_admin_h
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/lib/kadm5/admin.h	2010-12-01 22:37:25.000000000 +0100
++++ krb5-1.9/src/lib/kadm5/admin.h	2011-01-30 23:29:11.000000000 +0100
+@@ -47,7 +47,7 @@
+ #include        <gssrpc/rpc.h>
+ #include        <krb5.h>
+ #include        <kdb.h>
+-#include        <com_err.h>
++#include        <et/com_err.h>
+ #include        <kadm5/kadm_err.h>
+ #include        <kadm5/chpass_util_strings.h>
+ 
diff --git a/package/krb5/patches/patch-src_lib_kadm5_clnt_client_init_c b/package/krb5/patches/patch-src_lib_kadm5_clnt_client_init_c
new file mode 100644
index 000000000..03de1b7de
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_kadm5_clnt_client_init_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/lib/kadm5/clnt/client_init.c	2010-07-09 01:51:24.000000000 +0200
++++ krb5-1.9/src/lib/kadm5/clnt/client_init.c	2011-01-31 12:41:38.000000000 +0100
+@@ -36,7 +36,6 @@
+ #include <memory.h>
+ #endif
+ #include <string.h>
+-#include <com_err.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/package/krb5/patches/patch-src_lib_kadm5_logger_c b/package/krb5/patches/patch-src_lib_kadm5_logger_c
new file mode 100644
index 000000000..ccaa44792
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_kadm5_logger_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/lib/kadm5/logger.c	2010-03-10 21:45:12.000000000 +0100
++++ krb5-1.9/src/lib/kadm5/logger.c	2011-01-31 12:34:25.000000000 +0100
+@@ -34,7 +34,6 @@
+  */
+ #include "k5-int.h"
+ #include "adm_proto.h"
+-#include "com_err.h"
+ #include <stdio.h>
+ #include <ctype.h>
+ #ifdef  HAVE_SYSLOG_H
diff --git a/package/krb5/patches/patch-src_lib_kadm5_srv_server_init_c b/package/krb5/patches/patch-src_lib_kadm5_srv_server_init_c
new file mode 100644
index 000000000..518d5b92f
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_kadm5_srv_server_init_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/lib/kadm5/srv/server_init.c	2010-09-29 23:29:14.000000000 +0200
++++ krb5-1.9/src/lib/kadm5/srv/server_init.c	2011-01-31 12:47:29.000000000 +0100
+@@ -17,7 +17,6 @@ static char *rcsid = "$Header$";
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <com_err.h>
+ #include "k5-int.h"             /* needed for gssapiP_krb5.h */
+ #include <kadm5/admin.h>
+ #include <krb5.h>
diff --git a/package/krb5/patches/patch-src_lib_kdb_kdb_convert_c b/package/krb5/patches/patch-src_lib_kdb_kdb_convert_c
new file mode 100644
index 000000000..7c156955d
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_kdb_kdb_convert_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/lib/kdb/kdb_convert.c	2010-07-06 23:53:23.000000000 +0200
++++ krb5-1.9/src/lib/kdb/kdb_convert.c	2011-01-30 23:23:52.000000000 +0100
+@@ -11,7 +11,7 @@
+  * struct(s) into krb5_db_entry struct(s) and vice-versa.
+  */
+ #include <sys/types.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ #include <locale.h>
+ #include <errno.h>
+ #include <iprop_hdr.h>
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb5_libinit_c b/package/krb5/patches/patch-src_lib_krb5_krb5_libinit_c
new file mode 100644
index 000000000..30f9e9e3a
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_krb5_krb5_libinit_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/lib/krb5/krb5_libinit.c	2010-09-29 23:38:26.000000000 +0200
++++ krb5-1.9/src/lib/krb5/krb5_libinit.c	2011-01-30 23:10:08.000000000 +0100
+@@ -2,7 +2,7 @@
+ #include <assert.h>
+ 
+ #include "autoconf.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ #include "k5-int.h"
+ 
+ #if defined(_WIN32) || defined(USE_CCAPI)
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c
new file mode 100644
index 000000000..4ff2408cf
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/lib/krb5/krb/gic_pwd.c	2010-12-01 03:16:37.000000000 +0100
++++ krb5-1.9/src/lib/krb5/krb/gic_pwd.c	2011-01-30 22:42:53.000000000 +0100
+@@ -1,6 +1,6 @@
+ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+ #include "k5-int.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ #include "init_creds_ctx.h"
+ 
+ krb5_error_code
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c b/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c
new file mode 100644
index 000000000..2d62562da
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/lib/krb5/krb/recvauth.c	2009-10-31 01:48:38.000000000 +0100
++++ krb5-1.9/src/lib/krb5/krb/recvauth.c	2011-01-30 23:02:39.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ #include "k5-int.h"
+ #include "auth_con.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c b/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c
new file mode 100644
index 000000000..356b966cc
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/lib/krb5/krb/sendauth.c	2009-10-31 01:48:38.000000000 +0100
++++ krb5-1.9/src/lib/krb5/krb/sendauth.c	2011-01-30 23:06:08.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ #include "auth_con.h"
+ #include <errno.h>
+ #include <stdio.h>
diff --git a/package/krb5/patches/patch-src_plugins_kdb_db2_policy_db_h b/package/krb5/patches/patch-src_plugins_kdb_db2_policy_db_h
new file mode 100644
index 000000000..c35021862
--- /dev/null
+++ b/package/krb5/patches/patch-src_plugins_kdb_db2_policy_db_h
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/plugins/kdb/db2/policy_db.h	2010-07-06 23:53:23.000000000 +0200
++++ krb5-1.9/src/plugins/kdb/db2/policy_db.h	2011-01-31 13:00:29.000000000 +0100
+@@ -32,7 +32,7 @@
+ #include <gssrpc/xdr.h>
+ #include <db.h>
+ #include "adb_err.h"
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ typedef long            osa_adb_ret_t;
+ 
diff --git a/package/krb5/patches/patch-src_slave_kprop_c b/package/krb5/patches/patch-src_slave_kprop_c
new file mode 100644
index 000000000..c61ad0301
--- /dev/null
+++ b/package/krb5/patches/patch-src_slave_kprop_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/slave/kprop.c	2010-12-01 03:15:55.000000000 +0100
++++ krb5-1.9/src/slave/kprop.c	2011-01-31 13:46:16.000000000 +0100
+@@ -44,7 +44,6 @@
+ #include <fcntl.h>
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ #include "kprop.h"
+ 
+ #ifndef GETSOCKNAME_ARG3_TYPE
diff --git a/package/krb5/patches/patch-src_slave_kpropd_c b/package/krb5/patches/patch-src_slave_kpropd_c
new file mode 100644
index 000000000..29ab27efa
--- /dev/null
+++ b/package/krb5/patches/patch-src_slave_kpropd_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/slave/kpropd.c	2010-12-01 03:16:04.000000000 +0100
++++ krb5-1.9/src/slave/kpropd.c	2011-01-31 13:46:26.000000000 +0100
+@@ -78,7 +78,6 @@
+ #include <syslog.h>
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ #include <errno.h>
+ 
+ #include "kprop.h"
diff --git a/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_leak_c b/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_leak_c
new file mode 100644
index 000000000..388374e52
--- /dev/null
+++ b/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_leak_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/tests/asn.1/krb5_decode_leak.c	2010-04-30 23:22:48.000000000 +0200
++++ krb5-1.9/src/tests/asn.1/krb5_decode_leak.c	2011-01-31 15:25:17.000000000 +0100
+@@ -12,7 +12,6 @@
+ 
+ #include <stdio.h>
+ #include "k5-int.h"
+-#include "com_err.h"
+ #include "utility.h"
+ 
+ #include "ktest.h"
diff --git a/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_test_c b/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_test_c
new file mode 100644
index 000000000..5fdf13f84
--- /dev/null
+++ b/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_test_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/tests/asn.1/krb5_decode_test.c	2010-04-30 23:22:48.000000000 +0200
++++ krb5-1.9/src/tests/asn.1/krb5_decode_test.c	2011-01-31 15:18:13.000000000 +0100
+@@ -1,7 +1,6 @@
+ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+ #include "k5-int.h"
+ #include "ktest.h"
+-#include "com_err.h"
+ #include "utility.h"
+ #include "ktest_equal.h"
+ 
diff --git a/package/krb5/patches/patch-src_tests_asn_1_krb5_encode_test_c b/package/krb5/patches/patch-src_tests_asn_1_krb5_encode_test_c
new file mode 100644
index 000000000..6cc947964
--- /dev/null
+++ b/package/krb5/patches/patch-src_tests_asn_1_krb5_encode_test_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/tests/asn.1/krb5_encode_test.c	2010-04-30 23:22:48.000000000 +0200
++++ krb5-1.9/src/tests/asn.1/krb5_encode_test.c	2011-01-31 15:11:16.000000000 +0100
+@@ -1,7 +1,6 @@
+ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+ #include <stdio.h>
+ #include "k5-int.h"
+-#include "com_err.h"
+ #include "utility.h"
+ 
+ #include "ktest.h"
diff --git a/package/krb5/patches/patch-src_tests_create_kdb5_mkdums_c b/package/krb5/patches/patch-src_tests_create_kdb5_mkdums_c
new file mode 100644
index 000000000..c6105df97
--- /dev/null
+++ b/package/krb5/patches/patch-src_tests_create_kdb5_mkdums_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/tests/create/kdb5_mkdums.c	2010-07-06 23:53:23.000000000 +0200
++++ krb5-1.9/src/tests/create/kdb5_mkdums.c	2011-01-31 17:54:44.000000000 +0100
+@@ -30,7 +30,6 @@
+ 
+ #include "k5-int.h"
+ #include "kdb.h"
+-#include "com_err.h"
+ #include <ss/ss.h>
+ #include <stdio.h>
+ 
diff --git a/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c b/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c
new file mode 100644
index 000000000..a39a66e4d
--- /dev/null
+++ b/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/tests/dejagnu/t_inetd.c	2010-04-22 01:14:49.000000000 +0200
++++ krb5-1.9/src/tests/dejagnu/t_inetd.c	2011-01-31 18:34:11.000000000 +0100
+@@ -55,7 +55,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#include "com_err.h"
++#include <et/com_err.h>
+ 
+ 
+ char *progname;
diff --git a/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c b/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c
new file mode 100644
index 000000000..d41c7a26e
--- /dev/null
+++ b/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/tests/hammer/kdc5_hammer.c	2010-04-22 01:37:04.000000000 +0200
++++ krb5-1.9/src/tests/hammer/kdc5_hammer.c	2011-01-31 18:20:05.000000000 +0100
+@@ -31,7 +31,6 @@
+ #include <sys/time.h>
+ 
+ #include "k5-int.h"
+-#include "com_err.h"
+ 
+ #define KRB5_DEFAULT_OPTIONS 0
+ #define KRB5_DEFAULT_LIFE 60*60*8 /* 8 hours */
diff --git a/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c b/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c
new file mode 100644
index 000000000..1bbb80bfa
--- /dev/null
+++ b/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c
@@ -0,0 +1,10 @@
+--- krb5-1.9.orig/src/tests/verify/kdb5_verify.c	2010-09-15 19:13:23.000000000 +0200
++++ krb5-1.9/src/tests/verify/kdb5_verify.c	2011-01-31 18:26:51.000000000 +0100
+@@ -30,7 +30,6 @@
+ 
+ #include "k5-int.h"
+ #include "kdb.h"
+-#include "com_err.h"
+ #include <ss/ss.h>
+ #include <stdio.h>
+ 
diff --git a/package/krb5/patches/patch-src_util_profile_prof_int_h b/package/krb5/patches/patch-src_util_profile_prof_int_h
new file mode 100644
index 000000000..9cf1229c2
--- /dev/null
+++ b/package/krb5/patches/patch-src_util_profile_prof_int_h
@@ -0,0 +1,11 @@
+--- krb5-1.9.orig/src/util/profile/prof_int.h	2009-12-28 01:21:20.000000000 +0100
++++ krb5-1.9/src/util/profile/prof_int.h	2011-01-30 22:28:21.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ #include "k5-thread.h"
+ #include "k5-platform.h"
+-#include "com_err.h"
++#include <et/com_err.h>
+ #include "profile.h"
+ 
+ typedef long prf_magic_t;