mit-krb5: update to 1.13.1.

This commit is contained in:
Juan RP 2015-02-20 10:43:39 +01:00
parent 75c140ca82
commit d134e57772
4 changed files with 8 additions and 39 deletions

View File

@ -506,7 +506,7 @@ libkadm5clnt_mit.so.9 mit-krb5-libs-1.12.1_1
libkadm5clnt.so mit-krb5-libs-1.8_1
libkadm5srv_mit.so.9 mit-krb5-libs-1.12.1_1
libkadm5srv.so mit-krb5-libs-1.8_1
libkdb5.so.7 mit-krb5-libs-1.11_1
libkdb5.so.8 mit-krb5-libs-1.13.1_1
libkrb5.so.3 mit-krb5-libs-1.8_1
libkrad.so.0 mit-krb5-libs-1.12.1_1
libkrb5support.so.0 mit-krb5-libs-1.8_1

View File

@ -1,11 +0,0 @@
--- src/Makefile.in.orig 2014-02-07 18:25:41.262245667 +0100
+++ src/Makefile.in 2014-02-07 18:25:54.077550438 +0100
@@ -20,7 +20,7 @@ SUBDIRS=util include lib \
@ldap_plugin_dir@ \
plugins/preauth/otp \
plugins/preauth/pkinit \
- kdc kadmin slave clients appl tests \
+ kdc kadmin slave clients appl \
config-files build-tools man doc @po@
WINSUBDIRS=include util lib ccapi windows clients appl
BUILDTOP=$(REL).

View File

@ -1,11 +0,0 @@
--- 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 <openssl/cms.h>
#define pkinit_CMS_get0_content_signed(_cms) CMS_get0_content(_cms)

View File

@ -1,13 +1,13 @@
# Template file for 'mit-krb5'
pkgname=mit-krb5
version=1.12.2
version=1.13.1
revision=1
short_desc="MIT Kerberos 5 implementation"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="http://web.mit.edu/Kerberos"
distfiles="$homepage/dist/krb5/${version%.*}/krb5-${version}-signed.tar"
checksum=09bd180107b5c2b3b7378c57c023fb02a103d4cac39d6f2dd600275d7a4f3744
checksum=4df629fdf97f362cf81edbf38d613b32b492dd88c876cf3aa1c66562f296663e
wrksrc="krb5-${version}"
@ -16,24 +16,16 @@ disable_parallel_build=yes
build_style=gnu-configure
configure_script="./src/configure"
configure_args="--disable-rpath --with-system-et --without-system-verto
--with-system-ss --with-system-db --enable-shared --without-tcl"
--with-system-ss --with-system-db --enable-shared --without-tcl
ac_cv_func_pthread_once=yes ac_cv_func_pthread_rwlock_init=yes
acx_pthread_ok=yes ac_cv_func_regcomp=yes ac_cv_printf_positional=yes
krb5_cv_attr_constructor_destructor=yes,yes"
hostmakedepends="perl flex"
hostmakedepends="perl flex e2fsprogs-devel"
makedepends="db-devel>=5.3 e2fsprogs-devel libressl-devel"
depends="mit-krb5-client>=${version}_${revision}"
conflicts="heimdal>=0"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" e2fsprogs-devel"
makedepends+=" libfl-devel"
configure_args+=" ac_cv_func_pthread_once=yes
ac_cv_func_pthread_rwlock_init=yes
acx_pthread_ok=yes
ac_cv_func_regcomp=yes
ac_cv_printf_positional=yes
krb5_cv_attr_constructor_destructor=yes,yes"
fi
do_extract() {
# We have to do this dance because the real distfile is
# included in the .tar archive.
@ -65,7 +57,6 @@ mit-krb5-devel_package() {
vmove "usr/lib/*.so"
}
}
mit-krb5-libs_package() {
conflicts="heimdal-libs>=0"
short_desc+=" - runtime libraries"