ソースを参照

krb5: update to 1.14

Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo 9 年 前
コミット
dff1834cc2

+ 3
- 3
net/krb5/Makefile ファイルの表示

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

+ 0
- 45
net/krb5/patches/001-fix-build.patch ファイルの表示

@@ -1,45 +0,0 @@
1
-diff -u --recursive krb5-1.13.1-vanilla/src/lib/krad/packet.c krb5-1.13.1/src/lib/krad/packet.c
2
---- krb5-1.13.1-vanilla/src/lib/krad/packet.c	2015-02-22 10:08:38.213087138 -0500
3
-+++ krb5-1.13.1/src/lib/krad/packet.c	2015-02-22 10:13:25.223709951 -0500
4
-@@ -253,7 +253,7 @@
5
- {
6
-     krb5_error_code retval;
7
-     krad_packet *pkt;
8
--    uchar id;
9
-+    uchar id = 0;
10
-     size_t attrset_len;
11
- 
12
-     pkt = packet_new();
13
-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
14
---- krb5-1.13.1-vanilla/src/lib/krb5/ccache/cc_file.c	2015-02-22 10:08:38.211087133 -0500
15
-+++ krb5-1.13.1/src/lib/krb5/ccache/cc_file.c	2015-02-22 10:14:15.410819464 -0500
16
-@@ -401,7 +401,7 @@
17
- {
18
-     krb5_error_code ret;
19
-     struct k5buf buf;
20
--    size_t maxsize;
21
-+    size_t maxsize = 0;
22
- 
23
-     *princ = NULL;
24
-     k5_cc_mutex_assert_locked(context, &((fcc_data *)id->data)->lock);
25
-@@ -1088,7 +1088,7 @@
26
-     krb5_fcc_cursor *fcursor = *cursor;
27
-     fcc_data *data = id->data;
28
-     struct k5buf buf;
29
--    size_t maxsize;
30
-+    size_t maxsize = 0;
31
- 
32
-     memset(creds, 0, sizeof(*creds));
33
-     k5_cc_mutex_lock(context, &data->lock);
34
-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
35
---- krb5-1.13.1-vanilla/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2015-02-22 10:08:38.190087088 -0500
36
-+++ krb5-1.13.1/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2015-02-22 10:17:37.981263250 -0500
37
-@@ -3593,7 +3593,7 @@
38
- {
39
-     CK_ULONG i, r;
40
-     unsigned char *cp;
41
--    size_t label_len;
42
-+    size_t label_len = 0;
43
-     CK_ULONG count = 0;
44
-     CK_SLOT_ID_PTR slotlist;
45
-     CK_TOKEN_INFO tinfo;

+ 48
- 0
net/krb5/patches/001-fix-uninitialized-warning-errors.patch ファイルの表示

@@ -0,0 +1,48 @@
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;
7
+ {
8
+-    krb5_kt_list lp, prev;
9
++    krb5_kt_list lp, prev = NULL;
10
+     int i;
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
16
+@@ -253,7 +253,7 @@
17
+ {
18
+     krb5_error_code retval;
19
+     krad_packet *pkt;
20
+-    uchar id;
21
++    uchar id = 0;
22
+     size_t attrset_len;
23
+ 
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
28
+@@ -3618,7 +3618,7 @@
29
+ {
30
+     CK_ULONG i, r;
31
+     unsigned char *cp;
32
+-    size_t label_len;
33
++    size_t label_len = 0;
34
+     CK_ULONG count = 0;
35
+     CK_SLOT_ID_PTR slotlist;
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
+     }
47
+ 
48
+     data->upd_serial++;

+ 0
- 13
net/krb5/patches/002-fix-uninitialized-warning-error.patch ファイルの表示

@@ -1,13 +0,0 @@
1
-diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
2
-index 20a348c..97baff0 100644
3
---- a/src/kadmin/ktutil/ktutil_funcs.c
4
-+++ b/src/kadmin/ktutil/ktutil_funcs.c
5
-@@ -67,7 +67,7 @@ krb5_error_code ktutil_delete(context, list, idx)
6
-     krb5_kt_list lp, prev;
7
-     int i;
8
- 
9
--    for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
10
-+    for (prev = NULL, lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
11
-         if (i == idx) {
12
-             if (i == 1)
13
-                 *list = lp->next;