From bfc92af897eaad18625659b6d7645d55ef4e3a20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 6 May 2015 23:44:03 +0200 Subject: [PATCH] - fix kerberos libs detection on x32 - rel 2 --- nfs-utils-x32.patch | 20 ++++++++++++++++++++ nfs-utils.spec | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 nfs-utils-x32.patch diff --git a/nfs-utils-x32.patch b/nfs-utils-x32.patch new file mode 100644 index 0000000..1b79b90 --- /dev/null +++ b/nfs-utils-x32.patch @@ -0,0 +1,20 @@ +--- nfs-utils-1.3.2/aclocal/kerberos5.m4.orig 2015-05-06 23:41:11.208089930 +0200 ++++ nfs-utils-1.3.2/aclocal/kerberos5.m4 2015-05-06 23:41:53.404811795 +0200 +@@ -39,6 +39,8 @@ + if test -f $dir/include/gssapi/gssapi_krb5.h -a \ + \( -f $dir/lib/libgssapi_krb5.a -o \ + -f $dir/lib64/libgssapi_krb5.a -o \ ++ -f $dir/libx32/libgssapi_krb5.a -o \ ++ -f $dir/libx32/libgssapi_krb5.so -o \ + -f $dir/lib64/libgssapi_krb5.so -o \ + -f $dir/lib/libgssapi_krb5.so \) ; then + AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) +@@ -60,6 +62,8 @@ + -f $dir/include/heimdal/heim_err.h \) -a \ + \( -f $dir/lib/libroken.a -o \ + -f $dir/lib64/libroken.a -o \ ++ -f $dir/libx32/libroken.a -o \ ++ -f $dir/libx32/libroken.so -o \ + -f $dir/lib64/libroken.so -o \ + -f $dir/lib/libroken.so \) ; then + K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(2),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` diff --git a/nfs-utils.spec b/nfs-utils.spec index 0d4fdc8..7936c51 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -10,7 +10,7 @@ Summary(ru.UTF-8): Утилиты для NFS и демоны поддержки Summary(uk.UTF-8): Утиліти для NFS та демони підтримки для NFS-сервера ядра Name: nfs-utils Version: 1.3.2 -Release: 1 +Release: 2 License: GPL v2 Group: Networking/Daemons #Source0: https://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2 @@ -47,6 +47,7 @@ Patch1: %{name}-statdpath.patch Patch2: %{name}-subsys.patch Patch3: %{name}-union-mount.patch Patch4: %{name}-heimdal.patch +Patch5: %{name}-x32.patch URL: http://nfs.sourceforge.net/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -186,6 +187,7 @@ Wspólne programy do obsługi NFS. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__libtoolize} -- 2.44.0