From 6f247375032b7e498c7cbb965ddb7b587aafd15a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 8 Jun 2014 08:16:38 +0200 Subject: use own copy pf libss/libcom_err --- package/krb5/Makefile | 13 ++++++------- .../patches/patch-src_appl_sample_sclient_sclient_c | 11 ----------- .../patches/patch-src_appl_sample_sserver_sserver_c | 10 ---------- .../patches/patch-src_appl_simple_client_sim_client_c | 10 ---------- .../patches/patch-src_appl_simple_server_sim_server_c | 11 ----------- .../krb5/patches/patch-src_appl_user_user_client_c | 10 ---------- .../krb5/patches/patch-src_appl_user_user_server_c | 10 ---------- package/krb5/patches/patch-src_clients_kinit_kinit_c | 11 ----------- package/krb5/patches/patch-src_clients_ksu_ksu_h | 10 ---------- package/krb5/patches/patch-src_clients_kvno_kvno_c | 11 ----------- package/krb5/patches/patch-src_include_k5-int_h | 11 ----------- package/krb5/patches/patch-src_include_k5-thread_h | 19 +++++++++++++++++++ package/krb5/patches/patch-src_kadmin_dbutil_dump_c | 10 ---------- .../patches/patch-src_kadmin_dbutil_kdb5_destroy_c | 10 ---------- .../krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c | 10 ---------- package/krb5/patches/patch-src_kdc_do_as_req_c | 10 ---------- ...patch-src_lib_gssapi_generic_disp_com_err_status_c | 11 ----------- .../patches/patch-src_lib_gssapi_krb5_disp_status_c | 11 ----------- package/krb5/patches/patch-src_lib_kadm5_admin_h | 11 ----------- .../patches/patch-src_lib_kadm5_clnt_client_init_c | 10 ---------- package/krb5/patches/patch-src_lib_kadm5_logger_c | 10 ---------- .../patches/patch-src_lib_kadm5_srv_server_init_c | 10 ---------- package/krb5/patches/patch-src_lib_kdb_kdb_convert_c | 11 ----------- .../krb5/patches/patch-src_lib_krb5_krb5_libinit_c | 11 ----------- package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c | 10 ---------- .../krb5/patches/patch-src_lib_krb5_krb_recvauth_c | 11 ----------- .../patches/patch-src_plugins_kdb_db2_policy_db_h | 11 ----------- .../patches/patch-src_tests_asn_1_krb5_decode_leak_c | 10 ---------- .../patches/patch-src_tests_asn_1_krb5_decode_test_c | 10 ---------- .../patches/patch-src_tests_asn_1_krb5_encode_test_c | 10 ---------- .../krb5/patches/patch-src_tests_create_kdb5_mkdums_c | 10 ---------- .../krb5/patches/patch-src_tests_dejagnu_t_inetd_c | 11 ----------- .../krb5/patches/patch-src_tests_hammer_kdc5_hammer_c | 10 ---------- .../krb5/patches/patch-src_tests_verify_kdb5_verify_c | 10 ---------- 34 files changed, 25 insertions(+), 340 deletions(-) delete mode 100644 package/krb5/patches/patch-src_appl_sample_sclient_sclient_c delete mode 100644 package/krb5/patches/patch-src_appl_sample_sserver_sserver_c delete mode 100644 package/krb5/patches/patch-src_appl_simple_client_sim_client_c delete mode 100644 package/krb5/patches/patch-src_appl_simple_server_sim_server_c delete mode 100644 package/krb5/patches/patch-src_appl_user_user_client_c delete mode 100644 package/krb5/patches/patch-src_appl_user_user_server_c delete mode 100644 package/krb5/patches/patch-src_clients_kinit_kinit_c delete mode 100644 package/krb5/patches/patch-src_clients_ksu_ksu_h delete mode 100644 package/krb5/patches/patch-src_clients_kvno_kvno_c delete mode 100644 package/krb5/patches/patch-src_include_k5-int_h create mode 100644 package/krb5/patches/patch-src_include_k5-thread_h delete mode 100644 package/krb5/patches/patch-src_kadmin_dbutil_dump_c delete mode 100644 package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c delete mode 100644 package/krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c delete mode 100644 package/krb5/patches/patch-src_kdc_do_as_req_c delete mode 100644 package/krb5/patches/patch-src_lib_gssapi_generic_disp_com_err_status_c delete mode 100644 package/krb5/patches/patch-src_lib_gssapi_krb5_disp_status_c delete mode 100644 package/krb5/patches/patch-src_lib_kadm5_admin_h delete mode 100644 package/krb5/patches/patch-src_lib_kadm5_clnt_client_init_c delete mode 100644 package/krb5/patches/patch-src_lib_kadm5_logger_c delete mode 100644 package/krb5/patches/patch-src_lib_kadm5_srv_server_init_c delete mode 100644 package/krb5/patches/patch-src_lib_kdb_kdb_convert_c delete mode 100644 package/krb5/patches/patch-src_lib_krb5_krb5_libinit_c delete mode 100644 package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c delete mode 100644 package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c delete mode 100644 package/krb5/patches/patch-src_plugins_kdb_db2_policy_db_h delete mode 100644 package/krb5/patches/patch-src_tests_asn_1_krb5_decode_leak_c delete mode 100644 package/krb5/patches/patch-src_tests_asn_1_krb5_decode_test_c delete mode 100644 package/krb5/patches/patch-src_tests_asn_1_krb5_encode_test_c delete mode 100644 package/krb5/patches/patch-src_tests_create_kdb5_mkdums_c delete mode 100644 package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c delete mode 100644 package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c delete mode 100644 package/krb5/patches/patch-src_tests_verify_kdb5_verify_c diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 83f23521a..cbecf3edb 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -9,21 +9,20 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 524b1067b619cb5bf780759b6884c3f5 PKG_DESCR:= kerberos server PKG_SECTION:= app/crypto -PKG_DEPENDS:= libkrb5 libncurses libss libcom-err keyutils -PKG_DEPENDS+= libpthread -PKG_BUILDDEP:= ncurses e2fsprogs gettext-tiny bison-host +PKG_DEPENDS:= libkrb5 libncurses keyutils libpthread +PKG_BUILDDEP:= ncurses gettext-tiny bison-host PKG_URL:= http://web.mit.edu/kerberos/ PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.12/ -PKG_NOPARALLEL:= 1 PKG_LIBNAME:= libkrb5 PKG_OPTS:= dev +PKG_NOPARALLEL:= 1 PKG_SUBPKGS:= KRB5_SERVER KRB5_CLIENT LIBKRB5 PKGSD_LIBKRB5:= kerberos libraries PKGSC_LIBKRB5:= libs/crypto PKGSD_KRB5_CLIENT:= kerberos client tools PKGSC_KRB5_CLIENT:= app/crypto -PKGSS_KRB5_CLIENT:= libkrb5 libncurses libss libcom-err +PKGSS_KRB5_CLIENT:= libkrb5 libncurses DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-signed.tar WRKSRC= ${WRKDIST}/src @@ -36,8 +35,8 @@ $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGS CONFIGURE_ARGS+= --disable-static \ --disable-profiled \ - --with-system-ss \ - --with-system-et \ + --without-system-ss \ + --without-system-et \ --without-system-verto \ --without-tcl CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \ diff --git a/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c b/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c deleted file mode 100644 index 96c37bdd6..000000000 --- a/package/krb5/patches/patch-src_appl_sample_sclient_sclient_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" --#include "com_err.h" -+#include - - #include - #include diff --git a/package/krb5/patches/patch-src_appl_sample_sserver_sserver_c b/package/krb5/patches/patch-src_appl_sample_sserver_sserver_c deleted file mode 100644 index bcfe38acf..000000000 --- a/package/krb5/patches/patch-src_appl_sample_sserver_sserver_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include 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 deleted file mode 100644 index 03cbd6890..000000000 --- a/package/krb5/patches/patch-src_appl_simple_client_sim_client_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - - #include --#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 deleted file mode 100644 index 217ae2182..000000000 --- a/package/krb5/patches/patch-src_appl_simple_server_sim_server_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #include - --#include "com_err.h" -+#include - - #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 deleted file mode 100644 index cc121997c..000000000 --- a/package/krb5/patches/patch-src_appl_user_user_client_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - - #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 deleted file mode 100644 index d91ff797d..000000000 --- a/package/krb5/patches/patch-src_appl_user_user_server_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" --#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_kinit_kinit_c b/package/krb5/patches/patch-src_clients_kinit_kinit_c deleted file mode 100644 index 4089bbbbc..000000000 --- a/package/krb5/patches/patch-src_clients_kinit_kinit_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #include - #include --#include -+#include - - #ifdef GETOPT_LONG - #include diff --git a/package/krb5/patches/patch-src_clients_ksu_ksu_h b/package/krb5/patches/patch-src_clients_ksu_ksu_h deleted file mode 100644 index 164f53750..000000000 --- a/package/krb5/patches/patch-src_clients_ksu_ksu_h +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 --#include "com_err.h" - #include - #include - #include diff --git a/package/krb5/patches/patch-src_clients_kvno_kvno_c b/package/krb5/patches/patch-src_clients_kvno_kvno_c deleted file mode 100644 index 16be34aad..000000000 --- a/package/krb5/patches/patch-src_clients_kvno_kvno_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); - --#include -+#include - 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 deleted file mode 100644 index 65bd936e6..000000000 --- a/package/krb5/patches/patch-src_include_k5-int_h +++ /dev/null @@ -1,11 +0,0 @@ ---- krb5-1.12.1.orig/src/include/k5-int.h 2014-01-16 01:44:15.000000000 +0100 -+++ krb5-1.12.1/src/include/k5-int.h 2014-02-11 18:55:39.000000000 +0100 -@@ -904,7 +904,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" -+#include - #include "k5-plugin.h" - - #include diff --git a/package/krb5/patches/patch-src_include_k5-thread_h b/package/krb5/patches/patch-src_include_k5-thread_h new file mode 100644 index 000000000..71eb656f9 --- /dev/null +++ b/package/krb5/patches/patch-src_include_k5-thread_h @@ -0,0 +1,19 @@ +--- krb5-1.12.1.orig/src/include/k5-thread.h 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/include/k5-thread.h 2014-06-05 20:59:34.000000000 +0200 +@@ -380,14 +380,12 @@ static inline int k5_mutex_finish_init(k + + static inline void k5_mutex_lock(k5_mutex_t *m) + { +- int r = k5_os_mutex_lock(m); +- assert(r == 0); ++ k5_os_mutex_lock(m); + } + + static inline void k5_mutex_unlock(k5_mutex_t *m) + { +- int r = k5_os_mutex_unlock(m); +- assert(r == 0); ++ k5_os_mutex_unlock(m); + } + + #define k5_mutex_assert_locked(M) ((void)(M)) diff --git a/package/krb5/patches/patch-src_kadmin_dbutil_dump_c b/package/krb5/patches/patch-src_kadmin_dbutil_dump_c deleted file mode 100644 index 6380de6be..000000000 --- a/package/krb5/patches/patch-src_kadmin_dbutil_dump_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include - #include --#include - #include "kdb5_util.h" - #if defined(HAVE_REGEX_H) && defined(HAVE_REGCOMP) - #include diff --git a/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c b/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c deleted file mode 100644 index de4f958c4..000000000 --- a/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_destroy_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 --#include "com_err.h" - #include - #include - #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 deleted file mode 100644 index 23a4f710c..000000000 --- a/package/krb5/patches/patch-src_kadmin_dbutil_kdb5_stash_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" --#include "com_err.h" - #include - #include - #include "kdb5_util.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 deleted file mode 100644 index 2a3e96b49..000000000 --- a/package/krb5/patches/patch-src_kdc_do_as_req_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" --#include "com_err.h" - - #include - #ifdef HAVE_NETINET_IN_H 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 deleted file mode 100644 index 7fae48bc4..000000000 --- a/package/krb5/patches/patch-src_lib_gssapi_generic_disp_com_err_status_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - /* 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 deleted file mode 100644 index e26d8ee34..000000000 --- a/package/krb5/patches/patch-src_lib_gssapi_krb5_disp_status_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - /* XXXX internationalization!! */ - diff --git a/package/krb5/patches/patch-src_lib_kadm5_admin_h b/package/krb5/patches/patch-src_lib_kadm5_admin_h deleted file mode 100644 index d730c5517..000000000 --- a/package/krb5/patches/patch-src_lib_kadm5_admin_h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #include - #include --#include -+#include - #include - #include - 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 deleted file mode 100644 index 03de1b7de..000000000 --- a/package/krb5/patches/patch-src_lib_kadm5_clnt_client_init_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #endif - #include --#include - #include - #include - #include diff --git a/package/krb5/patches/patch-src_lib_kadm5_logger_c b/package/krb5/patches/patch-src_lib_kadm5_logger_c deleted file mode 100644 index 7d0665029..000000000 --- a/package/krb5/patches/patch-src_lib_kadm5_logger_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" --#include "com_err.h" - #include - #include - #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 deleted file mode 100644 index a693bc751..000000000 --- a/package/krb5/patches/patch-src_lib_kadm5_srv_server_init_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include - #include --#include - #include "k5-int.h" /* needed for gssapiP_krb5.h */ - #include - #include diff --git a/package/krb5/patches/patch-src_lib_kdb_kdb_convert_c b/package/krb5/patches/patch-src_lib_kdb_kdb_convert_c deleted file mode 100644 index 7c156955d..000000000 --- a/package/krb5/patches/patch-src_lib_kdb_kdb_convert_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 --#include -+#include - #include - #include - #include diff --git a/package/krb5/patches/patch-src_lib_krb5_krb5_libinit_c b/package/krb5/patches/patch-src_lib_krb5_krb5_libinit_c deleted file mode 100644 index 30f9e9e3a..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_krb5_libinit_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - #include "autoconf.h" --#include "com_err.h" -+#include - #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 deleted file mode 100644 index f121d4b37..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c +++ /dev/null @@ -1,10 +0,0 @@ ---- krb5-1.12.1.orig/src/lib/krb5/krb/gic_pwd.c 2014-01-16 01:44:15.000000000 +0100 -+++ krb5-1.12.1/src/lib/krb5/krb/gic_pwd.c 2014-02-11 18:55:39.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 - #include "init_creds_ctx.h" - #include "int-proto.h" - #include "os-proto.h" diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c b/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c deleted file mode 100644 index 8f25f73de..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_krb_recvauth_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" --#include "com_err.h" -+#include - #include - #include - #include 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 deleted file mode 100644 index c35021862..000000000 --- a/package/krb5/patches/patch-src_plugins_kdb_db2_policy_db_h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #include - #include "adb_err.h" --#include -+#include - - typedef long osa_adb_ret_t; - 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 deleted file mode 100644 index e0cba989c..000000000 --- a/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_leak_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #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 deleted file mode 100644 index 60081c99d..000000000 --- a/package/krb5/patches/patch-src_tests_asn_1_krb5_decode_test_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" - #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 deleted file mode 100644 index a59b3b9dd..000000000 --- a/package/krb5/patches/patch-src_tests_asn_1_krb5_encode_test_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #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 deleted file mode 100644 index 9822bc8b0..000000000 --- a/package/krb5/patches/patch-src_tests_create_kdb5_mkdums_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" --#include "com_err.h" - #include - #include - diff --git a/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c b/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c deleted file mode 100644 index ce5d0bb81..000000000 --- a/package/krb5/patches/patch-src_tests_dejagnu_t_inetd_c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #endif - --#include "com_err.h" -+#include - - - 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 deleted file mode 100644 index 4f65970bf..000000000 --- a/package/krb5/patches/patch-src_tests_hammer_kdc5_hammer_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - - #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 deleted file mode 100644 index f97409829..000000000 --- a/package/krb5/patches/patch-src_tests_verify_kdb5_verify_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" --#include "com_err.h" - #include - #include - -- cgit v1.2.3