Signed-off-by: Bastian Krause <[email protected]> --- ...-the-starting-and-stopping-of-rpcbin.patch | 45 ----------- ...nclude-file-so-UINT16_MAX-is-defined.patch | 21 ----- ...003-fix-building-w-newer-C-libraries.patch | 79 ------------------- .../0100-rpcgen-don-t-link-to-libtirpc.patch | 24 ------ patches/nfs-utils-1.3.3/series | 10 --- ...1-allow-installing-all-tools-in-usr.patch} | 21 +---- .../autogen.sh | 0 patches/nfs-utils-2.5.1/series | 4 + projectroot/usr/lib/tmpfiles.d/nfs.conf | 1 - rules/nfsutils.in | 1 + rules/nfsutils.make | 17 ++-- 11 files changed, 17 insertions(+), 206 deletions(-) delete mode 100644 patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch delete mode 100644 patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch delete mode 100644 patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch delete mode 100644 patches/nfs-utils-1.3.3/0100-rpcgen-don-t-link-to-libtirpc.patch delete mode 100644 patches/nfs-utils-1.3.3/series rename patches/{nfs-utils-1.3.3/0101-allow-installing-all-tools-in-usr.patch => nfs-utils-2.5.1/0001-allow-installing-all-tools-in-usr.patch} (64%) rename patches/{nfs-utils-1.3.3 => nfs-utils-2.5.1}/autogen.sh (100%) create mode 100644 patches/nfs-utils-2.5.1/series
diff --git a/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch b/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch deleted file mode 100644 index 28fbcc087..000000000 --- a/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Steve Dickson <[email protected]> -Date: Mon, 9 Nov 2015 11:28:30 -0500 -Subject: [PATCH] systemd: Decouple the starting and stopping of - rpcbind/nfs-server - -Commit b98f2af15 introduced a regression that cause the -starting and stop of rpcbind and the nfs-server to -be depended on each other - -The starting of the NFS server should start rpcbind -but bring rpcbind down should not bring the NFS -server down. - -Signed-off-by: Steve Dickson <[email protected]> ---- - systemd/nfs-server.service | 2 +- - systemd/rpc-statd.service | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service -index 12b02f26f9ce..317e5d689767 100644 ---- a/systemd/nfs-server.service -+++ b/systemd/nfs-server.service -@@ -1,7 +1,7 @@ - [Unit] - Description=NFS server and services - DefaultDependencies=no --Requires= network.target proc-fs-nfsd.mount rpcbind.service -+Requires= network.target proc-fs-nfsd.mount rpcbind.target - Requires= nfs-mountd.service - Wants=rpc-statd.service nfs-idmapd.service - Wants=rpc-statd-notify.service -diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service -index 14604d783ddf..f16ea425dc77 100644 ---- a/systemd/rpc-statd.service -+++ b/systemd/rpc-statd.service -@@ -3,7 +3,7 @@ Description=NFS status monitor for NFSv2/3 locking. - DefaultDependencies=no - Conflicts=umount.target - Requires=nss-lookup.target rpcbind.target --After=network.target nss-lookup.target rpcbind.target -+After=network.target nss-lookup.target rpcbind.service - - PartOf=nfs-utils.service - diff --git a/patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch b/patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch deleted file mode 100644 index 1242abbd2..000000000 --- a/patches/nfs-utils-1.3.3/0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Steve Dickson <[email protected]> -Date: Thu, 22 Jun 2017 12:56:41 -0400 -Subject: [PATCH] rpc.c: added include file so UINT16_MAX is defined. - -Signed-off-by: Steve Dickson <[email protected]> ---- - support/nsm/rpc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c -index 4e5f40e79d8f..0a8e56f0ca51 100644 ---- a/support/nsm/rpc.c -+++ b/support/nsm/rpc.c -@@ -38,6 +38,7 @@ - #include <sys/socket.h> - #include <sys/time.h> - -+#include <stdint.h> - #include <time.h> - #include <stdbool.h> - #include <string.h> diff --git a/patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch b/patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch deleted file mode 100644 index c0d974c9c..000000000 --- a/patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 4ac4b4f74dcec30dcb23aab827eed152db08daea Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Wed, 27 Apr 2016 12:57:08 -0400 -Subject: [PATCH] fix building w/newer C libraries - -Linux C libraries are moving away from implicitly including the header -sys/sysmacros.h via sys/types.h. We would like to do this for glibc -now, but others (musl/etc...) have been doing it already. This means -any code using major/minor/makedevs functions will fail to build when -they don't include that header. - -Leverage the AC_HEADER_MAJOR macro that configure is already using to -pull in the right header. - -Signed-off-by: Mike Frysinger <[email protected]> -Signed-off-by: Steve Dickson <[email protected]> ---- - support/include/xcommon.h | 6 ++++++ - support/nfs/nfsexport.c | 1 + - utils/blkmapd/device-discovery.c | 1 + - utils/mountd/cache.c | 1 + - 4 files changed, 9 insertions(+) - -diff --git a/support/include/xcommon.h b/support/include/xcommon.h -index d1a4b18..23c9a13 100644 ---- a/support/include/xcommon.h -+++ b/support/include/xcommon.h -@@ -17,6 +17,12 @@ - #include <stdlib.h> - #include <string.h> - -+#ifdef MAJOR_IN_MKDEV -+#include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) -+#include <sys/sysmacros.h> -+#endif -+ - #define streq(s, t) (strcmp ((s), (t)) == 0) - - /* Functions in sundries.c that are used in mount.c and umount.c */ -diff --git a/support/nfs/nfsexport.c b/support/nfs/nfsexport.c -index afd7c90..4b13265 100644 ---- a/support/nfs/nfsexport.c -+++ b/support/nfs/nfsexport.c -@@ -19,6 +19,7 @@ - - #include "nfslib.h" - #include "misc.h" -+#include "xcommon.h" - - /* if /proc/net/rpc/... exists, then - * write to it, as that interface is more stable. -diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c -index b010628..052d582 100644 ---- a/utils/blkmapd/device-discovery.c -+++ b/utils/blkmapd/device-discovery.c -@@ -51,6 +51,7 @@ - #include <libdevmapper.h> - - #include "device-discovery.h" -+#include "xcommon.h" - - #define EVENT_SIZE (sizeof(struct inotify_event)) - #define EVENT_BUFSIZE (1024 * EVENT_SIZE) -diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c -index 7847446..ec86a22 100644 ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -31,6 +31,7 @@ - #include "mountd.h" - #include "fsloc.h" - #include "pseudoflavors.h" -+#include "xcommon.h" - - #ifdef USE_BLKID - #include "blkid/blkid.h" --- -2.20.1 - diff --git a/patches/nfs-utils-1.3.3/0100-rpcgen-don-t-link-to-libtirpc.patch b/patches/nfs-utils-1.3.3/0100-rpcgen-don-t-link-to-libtirpc.patch deleted file mode 100644 index efc8ef80a..000000000 --- a/patches/nfs-utils-1.3.3/0100-rpcgen-don-t-link-to-libtirpc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Michael Olbrich <[email protected]> -Date: Mon, 11 Jan 2016 15:48:00 +0100 -Subject: [PATCH] rpcgen: don't link to libtirpc - -It's not necessay and causes problems when cross-compiling: -rpcgen is a host-tool and configure only checks for a target libtirpc. - -Signed-off-by: Michael Olbrich <[email protected]> ---- - tools/rpcgen/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 8a9ec89cea76..51a2bfa006f6 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -12,7 +12,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ - rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) - rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) - rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) --rpcgen_LDADD=$(LIBTIRPC) - - MAINTAINERCLEANFILES = Makefile.in - diff --git a/patches/nfs-utils-1.3.3/series b/patches/nfs-utils-1.3.3/series deleted file mode 100644 index 512cf9989..000000000 --- a/patches/nfs-utils-1.3.3/series +++ /dev/null @@ -1,10 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -#tag:upstream --start-number 1 -0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch -0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch -0003-fix-building-w-newer-C-libraries.patch -#tag:ptxdist --start-number 100 -0100-rpcgen-don-t-link-to-libtirpc.patch -0101-allow-installing-all-tools-in-usr.patch -# 97af92530acbf1a38d73438665f8e71d - git-ptx-patches magic diff --git a/patches/nfs-utils-1.3.3/0101-allow-installing-all-tools-in-usr.patch b/patches/nfs-utils-2.5.1/0001-allow-installing-all-tools-in-usr.patch similarity index 64% rename from patches/nfs-utils-1.3.3/0101-allow-installing-all-tools-in-usr.patch rename to patches/nfs-utils-2.5.1/0001-allow-installing-all-tools-in-usr.patch index 8796f35d2..8a4415770 100644 --- a/patches/nfs-utils-1.3.3/0101-allow-installing-all-tools-in-usr.patch +++ b/patches/nfs-utils-2.5.1/0001-allow-installing-all-tools-in-usr.patch @@ -6,11 +6,10 @@ Signed-off-by: Michael Olbrich <[email protected]> --- utils/mount/Makefile.am | 4 ---- utils/nfsdcltrack/Makefile.am | 4 ---- - utils/osd_login/Makefile.am | 4 ---- - 3 files changed, 12 deletions(-) + 2 files changed, 8 deletions(-) diff --git a/utils/mount/Makefile.am b/utils/mount/Makefile.am -index e24f3bd24b1b..be14484d4b0d 100644 +index ad0be93b1def..ece27eeab7bf 100644 --- a/utils/mount/Makefile.am +++ b/utils/mount/Makefile.am @@ -1,9 +1,5 @@ @@ -24,7 +23,7 @@ index e24f3bd24b1b..be14484d4b0d 100644 man5_MANS = nfs.man diff --git a/utils/nfsdcltrack/Makefile.am b/utils/nfsdcltrack/Makefile.am -index 0a2858f1e0f3..d603f925ed3a 100644 +index 2f7fe3de6922..6a17fce373f0 100644 --- a/utils/nfsdcltrack/Makefile.am +++ b/utils/nfsdcltrack/Makefile.am @@ -1,9 +1,5 @@ @@ -37,17 +36,3 @@ index 0a2858f1e0f3..d603f925ed3a 100644 man8_MANS = nfsdcltrack.man EXTRA_DIST = $(man8_MANS) -diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am -index ded1fd308608..612b8fe1858c 100644 ---- a/utils/osd_login/Makefile.am -+++ b/utils/osd_login/Makefile.am -@@ -1,9 +1,5 @@ - ## Process this file with automake to produce Makefile.in - --# These binaries go in /sbin (not /usr/sbin), and that cannot be --# overridden at config time. --sbindir = /sbin -- - dist_sbin_SCRIPTS = osd_login - - MAINTAINERCLEANFILES = Makefile.in diff --git a/patches/nfs-utils-1.3.3/autogen.sh b/patches/nfs-utils-2.5.1/autogen.sh similarity index 100% rename from patches/nfs-utils-1.3.3/autogen.sh rename to patches/nfs-utils-2.5.1/autogen.sh diff --git a/patches/nfs-utils-2.5.1/series b/patches/nfs-utils-2.5.1/series new file mode 100644 index 000000000..8bb22c5a3 --- /dev/null +++ b/patches/nfs-utils-2.5.1/series @@ -0,0 +1,4 @@ +# 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/projectroot/usr/lib/tmpfiles.d/nfs.conf b/projectroot/usr/lib/tmpfiles.d/nfs.conf index e37b7f494..e0d1922d0 100644 --- a/projectroot/usr/lib/tmpfiles.d/nfs.conf +++ b/projectroot/usr/lib/tmpfiles.d/nfs.conf @@ -1,6 +1,5 @@ d /var/lib/nfs 0755 rpcuser root - f /var/lib/nfs/etab 0644 rpcuser root - f /var/lib/nfs/rmtab 0644 rpcuser root - -f /var/lib/nfs/xtab 0600 rpcuser root - d /var/lib/nfs/sm 0700 rpcuser root - d /var/lib/nfs/sm.bak 0700 rpcuser root - diff --git a/rules/nfsutils.in b/rules/nfsutils.in index 77ea1a2ca..c086f5a7f 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -2,6 +2,7 @@ menuconfig NFSUTILS tristate prompt "nfsutils " + select HOST_NFSUTILS select GCCLIBS_GCC_S select LIBBLKID select UTIL_LINUX_NG diff --git a/rules/nfsutils.make b/rules/nfsutils.make index 3d2bd6cbd..46cafe45c 100644 --- a/rules/nfsutils.make +++ b/rules/nfsutils.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_NFSUTILS) += nfsutils # # Paths and names # -NFSUTILS_VERSION := 1.3.3 -NFSUTILS_MD5 := 9b87d890669eaaec8e97a2b0a35b2665 +NFSUTILS_VERSION := 2.5.1 +NFSUTILS_MD5 := 8c89b19224f2c8374ca9776435c66d37 NFSUTILS := nfs-utils-$(NFSUTILS_VERSION) -NFSUTILS_SUFFIX := tar.bz2 -NFSUTILS_URL := $(call ptx/mirror, SF, nfs/$(NFSUTILS).$(NFSUTILS_SUFFIX)) +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 @@ -46,18 +46,21 @@ NFSUTILS_CONF_OPT := \ --disable-uuid \ --$(call ptx/endis, PTXCONF_NFSUTILS_CLIENT)-mount \ --$(call ptx/endis, PTXCONF_NFSUTILS_CLIENT)-libmount-mount \ + --disable-junction \ --$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-tirpc \ $(GLOBAL_IPV6_OPTION) \ --disable-mountconfig \ + --disable-nfsdcld \ --disable-nfsdcltrack \ - --enable-osdlogin \ --disable-caps \ $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-ldap \ + --disable-gums \ --with-statedir=/var/lib/nfs \ --with-statdpath=/var/lib/nfs \ --with-statduser=rpcuser \ --with-systemd=/usr/lib/systemd/system \ - --with-rpcgen=internal \ + --with-rpcgen=$(PTXDIST_SYSROOT_HOST)/bin/rpcgen \ --without-mountfile \ --without-tcp-wrappers \ --without-krb5 \ @@ -95,8 +98,6 @@ else /var/lib/nfs/etab) @$(call install_copy, nfsutils, rpcuser, 0, 0644, -, \ /var/lib/nfs/rmtab) - @$(call install_copy, nfsutils, rpcuser, 0, 0644, -, \ - /var/lib/nfs/xtab) @$(call install_copy, nfsutils, rpcuser, 0, 0644, -, \ /var/lib/nfs/state) @$(call install_copy, nfsutils, rpcuser, 0, 0755, \ -- 2.28.0 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
