diff --git a/common/shlibs b/common/shlibs index db1f81278c..d174e46807 100644 --- a/common/shlibs +++ b/common/shlibs @@ -502,9 +502,9 @@ libmysqlclient.so.18 libmysqlclient-5.5.27_1 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1 libgssrpc.so.4 mit-krb5-libs-1.8_1 libk5crypto.so.3 mit-krb5-libs-1.8_1 -libkadm5clnt_mit.so.10 mit-krb5-libs-1.14_1 +libkadm5clnt_mit.so.11 mit-krb5-libs-1.15.1_1 libkadm5clnt.so mit-krb5-libs-1.8_1 -libkadm5srv_mit.so.10 mit-krb5-libs-1.14_1 +libkadm5srv_mit.so.11 mit-krb5-libs-1.15.1_1 libkadm5srv.so mit-krb5-libs-1.8_1 libkdb5.so.8 mit-krb5-libs-1.13.1_1 libkrb5.so.3 mit-krb5-libs-1.8_1 diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch new file mode 100644 index 0000000000..dcd76d3852 --- /dev/null +++ b/srcpkgs/mit-krb5/patches/libressl.patch @@ -0,0 +1,28 @@ +--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig ++++ 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 + /* + * 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 diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 35a6f9642f..44012f6315 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,13 +1,13 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 -version=1.14.4 -revision=3 +version=1.15.1 +revision=1 short_desc="MIT Kerberos 5 implementation" maintainer="Juan RP " license="MIT" homepage="http://web.mit.edu/kerberos" -distfiles="$homepage/dist/krb5/1.14/krb5-${version}.tar.gz" -checksum=03a61a4280c9161771fb39019085dbe6a57aa602080515ff93b43cd6137e0b95 +distfiles="$homepage/dist/krb5/1.15/krb5-${version}.tar.gz" +checksum=437c8831ddd5fde2a993fef425dedb48468109bb3d3261ef838295045a89eb45 build_style=gnu-configure wrksrc="krb5-${version}"