From d134e5777275ca71f813ff07fc35147476bd8ba3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 20 Feb 2015 10:43:39 +0100
Subject: [PATCH] mit-krb5: update to 1.13.1.

---
 common/shlibs                                |  2 +-
 srcpkgs/mit-krb5/patches/disable_tests.patch | 11 ----------
 srcpkgs/mit-krb5/patches/libressl.patch      | 11 ----------
 srcpkgs/mit-krb5/template                    | 23 ++++++--------------
 4 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/mit-krb5/patches/disable_tests.patch
 delete mode 100644 srcpkgs/mit-krb5/patches/libressl.patch

diff --git a/common/shlibs b/common/shlibs
index 366a779f04a..373e468b681 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -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
diff --git a/srcpkgs/mit-krb5/patches/disable_tests.patch b/srcpkgs/mit-krb5/patches/disable_tests.patch
deleted file mode 100644
index 2c9bbe9dc6c..00000000000
--- a/srcpkgs/mit-krb5/patches/disable_tests.patch
+++ /dev/null
@@ -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).
diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch
deleted file mode 100644
index d965ef84fb7..00000000000
--- a/srcpkgs/mit-krb5/patches/libressl.patch
+++ /dev/null
@@ -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)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index f4af288e6e4..1e384195659 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.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"