Accepting request 1296909 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1296909
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=186

0001-exportfs-remove-warning-if-neither-subtree_check-or-.patch

@@ -1,167 +0,0 @@
-From 40d6d58ee6e58f50d5f1aaf8c1253b2338bd7d06 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Mon, 27 Nov 2023 10:12:19 -0500
-Subject: [PATCH] exportfs: remove warning if neither subtree_check or
- no_subtree_check is given
-
-This warning was only ever intended as a transitional aid.
-It doesn't serve any purpose any longer.  Let's remove it.
-
-Also clean up some white-space issues.
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/export/export.c  |  2 +-
- support/export/xtab.c    |  2 +-
- support/include/nfslib.h |  2 +-
- support/nfs/exports.c    | 43 +++++++++++++++++-----------------------
- 4 files changed, 21 insertions(+), 28 deletions(-)
-
-diff --git a/support/export/export.c b/support/export/export.c
-index 3e48c42def19..100912cb29c3 100644
---- a/support/export/export.c
-+++ b/support/export/export.c
-@@ -119,7 +119,7 @@ export_read(char *fname, int ignore_hosts)
- 	int reexport_found = 0;
- 
- 	setexportent(fname, "r");
--	while ((eep = getexportent(0,1)) != NULL) {
-+	while ((eep = getexportent(0)) != NULL) {
- 		exp = export_lookup(eep->e_hostname, eep->e_path, ignore_hosts);
- 		if (!exp) {
- 			if (export_create(eep, 0))
-diff --git a/support/export/xtab.c b/support/export/xtab.c
-index e210ca99d574..282f15bc79cd 100644
---- a/support/export/xtab.c
-+++ b/support/export/xtab.c
-@@ -47,7 +47,7 @@ xtab_read(char *xtab, char *lockfn, int is_export)
- 	setexportent(xtab, "r");
- 	if (is_export == 1)
- 		v4root_needed = 1;
--	while ((xp = getexportent(is_export==0, 0)) != NULL) {
-+	while ((xp = getexportent(is_export==0)) != NULL) {
- 		if (!(exp = export_lookup(xp->e_hostname, xp->e_path, is_export != 1)) &&
- 		    !(exp = export_create(xp, is_export!=1))) {
-                         if(xp->e_hostname) {
-diff --git a/support/include/nfslib.h b/support/include/nfslib.h
-index bdbde78d9ebd..eff2a486307f 100644
---- a/support/include/nfslib.h
-+++ b/support/include/nfslib.h
-@@ -111,7 +111,7 @@ struct rmtabent {
-  * configuration file parsing
-  */
- void			setexportent(char *fname, char *type);
--struct exportent *	getexportent(int,int);
-+struct exportent *	getexportent(int);
- void 			secinfo_show(FILE *fp, struct exportent *ep);
- void			xprtsecinfo_show(FILE *fp, struct exportent *ep);
- void			putexportent(struct exportent *xep);
-diff --git a/support/nfs/exports.c b/support/nfs/exports.c
-index 15dc574cc21a..a6816e60d62e 100644
---- a/support/nfs/exports.c
-+++ b/support/nfs/exports.c
-@@ -59,7 +59,7 @@ static int	*squids = NULL, nsquids = 0,
- 
- static int	getexport(char *exp, int len);
- static int	getpath(char *path, int len);
--static int	parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr);
-+static int	parseopts(char *cp, struct exportent *ep, int *had_subtree_opt_ptr);
- static int	parsesquash(char *list, int **idp, int *lenp, char **ep);
- static int	parsenum(char **cpp);
- static void	freesquash(void);
-@@ -109,7 +109,7 @@ static void init_exportent (struct exportent *ee, int fromkernel)
- }
- 
- struct exportent *
--getexportent(int fromkernel, int fromexports)
-+getexportent(int fromkernel)
- {
- 	static struct exportent	ee, def_ee;
- 	char		exp[512], *hostname;
-@@ -147,7 +147,7 @@ getexportent(int fromkernel, int fromexports)
- 	 * we're not reading from the kernel.
- 	 */
- 	if (exp[0] == '-' && !fromkernel) {
--		if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts) < 0)
-+		if (parseopts(exp + 1, &def_ee, &has_default_subtree_opts) < 0)
- 			return NULL;
- 
- 		has_default_opts = 1;
-@@ -185,20 +185,20 @@ getexportent(int fromkernel, int fromexports)
- 	}
- 	ee.e_hostname = xstrdup(hostname);
- 
--	if (parseopts(opt, &ee, fromexports && !has_default_subtree_opts, NULL) < 0) {
--                if(ee.e_hostname)
--                {
--                    xfree(ee.e_hostname);
--                    ee.e_hostname=NULL;
--                }
--                if(ee.e_uuid)
--                {
--                    xfree(ee.e_uuid);
--                    ee.e_uuid=NULL;
--                }
-+	if (parseopts(opt, &ee, NULL) < 0) {
-+		if(ee.e_hostname)
-+		{
-+			xfree(ee.e_hostname);
-+			ee.e_hostname=NULL;
-+		}
-+		if(ee.e_uuid)
-+		{
-+			xfree(ee.e_uuid);
-+			ee.e_uuid=NULL;
-+		}
- 
- 		return NULL;
--        }
-+	}
- 	/* resolve symlinks */
- 	if (realpath(ee.e_path, rpath) != NULL) {
- 		rpath[sizeof (rpath) - 1] = '\0';
-@@ -433,7 +433,7 @@ mkexportent(char *hname, char *path, char *options)
- 	}
- 	strncpy(ee.e_path, path, sizeof (ee.e_path));
- 	ee.e_path[sizeof (ee.e_path) - 1] = '\0';
--	if (parseopts(options, &ee, 0, NULL) < 0)
-+	if (parseopts(options, &ee, NULL) < 0)
- 		return NULL;
- 	return &ee;
- }
-@@ -441,7 +441,7 @@ mkexportent(char *hname, char *path, char *options)
- int
- updateexportent(struct exportent *eep, char *options)
- {
--	if (parseopts(options, eep, 0, NULL) < 0)
-+	if (parseopts(options, eep, NULL) < 0)
- 		return 0;
- 	return 1;
- }
-@@ -632,7 +632,7 @@ void fix_pseudoflavor_flags(struct exportent *ep)
-  * Parse option string pointed to by cp and set mount options accordingly.
-  */
- static int
--parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
-+parseopts(char *cp, struct exportent *ep, int *had_subtree_opt_ptr)
- {
- 	int	had_subtree_opt = 0;
- 	char 	*flname = efname?efname:"command line";
-@@ -852,13 +852,6 @@ bad_option:
- 	ep->e_nsqgids = nsqgids;
- 
- out:
--	if (warn && !had_subtree_opt)
--		xlog(L_WARNING, "%s [%d]: Neither 'subtree_check' or 'no_subtree_check' specified for export \"%s:%s\".\n"
--				"  Assuming default behaviour ('no_subtree_check').\n"
--				"  NOTE: this default has changed since nfs-utils version 1.0.x\n",
--
--				flname, flline,
--				ep->e_hostname, ep->e_path);
- 	if (had_subtree_opt_ptr)
- 		*had_subtree_opt_ptr = had_subtree_opt;
- 
--- 
-2.43.0
-

0002-conffile-don-t-report-error-from-conf_init_file.patch

@@ -1,179 +0,0 @@
-From ed4dc834e1722b9217fae27da1adf29ab21d6a93 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Mon, 27 Nov 2023 10:30:43 -0500
-Subject: [PATCH] conffile: don't report error from conf_init_file()
-
-conf_init_file() currently reports an error if the main config file
-doesn't exist - even if there are conf files in the conf.d directory.
-
-This is only used by nfsconfcli.c.  However this is not needed.  If
-there is a real error, and error message is already logged.
-If it is simply that the file doesn't exist, that isn't really an error.
-
-So remove the error messages and change conf_init_file() to not return
-any status.
-
-Also fix up assorted nearby white-space issues.
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/include/conffile.h |  2 +-
- support/nfs/conffile.c     | 32 ++++++++++++++------------------
- tools/nfsconf/nfsconfcli.c | 15 ++-------------
- 3 files changed, 17 insertions(+), 32 deletions(-)
-
-diff --git a/support/include/conffile.h b/support/include/conffile.h
-index c4a3ca62860e..c04cd1ec5c0c 100644
---- a/support/include/conffile.h
-+++ b/support/include/conffile.h
-@@ -62,7 +62,7 @@ extern char    *conf_get_str(const char *, const char *);
- extern char    *conf_get_str_with_def(const char *, const char *, char *);
- extern char    *conf_get_section(const char *, const char *, const char *);
- extern char    *conf_get_entry(const char *, const char *, const char *);
--extern int      conf_init_file(const char *);
-+extern void     conf_init_file(const char *);
- extern void     conf_cleanup(void);
- extern int      conf_match_num(const char *, const char *, int);
- extern int      conf_remove(int, const char *, const char *);
-diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
-index fd4a17ad4293..6b813dd95147 100644
---- a/support/nfs/conffile.c
-+++ b/support/nfs/conffile.c
-@@ -658,7 +658,7 @@ conf_load_file(const char *conf_file)
- 	return 0;
- }
- 
--static void 
-+static void
- conf_init_dir(const char *conf_file)
- {
- 	struct dirent **namelist = NULL;
-@@ -669,14 +669,14 @@ conf_init_dir(const char *conf_file)
- 	dname = malloc(strlen(conf_file) + 3);
- 	if (dname == NULL) {
- 		xlog(L_WARNING, "conf_init_dir: malloc: %s", strerror(errno));
--		return;	
-+		return;
- 	}
- 	sprintf(dname, "%s.d", conf_file);
- 
- 	n = scandir(dname, &namelist, NULL, versionsort);
- 	if (n < 0) {
- 		if (errno != ENOENT) {
--			xlog(L_WARNING, "conf_init_dir: scandir %s: %s", 
-+			xlog(L_WARNING, "conf_init_dir: scandir %s: %s",
- 				dname, strerror(errno));
- 		}
- 		free(dname);
-@@ -691,7 +691,7 @@ conf_init_dir(const char *conf_file)
- 	for (i = 0; i < n; i++ ) {
- 		struct dirent *d = namelist[i];
- 
--	 	switch (d->d_type) {
-+		switch (d->d_type) {
- 			case DT_UNKNOWN:
- 			case DT_REG:
- 			case DT_LNK:
-@@ -701,13 +701,13 @@ conf_init_dir(const char *conf_file)
- 		}
- 		if (*d->d_name == '.')
- 			continue;
--		
-+
- 		fname_len = strlen(d->d_name);
- 		path_len = (fname_len + dname_len);
- 		if (!fname_len || path_len > PATH_MAX) {
- 			xlog(L_WARNING, "conf_init_dir: Too long file name: %s in %s", 
- 				d->d_name, dname);
--			continue; 
-+			continue;
- 		}
- 
- 		/*
-@@ -715,7 +715,7 @@ conf_init_dir(const char *conf_file)
- 		 * that end with CONF_FILE_EXT
- 		 */
- 		if (fname_len <= CONF_FILE_EXT_LEN) {
--			xlog(D_GENERAL, "conf_init_dir: %s: name too short", 
-+			xlog(D_GENERAL, "conf_init_dir: %s: name too short",
- 				d->d_name);
- 			continue;
- 		}
-@@ -746,31 +746,29 @@ conf_init_dir(const char *conf_file)
- 		free(namelist[i]);
- 	free(namelist);
- 	free(dname);
--	
-+
- 	return;
- }
- 
--int
-+void
- conf_init_file(const char *conf_file)
- {
- 	unsigned int i;
--	int ret;
- 
- 	for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++)
- 		LIST_INIT (&conf_bindings[i]);
- 
- 	TAILQ_INIT (&conf_trans_queue);
- 
--	if (conf_file == NULL) 
--		conf_file=NFS_CONFFILE;
-+	if (conf_file == NULL)
-+		conf_file = NFS_CONFFILE;
- 
- 	/*
--	 * First parse the give config file 
--	 * then parse the config.conf.d directory 
-+	 * First parse the give config file
-+	 * then parse the config.conf.d directory
- 	 * (if it exists)
--	 *
- 	 */
--	ret = conf_load_file(conf_file);
-+	conf_load_file(conf_file);
- 
- 	/*
- 	 * When the same variable is set in both files
-@@ -779,8 +777,6 @@ conf_init_file(const char *conf_file)
- 	 * have the final say.
- 	 */
- 	conf_init_dir(conf_file);
--
--	return ret;
- }
- 
- /*
-diff --git a/tools/nfsconf/nfsconfcli.c b/tools/nfsconf/nfsconfcli.c
-index b2ef96d1c600..bd9d52701aa6 100644
---- a/tools/nfsconf/nfsconfcli.c
-+++ b/tools/nfsconf/nfsconfcli.c
-@@ -135,19 +135,8 @@ int main(int argc, char **argv)
- 		return 1;
- 	}
- 
--	if (mode != MODE_SET && mode != MODE_UNSET) {
--		if (conf_init_file(confpath)) {
--			/* config file was missing or had an error, warn about it */
--			if (verbose || mode != MODE_ISSET) {
--				fprintf(stderr, "Error loading config file %s\n",
--					confpath);
--			}
--
--			/* this isnt fatal for --isset */
--			if (mode != MODE_ISSET)
--				return 1;
--		}
--	}
-+	if (mode != MODE_SET && mode != MODE_UNSET)
-+		conf_init_file(confpath);
- 
- 	/* --dump mode, output the current configuration */
- 	if (mode == MODE_DUMP) {
--- 
-2.43.0
-

0003-conffile-allow-usr-etc-to-provide-any-config-files-e.patch

@@ -1,188 +0,0 @@
-From 6a714409b17ad2cca99d497129fc944a808eb446 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Mon, 27 Nov 2023 10:35:56 -0500
-Subject: [PATCH] conffile: allow /usr/etc to provide any config files expected
- in /etc
-
-If any config file is configured to be in /etc, also read from /usr/etc.
-This followed a growing trend of moving as much as possible out of /
-and into /usr.
-
-See https://en.opensuse.org/openSUSE:Packaging_UsrEtc
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/nfs/conffile.c         |   26 +++++++++++++++-----------
- support/nfsidmap/idmapd.conf.5 |   15 ++++++++++++++-
- systemd/nfs.conf.man           |   23 ++++++++++++++---------
- systemd/nfs.systemd.man        |   10 +++++++++-
- utils/mount/nfsmount.conf.man  |   19 ++++++++++---------
- 5 files changed, 62 insertions(+), 31 deletions(-)
-
---- a/support/nfs/conffile.c
-+++ b/support/nfs/conffile.c
-@@ -763,19 +763,23 @@ conf_init_file(const char *conf_file)
- 	if (conf_file == NULL)
- 		conf_file = NFS_CONFFILE;
- 
--	/*
--	 * First parse the give config file
--	 * then parse the config.conf.d directory
--	 * (if it exists)
-+	/* If the config file is in /etc (normal) then check
-+	 * /usr/etc first.  Also check config.conf.d for files
-+	 * names *.conf.
-+	 *
-+	 * Content or later files always over-rides earlier
-+	 * files.
- 	 */
--	conf_load_file(conf_file);
-+	if (strncmp(conf_file, "/etc/", 5) == 0) {
-+		char *usrconf = NULL;
- 
--	/*
--	 * When the same variable is set in both files
--	 * the conf.d file will override the config file.
--	 * This allows automated admin systems to
--	 * have the final say.
--	 */
-+		if (asprintf(&usrconf, "/usr%s", conf_file) > 0 && usrconf) {
-+			conf_load_file(usrconf);
-+			conf_init_dir(usrconf);
-+			free(usrconf);
-+		}
-+	}
-+	conf_load_file(conf_file);
- 	conf_init_dir(conf_file);
- }
- 
---- a/support/nfsidmap/idmapd.conf.5
-+++ b/support/nfsidmap/idmapd.conf.5
-@@ -37,7 +37,7 @@ Configuration file for libnfsidmap.  Use
- .SH DESCRIPTION
- The
- .B idmapd.conf
--configuration file consists of several sections, initiated by strings of the
-+configuration files consists of several sections, initiated by strings of the
- form [General] and [Mapping].  Each section may contain lines of the form
- .nf
-   variable = value
-@@ -398,6 +398,19 @@ LDAP_base = dc=org,dc=domain
- .\" Additional sections
- .\" -------------------------------------------------------------------
- .\"
-+.SH FILES
-+.I /usr/etc/idmapd.conf
-+.br
-+.I /usr/etc/idmapd.conf.d/*.conf
-+.br
-+.I /etc/idmapd.conf
-+.br
-+.I /etc/idmapd.conf.d/*.conf
-+.br
-+.IP
-+Files are read in the order listed.  Later settings override earlier
-+settings.
-+
- .SH SEE ALSO
- .BR idmapd (8)
- .BR svcgssd (8)
---- a/systemd/nfs.conf.man
-+++ b/systemd/nfs.conf.man
-@@ -2,10 +2,13 @@
- .SH NAME
- nfs.conf \- general configuration for NFS daemons and tools
- .SH SYNOPSIS
-+.I /usr/etc/nfs.conf
-+.I /usr/etc/nfs.conf.d/
- .I /etc/nfs.conf
-+.I /etc/nfs.conf.d/
- .SH DESCRIPTION
- .PP
--This file contains site-specific configuration for various NFS daemons
-+These files contain site-specific configuration for various NFS daemons
- and other processes.  Most configuration can also be passed to
- processes via command line arguments, but it can be more convenient to
- have a central file.  In particular, this encourages consistent
-@@ -314,15 +317,17 @@ See
- for deatils.
- 
- .SH FILES
--.TP 10n
-+.I /usr/etc/nfs.conf
-+.br
-+.I /usr/etc/nfs.conf.d/*.conf
-+.br
- .I /etc/nfs.conf
--Default NFS client configuration file
--.TP 10n
--.I /etc/nfs.conf.d
--When this directory exists and files ending 
--with ".conf" exist, those files will be
--used to set configuration variables. These
--files will override variables set in /etc/nfs.conf
-+.br
-+.I /etc/nfs.conf.d/*.conf
-+.br
-+.IP
-+Various configuration files read in order.  Later settings override
-+earlier settings.
- .SH SEE ALSO
- .BR nfsdcltrack (8),
- .BR rpc.nfsd (8),
---- a/systemd/nfs.systemd.man
-+++ b/systemd/nfs.systemd.man
-@@ -27,7 +27,9 @@ any command line arguments to daemons so
- behavior.  In many case such configuration can be performed by making
- changes to
- .I /etc/nfs.conf
--or other configuration files.  When that is not convenient, a
-+or other configuration files (see
-+.BR nfs.conf (5)).
-+When that is not convenient, a
- distribution might provide systemd "drop-in" files which replace the
- .B ExecStart=
- setting to start the program with different arguments.  For example a
-@@ -171,6 +173,12 @@ running, it can be masked with
- /etc/nfsmount.conf
- .br
- /etc/idmapd.conf
-+.P
-+Also similar files in 
-+.B /usr/etc
-+and in related
-+.I conf.d
-+drop-in directories.
- .SH SEE ALSO
- .BR systemd.unit (5),
- .BR nfs.conf (5),
---- a/utils/mount/nfsmount.conf.man
-+++ b/utils/mount/nfsmount.conf.man
-@@ -115,16 +115,17 @@ All mounts to the '/export/home' export
- the background (i.e. done asynchronously).
- .RE
- .SH FILES
--.TP 10n
-+.I /usr/etc/nfsmount.conf
-+.br
-+.I /usr/etc/nfsmount.conf.d/*.conf
-+.br
- .I /etc/nfsmount.conf
--Default NFS mount configuration file
--.TP 10n
--.I /etc/nfsmount.conf.d
--When this directory exists and files ending
--with ".conf" exist, those files will be
--used to set configuration variables. These
--files will override variables set
--in /etc/nfsmount.conf
-+.br
-+.I /etc/nfsmount.conf.d/*.conf
-+.br
-+.IP
-+Default NFS mount configuration files, variables set in the later file
-+over-ride those in the earlier file.
- .PD
- .SH SEE ALSO
- .BR nfs (5),

0004-fsidd-call-anonymous-sockets-by-their-name-only-don-.patch

@@ -1,115 +0,0 @@
-From 46f91dc8f0d9aa31e18327cf3ad61c27551c4cfc Mon Sep 17 00:00:00 2001
-From: Ahelenia Ziemiaska <nabijaczleweli@nabijaczleweli.xyz>
-Date: Mon, 27 Nov 2023 10:41:04 -0500
-Subject: [PATCH] fsidd: call anonymous sockets by their name only, don't fill
- with NULs to 108 bytes
-
-Since e00ab3c0616fe6d83ab0710d9e7d989c299088f7, ss -l looks like this:
-  u_seq               LISTEN                0                     5                 @/run/fsid.sock@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 26989379                                                       * 0
-with fsidd pushing all the addresses to 108 bytes wide, which is deeply
-egregious if you don't filter it out and recolumnate.
-
-This is because, naturally (unix(7)), "Null bytes in the name have
-no special significance": abstract addresses are binary blobs, but
-paths automatically terminate at the first NUL byte, since paths
-can't contain those.
-
-So just specify the correct address length when we're using the abstract domain:
-unix(7) recommends "offsetof(struct sockaddr_un, sun_path) + strlen(sun_path) + 1"
-for paths, but we don't want to include the terminating NUL, so it's just
-"offsetof(struct sockaddr_un, sun_path) + strlen(sun_path)".
-This brings the width back to order:
--- >8 --
-$ ss -la | grep @
-u_str ESTAB     0      0      @45208536ec96909a/bus/systemd-timesyn/bus-api-timesync 18500238                            * 18501249
-u_str ESTAB     0      0       @fecc9657d2315eb7/bus/systemd-network/bus-api-network 18495452                            * 18494406
-u_seq LISTEN    0      5                                             @/run/fsid.sock 27168796                            * 0
-u_str ESTAB     0      0                 @ac308f35f50797a2/bus/systemd-logind/system 19406                               * 15153
-u_str ESTAB     0      0                @b6606e0dfacbae75/bus/systemd/bus-api-system 18494353                            * 18495334
-u_str ESTAB     0      0                    @5880653d215718a7/bus/systemd/bus-system 26930876                            * 26930003
--- >8 --
-
-Fixes: e00ab3c0616fe6d83ab0710d9e7d989c299088f7 ("fsidd: provide
- better default socket name.")
-Reviewed-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Ahelenia Ziemia?ska <nabijaczleweli@nabijaczleweli.xyz>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- support/reexport/fsidd.c    | 9 ++++++---
- support/reexport/reexport.c | 8 ++++++--
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c
-index 3e62b3fc1370..8a70b78f6362 100644
---- a/support/reexport/fsidd.c
-+++ b/support/reexport/fsidd.c
-@@ -147,6 +147,7 @@ int main(void)
- {
- 	struct event *srv_ev;
- 	struct sockaddr_un addr;
-+	socklen_t addr_len;
- 	char *sock_file;
- 	int srv;
- 
-@@ -161,10 +162,12 @@ int main(void)
- 	memset(&addr, 0, sizeof(struct sockaddr_un));
- 	addr.sun_family = AF_UNIX;
- 	strncpy(addr.sun_path, sock_file, sizeof(addr.sun_path) - 1);
--	if (addr.sun_path[0] == '@')
-+	addr_len = sizeof(struct sockaddr_un);
-+	if (addr.sun_path[0] == '@') {
- 		/* "abstract" socket namespace */
-+		addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path);
- 		addr.sun_path[0] = 0;
--	else
-+	} else
- 		unlink(sock_file);
- 
- 	srv = socket(AF_UNIX, SOCK_SEQPACKET | SOCK_NONBLOCK, 0);
-@@ -173,7 +176,7 @@ int main(void)
- 		return 1;
- 	}
- 
--	if (bind(srv, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)) == -1) {
-+	if (bind(srv, (const struct sockaddr *)&addr, addr_len) == -1) {
- 		xlog(L_WARNING, "Unable to bind %s: %m\n", sock_file);
- 		return 1;
- 	}
-diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c
-index 78516586b98e..0fb49a46723c 100644
---- a/support/reexport/reexport.c
-+++ b/support/reexport/reexport.c
-@@ -21,6 +21,7 @@ static int fsidd_srv = -1;
- static bool connect_fsid_service(void)
- {
- 	struct sockaddr_un addr;
-+	socklen_t addr_len;
- 	char *sock_file;
- 	int ret;
- 	int s;
-@@ -33,9 +34,12 @@ static bool connect_fsid_service(void)
- 	memset(&addr, 0, sizeof(struct sockaddr_un));
- 	addr.sun_family = AF_UNIX;
- 	strncpy(addr.sun_path, sock_file, sizeof(addr.sun_path) - 1);
--	if (addr.sun_path[0] == '@')
-+	addr_len = sizeof(struct sockaddr_un);
-+	if (addr.sun_path[0] == '@') {
- 		/* "abstract" socket namespace */
-+		addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path);
- 		addr.sun_path[0] = 0;
-+	}
- 
- 	s = socket(AF_UNIX, SOCK_SEQPACKET, 0);
- 	if (s == -1) {
-@@ -43,7 +47,7 @@ static bool connect_fsid_service(void)
- 		return false;
- 	}
- 
--	ret = connect(s, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un));
-+	ret = connect(s, (const struct sockaddr *)&addr, addr_len);
- 	if (ret == -1) {
- 		xlog(L_WARNING, "Unable to connect %s: %m, is fsidd running?\n", sock_file);
- 		return false;
--- 
-2.43.0
-

nfs-utils-1.0.7-bind-syntax.patch

@@ -1,19 +0,0 @@
- 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.6.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d
-size 728280

nfs-utils-2.8.3.tar.xz

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

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

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,42 @@
+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,3 +1,98 @@
+-------------------------------------------------------------------
+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>
+
+- update to 2.8.2:
+  * exports: Fix referrals when --enable-junction=no
+  * nfsidmap(v2): Add guards around [nfsidmap] usages of [sysconf].
+  * libnsm(v2): fix the safer atomic filenames fix
+  * libnsm: fix the safer atomic filenames fix
+  * nfsd: dump default number of threads to 16
+  * autoconf: don't build nfsdcltrack by default
+  * nfs(5): Update rsize/wsize options
+  * nfsdctl: clarify when versions can be set on the man page
+  * nfsdctl: fix up the help text in version_usage()
+  * libnsm: safer atomic filenames
+  * nfs-utils: fixup statd testing simulator host arg
+  * mount.nfs: retry NFSv3 mount after NFSv4 failure in auto negotiation
+
+-------------------------------------------------------------------
+Wed Dec 11 03:18:18 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Require system-user-nobody for nfs-client as the statd user relies
+  on `nogroup` from this package
+
+-------------------------------------------------------------------
+Tue Oct 29 10:05:55 UTC 2024 - Petr Vorel <pvorel@suse.cz>
+
+- Update to version 2.8.1
+  - https://lore.kernel.org/linux-nfs/4a86eea3-973e-4535-8aa5-f3b8b5f7934d@redhat.com/
+  - https://kernel.org/pub/linux/utils/nfs-utils/2.8.1/2.8.1-Changelog
+  - Add new binary nfsdctl
+  - The default number of nfsd threads is now 16 instead of 8
+- Removed patchs from previous releases
+  - 0001-exportfs-remove-warning-if-neither-subtree_check-or-.patch
+  - 0002-conffile-don-t-report-error-from-conf_init_file.patch
+  - 0003-conffile-allow-usr-etc-to-provide-any-config-files-e.patch
+  - 0004-fsidd-call-anonymous-sockets-by-their-name-only-don-.patch
+  - 0001-gssd-revert-commit-a5f3b7ccb01c.patch
+  - 0002-gssd-revert-commit-513630d720bd.patch
+  - 0003-gssd-switch-to-using-rpc_gss_seccreate.patch
+  - 0004-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-machine-cr.patch
+  - 0005-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-user-crede.patch
+  - 0006-configure-check-for-rpc_gss_seccreate.patch
+- Turn nfs-utils-1.0.7-bind-syntax.patch to git patch (bug reference,
+  easier to refresh via git, likely it can be now removed)
+- Add BuildRequires libnl-3.0, readline
+
+-------------------------------------------------------------------
+Tue Aug 20 20:21:14 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- add 0001-gssd-revert-commit-a5f3b7ccb01c.patch,
+  0002-gssd-revert-commit-513630d720bd.patch,
+  0003-gssd-switch-to-using-rpc_gss_seccreate.patch,
+  0004-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-machine-cr.patch,
+  0005-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-user-crede.patch,
+  0006-configure-check-for-rpc_gss_seccreate.patch: fixes for
+  libtirpc 1.3.5
+
 -------------------------------------------------------------------
 Mon Apr 22 02:56:13 UTC 2024 - Neil Brown <nfbrown@suse.com>
 
@@ -144,7 +239,7 @@ Sat May  7 12:17:24 UTC 2022 - Marcus Meissner <meissner@suse.com>
 -------------------------------------------------------------------
 Mon Mar 21 14:50:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
-- drop reenable-nfsv2.patch (poo#106679) 
+- drop reenable-nfsv2.patch (poo#106679)
 
 -------------------------------------------------------------------
 Tue Mar  8 20:58:54 UTC 2022 - Dirk Müller <dmueller@suse.com>
@@ -186,7 +281,7 @@ Mon Oct 25 23:53:37 UTC 2021 - Neil Brown <nfbrown@suse.com>
 Thu Sep  9 23:35:04 UTC 2021 - Neil Brown <nfbrown@suse.com>
 
 - Add 0001-gssd-fix-crash-in-debug-message.patch
-  Fix crash when rpc-gssd run with -v. 
+  Fix crash when rpc-gssd run with -v.
   (boo#1190144)
 
 -------------------------------------------------------------------
@@ -366,7 +461,7 @@ Mon Feb 10 18:58:59 UTC 2020 - Petr Vorel <pvorel@suse.cz>
    Dropped patches (upstream used different solution):
    - 0009-Allow-compilation-to-succeed-with-fno-common.patch (btw this used
 	 Patch0: instead of Patch10:) (boo#1160405)
-   
+
    Add nfsdcld - NFSv4 Client Tracking Daemon, add nfsdcld.service and enable it
    for nfs-kernel-server, add man page
    Add clddb-tool - tool for downgrading the nfsdcld sqlite database schema,
@@ -515,7 +610,7 @@ Fri Jul  6 15:02:49 CEST 2018 - kukuk@suse.de
 -------------------------------------------------------------------
 Thu Nov 23 13:40:51 UTC 2017 - rbrown@suse.com
 
-- Replace references to /var/adm/fillup-templates with new 
+- Replace references to /var/adm/fillup-templates with new
   %_fillupdir macro (boo#1069468)
 
 -------------------------------------------------------------------
@@ -1020,7 +1115,7 @@ Mon May 13 15:32:55 UTC 2013 - coolo@suse.com
 Wed Mar  6 20:04:55 UTC 2013 - darin@darins.net
 
 - nfsserver.init,sysconfig.nfs - Add support for setting rpc.mountd
-  options. 
+  options.
 
 -------------------------------------------------------------------
 Wed Nov 28 00:08:55 UTC 2012 - nfbrown@suse.com
@@ -1085,7 +1180,7 @@ Sun Nov 20 06:47:14 UTC 2011 - coolo@suse.com
 -------------------------------------------------------------------
 Sun Nov  6 11:43:39 UTC 2011 - puzel@suse.com
 
-- do not strip the binaries 
+- do not strip the binaries
 
 -------------------------------------------------------------------
 Wed Oct 12 05:18:17 UTC 2011 - nfbrown@suse.com
@@ -1261,7 +1356,7 @@ Sun May  9 23:07:24 UTC 2010 - nfbrown@novell.com
 -------------------------------------------------------------------
 Mon Apr 19 23:43:45 UTC 2010 - nfbrown@novell.com
 
-- mkinitrd-boot.sh: allow other mkinitrd-setup 
+- mkinitrd-boot.sh: allow other mkinitrd-setup
   scripts to request the inclusion of nfs support
   by setting need_nfs to 1.  (bnc#572207)
 
@@ -1294,7 +1389,7 @@ Tue Feb 23 22:15:18 UTC 2010 - nfbrown@novell.com
 -------------------------------------------------------------------
 Sun Nov 29 22:03:26 UTC 2009 - nfbrown@novell.com
 
-- nfs-utils-eperm-fallback.patch:  mount.nfs 
+- nfs-utils-eperm-fallback.patch:  mount.nfs
   tries a v3 mount after a v4 mount fails with ENOENT.
   Older linux nfsd servers return EPERM, so fall
   back in that case too.  bnc#557138
@@ -1303,7 +1398,7 @@ Sun Nov 29 22:03:26 UTC 2009 - nfbrown@novell.com
 Thu Nov  5 03:16:22 UTC 2009 - nfbrown@novell.com
 
 - New upsteam release - 1.2.1
-  Includes new config file: /etc/nfsmount.conf and 
+  Includes new config file: /etc/nfsmount.conf and
   man page.
 - nfs.init
   * implement try-restart in a more gentle fashion
@@ -1320,7 +1415,7 @@ Thu Nov  5 03:16:22 UTC 2009 - nfbrown@novell.com
 -------------------------------------------------------------------
 Fri Oct 30 05:43:32 CET 2009 - nfbrown@suse.de
 
-- Kill processes on NFS mounts when unmounting 
+- Kill processes on NFS mounts when unmounting
   for shutdown.  This allows any 'sync' to happen
   before we turn off the network.
   (bnc#503640)
@@ -1361,7 +1456,7 @@ Sun Dec  7 22:20:05 CET 2008 - nfbrown@suse.de
 - gssd-mem-leak
   * set better expiry date for cached auth info
   so kernel does not run out of memory
-  bnc#442490  
+  bnc#442490
 
 -------------------------------------------------------------------
 Fri Dec  5 02:43:20 CET 2008 - nfbrown@suse.de
@@ -1389,7 +1484,7 @@ Tue Dec  2 03:15:50 CET 2008 - nfbrown@suse.de
 - nfsserver.init
   * set lockd sysctls before starting lockd.
     (bnc#443118)
- 
+
 
 -------------------------------------------------------------------
 Tue Nov 25 06:10:31 CET 2008 - nfbrown@suse.de
@@ -1412,7 +1507,7 @@ Mon Nov 24 00:01:51 CET 2008 - nfbrown@suse.de
   * Don't use 'system' to run start-statd
   as this looses our setuid bit.
   bnc#447812
- 
+
 -------------------------------------------------------------------
 Fri Nov 21 11:45:58 CET 2008 - hare@suse.de
 
@@ -1457,21 +1552,21 @@ Fri Nov 14 03:19:34 CET 2008 - nfbrown@suse.de
 Fri Nov  7 04:32:51 CET 2008 - nfbrown@suse.de
 
 - nfs.init
-  * fix typo in handling of "init.d/nfs status"  
+  * fix typo in handling of "init.d/nfs status"
       $status should have been $state
 
 -------------------------------------------------------------------
 Mon Oct 13 17:58:34 CEST 2008 - mkoenig@suse.de
 
-- nfs.init: 
+- nfs.init:
   * ensure all daemons get killed on stop (including rpc.statd)
-  * unmount rpc_pipefs 
+  * unmount rpc_pipefs
   * let close_usr do the work before the NFS filesystems get unmounted
 
 -------------------------------------------------------------------
 Mon Oct 13 10:35:13 CEST 2008 - ro@suse.de
 
-- fix sysconfig filename for changed fillup call 
+- fix sysconfig filename for changed fillup call
 
 -------------------------------------------------------------------
 Mon Oct  6 14:37:33 CEST 2008 - kukuk@suse.de
@@ -1586,7 +1681,7 @@ Fri May  2 05:22:19 CEST 2008 - nfbrown@suse.de
 - Added SM_NOTIFY_OPTIONS sysconfig - (bnc #379806)
 - Removed needless rc_status/rc_exit games in nfsserver.init (bnc #380156)
 - Fixed some sysconfig entries that asked to restart non-existent
-   services (gssd and idmpad have been rolled in to nfs/nfsserver). 
+   services (gssd and idmpad have been rolled in to nfs/nfsserver).
 
 -------------------------------------------------------------------
 Fri Apr 11 12:08:38 CEST 2008 - jsrain@suse.cz
@@ -1602,25 +1697,25 @@ Wed Apr  9 12:06:23 CEST 2008 - jsrain@suse.cz
 Tue Apr  1 16:12:22 CEST 2008 - mkoenig@suse.de
 
 - fix path srvinfo.d -> svcinfo.d
-- remove svcinfo.d dir as it is provided now by filesystem  
+- remove svcinfo.d dir as it is provided now by filesystem
 
 -------------------------------------------------------------------
 Thu Mar 27 13:53:20 CET 2008 - mkoenig@suse.de
 
-- update to version 1.1.2 
+- update to version 1.1.2
-- uses libgssglue instead of libgssapi 
+- uses libgssglue instead of libgssapi
 - remove patch
   nfs-utils-o_create-mode
 
 -------------------------------------------------------------------
 Wed Mar 26 17:11:33 CET 2008 - mkoenig@suse.de
 
-- add rpcbind support [fate#300607] 
+- add rpcbind support [fate#300607]
 
 -------------------------------------------------------------------
 Thu Feb 28 18:42:52 CET 2008 - ro@suse.de
 
-- added gssapi to buildrequires 
+- added gssapi to buildrequires
 
 -------------------------------------------------------------------
 Wed Feb 13 21:04:46 CET 2008 - jeffm@suse.com
@@ -1645,7 +1740,7 @@ Mon Dec 17 02:29:08 CET 2007 - nfbrown@suse.de
 Mon Nov 12 12:58:01 CET 2007 - ro@suse.de
 
 - use navigation icons from latex2html in nfs-utils-doc package
-  (#116355) 
+  (#116355)
 
 -------------------------------------------------------------------
 Fri Sep 14 12:22:08 CEST 2007 - ro@suse.de
@@ -1657,12 +1752,12 @@ Fri Sep 14 12:22:08 CEST 2007 - ro@suse.de
 Wed Sep 12 15:36:34 CEST 2007 - ro@suse.de
 
 - drop conflicts with nfs-server (userspace) in nfs-client package
-  showmount has been removed there (#309782) 
+  showmount has been removed there (#309782)
 
 -------------------------------------------------------------------
 Thu Jul 19 16:40:38 CEST 2007 - ro@suse.de
 
-- added README.NFSv4 (#182775) 
+- added README.NFSv4 (#182775)
 
 -------------------------------------------------------------------
 Tue Jul 17 13:32:25 CEST 2007 - meissner@suse.de
@@ -1704,7 +1799,7 @@ Tue Feb 27 08:52:29 CET 2007 - ro@suse.de
   - Fix -n option to mountd
   - Document sensitive gids
 - upstreamed patches deleted:
-  nfs-utils-anon-uid32.patch 
+  nfs-utils-anon-uid32.patch
 - added e2fsprogs-devel (for libblkid)
 - nhfsXXX binaries and manpages have been removed upstream
 
@@ -1722,7 +1817,7 @@ Mon Jan  8 18:23:44 CET 2007 - ro@suse.de
 -------------------------------------------------------------------
 Mon Dec 18 18:40:03 CET 2006 - ro@suse.de
 
-- added nfsserver.xml to /etc/omc/srvinfo.d (fate#301835) 
+- added nfsserver.xml to /etc/omc/srvinfo.d (fate#301835)
 
 -------------------------------------------------------------------
 Tue Aug  8 17:49:47 CEST 2006 - ro@suse.de
@@ -1743,7 +1838,7 @@ Tue Aug  8 17:49:47 CEST 2006 - ro@suse.de
   - nfs-utils-1.0.7-strip.patch
   - nfs-utils-64bigendian.patch
   - nfs-utils-1.0.6-quota.patch (upstream different)
-  
+
   partly upstreamed patches:
   - nfs-utils-1.0.6-anon-uid32.patch
   - nfs-utils-1.0.7-gssd-select-ccache.patch
@@ -1760,17 +1855,17 @@ Thu Jul 13 14:33:24 CEST 2006 - aj@suse.de
 -------------------------------------------------------------------
 Fri Jun 23 15:20:54 CEST 2006 - ro@suse.de
 
-- find kerberos ticket files even if /tmp on reiser (#187775) 
+- find kerberos ticket files even if /tmp on reiser (#187775)
 
 -------------------------------------------------------------------
 Wed Jun 21 12:13:00 CEST 2006 - ro@suse.de
 
-- fix /etc/gssapi_mech.conf for lib64 platforms (#186954) 
+- fix /etc/gssapi_mech.conf for lib64 platforms (#186954)
 
 -------------------------------------------------------------------
 Mon Jun 12 15:26:54 CEST 2006 - ro@suse.de
 
-- added support for type 3 filehandles to mountd (#182552) 
+- added support for type 3 filehandles to mountd (#182552)
 
 -------------------------------------------------------------------
 Fri Jun  2 12:39:10 CEST 2006 - ro@suse.de
@@ -1781,7 +1876,7 @@ Fri Jun  2 12:39:10 CEST 2006 - ro@suse.de
 -------------------------------------------------------------------
 Fri Jun  2 12:17:25 CEST 2006 - ro@suse.de
 
-- added fix for 64bit bigendian platforms in gssd (#172605) 
+- added fix for 64bit bigendian platforms in gssd (#172605)
 
 -------------------------------------------------------------------
 Tue May  2 09:39:42 CEST 2006 - okir@suse.de
@@ -1792,7 +1887,7 @@ Tue May  2 09:39:42 CEST 2006 - okir@suse.de
 Mon Apr 24 14:05:16 CEST 2006 - ro@suse.de
 
 - nfs-server rc-script: make force-reload do as reload does
-  (#167152) 
+  (#167152)
 - nfs-server rc-script: reload idmapd if NFSV4 is on (#167016)
 
 -------------------------------------------------------------------
@@ -1817,7 +1912,7 @@ Fri Jan 27 02:14:16 CET 2006 - mls@suse.de
 -------------------------------------------------------------------
 Wed Jan 25 16:20:23 CET 2006 - ro@suse.de
 
-- nfsserver rcscript: only mount nfsdfs if not mounted already 
+- nfsserver rcscript: only mount nfsdfs if not mounted already
 
 -------------------------------------------------------------------
 Tue Jan 17 00:32:02 CET 2006 - schwab@suse.de
@@ -1833,12 +1928,12 @@ Mon Dec 19 14:56:53 CET 2005 - mmj@suse.de
 Mon Nov 28 16:29:12 CET 2005 - ro@suse.de
 
 - fix init scripts: in the stop case, a not running service
-  is not an error (#134904) 
+  is not an error (#134904)
 
 -------------------------------------------------------------------
 Mon Nov 14 13:11:15 CET 2005 - ro@suse.de
 
-- packaging /var/lib/nfs/v4recovery directory (#133502) 
+- packaging /var/lib/nfs/v4recovery directory (#133502)
 
 -------------------------------------------------------------------
 Thu Sep  1 11:09:56 CEST 2005 - okir@suse.de
@@ -1861,7 +1956,7 @@ Fri Aug 19 14:23:23 CEST 2005 - okir@suse.de
 -------------------------------------------------------------------
 Mon Jun 20 15:48:17 CEST 2005 - ro@suse.de
 
-- fix in init-script (do not try unmount if not mounted) (#91460) 
+- fix in init-script (do not try unmount if not mounted) (#91460)
 
 -------------------------------------------------------------------
 Mon Jun  6 17:28:03 CEST 2005 - schwab@suse.de
@@ -1881,12 +1976,12 @@ Tue May 31 13:16:12 CEST 2005 - okir@suse.de
 -------------------------------------------------------------------
 Tue Apr 19 14:25:48 CEST 2005 - ro@suse.de
 
-- do not warn about sync/async for readonly exports (#78369) 
+- do not warn about sync/async for readonly exports (#78369)
 
 -------------------------------------------------------------------
 Mon Apr  4 01:57:06 CEST 2005 - ro@suse.de
 
-- make it build with gcc4 
+- make it build with gcc4
 
 -------------------------------------------------------------------
 Sat Feb  5 12:54:14 CET 2005 - schwab@suse.de
@@ -1898,7 +1993,7 @@ Sat Feb  5 12:54:14 CET 2005 - schwab@suse.de
 -------------------------------------------------------------------
 Mon Dec 13 14:00:35 CET 2004 - ro@suse.de
 
-- update to 1.0.7-pre2 (use 1.0.6.2 as package version) 
+- update to 1.0.7-pre2 (use 1.0.6.2 as package version)
 - disable gss and nfsv4 for now
 
 -------------------------------------------------------------------
@@ -1938,7 +2033,7 @@ Thu Jun 24 12:58:14 CEST 2004 - ro@suse.de
 Tue Jun 22 14:23:11 CEST 2004 - ro@suse.de
 
 - remove nfslock start script
-- remove nfslock dependency 
+- remove nfslock dependency
 
 -------------------------------------------------------------------
 Thu Jun 17 23:11:31 CEST 2004 - ro@suse.de
@@ -1981,34 +2076,34 @@ Mon Sep 15 09:12:00 CEST 2003 - ro@suse.de
 -------------------------------------------------------------------
 Fri Aug 29 18:47:29 CEST 2003 - ro@suse.de
 
-- fix hed/tail calling syntax (#29644) 
+- fix hed/tail calling syntax (#29644)
 
 -------------------------------------------------------------------
 Mon Aug 25 11:41:31 CEST 2003 - ro@suse.de
 
-- add restart_on_update/stop_on_removal macros 
+- add restart_on_update/stop_on_removal macros
 
 -------------------------------------------------------------------
 Fri Aug 15 15:04:43 CEST 2003 - ro@suse.de
 
-- added sysconfig metadata (#28908) 
+- added sysconfig metadata (#28908)
 
 -------------------------------------------------------------------
 Tue Aug  5 01:38:42 CEST 2003 - ro@suse.de
 
-- fix compile for rquotad (unused anyway 
+- fix compile for rquotad (unused anyway
 
 -------------------------------------------------------------------
 Thu Jul 31 14:15:43 CEST 2003 - ro@suse.de
 
-- add support for STATD_HOSTNAME (#28201) 
+- add support for STATD_HOSTNAME (#28201)
 
 -------------------------------------------------------------------
 Mon Jul 28 14:20:00 CEST 2003 - ro@suse.de
 
 - update to 1.0.5 and adapt patches
 - overflow patch already included
-- part of acl patch already included 
+- part of acl patch already included
 
 -------------------------------------------------------------------
 Mon Jul 21 17:04:00 CEST 2003 - agruen@suse.de
@@ -2035,7 +2130,7 @@ Thu Jun 12 07:19:59 CEST 2003 - kukuk@suse.de
 -------------------------------------------------------------------
 Tue May 13 00:34:35 CEST 2003 - ro@suse.de
 
-- fix file list 
+- fix file list
 
 -------------------------------------------------------------------
 Fri Mar 28 01:42:47 CET 2003 - ro@suse.de
@@ -2045,12 +2140,12 @@ Fri Mar 28 01:42:47 CET 2003 - ro@suse.de
 -------------------------------------------------------------------
 Wed Jan  8 12:56:27 CET 2003 - ro@suse.de
 
-- added sysconfig metadata (#22663) 
+- added sysconfig metadata (#22663)
 
 -------------------------------------------------------------------
 Fri Sep  6 15:07:56 CEST 2002 - ro@suse.de
 
-- rcnfsserver: moved ypbind to should-start (#18952) 
+- rcnfsserver: moved ypbind to should-start (#18952)
 - rcnfslock: fixed typo killing daemons on "status" (#19046)
 
 -------------------------------------------------------------------
@@ -2067,7 +2162,7 @@ Mon Aug 26 11:47:10 CEST 2002 - okir@suse.de
 -------------------------------------------------------------------
 Thu Aug 22 11:18:32 CEST 2002 - ro@suse.de
 
-- fixed symlink rcnfslock (#18171) 
+- fixed symlink rcnfslock (#18171)
 
 -------------------------------------------------------------------
 Wed Aug  7 17:14:21 CEST 2002 - ro@suse.de
@@ -2078,7 +2173,7 @@ Wed Aug  7 17:14:21 CEST 2002 - ro@suse.de
 Thu Aug  1 16:47:34 CEST 2002 - ro@suse.de
 
 - update to 1.0.1
-- added prereqs 
+- added prereqs
 
 -------------------------------------------------------------------
 Thu Jul 25 10:16:28 CEST 2002 - okir@suse.de
@@ -2102,7 +2197,7 @@ Tue Jul 16 18:41:22 CEST 2002 - kukuk@suse.de
 Fri Jun 14 01:55:23 CEST 2002 - ro@suse.de
 
 - run suse_update_config
- 
+
 -------------------------------------------------------------------
 Tue Feb 26 17:06:41 CET 2002 - ro@suse.de
 
@@ -2111,31 +2206,31 @@ Tue Feb 26 17:06:41 CET 2002 - ro@suse.de
 -------------------------------------------------------------------
 Wed Feb  6 14:07:06 CET 2002 - ro@suse.de
 
-- ignore returncodes from killing statd and lockd (#13072) 
+- ignore returncodes from killing statd and lockd (#13072)
 
 -------------------------------------------------------------------
 Wed Feb  6 13:33:08 CET 2002 - ro@suse.de
 
-- sysconfig/nfs-server -> sysconfig/nfs 
+- sysconfig/nfs-server -> sysconfig/nfs
 
 -------------------------------------------------------------------
 Wed Jan  9 11:44:08 CET 2002 - ro@suse.de
 
 - removed variable NFS_SERVER (#12742)
-- moved USE_KERNEL_NFSD_NUMBER to /etc/sysconfig/nfs-server 
+- moved USE_KERNEL_NFSD_NUMBER to /etc/sysconfig/nfs-server
 
 -------------------------------------------------------------------
 Wed Sep 26 15:36:25 CEST 2001 - ro@suse.de
 
 - up to 0.3.3
-  many fixes to canonicalize hostnames in exports 
+  many fixes to canonicalize hostnames in exports
 
 -------------------------------------------------------------------
 Fri Aug 24 15:31:29 CEST 2001 - ro@suse.de
 
 - removed nfs-version 3 detection in start-script, all kernels
   that have kernel nfsd support usually do have nfsd-v3 support
-  and detection would require at least a 5 sec wait in the script 
+  and detection would require at least a 5 sec wait in the script
 
 -------------------------------------------------------------------
 Tue Jul 31 09:53:20 CEST 2001 - kukuk@suse.de
@@ -2147,26 +2242,26 @@ Tue Jul 31 09:53:20 CEST 2001 - kukuk@suse.de
 -------------------------------------------------------------------
 Wed Apr 11 18:39:20 CEST 2001 - ro@suse.de
 
-- lockd only started for 2.2 kernels instead of ignoring error 
+- lockd only started for 2.2 kernels instead of ignoring error
 - completed rpc.statd to /sbin move in startscript
 
 -------------------------------------------------------------------
 Mon Mar 12 16:30:48 CET 2001 - ro@suse.de
 
-- move rpc.lockd, rpc.statd to /sbin 
+- move rpc.lockd, rpc.statd to /sbin
 
 -------------------------------------------------------------------
 Mon Mar 12 01:39:10 CET 2001 - ro@suse.de
 
 - update to 0.3.1
 - ignore lockd error messages
-- dump filedescriptors before starting kernel threads 
+- dump filedescriptors before starting kernel threads
 
 -------------------------------------------------------------------
 Tue Feb  6 12:33:46 CET 2001 - ro@suse.de
 
 - renamed package to nfs-utils
-- Obsoletes and Provides nfsutils 
+- Obsoletes and Provides nfsutils
 
 -------------------------------------------------------------------
 Fri Jan 12 01:47:05 CET 2001 - ro@suse.de
@@ -2176,7 +2271,7 @@ Fri Jan 12 01:47:05 CET 2001 - ro@suse.de
 -------------------------------------------------------------------
 Thu Jan 11 23:09:27 CET 2001 - ro@suse.de
 
-- don't fail if lockd can't be started 
+- don't fail if lockd can't be started
 
 -------------------------------------------------------------------
 Wed Dec  6 00:44:49 PST 2000 - bk@suse.de
@@ -2192,24 +2287,24 @@ Tue Nov 28 10:30:00 CET 2000 - kukuk@suse.de
 Thu Oct 12 18:13:48 CEST 2000 - ro@suse.de
 
 - exports.4 should be exports.5
-- removed k-prefix 
+- removed k-prefix
 
 -------------------------------------------------------------------
 Thu Oct 12 15:43:43 CEST 2000 - ro@suse.de
 
-- added exports.4 man-page 
+- added exports.4 man-page
 - up to 0.2.1
 
 -------------------------------------------------------------------
 Wed Sep 27 11:44:11 CEST 2000 - ro@suse.de
 
 - update to 0.2
-- fix for nfsserver.init (check for v3) 
+- fix for nfsserver.init (check for v3)
 
 -------------------------------------------------------------------
 Thu Aug 17 15:04:11 CEST 2000 - ro@suse.de
 
-- ugraded from knfsd to successor package nfs-utils (v.0.1.9.1) 
+- ugraded from knfsd to successor package nfs-utils (v.0.1.9.1)
 
 -------------------------------------------------------------------
 Fri Jul 28 18:31:24 CEST 2000 - bjacke@suse.de
@@ -2246,18 +2341,18 @@ Sat Apr 15 16:22:26 CEST 2000 - kukuk@suse.de
 Wed Feb 16 17:31:37 CET 2000 - kukuk@suse.de
 
 - Fill out Copyright and Group field
-- Remove rquotad from file list, it is already in the quota 
+- Remove rquotad from file list, it is already in the quota
   package [Bug 1571]
 
 -------------------------------------------------------------------
 Tue Jan 25 15:11:24 CET 2000 - ro@suse.de
 
-- manpages to /usr/share using macro 
+- manpages to /usr/share using macro
 
 -------------------------------------------------------------------
 Thu Oct 21 00:26:42 CEST 1999 - ro@suse.de
 
-- renamed package from linuxnfs to knfsd 
+- renamed package from linuxnfs to knfsd
 
 -------------------------------------------------------------------
 Tue Oct 12 17:56:24 CEST 1999 - garloff@suse.de
@@ -2293,7 +2388,7 @@ Mon Jun 14 10:27:36 MEST 1999 - kukuk@suse.de
 -------------------------------------------------------------------
 Sun Jun  6 15:51:15 MEST 1999 - kukuk@suse.de
 
-- update to version 1.3.3b 
+- update to version 1.3.3b
 
 -------------------------------------------------------------------
 Tue Mar 16 13:14:54 MET 1999 - ro@suse.de

nfs-utils.spec

@@ -1,7 +1,8 @@
 #
 # spec file for package nfs-utils
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,13 +23,15 @@
 %endif
 
 Name:           nfs-utils
-Version:        2.6.4
+Version:        2.8.3
 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
@@ -41,11 +44,8 @@ Source24:       rpc-statd-notify.options.conf
 Source25:       rpc-svcgssd.options.conf
 Source26:       nfs.conf
 Source27:       nfs-kernel-server.tmpfiles.conf
-Patch0:         nfs-utils-1.0.7-bind-syntax.patch
+Patch0:         nfs-utils-Fix-build-with-glibc-2.42.patch
-Patch1:         0001-exportfs-remove-warning-if-neither-subtree_check-or-.patch
+Patch1:         nfs-utils-nfsdctl-fix-lockd-config-during-autostart.patch
-Patch2:         0002-conffile-don-t-report-error-from-conf_init_file.patch
-Patch3:         0003-conffile-allow-usr-etc-to-provide-any-config-files-e.patch
-Patch4:         0004-fsidd-call-anonymous-sockets-by-their-name-only-don-.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -59,9 +59,11 @@ BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(libevent)
 BuildRequires:  pkgconfig(libkeyutils)
+BuildRequires:  pkgconfig(libnl-3.0)
 BuildRequires:  pkgconfig(libtirpc)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mount)
+BuildRequires:  pkgconfig(readline)
 BuildRequires:  pkgconfig(sqlite3)
 Suggests:       python-base
 %{?systemd_ordering}
@@ -77,6 +79,8 @@ Group:          Productivity/Networking/NFS
 Requires:       keyutils
 Requires:       netcfg
 Requires:       rpcbind
+# The statd user relies on 'nogroup' from system-user-nobody
+Requires:       system-user-nobody
 Requires(post): %fillup_prereq
 Requires(pre):  permissions
 Obsoletes:      nfs-utils < 1.1.0
@@ -368,6 +372,7 @@ fi
 %{_sbindir}/rpc.mountd
 %{_sbindir}/rpc.nfsd
 %{_sbindir}/nfsdcltrack
+%{_sbindir}/nfsdctl
 %{_sbindir}/nfsref
 %attr(0755,root,root) %{_sbindir}/nfsdclddb
 %attr(0755,root,root) %{_sbindir}/nfsdclnts
@@ -379,6 +384,7 @@ fi
 %{_mandir}/man8/nfsref.8%{ext_man}
 %{_mandir}/man8/rpc.mountd.8%{ext_man}
 %{_mandir}/man8/rpc.nfsd.8%{ext_man}
+%{_mandir}/man8/nfsdctl.8%{ext_man}
 %{_mandir}/man8/nfsdcltrack.8%{ext_man}
 %config(noreplace) %{_localstatedir}/lib/nfs/etab
 %config(noreplace) %{_localstatedir}/lib/nfs/rmtab