lede-packages-rs

commit 97a6a903e84c3af94765d8d6c0bbfa9992e2ff1d
parent e26fc30eb9b57a3f063028fa0296a48179c03512
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Tue, 22 Dec 2015 11:11:44 +0200

Merge pull request #2129 from commodo/krb5-upgrade-n-fix

krb5: bump to version 1.13.3 and fix uninitialized warning/error
Diffstat:
M
net/krb5/Makefile
 | 
14
+++-----------
A
net/krb5/patches/002-fix-uninitialized-warning-error.patch
 | 
13
+++++++++++++

2 files changed, 16 insertions(+), 11 deletions(-)
diff --git 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.13.3
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -16,9 +16,9 @@ PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=NOTICE
 
-PKG_SOURCE:=krb5-$(PKG_VERSION)-signed.tar
+PKG_SOURCE:=krb5-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.13/
-PKG_MD5SUM:=f7ebfa6c99c10b16979ebf9a98343189
+PKG_MD5SUM:=f99fb414932a4d8b1925e00ef31e7680
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -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 += \
diff --git a/net/krb5/patches/002-fix-uninitialized-warning-error.patch b/net/krb5/patches/002-fix-uninitialized-warning-error.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
+index 20a348c..97baff0 100644
+--- a/src/kadmin/ktutil/ktutil_funcs.c
++++ b/src/kadmin/ktutil/ktutil_funcs.c
+@@ -67,7 +67,7 @@ krb5_error_code ktutil_delete(context, list, idx)
+     krb5_kt_list lp, prev;
+     int i;
+ 
+-    for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
++    for (prev = NULL, lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
+         if (i == idx) {
+             if (i == 1)
+                 *list = lp->next;