debian/patches/17-multiarch-kerberos-paths.patch (Closes: #642797).

diff --git a/debian/changelog b/debian/changelog
index ccdefffd8289f3e586b0d086d6b28bba7b9564b1..887287b684c90c1d9108f9407cd09e6d1ddf135c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ nfs-utils (1:1.2.5-1) UNRELEASED; urgency=low
     - rpc.statd: Bind downcall socket to loopback address (Closes: #457095). 
   * Add version to build-dep on libnfsidmap-dev (Closes: #639691).
   * debian/idmapd.conf: Comment Domain (Closes: #638607).
+  * debian/patches/17-multiarch-kerberos-paths.patch (Closes: #642797).
 
- -- Luk Claes <luk@debian.org>  Sun, 02 Oct 2011 17:31:48 +0200
+ -- Luk Claes <luk@debian.org>  Sun, 02 Oct 2011 18:04:27 +0200
 
 nfs-utils (1:1.2.4-2) UNRELEASED; urgency=low
 

diff --git a/debian/patches/17-multiarch-kerberos-paths.patch b/debian/patches/17-multiarch-kerberos-paths.patch
new file mode 100644 (file)
index 0000000..385eb40
--- /dev/null
+++ b/debian/patches/17-multiarch-kerberos-paths.patch
@@ -0,0 +1,18 @@
++--- trunk.orig/aclocal/kerberos5.m4
+++++ trunk/aclocal/kerberos5.m4
++@@ -29,6 +29,7 @@
++     elif test -f "/usr/lib/mit/bin/krb5-config"; then
++       K5CONFIG="/usr/lib/mit/bin/krb5-config"
++     fi
+++    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
++     if test "$K5CONFIG" != ""; then
++       KRBCFLAGS=`$K5CONFIG --cflags`
++       KRBLIBS=`$K5CONFIG --libs gssapi`
++@@ -38,6 +39,7 @@
++                 \( -f $dir/lib/libgssapi_krb5.a -o \
++                    -f $dir/lib64/libgssapi_krb5.a -o \
++                    -f $dir/lib64/libgssapi_krb5.so -o \
+++                   -f $dir/lib/$MULTIARCH/libgssapi_krb5.so -o \
++                    -f $dir/lib/libgssapi_krb5.so \) ; then
++          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
++          KRBDIR="$dir"

diff --git a/debian/patches/series b/debian/patches/series
index 4c7886100b7d572a725d7c6e68c826235d294b76..e05755be28305c2bf621aee393afd50a723b9aed 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03-handle-mtab-symlink.patch
 11-532048-reduce-verbosity.patch
 16-mount.nfs.man-update-distinction-between-fstype.patch
+17-multiarch-kerberos-paths.patch