From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 27 Dec 2015 12:11:12 +0000 (+0100)
Subject: - simplify krb5 libs detection
X-Git-Tag: auto/th/amanda-3.3.6-6
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Famanda.git;a=commitdiff_plain;h=e2a11a769d144b0a182107dc88c73acf6f0514be

- simplify krb5 libs detection
- rel 6
---

diff --git a/amanda.spec b/amanda.spec
index 7d71cad..f1f1e43 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@ Summary:	A network-capable tape backup solution
 Summary(pl.UTF-8):	Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:		amanda
 Version:	3.3.6
-Release:	5
+Release:	6
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://downloads.sourceforge.net/amanda/%{name}-%{version}.tar.gz
@@ -41,6 +41,7 @@ Patch11:	%{name}-amstar-exclude-fix.patch
 Patch12:	%{name}-krb5-auth.patch
 Patch13:	%{name}-amstar-device.patch
 Patch14:	swig.patch
+Patch15:	krb5-ac.patch
 URL:		http://www.amanda.org/
 %{?with_samba:BuildRequires:	/usr/bin/smbclient}
 BuildRequires:	autoconf >= 2.53
@@ -215,6 +216,7 @@ typu streamer).
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 cp -a %{SOURCE10} .
 
 find perl/ -name '*.swg' -print0 | xargs -0 touch
diff --git a/krb5-ac.patch b/krb5-ac.patch
new file mode 100644
index 0000000..86b8855
--- /dev/null
+++ b/krb5-ac.patch
@@ -0,0 +1,35 @@
+--- amanda-3.3.6/config/amanda/krb5-security.m4~	2015-12-27 12:57:37.000000000 +0100
++++ amanda-3.3.6/config/amanda/krb5-security.m4	2015-12-27 13:01:46.912103153 +0100
+@@ -40,9 +40,7 @@
+         # in autoconf at this time. -kashmir
+         AC_MSG_CHECKING(for Kerberos V libraries)
+         KRB5_DIR_FOUND=""
+-        for dir in $KRB5_SPOTS; do
+-          for lib in lib lib64; do
+-            k5libdir=${dir}/${lib}
++            k5libdir=$libdir
+             if test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libgssapi_krb5.so -o -f ${k5libdir}/libgssapi_krb5.a \) -a \( -f ${k5libdir}/libcom_err.a -o -f ${k5libdir}/libcom_err.so \); then
+                 if test -f ${k5libdir}/libk5crypto.a -o -f ${k5libdir}/libk5crypto.so; then
+                     K5CRYPTO=-lk5crypto
+@@ -54,19 +54,15 @@
+                 else
+                     K5SUPPORT=""
+                 fi
+-                KRB5_DIR_FOUND=$dir
++                KRB5_DIR_FOUND=$prefix
+                 KRB5_LIBDIR_FOUND=$k5libdir
+                 AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err])
+-                break
+             elif test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libasn1.a -o -f ${k5libdir}/libasn1.so \) -a \( -f ${k5libdir}/libgssapi.a -o -f ${k5libdir}/libgssapi.so \); then
+-                KRB5_DIR_FOUND=$dir
++                KRB5_DIR_FOUND=$prefix
+                 KRB5_LIBDIR_FOUND=$k5libdir
+                 AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1])
+                 AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES])
+-                break
+             fi
+-          done
+-        done
+ 
+         if test "$KRB5_DIR_FOUND"; then
+             AC_MSG_RESULT(found in $KRB5_DIR_FOUND)