From 29fdf3e483ef6f5c7e0df8cbb082245931a4bfea Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Wed, 30 Dec 2015 19:23:25 -0500 Subject: [PATCH 1/6] luasec: update to 0.5.1 Signed-off-by: W. Michael Petullo --- lang/luasec/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile index 9ed69d245..6429b2d3e 100644 --- a/lang/luasec/Makefile +++ b/lang/luasec/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasec -PKG_VERSION:=0.5 +PKG_VERSION:=0.5.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/ -PKG_MD5SUM:=0518f4524f399f33424c6f450e1d06db +PKG_MD5SUM:=e34e274a57e9045641191eb7398cce2a PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION) MAINTAINER:=W. Michael Petullo From 304fefb3fa893976ae55becad7c1af85dfa655a5 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Wed, 30 Dec 2015 19:21:21 -0500 Subject: [PATCH 2/6] libsoup: update to 2.53.2 Signed-off-by: W. Michael Petullo --- libs/libsoup/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile index a482b5ed4..873632a8d 100644 --- a/libs/libsoup/Makefile +++ b/libs/libsoup/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsoup -PKG_VERSION:=2.44.2 +PKG_VERSION:=2.53.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.44 -PKG_MD5SUM:=92aa3667357157e8f3489bcca287f2fa +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.53 +PKG_MD5SUM:=dc23612d6365a0b8a6a650ffe0bdcb4c PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -42,6 +42,7 @@ define Build/Configure --disable-glibtest \ --without-apache-httpd \ --without-gnome \ + --enable-vala=no \ ) endef From b8c9bc02008e05725699e2602cdd6d1e765c126b Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Wed, 30 Dec 2015 19:28:36 -0500 Subject: [PATCH 3/6] openldap: update to 2.4.43 Signed-off-by: W. Michael Petullo --- libs/openldap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index a2423d297..f9a834772 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap -PKG_VERSION:=2.4.41 +PKG_VERSION:=2.4.43 PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \ ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \ ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/ -PKG_MD5SUM:=3f1a4cea52827e18feaedfdc1634b5d0 +PKG_MD5SUM:=49ca65e27891fcf977d78c10f073c705 PKG_FIXUP:=autoreconf From 19e3ebc68ea2bc80625cd71781f5f0529c3bddfc Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Thu, 31 Dec 2015 22:21:32 -0500 Subject: [PATCH 4/6] 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 c9c84de91..1281a4408 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 2801fd363..000000000 --- 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 000000000..e416209e1 --- /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++; From aa49d8967b401aef5dd14f8b6c3a5232004acae9 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Wed, 30 Dec 2015 19:25:01 -0500 Subject: [PATCH 5/6] lighttpd: update to 1.4.38 Signed-off-by: W. Michael Petullo --- net/lighttpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 72eb7b66d..6769287cc 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd -PKG_VERSION:=1.4.37 +PKG_VERSION:=1.4.38 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x -PKG_MD5SUM:=ca40168f54b46ee29475868ced8507d6 +PKG_MD5SUM:=7adc12323f37ed24ecf026c7547b577d PKG_LICENSE:=BSD-3c PKG_LICENSE_FILES:=COPYING From 23fbc853226c3d10163579ca206a3fe35061dacc Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Fri, 1 Jan 2016 17:23:27 -0500 Subject: [PATCH 6/6] krb5: port removal of Prepare target from master Signed-off-by: W. Michael Petullo --- net/krb5/Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/net/krb5/Makefile b/net/krb5/Makefile index 1281a4408..2ae831beb 100644 --- a/net/krb5/Makefile +++ b/net/krb5/Makefile @@ -60,14 +60,6 @@ define Package/krb5/description Kerberos endef -define Build/Prepare - # Krb5 tarball contains signature and a second tarball - # containing source code. - tar xf "$(DL_DIR)/$(PKG_SOURCE)" -C "$(BUILD_DIR)" - tar xzf "$(BUILD_DIR)/krb5-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)" - patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/001-fix-build.patch" -endef - CONFIGURE_PATH = ./src CONFIGURE_VARS += \