From 665590b844045359e2d8c229540d942fd85aba1f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 16 Jul 2014 00:05:48 +0200 Subject: [PATCH] mit-krb5: switch to libressl. --- srcpkgs/mit-krb5/patches/libressl.patch | 11 +++++++++++ srcpkgs/mit-krb5/template | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/mit-krb5/patches/libressl.patch diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch new file mode 100644 index 00000000000..d965ef84fb7 --- /dev/null +++ b/srcpkgs/mit-krb5/patches/libressl.patch @@ -0,0 +1,11 @@ +--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2014-07-16 00:02:32.311738055 +0200 ++++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2014-07-16 00:03:04.729003461 +0200 +@@ -172,7 +172,7 @@ static char * + pkinit_pkcs11_code_to_text(int err); + + +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x20000000L + /* Use CMS support present in OpenSSL 1.0 and later. */ + #include + #define pkinit_CMS_get0_content_signed(_cms) CMS_get0_content(_cms) diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 47b0fad1340..f43b8ec9967 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -1,7 +1,7 @@ # Template file for 'mit-krb5' pkgname=mit-krb5 version=1.12.1 -revision=2 +revision=3 short_desc="MIT Kerberos 5 implementation" maintainer="Juan RP " license="MIT" @@ -19,7 +19,7 @@ configure_args="--disable-rpath --with-system-et --without-system-verto --with-system-ss --with-system-db --enable-shared --without-tcl" hostmakedepends="perl flex" -makedepends="db-devel>=5.3 e2fsprogs-devel openssl-devel" +makedepends="db-devel>=5.3 e2fsprogs-devel libressl-devel" depends="mit-krb5-client>=${version}_${revision}" conflicts="heimdal>=0" @@ -57,7 +57,7 @@ mit-krb5-client_package() { } mit-krb5-devel_package() { - depends="db-devel>=5.3 openssl-devel e2fsprogs-devel>=1.4.10_1 mit-krb5-libs>=${version}_${revision}" + depends="${makedepends} mit-krb5-libs>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include