Merge branch 'master' of git+ssh://openadk.org/git/openadk

36 files changed, 106 insertions, 167 deletions

diff --git a/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c b/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c
index 034e80bcc..96c37bdd6 100644
--- a/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c
+++ b/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/appl/sample/sclient/sclient.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/appl/sample/sclient/sclient.c	2013-08-14 14:05:17.000000000 +0200
+@@ -32,7 +32,7 @@
   */
  
  #include "krb5.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
index 76f6f7e35..217ae2182 100644
--- a/package/krb5/patches/patch-src_appl_simple_server_sim_server_c
+++ b/package/krb5/patches/patch-src_appl_simple_server_sim_server_c
@@ -1,8 +1,8 @@
---- 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>
+--- krb5-1.11.3.orig/src/appl/simple/server/sim_server.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/appl/simple/server/sim_server.c	2013-08-14 14:05:17.000000000 +0200
+@@ -43,7 +43,7 @@
  #include <netdb.h>
+ #include <arpa/inet.h>
  
 -#include "com_err.h"
 +#include <et/com_err.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
index 61fd8b156..cc121997c 100644
--- a/package/krb5/patches/patch-src_appl_user_user_client_c
+++ b/package/krb5/patches/patch-src_appl_user_user_client_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/appl/user_user/client.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/appl/user_user/client.c	2013-08-14 14:05:17.000000000 +0200
+@@ -34,7 +34,6 @@
  #include <errno.h>
  
  #include "k5-int.h"
diff --git a/package/krb5/patches/patch-src_appl_user_user_server_c b/package/krb5/patches/patch-src_appl_user_user_server_c
index 314804002..d91ff797d 100644
--- a/package/krb5/patches/patch-src_appl_user_user_server_c
+++ b/package/krb5/patches/patch-src_appl_user_user_server_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/appl/user_user/server.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/appl/user_user/server.c	2013-08-14 14:05:17.000000000 +0200
+@@ -37,7 +37,6 @@
  
  #include "port-sockets.h"
  #include "k5-int.h"
diff --git a/package/krb5/patches/patch-src_clients_kdestroy_kdestroy_c b/package/krb5/patches/patch-src_clients_kdestroy_kdestroy_c
deleted file mode 100644
index fd0f19712..000000000
--- a/package/krb5/patches/patch-src_clients_kdestroy_kdestroy_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index 4517cd7e1..4089bbbbc 100644
--- a/package/krb5/patches/patch-src_clients_kinit_kinit_c
+++ b/package/krb5/patches/patch-src_clients_kinit_kinit_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/clients/kinit/kinit.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/clients/kinit/kinit.c	2013-08-14 14:05:17.000000000 +0200
+@@ -33,7 +33,7 @@
  #include <stdio.h>
  #include <time.h>
  #include <errno.h>
diff --git a/package/krb5/patches/patch-src_clients_klist_klist_c b/package/krb5/patches/patch-src_clients_klist_klist_c
deleted file mode 100644
index 274f87972..000000000
--- a/package/krb5/patches/patch-src_clients_klist_klist_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_kvno_kvno_c b/package/krb5/patches/patch-src_clients_kvno_kvno_c
index 23bdbe6e3..16be34aad 100644
--- a/package/krb5/patches/patch-src_clients_kvno_kvno_c
+++ b/package/krb5/patches/patch-src_clients_kvno_kvno_c
@@ -1,6 +1,6 @@
---- 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 *
+--- krb5-1.11.3.orig/src/clients/kvno/kvno.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/clients/kvno/kvno.c	2013-08-14 14:05:17.000000000 +0200
+@@ -58,7 +58,7 @@ static void do_v5_kvno (int argc, char *
                          char *sname, int canon, int unknown,
                          char *for_user, int proxy);
  
diff --git a/package/krb5/patches/patch-src_include_k5-int_h b/package/krb5/patches/patch-src_include_k5-int_h
index dfc1eb832..1c6dd8e05 100644
--- a/package/krb5/patches/patch-src_include_k5-int_h
+++ b/package/krb5/patches/patch-src_include_k5-int_h
@@ -1,7 +1,7 @@
---- 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 *);
+--- krb5-1.11.3.orig/src/include/k5-int.h	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/include/k5-int.h	2013-08-14 14:05:17.000000000 +0200
+@@ -1156,7 +1156,7 @@ void k5_free_pa_otp_challenge(krb5_conte
+ void k5_free_pa_otp_req(krb5_context context, krb5_pa_otp_req *val);
  
  /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */
 -#include "com_err.h"
diff --git a/package/krb5/patches/patch-src_include_osconf_hin b/package/krb5/patches/patch-src_include_osconf_hin
index 4f672219e..cd22cccf4 100644
--- a/package/krb5/patches/patch-src_include_osconf_hin
+++ b/package/krb5/patches/patch-src_include_osconf_hin
@@ -1,8 +1,8 @@
---- krb5-1.9.orig/src/include/osconf.hin	2010-01-05 03:47:58.000000000 +0100
-+++ krb5-1.9/src/include/osconf.hin	2011-01-29 20:25:42.000000000 +0100
-@@ -61,14 +61,14 @@
- #define DEFAULT_LNAME_FILENAME  "@PREFIX/lib/krb5.aname"
- #endif /* _WINDOWS  */
+--- krb5-1.11.3.orig/src/include/osconf.hin	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/include/osconf.hin	2013-08-14 14:05:17.000000000 +0200
+@@ -58,14 +58,14 @@
+ #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins"
+ #define PLUGIN_EXT              "@DYNOBJEXT"
  
 -#define DEFAULT_KDB_FILE        "@LOCALSTATEDIR/krb5kdc/principal"
 -#define DEFAULT_KEYFILE_STUB    "@LOCALSTATEDIR/krb5kdc/.k5."
diff --git a/package/krb5/patches/patch-src_kadmin_dbutil_dump_c b/package/krb5/patches/patch-src_kadmin_dbutil_dump_c
index 37cd8b43d..6380de6be 100644
--- a/package/krb5/patches/patch-src_kadmin_dbutil_dump_c
+++ b/package/krb5/patches/patch-src_kadmin_dbutil_dump_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/kadmin/dbutil/dump.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/kadmin/dbutil/dump.c	2013-08-14 14:05:17.000000000 +0200
+@@ -33,7 +33,6 @@
  #include <kadm5/admin.h>
  #include <kadm5/server_internal.h>
  #include <kdb.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
index 2aaebb5dd..de4f958c4 100644
--- a/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c
+++ b/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/kadmin/dbutil/kdb5_destroy.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/kadmin/dbutil/kdb5_destroy.c	2013-08-14 14:05:17.000000000 +0200
+@@ -26,7 +26,6 @@
  
  #include "k5-int.h"
  #include <stdio.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
index bca55f9ce..23a4f710c 100644
--- a/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c
+++ b/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/kadmin/dbutil/kdb5_stash.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/kadmin/dbutil/kdb5_stash.c	2013-08-14 14:05:17.000000000 +0200
+@@ -50,7 +50,6 @@
   */
  
  #include "k5-int.h"
diff --git a/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_c b/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_c
deleted file mode 100644
index cad21e871..000000000
--- a/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
index de4b83147..2a3e96b49 100644
--- a/package/krb5/patches/patch-src_kdc_do_as_req_c
+++ b/package/krb5/patches/patch-src_kdc_do_as_req_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/kdc/do_as_req.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/kdc/do_as_req.c	2013-08-14 14:05:17.000000000 +0200
+@@ -56,7 +56,6 @@
   */
  
  #include "k5-int.h"
diff --git a/package/krb5/patches/patch-src_kdc_main_c b/package/krb5/patches/patch-src_kdc_main_c
index 433249448..5b2e32607 100644
--- a/package/krb5/patches/patch-src_kdc_main_c
+++ b/package/krb5/patches/patch-src_kdc_main_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/kdc/main.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/kdc/main.c	2013-08-14 14:05:17.000000000 +0200
+@@ -34,7 +34,6 @@
  #include <sys/wait.h>
  
  #include "k5-int.h"
diff --git a/package/krb5/patches/patch-src_krb5-config_in b/package/krb5/patches/patch-src_krb5-config_in
index ddc0159a6..cfbe7b475 100644
--- a/package/krb5/patches/patch-src_krb5-config_in
+++ b/package/krb5/patches/patch-src_krb5-config_in
@@ -1,5 +1,5 @@
---- krb5-1.8.1.orig/src/krb5-config.in	2010-01-21 23:49:01.000000000 +0100
-+++ krb5-1.8.1/src/krb5-config.in	2011-01-09 01:33:14.000000000 +0100
+--- krb5-1.11.3.orig/src/krb5-config.in	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/krb5-config.in	2013-08-14 14:05:17.000000000 +0200
 @@ -34,8 +34,6 @@ libdir=@libdir@
  CC_LINK='@CC_LINK@'
  KDB5_DB_LIB=@KDB5_DB_LIB@
@@ -8,8 +8,8 @@
 -PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@'
  PTHREAD_CFLAGS='@PTHREAD_CFLAGS@'
  DL_LIB='@DL_LIB@'
- 
-@@ -180,10 +178,7 @@ if test -n "$do_libs"; then
+ DEFCCNAME='@DEFCCNAME@'
+@@ -213,10 +211,7 @@ if test -n "$do_libs"; then
      # Ugly gross hack for our build tree
      lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
  	    -e 's/\$(PURE)//' \
@@ -19,4 +19,4 @@
 -	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
  	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
  	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
+ 	    -e 's#\$(CFLAGS)##'`
diff --git a/package/krb5/patches/patch-src_lib_crypto_krb_prng_c b/package/krb5/patches/patch-src_lib_crypto_krb_prng_c
new file mode 100644
index 000000000..25234e88c
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_crypto_krb_prng_c
@@ -0,0 +1,13 @@
+--- krb5-1.11.3.orig/src/lib/crypto/krb/prng.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/crypto/krb/prng.c	2013-08-14 14:12:20.000000000 +0200
+@@ -138,10 +138,6 @@ krb5_c_random_os_entropy(krb5_context co
+        guaranteed to cause a reseed of some kind if strong is true and
+        we have both /dev/random and /dev/urandom.  We want the strong
+        data included in the reseed so we get it first.*/
+-    if (strong) {
+-        if (add_entropy_from_device(context, "/dev/random"))
+-            *oursuccess = 1;
+-    }
+     if (add_entropy_from_device(context, "/dev/urandom"))
+         *oursuccess = 1;
+     return 0;
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
deleted file mode 100644
index e7686248f..000000000
--- a/package/krb5/patches/patch-src_lib_crypto_krb_prng_prng_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) {
--        if (read_entropy_from_device(context, "/dev/random"))
-+        if (read_entropy_from_device(context, "/dev/urandom"))
-             *oursuccess = 1;
-     }
-     if (read_entropy_from_device(context, "/dev/urandom"))
diff --git a/package/krb5/patches/patch-src_lib_kadm5_admin_h b/package/krb5/patches/patch-src_lib_kadm5_admin_h
index 0fcb38b2c..d730c5517 100644
--- a/package/krb5/patches/patch-src_lib_kadm5_admin_h
+++ b/package/krb5/patches/patch-src_lib_kadm5_admin_h
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/lib/kadm5/admin.h	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/kadm5/admin.h	2013-08-14 14:05:17.000000000 +0200
+@@ -45,7 +45,7 @@
  #include        <gssrpc/rpc.h>
  #include        <krb5.h>
  #include        <kdb.h>
diff --git a/package/krb5/patches/patch-src_lib_kadm5_logger_c b/package/krb5/patches/patch-src_lib_kadm5_logger_c
index ccaa44792..7d0665029 100644
--- a/package/krb5/patches/patch-src_lib_kadm5_logger_c
+++ b/package/krb5/patches/patch-src_lib_kadm5_logger_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/lib/kadm5/logger.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/kadm5/logger.c	2013-08-14 14:05:17.000000000 +0200
+@@ -32,7 +32,6 @@
   */
  #include "k5-int.h"
  #include "adm_proto.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
index 518d5b92f..a693bc751 100644
--- a/package/krb5/patches/patch-src_lib_kadm5_srv_server_init_c
+++ b/package/krb5/patches/patch-src_lib_kadm5_srv_server_init_c
@@ -1,6 +1,6 @@
---- 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$";
+--- krb5-1.11.3.orig/src/lib/kadm5/srv/server_init.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/kadm5/srv/server_init.c	2013-08-14 14:05:17.000000000 +0200
+@@ -13,7 +13,6 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <errno.h>
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
index 4ff2408cf..a451a2710 100644
--- a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c
@@ -1,10 +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
+--- krb5-1.11.3.orig/src/lib/krb5/krb/gic_pwd.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/krb5/krb/gic_pwd.c	2013-08-14 14:05:17.000000000 +0200
 @@ -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"
+ #include "int-proto.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
index 2d62562da..8f25f73de 100644
--- a/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/lib/krb5/krb/recvauth.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/krb5/krb/recvauth.c	2013-08-14 14:05:18.000000000 +0200
+@@ -31,7 +31,7 @@
  
  #include "k5-int.h"
  #include "auth_con.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
index 356b966cc..21f503a99 100644
--- a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c
@@ -1,7 +1,7 @@
---- 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 @@
- 
+--- krb5-1.11.3.orig/src/lib/krb5/krb/sendauth.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/krb5/krb/sendauth.c	2013-08-14 14:05:18.000000000 +0200
+@@ -25,7 +25,7 @@
+  */
  
  #include "k5-int.h"
 -#include "com_err.h"
diff --git a/package/krb5/patches/patch-src_slave_kprop_c b/package/krb5/patches/patch-src_slave_kprop_c
deleted file mode 100644
index c61ad0301..000000000
--- a/package/krb5/patches/patch-src_slave_kprop_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 29ab27efa..000000000
--- a/package/krb5/patches/patch-src_slave_kpropd_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
index 388374e52..e0cba989c 100644
--- 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
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/tests/asn.1/krb5_decode_leak.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/tests/asn.1/krb5_decode_leak.c	2013-08-14 14:05:18.000000000 +0200
+@@ -37,7 +37,6 @@
  
  #include <stdio.h>
  #include "k5-int.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
index 5fdf13f84..60081c99d 100644
--- 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
@@ -1,7 +1,7 @@
---- 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 -*- */
+--- krb5-1.11.3.orig/src/tests/asn.1/krb5_decode_test.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/tests/asn.1/krb5_decode_test.c	2013-08-14 14:05:18.000000000 +0200
+@@ -26,7 +26,6 @@
+ 
  #include "k5-int.h"
  #include "ktest.h"
 -#include "com_err.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
index 6cc947964..a59b3b9dd 100644
--- 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
@@ -1,7 +1,7 @@
---- 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 -*- */
+--- krb5-1.11.3.orig/src/tests/asn.1/krb5_encode_test.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/tests/asn.1/krb5_encode_test.c	2013-08-14 14:05:18.000000000 +0200
+@@ -26,7 +26,6 @@
+ 
  #include <stdio.h>
  #include "k5-int.h"
 -#include "com_err.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
index c6105df97..9822bc8b0 100644
--- a/package/krb5/patches/patch-src_tests_create_kdb5_mkdums_c
+++ b/package/krb5/patches/patch-src_tests_create_kdb5_mkdums_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/tests/create/kdb5_mkdums.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/tests/create/kdb5_mkdums.c	2013-08-14 14:05:18.000000000 +0200
+@@ -31,7 +31,6 @@
  
  #include "k5-int.h"
  #include "kdb.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
index a39a66e4d..ce5d0bb81 100644
--- a/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c
+++ b/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/tests/dejagnu/t_inetd.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/tests/dejagnu/t_inetd.c	2013-08-14 14:05:18.000000000 +0200
+@@ -54,7 +54,7 @@
  #include <unistd.h>
  #endif
  
diff --git a/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c b/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c
index d41c7a26e..4f65970bf 100644
--- a/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c
+++ b/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/tests/hammer/kdc5_hammer.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/tests/hammer/kdc5_hammer.c	2013-08-14 14:05:18.000000000 +0200
+@@ -27,7 +27,6 @@
  #include <sys/time.h>
  
  #include "k5-int.h"
diff --git a/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c b/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c
index 1bbb80bfa..f97409829 100644
--- a/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c
+++ b/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c
@@ -1,6 +1,6 @@
---- 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 @@
+--- krb5-1.11.3.orig/src/tests/verify/kdb5_verify.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/tests/verify/kdb5_verify.c	2013-08-14 14:05:18.000000000 +0200
+@@ -26,7 +26,6 @@
  
  #include "k5-int.h"
  #include "kdb.h"
diff --git a/package/krb5/patches/patch-src_util_export-check_pl b/package/krb5/patches/patch-src_util_export-check_pl
index 04d21a299..788411962 100644
--- a/package/krb5/patches/patch-src_util_export-check_pl
+++ b/package/krb5/patches/patch-src_util_export-check_pl
@@ -1,11 +1,11 @@
---- krb5-1.8.1.orig/src/util/export-check.pl	Sun Aug  1 18:36:11 2010
-+++ krb5-1.8.1/src/util/export-check.pl	Sun Aug  1 18:27:23 2010
+--- krb5-1.11.3.orig/src/util/export-check.pl	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/util/export-check.pl	2013-08-14 14:05:45.000000000 +0200
 @@ -38,7 +38,7 @@ if ($#ARGV != 1) {
  my($exfile, $libfile) = @ARGV;
  
  @missing = ();
 -open NM, "nm -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!";
-+open NM, "@@NM@@ -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!";
++open NM, "/home/wbx/openadk/host_arm_glibc/bin/arm-openadk-linux-gnueabi-nm -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!";
  open EXPORT, "< $exfile" || die "can't read $exfile: $!";
  
  @export = <EXPORT>;
diff --git a/package/krb5/patches/patch-src_util_profile_prof_int_h b/package/krb5/patches/patch-src_util_profile_prof_int_h
deleted file mode 100644
index 9cf1229c2..000000000
--- a/package/krb5/patches/patch-src_util_profile_prof_int_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;