Sync changes to SLFO-1.2 branch

nfs-utils-1.0.7-bind-syntax.patch

@@ -0,0 +1,19 @@
+ support/export/export.c   |    2 
+ support/include/misc.h    |    3 
+ support/include/nfslib.h  |    1 
+================================================================================
+---
+ support/nfs/exports.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/support/nfs/exports.c
++++ b/support/nfs/exports.c
+@@ -684,6 +684,8 @@ bad_option:
+ 		} else if (strncmp(opt, "replicas=", 9) == 0) {
+ 			ep->e_fslocmethod = FSLOC_REPLICA;
+ 			ep->e_fslocdata = strdup(opt+9);
++		} else if (strncmp(opt, "bind=/", 6) == 0) {
++			/* ignore this for now */
+ 		} else if (strncmp(opt, "sec=", 4) == 0) {
+ 			active = parse_flavors(opt+4, ep);
+ 			if (!active)

nfs-utils-2.8.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725
-size 743952

nfs-utils-Fix-build-with-glibc-2.42.patch

@@ -1,55 +0,0 @@
-From 9f974046c37b7c28705d5558328759fff708b1cb Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Fri, 27 Jun 2025 04:54:08 -0500
-Subject: [PATCH] Fix build with glibc-2.42
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-exportfs.c: In function ‘release_lockfile’:
-exportfs.c:83:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
-   83 |                 lockf(_lockfd, F_ULOCK, 0);
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
-exportfs.c: In function ‘grab_lockfile’:
-exportfs.c:77:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
-   77 |                 lockf(_lockfd, F_LOCK, 0);
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
-
-lockf is now marked with attribute warn_unused_result:
-
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f3c82fc1b41261f582f5f9fa12f74af9bcbc88f9
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/exportfs/exportfs.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
-index b03a047b0968..748c38e3e966 100644
---- a/utils/exportfs/exportfs.c
-+++ b/utils/exportfs/exportfs.c
-@@ -74,13 +74,19 @@ grab_lockfile(void)
- {
- 	_lockfd = open(lockfile, O_CREAT|O_RDWR, 0666);
- 	if (_lockfd != -1)
--		lockf(_lockfd, F_LOCK, 0);
-+		if (lockf(_lockfd, F_LOCK, 0) != 0) {
-+			xlog_warn("%s: lockf() failed: errno %d (%s)",
-+			__func__, errno, strerror(errno));
-+		}
- }
- static void
- release_lockfile(void)
- {
- 	if (_lockfd != -1) {
--		lockf(_lockfd, F_ULOCK, 0);
-+		if (lockf(_lockfd, F_ULOCK, 0) != 0) {
-+			xlog_warn("%s: lockf() failed: errno %d (%s)",
-+			__func__, errno, strerror(errno));
-+		}
- 		close(_lockfd);
- 		_lockfd = -1;
- 	}
--- 
-2.50.1
-

nfs-utils-nfsdctl-fix-lockd-config-during-autostart.patch

@@ -1,42 +0,0 @@
-From c5b1a81310471927f0f42ae9b592c6e06ceb2793 Mon Sep 17 00:00:00 2001
-From: Scott Mayhew <smayhew@redhat.com>
-Date: Tue, 6 May 2025 10:53:14 -0400
-Subject: [PATCH] nfsdctl: fix lockd config during autostart
-
-Be sure to actually send the lockd config values over the netlink
-interface.
-
-While we're at it, get rid of the unused "ret" variable.
-
-Fixes: f61c2ff8 ("nfsdctl: add necessary bits to configure lockd")
-Reviewed-by: Jeff Layton <jlayton@kernel.org>
-Signed-off-by: Scott Mayhew <smayhew@redhat.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- utils/nfsdctl/nfsdctl.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
-index 1fdbb44daf51..c2e342607a6e 100644
---- a/utils/nfsdctl/nfsdctl.c
-+++ b/utils/nfsdctl/nfsdctl.c
-@@ -1417,7 +1417,6 @@ static int lockd_configure(struct nl_sock *sock, int grace)
- {
- 	char *tcp_svc, *udp_svc;
- 	int tcpport = 0, udpport = 0;
--	int ret;
- 
- 	tcp_svc = conf_get_str("lockd", "port");
- 	if (tcp_svc) {
-@@ -1432,6 +1431,8 @@ static int lockd_configure(struct nl_sock *sock, int grace)
- 		if (udpport < 0)
- 			return 1;
- 	}
-+
-+	return lockd_config_doit(sock, LOCKD_CMD_SERVER_SET, grace, tcpport, udpport);
- }
- 
- static int
--- 
-2.50.1
-

nfs-utils.changes

@@ -1,41 +1,3 @@
--------------------------------------------------------------------
-Thu Jul 31 22:10:40 UTC 2025 - Anthony Iliopoulos <ailiop@suse.com>
-
-- update to 2.8.3:
-  - https://kernel.org/pub/linux/utils/nfs-utils/2.8.3/2.8.3-Changelog
-  * nfs(5): Add new rdirplus functionality, clarify
-  * nfsdcld: fix cld pipe read size
-  * gssd: do not use krb5_cc_initialize
-  * gssd: unconditionally use krb5_get_init_creds_opt_alloc
-  * nfsdctl: ensure autostart honors the default nfs.conf versX.Y settings
-  * nfsdctl: dont ignore rdma listener return
-  * nfsdctl: add necessary bits to configure lockd
-  * nfsdctl: fix host-limited add listener
-  * nfsdctl: cleanup listeners if some failed
-  * nfsdctl: fix autostart
-  * nfsdctl: fix update_listeners
-  * systemd: mount nfsd after load kernel module
-  * mountstats/nfsiostat: merge and rework the infinite and counted loops
-  * mountstats/nfsiostat: Move the checks for empty mountpoint list into the print function
-  * mountstats: filter for nfs mounts in a function, each iostat iteration
-  * nfsiostat: fix crash when filtering mountstats after unmount
-  * nfsiostat: mirror how mountstats iostat prints the stats
-  * mountstats: when printing iostats, verify that old and new types are the same
-  * mountstats/nfsiostat: add a function to return the fstype
-  * nfsiostat: skip argv[0] when parsing command-line
-  * nfsd: fix version sanity check
-  * nfsdctl: tweak the nfs.conf version handling
-  * nfsdctl: tweak the version subcommand behavior
-  * NFS export symlink vulnerability fix
-  * conffile: add 'arg' argument to conf_remove_now()
-
-- Removed obsolete patch from this release:
-  - nfs-utils-1.0.7-bind-syntax.patch
-
-- Added upstream patches:
-  - nfs-utils-Fix-build-with-glibc-2.42.patch
-  - nfs-utils-nfsdctl-fix-lockd-config-during-autostart.patch
-
 -------------------------------------------------------------------
 Sat Feb  8 21:30:47 UTC 2025 - Dirk Müller <dmueller@suse.com>
 

nfs-utils.spec

@@ -1,8 +1,7 @@
 #
 # spec file for package nfs-utils
 #
-# Copyright (c) 2025 SUSE LLC and contributors
-# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,15 +22,13 @@
 %endif
 
 Name:           nfs-utils
-Version:        2.8.3
+Version:        2.8.2
 Release:        0
 Summary:        Support Utilities for Kernel nfsd
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/NFS
 URL:            https://kernel.org/pub/linux/utils/nfs-utils/
 Source0:        https://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
-Source1:        https://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.sign
-Source2:        %{name}.keyring
 Source4:        sysconfig.nfs
 Source11:       idmapd.conf
 Source12:       statd-user.conf
@@ -44,8 +41,7 @@ Source24:       rpc-statd-notify.options.conf
 Source25:       rpc-svcgssd.options.conf
 Source26:       nfs.conf
 Source27:       nfs-kernel-server.tmpfiles.conf
-Patch0:         nfs-utils-Fix-build-with-glibc-2.42.patch
-Patch1:         nfs-utils-nfsdctl-fix-lockd-config-during-autostart.patch
+Patch0:         nfs-utils-1.0.7-bind-syntax.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libtool

nfs.conf

@@ -3,9 +3,8 @@
 # NFS daemons and tools
 # DO NOT MAKE CHANGES TO THIS FILE as they will
 # be lost on the next software update.  Make changes
-# to /etc/sysconfig/nfs, /usr/src/nfs.conf./*.conf or
-# /etc/nfs.conf.d/*.conf instead.
-# The .conf file can include multiple sections, just
+# to /etc/sysconfig/nfs or /etc/nfs.conf.local instead.
+# /etc/nfs.conf.local can include multiple sections, just
 # like this file.
 
 [environment]
@@ -13,20 +12,77 @@ include = /etc/sysconfig/nfs
 include = -/etc/nfs.conf.local
 [general]
  pipefs-directory=$RPC_PIPEFS_DIR
-[gssd]
+#
+#[exportfs]
+# debug=0
+#
+#[gssd]
+# verbosity=0
+# rpc-verbosity=0
+# use-memcache=0
+# use-machine-creds=1
+# use-gss-proxy=0
  avoid-dns=$NFS_GSSD_AVOID_DNS
+# limit-to-legacy-enctypes=0
+# context-timeout=0
+# rpc-timeout=5
+# keytab-file=/etc/krb5.keytab
+# cred-cache-directory=
+# preferred-realm=
+#
 [lockd]
  port=$LOCKD_TCPPORT
  udp-port=$LOCKD_UDPPORT
+#
 [mountd]
+# debug=0
+# manage-gids=n
+# descriptors=0
  port= $MOUNTD_PORT
+# threads=1
+# reverse-lookup=n
+# state-directory-path=/var/lib/nfs
+# ha-callout=
+#
+#[nfsdcltrack]
+# debug=0
+# storagedir=/var/lib/nfs/nfsdcltrack
+#
 [nfsd]
+# debug=0
  threads= $USE_KERNEL_NFSD_NUMBER
+# host=
+# port=0
  grace-time=$NFSV4GRACETIME
  lease-time=$NFSV4LEASETIME
+# udp=n
+# tcp=y
+# vers2=n
  vers3=$NFS3_SERVER_SUPPORT
  vers4=$NFS4_SUPPORT
+# vers4.0=y
+# vers4.1=y
+# vers4.2=y
+# rdma=n
+# rdma-port=20049
  scope=$NFSD_SCOPE
+#
 [statd]
+# debug=0
  port=$STATD_PORT
+# outgoing-port=0
  name=$STATD_HOSTNAME
+# state-directory-path=/var/lib/nfs/statd
+# ha-callout=
+# no-notify=0
+#
+#[sm-notify]
+# debug=0
+# force=0
+# retry-time=900
+# outgoing-port=
+# outgoing-addr=
+# lift-grace=y
+#
+#[svcgssd]
+# principal=