From: Luk Claes Date: Sun, 2 Oct 2011 16:06:25 +0000 (+0200) Subject: debian/patches/17-multiarch-kerberos-paths.patch (Closes: #642797). X-Git-Tag: debian/1%1.2.5-1~5 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fb746fb091508fe19c9c5bb46bdf2134184a6642;p=nfs-utils.git debian/patches/17-multiarch-kerberos-paths.patch (Closes: #642797). --- diff --git a/debian/changelog b/debian/changelog index ccdefff..887287b 100644 --- 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 Sun, 02 Oct 2011 17:31:48 +0200 + -- Luk Claes 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 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 4c78861..e05755b 100644 --- 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