Browse Source

krb5: update to 1.14.1

Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo 8 years ago
parent
commit
c35ba8097a
2 changed files with 30 additions and 29 deletions
  1. 2
    2
      net/krb5/Makefile
  2. 28
    27
      net/krb5/patches/001-fix-uninitialized-warning-errors.patch

+ 2
- 2
net/krb5/Makefile View File

@@ -8,7 +8,7 @@
8 8
 include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=krb5
11
-PKG_VERSION:=1.14
11
+PKG_VERSION:=1.14.1
12 12
 PKG_RELEASE:=1
13 13
 
14 14
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=NOTICE
18 18
 
19 19
 PKG_SOURCE:=krb5-$(PKG_VERSION).tar.gz
20 20
 PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.14/
21
-PKG_MD5SUM:=0727968764d0208388b85ad31aafde24
21
+PKG_MD5SUM:=400de0cabbfbe85c2c36f60347bf7dc6
22 22
 
23 23
 PKG_BUILD_PARALLEL:=1
24 24
 PKG_INSTALL:=1

+ 28
- 27
net/krb5/patches/001-fix-uninitialized-warning-errors.patch View File

@@ -1,18 +1,18 @@
1
-diff -u --recursive krb5-1.14-vanilla/src/kadmin/ktutil/ktutil_funcs.c krb5-1.14/src/kadmin/ktutil/ktutil_funcs.c
2
---- krb5-1.14-vanilla/src/kadmin/ktutil/ktutil_funcs.c	2015-12-31 21:50:20.572824136 -0500
3
-+++ krb5-1.14/src/kadmin/ktutil/ktutil_funcs.c	2015-12-31 22:11:26.603926597 -0500
4
-@@ -64,7 +64,7 @@
5
-     krb5_kt_list *list;
6
-     int idx;
1
+diff -u --recursive krb5-1.14.1-vanilla/src/lib/kadm5/str_conv.c krb5-1.14.1/src/lib/kadm5/str_conv.c
2
+--- krb5-1.14.1-vanilla/src/lib/kadm5/str_conv.c	2016-03-26 19:49:13.651926364 -0400
3
++++ krb5-1.14.1/src/lib/kadm5/str_conv.c	2016-03-26 21:05:37.436084066 -0400
4
+@@ -131,7 +131,7 @@
7 5
  {
8
--    krb5_kt_list lp, prev;
9
-+    krb5_kt_list lp, prev = NULL;
10
-     int i;
6
+     int found = 0, invert = 0;
7
+     size_t i;
8
+-    krb5_flags flag;
9
++    krb5_flags flag = 0;
10
+     unsigned long ul;
11 11
  
12
-     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
13
-diff -u --recursive krb5-1.14-vanilla/src/lib/krad/packet.c krb5-1.14/src/lib/krad/packet.c
14
---- krb5-1.14-vanilla/src/lib/krad/packet.c	2015-12-31 21:50:20.476819205 -0500
15
-+++ krb5-1.14/src/lib/krad/packet.c	2015-12-31 22:05:32.041257903 -0500
12
+     for (i = 0; !found && i < NFTBL; i++) {
13
+diff -u --recursive krb5-1.14.1-vanilla/src/lib/krad/packet.c krb5-1.14.1/src/lib/krad/packet.c
14
+--- krb5-1.14.1-vanilla/src/lib/krad/packet.c	2016-03-26 19:49:13.634926238 -0400
15
++++ krb5-1.14.1/src/lib/krad/packet.c	2016-03-26 21:13:03.023144940 -0400
16 16
 @@ -253,7 +253,7 @@
17 17
  {
18 18
      krb5_error_code retval;
@@ -22,9 +22,9 @@ diff -u --recursive krb5-1.14-vanilla/src/lib/krad/packet.c krb5-1.14/src/lib/kr
22 22
      size_t attrset_len;
23 23
  
24 24
      pkt = packet_new();
25
-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
26
---- krb5-1.14-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2015-12-31 21:50:20.531822031 -0500
27
-+++ krb5-1.14/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2015-12-31 22:08:32.871650805 -0500
25
+diff -u --recursive krb5-1.14.1-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c krb5-1.14.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
26
+--- krb5-1.14.1-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2016-03-26 19:49:13.653926379 -0400
27
++++ krb5-1.14.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2016-03-26 21:17:07.151335877 -0400
28 28
 @@ -3618,7 +3618,7 @@
29 29
  {
30 30
      CK_ULONG i, r;
@@ -34,15 +34,16 @@ diff -u --recursive krb5-1.14-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_o
34 34
      CK_ULONG count = 0;
35 35
      CK_SLOT_ID_PTR slotlist;
36 36
      CK_TOKEN_INFO tinfo;
37
-diff -u --recursive krb5-1.14-vanilla/src/util/profile/prof_file.c krb5-1.14/src/util/profile/prof_file.c
38
---- krb5-1.14-vanilla/src/util/profile/prof_file.c	2015-12-31 21:50:20.474819103 -0500
39
-+++ krb5-1.14/src/util/profile/prof_file.c	2015-12-31 21:59:08.551797171 -0500
40
-@@ -359,6 +359,8 @@
41
-         if (f == NULL)
42
-             return (errno != 0) ? errno : ENOENT;
43
-         set_cloexec_file(f);
44
-+    } else {
45
-+        f = NULL;
46
-     }
37
+Only in krb5-1.14.1/src/plugins/preauth/pkinit: .pkinit_crypto_openssl.c.swp
38
+diff -u --recursive krb5-1.14.1-vanilla/src/util/profile/prof_file.c krb5-1.14.1/src/util/profile/prof_file.c
39
+--- krb5-1.14.1-vanilla/src/util/profile/prof_file.c	2016-03-26 19:49:13.633926230 -0400
40
++++ krb5-1.14.1/src/util/profile/prof_file.c	2016-03-26 21:03:07.934427580 -0400
41
+@@ -309,7 +309,7 @@
42
+     unsigned long frac;
43
+     time_t now;
44
+ #endif
45
+-    FILE *f;
46
++    FILE *f = NULL;
47
+     int isdir = 0;
47 48
  
48
-     data->upd_serial++;
49
+ #ifdef HAVE_STAT