Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/, net-fs/nfs-utils/files/
Date: Sun, 11 Aug 2019 22:09:53
Message-Id: 1565561378.b4ff413bd4b91cd387a6087519527476d64aa90b.mattst88@gentoo
1 commit: b4ff413bd4b91cd387a6087519527476d64aa90b
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 22:05:52 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 22:09:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ff413b
7
8 net-fs/nfs-utils: Look in lib32 for krb5 libs
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 ....1-gssd-Look-in-lib32-for-gss-libs-aswell.patch | 39 ++++++++++++++++++++++
13 net-fs/nfs-utils/nfs-utils-2.4.1.ebuild | 1 +
14 2 files changed, 40 insertions(+)
15
16 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch
17 new file mode 100644
18 index 00000000000..8e340656b3e
19 --- /dev/null
20 +++ b/net-fs/nfs-utils/files/nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch
21 @@ -0,0 +1,39 @@
22 +From e2244412ae8b0b04446063ff6e8a1d0ebebe55a8 Mon Sep 17 00:00:00 2001
23 +From: Matt Turner <mattst88@×××××.com>
24 +Date: Sun, 11 Aug 2019 14:50:01 -0700
25 +Subject: [PATCH] gssd: Look in lib32 for gss libs aswell.
26 +
27 +Akin to commit da999b81b058 ("Look in lib64 for gss libs aswell.")
28 +
29 +mips/n32 systems have libraries in lib32 (but not lib or lib64). Without
30 +checking lib32, configure fails with
31 +
32 +checking for Kerberos v5... configure: error: Kerberos v5 with GSS
33 + support not found: consider --disable-gss or --with-krb5=
34 +
35 +Signed-off-by: Matt Turner <mattst88@×××××.com>
36 +---
37 + aclocal/kerberos5.m4 | 6 ++++--
38 + 1 file changed, 4 insertions(+), 2 deletions(-)
39 +
40 +diff --git a/aclocal/kerberos5.m4 b/aclocal/kerberos5.m4
41 +index 8a0f3e4c..faa58049 100644
42 +--- a/aclocal/kerberos5.m4
43 ++++ b/aclocal/kerberos5.m4
44 +@@ -38,9 +38,11 @@ AC_DEFUN([AC_KERBEROS_V5],[
45 + AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
46 + if test -f $dir/include/gssapi/gssapi_krb5.h -a \
47 + \( -f $dir/lib/libgssapi_krb5.a -o \
48 ++ -f $dir/lib/libgssapi_krb5.so -o \
49 ++ -f $dir/lib32/libgssapi_krb5.a -o \
50 ++ -f $dir/lib32/libgssapi_krb5.so -o \
51 + -f $dir/lib64/libgssapi_krb5.a -o \
52 +- -f $dir/lib64/libgssapi_krb5.so -o \
53 +- -f $dir/lib/libgssapi_krb5.so \) ; then
54 ++ -f $dir/lib64/libgssapi_krb5.so \) ; then
55 + AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
56 + KRBDIR="$dir"
57 + gssapi_lib=gssapi_krb5
58 +--
59 +2.21.0
60 +
61
62 diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
63 index 2691baaa27f..c579954763a 100644
64 --- a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
65 +++ b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
66 @@ -67,6 +67,7 @@ PATCHES=(
67 "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
68 "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
69 "${FILESDIR}"/${PN}-2.3.4-no-werror.patch
70 + "${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
71 )
72
73 src_prepare() {