Browse Source

krb5: update to 1.13.1

Signed-off-by: W. Michael Petullo <mike@flyn.org>
lilik-openwrt-22.03
W. Michael Petullo 10 years ago
parent
commit
a581d888a2
2 changed files with 51 additions and 8 deletions
  1. +15
    -5
      net/krb5/Makefile
  2. +36
    -3
      net/krb5/patches/001-fix-build.patch

+ 15
- 5
net/krb5/Makefile View File

@ -1,12 +1,24 @@
#
# Copyright (C) 2009-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=krb5
PKG_VERSION:=1.12.1
PKG_VERSION:=1.13.1
PKG_RELEASE:=1
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
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.12/
PKG_MD5SUM:=524b1067b619cb5bf780759b6884c3f5
PKG_SOURCE_URL:=http://web.mit.edu/kerberos/dist/krb5/1.13/
PKG_MD5SUM:=567586cdf02aa8c842c2fab7a94f3c1f
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -23,7 +35,6 @@ define Package/krb5/Default
CATEGORY:=Network
TITLE:=Kerberos
URL:=http://web.mit.edu/kerberos/
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
endef
define Package/krb5-libs
@ -33,7 +44,6 @@ define Package/krb5-libs
DEPENDS:=+libncurses
TITLE:=Kerberos 5 Shared Libraries
URL:=http://web.mit.edu/kerberos/
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
endef
define Package/krb5-server


+ 36
- 3
net/krb5/patches/001-fix-build.patch View File

@ -1,6 +1,6 @@
diff -u --recursive krb5-1.12.1-vanilla/src/lib/krad/packet.c krb5-1.12.1/src/lib/krad/packet.c
--- krb5-1.12.1-vanilla/src/lib/krad/packet.c 2014-07-18 00:10:11.916603406 -0400
+++ krb5-1.12.1/src/lib/krad/packet.c 2014-07-18 00:20:23.471574387 -0400
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;
@ -10,3 +10,36 @@ diff -u --recursive krb5-1.12.1-vanilla/src/lib/krad/packet.c krb5-1.12.1/src/li
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;

Loading…
Cancel
Save