main/krb5: upgrade to 1.15.1

2 files changed, 42 insertions, 34 deletions

diff --git a/main/krb5/APKBUILD b/main/krb5/APKBUILD
index a6f8c2af2a..ea17eb0e59 100644
--- a/main/krb5/APKBUILD
+++ b/main/krb5/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=krb5
-pkgver=1.14.3
-pkgrel=2
+pkgver=1.15.1
+pkgrel=0
 
 case $pkgver in
 *.*.*) _ver=${pkgver%.*};;
@@ -16,12 +16,12 @@ depends="krb5-conf"
 depends_dev="e2fsprogs-dev"
 makedepends="$depends_dev libverto-dev openldap-dev libressl-dev
 	keyutils-dev bison flex perl"
-install=""
-options="suid"
+options="suid !check"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-server
 	$pkgname-server-ldap:ldap $pkgname-pkinit $pkgname-libs"
 source="http://web.mit.edu/kerberos/dist/krb5/${_ver}/krb5-$pkgver.tar.gz
 	mit-krb5_krb5-config_LDFLAGS.patch
+	libressl.patch
 
 	krb5kadmind.initd
 	krb5kdc.initd
@@ -29,22 +29,13 @@ source="http://web.mit.edu/kerberos/dist/krb5/${_ver}/krb5-$pkgver.tar.gz
 	"
 
 _builddir="$srcdir"/krb5-$pkgver
+
 unpack() {
 	default_unpack
 	cd "$srcdir"
 	tar -zxf krb5-$pkgver.tar.gz
 }
 
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
 	cd "$_builddir"/src
 	./configure \
@@ -61,15 +52,13 @@ build() {
 		--with-system-ss \
 		--with-system-verto \
 		--without-tcl \
-		--with-ldap \
-		--with-crypto-impl=openssl \
-		|| return 1
+		--with-ldap
 	make
 }
 
 package() {
 	cd "$_builddir"/src
-	make install DESTDIR="$pkgdir" || return 1
+	make install DESTDIR="$pkgdir"
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
 	mv "$pkgdir"/usr/share/examples "$pkgdir"/usr/share/doc/$pkgname/
 
@@ -87,9 +76,9 @@ server() {
 	mkdir -p "$subpkgdir"/usr/share \
 		"$subpkgdir"/usr/bin \
 		"$subpkgdir"/etc/
-	install -d "$subpkgdir"/var/lib/krb5kdc || return 1
-	mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/ || return 1
-	mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/ || return 1
+	install -d "$subpkgdir"/var/lib/krb5kdc
+	mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/
+	mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/
 	# used for testing server
 	mv "$pkgdir"/usr/bin/sclient "$subpkgdir"/usr/bin/
 
@@ -99,7 +88,7 @@ ldap() {
 	pkgdesc="The LDAP storage plugin for the Kerberos 5 KDC"
 	mkdir -p "$subpkgdir"/usr/lib/krb5/plugins/kdb
 	mv "$pkgdir"/usr/lib/krb5/plugins/kdb/kldap.so \
-		"$subpkgdir"/usr/lib/krb5/plugins/kdb/ || return 1
+		"$subpkgdir"/usr/lib/krb5/plugins/kdb/
 	mv "$pkgdir"/usr/lib/libkdb_ldap* \
 		 "$subpkgdir"/usr/lib/
 }
@@ -115,20 +104,11 @@ libs() {
 	pkgdesc="The shared libraries used by Kerberos 5"
 	depends="krb5-conf"
 	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ || return 1
+	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
-md5sums="f76e4f8a3c95bb59980dd5ef4b48aea9  krb5-1.14.3.tar.gz
-c84a0c7d8014e3528524956ffdd1c3e9  mit-krb5_krb5-config_LDFLAGS.patch
-9c0e3bac122326cdbbbac068056ee8af  krb5kadmind.initd
-71131479c07a2d89b30a2ea18dd64e74  krb5kdc.initd
-d94873a6a1ac6277adf2d25458eda9e5  krb5kpropd.initd"
-sha256sums="cd4620d520cf0df0dd8791309912df2bb20fcba76790b9fba4e25c1da08ff2c9  krb5-1.14.3.tar.gz
-84007c7423f67db7a8b248b9643c49ef25f2d56ce15c2574eb41ecbf51bcd3f2  mit-krb5_krb5-config_LDFLAGS.patch
-213a5b04f091e4644e856aabc38da586bd86c4616ab15f00eefca52fca7137d6  krb5kadmind.initd
-577842c7fe4639a8e9dd349da40e514284dd53440bb71be58283faaf18508f9a  krb5kdc.initd
-1644639d83791bd871f3c89a53a7052ab52994d3ef03d1d675d4217130c1fa94  krb5kpropd.initd"
-sha512sums="97f42bb7e0f69e337b949b451bf925f604e7ef9336c32bd4d62224a8c4a37e631f5a6fc01016bbdf268bbb60fa58712e244e00a1ab5a8bceede6a676482235aa  krb5-1.14.3.tar.gz
+sha512sums="068b4c012722d8c232049d2a617f7ee28ceeaba6be94a78439e69e37b66cfdc49085641e42cfb03b2fbb72d21517b537e437061ec4dd2bf864f31e55e05fe918  krb5-1.15.1.tar.gz
 5a3782ff17b383f8cd0415fd13538ab56afd788130d6ad640e9f2682b7deaae7f25713ce358058ed771091040dccf62a3bc87e6fd473d505ec189a95debcc801  mit-krb5_krb5-config_LDFLAGS.patch
+1bcfd92f610ccee6edeb22d3cfef1388ed52f999eb976f158e7be3e4d65394ceb82d915f232e4fa1f365cd35814e4a97a657d70b6d9d64c1f8c08541adcdcc23  libressl.patch
 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682  krb5kadmind.initd
 ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec  krb5kdc.initd
 45be0d421efd41e9dd056125a750c90856586e990317456b68170d733b03cba9ecd18ab87603b20e49575e7839fb4a6d628255533f2631f9e8ddb7f3cc493a90  krb5kpropd.initd"
diff --git a/main/krb5/libressl.patch b/main/krb5/libressl.patch
new file mode 100644
index 0000000000..ec274cc6ae
--- /dev/null
+++ b/main/krb5/libressl.patch
@@ -0,0 +1,28 @@
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -191,7 +191,7 @@
+     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ /* 1.1 standardizes constructor and destructor names, renaming
+  * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
+@@ -3059,7 +3059,7 @@
+     return retval;
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ /*
+  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
+@@ -3122,6 +3122,7 @@
+ 
+ #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ 
++#include <openssl/asn1_mac.h>
+ /*
+  * Do the same decoding (except without decoding j and vparams or checking the
+  * sequence length) using the pre-OpenSSL-1.1 asn1_mac.h.  Define an internal