diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 06:03:02 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 06:03:02 +0000 |
commit | edd02aa960301b52f94c88efb6fae0d3ca79b548 (patch) | |
tree | 5cec2df47f338a42883a0e6189028df4f4ec6077 /debian/patches/multiarch-kerberos-paths.patch | |
parent | Adding upstream version 1:2.6.4. (diff) | |
download | nfs-utils-edd02aa960301b52f94c88efb6fae0d3ca79b548.tar.xz nfs-utils-edd02aa960301b52f94c88efb6fae0d3ca79b548.zip |
Adding debian version 1:2.6.4-3.debian/1%2.6.4-3
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/multiarch-kerberos-paths.patch')
-rw-r--r-- | debian/patches/multiarch-kerberos-paths.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/multiarch-kerberos-paths.patch b/debian/patches/multiarch-kerberos-paths.patch new file mode 100644 index 0000000..ed63325 --- /dev/null +++ b/debian/patches/multiarch-kerberos-paths.patch @@ -0,0 +1,22 @@ +Author: Luk Claes <luk@debian.org> +Description: Support multiarch kerberos paths (Closes: #642797). + +diff -Naurp nfs-utils.orig/aclocal/kerberos5.m4 nfs-utils/aclocal/kerberos5.m4 +--- nfs-utils.orig/aclocal/kerberos5.m4 ++++ nfs-utils/aclocal/kerberos5.m4 +@@ -29,6 +29,7 @@ AC_DEFUN([AC_KERBEROS_V5],[ + 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` +@@ -43,6 +44,7 @@ AC_DEFUN([AC_KERBEROS_V5],[ + -f $dir/lib32/libgssapi_krb5.so -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/$(uname -m)-linux-gnu/libgssapi_krb5.a -o \ + -f $dir/lib/$(uname -m)-linux-gnu/libgssapi_krb5.so \) ; then + AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) |