From 19e3ebc68ea2bc80625cd71781f5f0529c3bddfc Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Thu, 31 Dec 2015 22:21:32 -0500 Subject: [PATCH] krb5: update to 1.14 Signed-off-by: W. Michael Petullo --- net/krb5/Makefile | 8 ++-- net/krb5/patches/001-fix-build.patch | 45 ----------------- ...001-fix-uninitialized-warning-errors.patch | 48 +++++++++++++++++++ 3 files changed, 52 insertions(+), 49 deletions(-) delete mode 100644 net/krb5/patches/001-fix-build.patch create mode 100644 net/krb5/patches/001-fix-uninitialized-warning-errors.patch diff --git a/net/krb5/Makefile b/net/krb5/Makefile index c9c84de910..1281a44087 100644 --- a/net/krb5/Makefile +++ b/net/krb5/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=krb5 -PKG_VERSION:=1.13.2 +PKG_VERSION:=1.14 PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -16,9 +16,9 @@ PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=MIT PKG_LICENSE_FILES:=NOTICE -PKG_SOURCE:=krb5-$(PKG_VERSION)-signed.tar -PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.13/ -PKG_MD5SUM:=f7ebfa6c99c10b16979ebf9a98343189 +PKG_SOURCE:=krb5-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.14/ +PKG_MD5SUM:=0727968764d0208388b85ad31aafde24 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/net/krb5/patches/001-fix-build.patch b/net/krb5/patches/001-fix-build.patch deleted file mode 100644 index 2801fd3631..0000000000 --- a/net/krb5/patches/001-fix-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -u --recursive krb5-1.13.1-vanilla/src/lib/krad/packet.c krb5-1.13.1/src/lib/krad/packet.c ---- krb5-1.13.1-vanilla/src/lib/krad/packet.c 2015-02-22 10:08:38.213087138 -0500 -+++ krb5-1.13.1/src/lib/krad/packet.c 2015-02-22 10:13:25.223709951 -0500 -@@ -253,7 +253,7 @@ - { - krb5_error_code retval; - krad_packet *pkt; -- uchar id; -+ uchar id = 0; - size_t attrset_len; - - pkt = packet_new(); -diff -u --recursive krb5-1.13.1-vanilla/src/lib/krb5/ccache/cc_file.c krb5-1.13.1/src/lib/krb5/ccache/cc_file.c ---- krb5-1.13.1-vanilla/src/lib/krb5/ccache/cc_file.c 2015-02-22 10:08:38.211087133 -0500 -+++ krb5-1.13.1/src/lib/krb5/ccache/cc_file.c 2015-02-22 10:14:15.410819464 -0500 -@@ -401,7 +401,7 @@ - { - 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 @@ - 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 -u --recursive krb5-1.13.1-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c krb5-1.13.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c ---- krb5-1.13.1-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-02-22 10:08:38.190087088 -0500 -+++ krb5-1.13.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-02-22 10:17:37.981263250 -0500 -@@ -3593,7 +3593,7 @@ - { - 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; diff --git a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch new file mode 100644 index 0000000000..e416209e10 --- /dev/null +++ b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch @@ -0,0 +1,48 @@ +diff -u --recursive krb5-1.14-vanilla/src/kadmin/ktutil/ktutil_funcs.c krb5-1.14/src/kadmin/ktutil/ktutil_funcs.c +--- krb5-1.14-vanilla/src/kadmin/ktutil/ktutil_funcs.c 2015-12-31 21:50:20.572824136 -0500 ++++ krb5-1.14/src/kadmin/ktutil/ktutil_funcs.c 2015-12-31 22:11:26.603926597 -0500 +@@ -64,7 +64,7 @@ + krb5_kt_list *list; + int idx; + { +- krb5_kt_list lp, prev; ++ krb5_kt_list lp, prev = NULL; + int i; + + for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) { +diff -u --recursive krb5-1.14-vanilla/src/lib/krad/packet.c krb5-1.14/src/lib/krad/packet.c +--- krb5-1.14-vanilla/src/lib/krad/packet.c 2015-12-31 21:50:20.476819205 -0500 ++++ krb5-1.14/src/lib/krad/packet.c 2015-12-31 22:05:32.041257903 -0500 +@@ -253,7 +253,7 @@ + { + krb5_error_code retval; + krad_packet *pkt; +- uchar id; ++ uchar id = 0; + size_t attrset_len; + + pkt = packet_new(); +diff -u --recursive krb5-1.14-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c krb5-1.14/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +--- krb5-1.14-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-12-31 21:50:20.531822031 -0500 ++++ krb5-1.14/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2015-12-31 22:08:32.871650805 -0500 +@@ -3618,7 +3618,7 @@ + { + 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; +diff -u --recursive krb5-1.14-vanilla/src/util/profile/prof_file.c krb5-1.14/src/util/profile/prof_file.c +--- krb5-1.14-vanilla/src/util/profile/prof_file.c 2015-12-31 21:50:20.474819103 -0500 ++++ krb5-1.14/src/util/profile/prof_file.c 2015-12-31 21:59:08.551797171 -0500 +@@ -359,6 +359,8 @@ + if (f == NULL) + return (errno != 0) ? errno : ENOENT; + set_cloexec_file(f); ++ } else { ++ f = NULL; + } + + data->upd_serial++; -- 2.30.2