diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-15 21:40:58 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-15 21:40:58 +0200 |
| commit | 88dc317d5510827a551697805c5d167d3ecb0975 (patch) | |
| tree | 844617488fd1dc07aaccac5f680cb73a66622939 /package/krb5 | |
| parent | dff2d49e4342587e3d4c2f578eacfdc0e4089cca (diff) | |
| parent | 0a1c8865d1e019c19639108b2ae1cf53eb863f31 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/krb5')
5 files changed, 41 insertions, 10 deletions
diff --git a/package/krb5/Makefile b/package/krb5/Makefile index a16662b92..6bf32d875 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= krb5 -PKG_VERSION:= 1.12.1 +PKG_VERSION:= 1.13.1 PKG_RELEASE:= 1 -PKG_HASH:= 72f1b6c166cb42c0b03814ab7ea10f91926d8a665a5ba1cee430a3f31e62c580 +PKG_HASH:= 4df629fdf97f362cf81edbf38d613b32b492dd88c876cf3aa1c66562f296663e PKG_DESCR:= kerberos server PKG_SECTION:= app/crypto 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_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.13/ PKG_LIBNAME:= libkrb5 PKG_OPTS:= dev PKG_NOPARALLEL:= 1 @@ -35,8 +35,8 @@ $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGS CONFIGURE_ARGS+= --disable-static \ --disable-profiled \ - --without-system-ss \ --without-system-et \ + --without-system-ss \ --without-system-verto \ --without-tcl CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \ diff --git a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c index e29061185..cbe02c798 100644 --- a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c +++ b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c @@ -1,6 +1,6 @@ ---- krb5-1.12.1.orig/src/lib/kadm5/alt_prof.c 2014-01-16 01:44:15.000000000 +0100 -+++ krb5-1.12.1/src/lib/kadm5/alt_prof.c 2014-02-11 18:55:39.000000000 +0100 -@@ -155,7 +155,7 @@ krb5_aprof_get_boolean(krb5_pointer acon +--- krb5-1.13.1.orig/src/lib/kadm5/alt_prof.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/lib/kadm5/alt_prof.c 2015-05-02 15:11:04.883427001 -0500 +@@ -154,7 +154,7 @@ krb5_aprof_get_boolean(krb5_pointer acon krb5_error_code ret; char **values, *valp; int idx; diff --git a/package/krb5/patches/patch-src_lib_krb5_ccache_cc_file_c b/package/krb5/patches/patch-src_lib_krb5_ccache_cc_file_c new file mode 100644 index 000000000..be64a4947 --- /dev/null +++ b/package/krb5/patches/patch-src_lib_krb5_ccache_cc_file_c @@ -0,0 +1,20 @@ +--- krb5-1.13.1.orig/src/lib/krb5/ccache/cc_file.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/lib/krb5/ccache/cc_file.c 2015-05-02 15:20:59.335427054 -0500 +@@ -401,7 +401,7 @@ read_principal(krb5_context context, krb + { + krb5_error_code ret; + struct k5buf buf; +- size_t maxsize; ++ size_t maxsize = 0; + + *princ = NULL; + k5_cc_mutex_assert_locked(context, &((fcc_data *)id->data)->lock); +@@ -1088,7 +1088,7 @@ fcc_next_cred(krb5_context context, krb5 + krb5_fcc_cursor *fcursor = *cursor; + fcc_data *data = id->data; + struct k5buf buf; +- size_t maxsize; ++ size_t maxsize = 0; + + memset(creds, 0, sizeof(*creds)); + k5_cc_mutex_lock(context, &data->lock); diff --git a/package/krb5/patches/patch-src_lib_rpc_bindresvport_c b/package/krb5/patches/patch-src_lib_rpc_bindresvport_c index 925485160..3999aa242 100644 --- a/package/krb5/patches/patch-src_lib_rpc_bindresvport_c +++ b/package/krb5/patches/patch-src_lib_rpc_bindresvport_c @@ -1,6 +1,6 @@ ---- krb5-1.11.3.orig/src/lib/rpc/bindresvport.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/rpc/bindresvport.c 2013-08-14 14:52:36.000000000 +0200 -@@ -37,6 +37,7 @@ +--- krb5-1.13.1.orig/src/lib/rpc/bindresvport.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/lib/rpc/bindresvport.c 2015-05-02 15:11:04.955427001 -0500 +@@ -39,6 +39,7 @@ #include <sys/types.h> #include <sys/errno.h> #include <sys/socket.h> diff --git a/package/krb5/patches/patch-src_plugins_preauth_pkinit_pkinit_crypto_openssl_c b/package/krb5/patches/patch-src_plugins_preauth_pkinit_pkinit_crypto_openssl_c new file mode 100644 index 000000000..41831586e --- /dev/null +++ b/package/krb5/patches/patch-src_plugins_preauth_pkinit_pkinit_crypto_openssl_c @@ -0,0 +1,11 @@ +--- krb5-1.13.1.orig/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-02-11 21:16:43.000000000 -0600 ++++ krb5-1.13.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-05-02 15:39:13.727426998 -0500 +@@ -3593,7 +3593,7 @@ pkinit_open_session(krb5_context context + { + CK_ULONG i, r; + unsigned char *cp; +- size_t label_len; ++ size_t label_len = 0; + CK_ULONG count = 0; + CK_SLOT_ID_PTR slotlist; + CK_TOKEN_INFO tinfo; |