From d3e7c6e21f3c49f30ea47c2220eba9edb8f0ade4 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 18 Nov 2018 12:00:09 -0800
Subject: [PATCH] krb5: Update to 1.16.2

Minor cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 net/krb5/Makefile                             | 11 ++++---
 ...001-fix-uninitialized-warning-errors.patch | 30 +++++++++----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/net/krb5/Makefile b/net/krb5/Makefile
index 22388ab50..39c5345cc 100644
--- a/net/krb5/Makefile
+++ b/net/krb5/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=krb5
-PKG_VERSION:=1.16.1
-PKG_RELEASE:=4
+PKG_VERSION:=1.16.2
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 
@@ -17,12 +17,11 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=NOTICE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.16/
-PKG_HASH:=214ffe394e3ad0c730564074ec44f1da119159d94281bbec541dc29168d21117
+PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.16
+PKG_HASH:=9f721e1fe593c219174740c71de514c7228a97d23eb7be7597b2ae14e487f027
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
-PKG_CHECK_FORMAT_SECURITY:=0
 PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
@@ -33,7 +32,7 @@ define Package/krb5/Default
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=Kerberos
-	URL:=http://web.mit.edu/kerberos/
+	URL:=https://web.mit.edu/kerberos/
 endef
 
 define Package/krb5-libs
diff --git a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch
index 88397c9ed..2ec16f852 100644
--- a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch
+++ b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch
@@ -1,6 +1,17 @@
+--- a/src/kadmin/ktutil/ktutil_funcs.c
++++ b/src/kadmin/ktutil/ktutil_funcs.c
+@@ -64,7 +64,7 @@ krb5_error_code ktutil_delete(context, list, idx)
+     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++) {
 --- a/src/lib/kadm5/str_conv.c
 +++ b/src/lib/kadm5/str_conv.c
-@@ -131,7 +131,7 @@
+@@ -133,7 +133,7 @@ raw_flagspec_to_mask(const char *s, int req_neg, krb5_flags *toset,
  {
      int found = 0, invert = 0;
      size_t i;
@@ -11,7 +22,7 @@
      for (i = 0; !found && i < NFTBL; i++) {
 --- a/src/lib/krad/packet.c
 +++ b/src/lib/krad/packet.c
-@@ -253,7 +253,7 @@
+@@ -253,7 +253,7 @@ krad_packet_new_request(krb5_context ctx, const char *secret, krad_code code,
  {
      krb5_error_code retval;
      krad_packet *pkt;
@@ -22,7 +33,7 @@
      pkt = packet_new();
 --- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
 +++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -3618,7 +3618,7 @@
+@@ -3764,7 +3764,7 @@ pkinit_open_session(krb5_context context,
  {
      CK_ULONG i, r;
      unsigned char *cp;
@@ -33,7 +44,7 @@
      CK_TOKEN_INFO tinfo;
 --- a/src/util/profile/prof_file.c
 +++ b/src/util/profile/prof_file.c
-@@ -309,7 +309,7 @@
+@@ -309,7 +309,7 @@ errcode_t profile_update_file_data_locked(prf_data_t data, char **ret_modspec)
      unsigned long frac;
      time_t now;
  #endif
@@ -42,14 +53,3 @@
      int isdir = 0;
  
  #ifdef HAVE_STAT
---- a/src/kadmin/ktutil/ktutil_funcs.c
-+++ b/src/kadmin/ktutil/ktutil_funcs.c
-@@ -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++) {