summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/nfs-utils
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-06-26 15:59:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-05 11:39:06 +0100
commit6a51dbf9bbb9a8f78b7afa62da4db36e970ded55 (patch)
treee67ca205ecc97f838be683961346904e81a720e3 /meta/recipes-connectivity/nfs-utils
parent0996eecb210c9a6e1ae63cb64f2f0b4fef04469d (diff)
downloadpoky-6a51dbf9bbb9a8f78b7afa62da4db36e970ded55.tar.gz
nfs-utils: 2.1.1 -> 2.3.1
* Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch, the nfsidmap is enabled when --enable-nfsv4, so I added a PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by default. * Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the source. * Taken two patches from git://git.alpinelinux.org/aports to fix build with musl, and the nfs-utils-musl-res_querydomain.patch is for musl only. (From OE-Core rev: 0b51ed606b2e7543b50dadae7c0822b0f0de77ef) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch40
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch27
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch37
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch133
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch22
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb (renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb)13
6 files changed, 162 insertions, 110 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
deleted file mode 100644
index 26b558c81f..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 15 Nov 2013 23:21:35 +0100
4Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
5
6* keyutils availability is autodetected and builds aren't reproducible
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure.ac | 10 +++++++++-
13 1 file changed, 9 insertions(+), 1 deletion(-)
14
15Index: nfs-utils-2.1.1/configure.ac
16===================================================================
17--- nfs-utils-2.1.1.orig/configure.ac
18+++ nfs-utils-2.1.1/configure.ac
19@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
20 AC_SUBST(enable_nfsv4)
21 AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
22
23+AC_ARG_ENABLE(nfsidmap,
24+ [AC_HELP_STRING([--enable-nfsidmap],
25+ [enable support for NFSv4 idmapper @<:@default=yes@:>@])],
26+ enable_nfsidmap=$enableval,
27+ enable_nfsidmap=yes)
28+
29 AC_ARG_ENABLE(nfsv41,
30 [AC_HELP_STRING([--disable-nfsv41],
31 [disable support for NFSv41 @<:@default=no@:>@])],
32@@ -339,7 +345,7 @@ fi
33
34 dnl enable nfsidmap when its support by libnfsidmap
35 AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
36-AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
37+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyesyes"])
38
39
40 if test "$knfsd_cv_glibc2" = no; then
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
deleted file mode 100644
index 235a2c76fc..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 36b48057bce76dced335d67a2894a420967811c9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 20 May 2017 14:07:53 -0700
4Subject: [PATCH] include stdint.h for UINT16_MAX definition
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 support/nsm/rpc.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
14index 4e5f40e..d91c6ea 100644
15--- a/support/nsm/rpc.c
16+++ b/support/nsm/rpc.c
17@@ -40,6 +40,7 @@
18
19 #include <time.h>
20 #include <stdbool.h>
21+#include <stdint.h>
22 #include <string.h>
23 #include <unistd.h>
24 #include <fcntl.h>
25--
262.13.0
27
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
deleted file mode 100644
index 89a8a57260..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Fixes errors like
2sm-notify[1070]: DNS resolution of a.b.c.d..com failed; retrying later
3This error will occur anytime sm-notify is run before the network if fully up,
4which is happening more and more with parallel startup systems.
5The res_init() call is simple, safe, quick, and a patch to use it should be
6able to go upstream. Presumably the whole reason sm-notify tries several
7times is to wait for possible changes to the network configuration, but without
8calling res_init() it will never be aware of those changes
9
10Backported drom Fedora
11
12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15
16Index: nfs-utils-2.1.1/utils/statd/sm-notify.c
17===================================================================
18--- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c
19+++ nfs-utils-2.1.1/utils/statd/sm-notify.c
20@@ -28,6 +28,9 @@
21 #include <netdb.h>
22 #include <errno.h>
23 #include <grp.h>
24+#include <netinet/in.h>
25+#include <arpa/nameser.h>
26+#include <resolv.h>
27
28 #include "conffile.h"
29 #include "sockaddr.h"
30@@ -89,6 +92,7 @@ smn_lookup(const char *name)
31 };
32 int error;
33
34+ res_init();
35 error = getaddrinfo(name, NULL, &hint, &ai);
36 if (error != 0) {
37 xlog(D_GENERAL, "getaddrinfo(3): %s", gai_strerror(error));
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
new file mode 100644
index 0000000000..25ca415155
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
@@ -0,0 +1,133 @@
1Fixed:
2| file.c: In function 'generic_make_pathname':
3| file.c:48:13: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
4| if (size > PATH_MAX)
5| ^~~~~~~~
6[snip]
7
8Upstream-Status: Pending [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/limits.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 support/export/export.c | 1 +
13 support/export/xtab.c | 1 +
14 support/misc/file.c | 1 +
15 support/nfs/xcommon.c | 1 +
16 support/nsm/file.c | 1 +
17 utils/blkmapd/device-discovery.c | 1 +
18 utils/gssd/krb5_util.c | 1 +
19 utils/mountd/cache.c | 1 +
20 utils/mountd/mountd.c | 1 +
21 utils/mountd/rmtab.c | 1 +
22 10 files changed, 10 insertions(+)
23
24diff --git a/support/export/export.c b/support/export/export.c
25--- a/support/export/export.c
26+++ b/support/export/export.c
27@@ -17,6 +17,7 @@
28 #include <stdlib.h>
29 #include <dirent.h>
30 #include <errno.h>
31+#include <limits.h>
32 #include "xmalloc.h"
33 #include "nfslib.h"
34 #include "exportfs.h"
35diff --git a/support/export/xtab.c b/support/export/xtab.c
36--- a/support/export/xtab.c
37+++ b/support/export/xtab.c
38@@ -18,6 +18,7 @@
39 #include <sys/stat.h>
40 #include <errno.h>
41 #include <libgen.h>
42+#include <limits.h>
43
44 #include "nfslib.h"
45 #include "exportfs.h"
46diff --git a/support/misc/file.c b/support/misc/file.c
47--- a/support/misc/file.c
48+++ b/support/misc/file.c
49@@ -27,6 +27,7 @@
50 #include <dirent.h>
51 #include <stdlib.h>
52 #include <stdbool.h>
53+#include <limits.h>
54
55 #include "xlog.h"
56 #include "misc.h"
57diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c
58--- a/support/nfs/xcommon.c
59+++ b/support/nfs/xcommon.c
60@@ -16,6 +16,7 @@
61 #include <stdio.h>
62 #include <stdlib.h>
63 #include <string.h>
64+#include <limits.h>
65
66 #include "xcommon.h"
67 #include "nls.h" /* _() */
68diff --git a/support/nsm/file.c b/support/nsm/file.c
69--- a/support/nsm/file.c
70+++ b/support/nsm/file.c
71@@ -85,6 +85,7 @@
72 #include <fcntl.h>
73 #include <dirent.h>
74 #include <grp.h>
75+#include <limits.h>
76
77 #include "xlog.h"
78 #include "nsm.h"
79diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
80--- a/utils/blkmapd/device-discovery.c
81+++ b/utils/blkmapd/device-discovery.c
82@@ -49,6 +49,7 @@
83 #include <unistd.h>
84 #include <libgen.h>
85 #include <errno.h>
86+#include <limits.h>
87 #include <libdevmapper.h>
88
89 #ifdef HAVE_CONFIG_H
90diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
91--- a/utils/gssd/krb5_util.c
92+++ b/utils/gssd/krb5_util.c
93@@ -120,6 +120,7 @@
94 #endif
95 #include <krb5.h>
96 #include <rpc/auth_gss.h>
97+#include <limits.h>
98
99 #include "gssd.h"
100 #include "err_util.h"
101diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
102--- a/utils/mountd/cache.c
103+++ b/utils/mountd/cache.c
104@@ -26,6 +26,7 @@
105 #include <pwd.h>
106 #include <grp.h>
107 #include <mntent.h>
108+#include <limits.h>
109 #include "misc.h"
110 #include "nfslib.h"
111 #include "exportfs.h"
112diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
113--- a/utils/mountd/mountd.c
114+++ b/utils/mountd/mountd.c
115@@ -22,6 +22,7 @@
116 #include <fcntl.h>
117 #include <sys/resource.h>
118 #include <sys/wait.h>
119+#include <limits.h>
120
121 #include "conffile.h"
122 #include "xmalloc.h"
123diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
124--- a/utils/mountd/rmtab.c
125+++ b/utils/mountd/rmtab.c
126@@ -16,6 +16,7 @@
127 #include <netinet/in.h>
128 #include <arpa/inet.h>
129 #include <netdb.h>
130+#include <limits.h>
131
132 #include "misc.h"
133 #include "exportfs.h"
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
new file mode 100644
index 0000000000..a169e6a222
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
@@ -0,0 +1,22 @@
1Fixed:
2configure: error: res_querydomain needed
3
4Upstream-Status: Pending [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/musl-res_querydomain.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
5
6Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
7---
8 configure.ac | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/configure.ac b/configure.ac
12--- a/configure.ac
13+++ b/configure.ac
14@@ -401,7 +401,7 @@ if test "$enable_gss" = yes; then
15 fi
16
17 dnl libdnsidmap specific checks
18-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
19+AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
20
21 AC_ARG_ENABLE([ldap],
22 [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
index 79453ad20c..6390c324f8 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb
@@ -19,8 +19,6 @@ USERADD_PARAM_${PN}-client = "--system --home-dir /var/lib/nfs \
19 --shell /bin/false --user-group rpcuser" 19 --shell /bin/false --user-group rpcuser"
20 20
21SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ 21SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
22 file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
23 file://nfs-utils-1.2.3-sm-notify-res_init.patch \
24 file://nfsserver \ 22 file://nfsserver \
25 file://nfscommon \ 23 file://nfscommon \
26 file://nfs-utils.conf \ 24 file://nfs-utils.conf \
@@ -31,11 +29,13 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
31 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ 29 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
32 file://nfs-utils-debianize-start-statd.patch \ 30 file://nfs-utils-debianize-start-statd.patch \
33 file://bugfix-adjust-statd-service-name.patch \ 31 file://bugfix-adjust-statd-service-name.patch \
34 file://0001-include-stdint.h-for-UINT16_MAX-definition.patch \ 32 file://nfs-utils-musl-limits.patch \
35" 33"
36 34
37SRC_URI[md5sum] = "59dfcb2e6254b129f901f40c86086b13" 35SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch"
38SRC_URI[sha256sum] = "0faeb54c70b84e6bd3b9b6901544b1f6add8d246f35c1683e402daf4e0c719ef" 36
37SRC_URI[md5sum] = "d77b182a9ee396aa6221ac2401ad7046"
38SRC_URI[sha256sum] = "96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5"
39 39
40# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will 40# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
41# pull in the remainder of the dependencies. 41# pull in the remainder of the dependencies.
@@ -67,10 +67,11 @@ PACKAGECONFIG ??= "tcp-wrappers \
67" 67"
68PACKAGECONFIG_remove_libc-musl = "tcp-wrappers" 68PACKAGECONFIG_remove_libc-musl = "tcp-wrappers"
69PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" 69PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
70PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
71PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 70PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
72# libdevmapper is available in meta-oe 71# libdevmapper is available in meta-oe
73PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper" 72PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper"
73# keyutils is available in meta-security
74PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils"
74 75
75PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats" 76PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats"
76 77