nfs-utils: version bump 2.5.1 -> 2.5.3

With OSELAS.Toolchain 2020.08, rpc/rpc.h is no longer provided by glibc,
so libtirpc is now needed to supply it. Apply a patch to improve
checking for the header in configure, and add some license checksums.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Message-Id: <20210525204533.6317-1-rhi@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 50 insertions, 9 deletions

diff --git a/patches/nfs-utils-2.5.1/series b/patches/nfs-utils-2.5.1/series
deleted file mode 100644
index 8bb22c5a3..000000000
--- a/patches/nfs-utils-2.5.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-allow-installing-all-tools-in-usr.patch
-# 91e7bec7165047cc003ff057901b3ade  - git-ptx-patches magic
diff --git a/patches/nfs-utils-2.5.1/0001-allow-installing-all-tools-in-usr.patch b/patches/nfs-utils-2.5.3/0001-allow-installing-all-tools-in-usr.patch
index 8a4415770..8a4415770 100644
--- a/patches/nfs-utils-2.5.1/0001-allow-installing-all-tools-in-usr.patch
+++ b/patches/nfs-utils-2.5.3/0001-allow-installing-all-tools-in-usr.patch
diff --git a/patches/nfs-utils-2.5.3/0002-configure-check-for-rpc-rpc.h-presence.patch b/patches/nfs-utils-2.5.3/0002-configure-check-for-rpc-rpc.h-presence.patch
new file mode 100644
index 000000000..27519121c
--- /dev/null
+++ b/patches/nfs-utils-2.5.3/0002-configure-check-for-rpc-rpc.h-presence.patch
@@ -0,0 +1,32 @@
+From: Roland Hieber <rhi@pengutronix.de>
+Date: Tue, 25 May 2021 01:08:07 +0200
+Subject: [PATCH] configure: check for rpc/rpc.h presence
+
+Recent versions of glibc (since 2.26?) no longer supply rpc/rpc.h.
+Detect such cases and prompt the user to build with libtirpc instead.
+
+Signed-off-by: Roland Hieber <rhi@pengutronix.de>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+Origin: upstream, http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=be7365239abf8556773b063730621967b9971708
+---
+ configure.ac | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index f2e1bd30d0f2..25e988dfa33c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -335,6 +335,13 @@ AC_CHECK_HEADERS([sched.h], [], [])
+ AC_CHECK_FUNCS([unshare fstatat statx], [] , [])
+ AC_LIBPTHREAD([])
+ 
++# rpc/rpc.h can come from the glibc or from libtirpc
++nfsutils_save_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${TIRPC_CFLAGS}"
++AC_CHECK_HEADER(rpc/rpc.h, ,
++                AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc]))
++CPPFLAGS="${nfsutils_save_CPPFLAGS}"
++
+ if test "$enable_nfsv4" = yes; then
+   dnl check for libevent libraries and headers
+   AC_LIBEVENT
diff --git a/patches/nfs-utils-2.5.1/autogen.sh b/patches/nfs-utils-2.5.3/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/nfs-utils-2.5.1/autogen.sh
+++ b/patches/nfs-utils-2.5.3/autogen.sh
diff --git a/patches/nfs-utils-2.5.3/series b/patches/nfs-utils-2.5.3/series
new file mode 100644
index 000000000..b6261ed8f
--- /dev/null
+++ b/patches/nfs-utils-2.5.3/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-allow-installing-all-tools-in-usr.patch
+0002-configure-check-for-rpc-rpc.h-presence.patch
+# e74bb66e111cbf71e8ff8030c9081753  - git-ptx-patches magic
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index 057641754..9a27ddead 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -5,10 +5,10 @@ menuconfig NFSUTILS
 	select HOST_NFSUTILS
 	select GCCLIBS_GCC_S
 	select LIBBLKID
+	select LIBTIRPC
 	select UTIL_LINUX_NG
 	select UTIL_LINUX_NG_LIBMOUNT
 	select RPCBIND			if RUNTIME
-	select LIBTIRPC			if GLOBAL_IPV6
 	select ROOTFS_PROTOCOLS		if NFSUTILS_CLIENT
 	select PYTHON3			if NFSUTILS_PYTHON && !PYTHON && RUNTIME
 	select PYTHON3_SYMLINK		if NFSUTILS_PYTHON && !PYTHON && RUNTIME
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index 213fe97f2..77e6a7e6b 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -14,14 +14,21 @@ PACKAGES-$(PTXCONF_NFSUTILS) += nfsutils
 #
 # Paths and names
 #
-NFSUTILS_VERSION	:= 2.5.1
-NFSUTILS_MD5		:= 8c89b19224f2c8374ca9776435c66d37
+NFSUTILS_VERSION	:= 2.5.3
+NFSUTILS_MD5		:= e22d09701b4da853baa6ac7bae259732
 NFSUTILS		:= nfs-utils-$(NFSUTILS_VERSION)
 NFSUTILS_SUFFIX		:= tar.gz
 NFSUTILS_URL		:= https://kernel.org/pub/linux/utils/nfs-utils/$(NFSUTILS_VERSION)/$(NFSUTILS).$(NFSUTILS_SUFFIX)
 NFSUTILS_SOURCE		:= $(SRCDIR)/$(NFSUTILS).$(NFSUTILS_SUFFIX)
 NFSUTILS_DIR		:= $(BUILDDIR)/$(NFSUTILS)
-NFSUTILS_LICENSE	:= GPL-2.0-or-later
+NFSUTILS_LICENSE	:= GPL-2.0-or-later AND BSD-3-Clause
+NFSUTILS_LICENSE_FILES	:= \
+	file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84 \
+	file://utils/showmount/showmount.c;startline=5;endline=13;md5=d3811a49409f2f42614bb59fd6d68bb4 \
+	file://utils/statd/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+	file://utils/statd/hostname.c;startline=6;endline=14;md5=3607f10ab196fbbf8bacb79042f718e7 \
+	file://utils/statd/svc_run.c;startline=13;endline=34;md5=78baf6ac3cfbb3cb057a7668cb93f64b \
+	file://utils/mount/mount.c;startline=9;endline=17;md5=d3811a49409f2f42614bb59fd6d68bb4 \
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -47,11 +54,12 @@ NFSUTILS_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_NFSUTILS_CLIENT)-mount \
 	--$(call ptx/endis, PTXCONF_NFSUTILS_CLIENT)-libmount-mount \
 	--disable-junction \
-	--$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-tirpc \
+	--enable-tirpc \
 	$(GLOBAL_IPV6_OPTION) \
 	--disable-mountconfig \
 	--disable-nfsdcld \
 	--disable-nfsdcltrack \
+	--disable-nfsv4server \
 	--disable-caps \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-ldap \