automatic version update by autodist [release 2.8.1-1mamba;Wed Oct 23 2024]

nfs-utils-1.2.5-arm-PAGE_SIZE.patch

@@ -1,13 +0,0 @@
-diff --git a/utils/blkmapd/device-process.c b/utils/blkmapd/device-process.c
-index 27ff374..652a7a8 100644
---- a/utils/blkmapd/device-process.c
-+++ b/utils/blkmapd/device-process.c
-@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_t *end, struct bl_volume *vols, int voln
- 		off_t stripe_unit = vol->param.bv_stripe_unit;
- 		/* Check limitations imposed by device-mapper */
- 		if ((stripe_unit & (stripe_unit - 1)) != 0
--		    || stripe_unit < (off_t) (PAGE_SIZE >> 9))
-+		    || stripe_unit < (off_t) (sysconf(_SC_PAGE_SIZE) >> 9))
- 			return -EIO;
- 		BLK_READBUF(p, end, 4);
- 		READ32(vol->bv_vol_n);

nfs-utils-1.3.3-rundir.patch

@@ -1,114 +0,0 @@
-diff -Nru nfs-utils-1.3.3.orig/support/nfs/getport.c nfs-utils-1.3.3/support/nfs/getport.c
---- nfs-utils-1.3.3.orig/support/nfs/getport.c	2015-09-26 16:01:11.000000000 +0200
-+++ nfs-utils-1.3.3/support/nfs/getport.c	2015-11-06 13:12:12.565448067 +0100
-@@ -903,7 +903,7 @@
-  * listen on AF_LOCAL.
-  *
-  * If that doesn't work (for example, if portmapper is running, or rpcbind
-- * isn't listening on /var/run/rpcbind.sock), send a query via UDP to localhost
-+ * isn't listening on /run/rpcbind.sock), send a query via UDP to localhost
-  * (UDP doesn't leave a socket in TIME_WAIT, and the timeout is a relatively
-  * short 3 seconds).
-  */
-diff -Nru nfs-utils-1.3.3.orig/systemd/nfs-blkmap.service nfs-utils-1.3.3/systemd/nfs-blkmap.service
---- nfs-utils-1.3.3.orig/systemd/nfs-blkmap.service	2015-11-06 13:10:23.376392802 +0100
-+++ nfs-utils-1.3.3/systemd/nfs-blkmap.service	2015-11-06 13:11:11.836973182 +0100
-@@ -9,7 +9,7 @@
- 
- [Service]
- Type=forking
--PIDFile=/var/run/blkmapd.pid
--EnvironmentFile=-/run/sysconfig/nfs-utils
-+PIDFile=/run/blkmapd.pid
-+EnvironmentFile=-/run/nfs-utils
- ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS
- 
-diff -Nru nfs-utils-1.3.3.orig/systemd/rpc-statd.service nfs-utils-1.3.3/systemd/rpc-statd.service
---- nfs-utils-1.3.3.orig/systemd/rpc-statd.service	2015-11-06 13:10:23.381392759 +0100
-+++ nfs-utils-1.3.3/systemd/rpc-statd.service	2015-11-06 13:10:49.572165905 +0100
-@@ -13,5 +13,5 @@
- [Service]
- EnvironmentFile=-/run/nfs-utils
- Type=forking
--PIDFile=/var/run/rpc.statd.pid
-+PIDFile=/run/rpc.statd.pid
- ExecStart=/usr/sbin/rpc.statd --no-notify $STATDARGS
-diff -Nru nfs-utils-1.3.3.orig/tests/test-lib.sh nfs-utils-1.3.3/tests/test-lib.sh
---- nfs-utils-1.3.3.orig/tests/test-lib.sh	2015-09-26 16:01:11.000000000 +0200
-+++ nfs-utils-1.3.3/tests/test-lib.sh	2015-11-06 13:11:48.084659658 +0100
-@@ -56,5 +56,5 @@
- 
- # shut down statd
- kill_statd() {
--	kill `cat /var/run/rpc.statd.pid`
-+	kill `cat /run/rpc.statd.pid`
- }
-diff -Nru nfs-utils-1.3.3.orig/utils/blkmapd/device-discovery.c nfs-utils-1.3.3/utils/blkmapd/device-discovery.c
---- nfs-utils-1.3.3.orig/utils/blkmapd/device-discovery.c	2015-09-26 16:01:11.000000000 +0200
-+++ nfs-utils-1.3.3/utils/blkmapd/device-discovery.c	2015-11-06 13:11:29.333821808 +0100
-@@ -58,7 +58,7 @@
- #define BL_PIPE_FILE	"/var/lib/nfs/rpc_pipefs/nfs/blocklayout"
- #define NFSPIPE_DIR	"/var/lib/nfs/rpc_pipefs/nfs"
- #define RPCPIPE_DIR	"/var/lib/nfs/rpc_pipefs"
--#define PID_FILE	"/var/run/blkmapd.pid"
-+#define PID_FILE	"/run/blkmapd.pid"
- 
- struct bl_disk *visible_disk_list;
- int    bl_watch_fd, bl_pipe_fd, nfs_pipedir_wfd, rpc_pipedir_wfd;
-diff -Nru nfs-utils-1.3.3.orig/utils/statd/sm-notify.c nfs-utils-1.3.3/utils/statd/sm-notify.c
---- nfs-utils-1.3.3.orig/utils/statd/sm-notify.c	2015-09-26 16:01:11.000000000 +0200
-+++ nfs-utils-1.3.3/utils/statd/sm-notify.c	2015-11-06 13:12:03.394527318 +0100
-@@ -871,7 +871,7 @@
- }
- 
- /*
-- * Record pid in /var/run/sm-notify.pid
-+ * Record pid in /run/sm-notify.pid
-  * This file should remain until a reboot, even if the
-  * program exits.
-  * If file already exists, fail.
-@@ -883,7 +883,7 @@
- 	int fd;
- 
- 	(void)snprintf(pid, sizeof(pid), "%d\n", (int)getpid());
--	fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
-+	fd = open("/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
- 	if (fd < 0)
- 		return 0;
- 
-diff -Nru nfs-utils-1.3.3.orig/utils/statd/start-statd nfs-utils-1.3.3/utils/statd/start-statd
---- nfs-utils-1.3.3.orig/utils/statd/start-statd	2015-09-26 16:01:11.000000000 +0200
-+++ nfs-utils-1.3.3/utils/statd/start-statd	2015-11-06 13:12:36.640240100 +0100
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # nfsmount calls this script when mounting a filesystem with locking
- # enabled, but when statd does not seem to be running (based on
--# /var/run/rpc.statd.pid).
-+# /run/rpc.statd.pid).
- # It should run statd with whatever flags are apropriate for this
- # site.
- PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-diff -Nru nfs-utils-1.3.3.orig/utils/statd/statd.c nfs-utils-1.3.3/utils/statd/statd.c
---- nfs-utils-1.3.3.orig/utils/statd/statd.c	2015-09-26 16:01:11.000000000 +0200
-+++ nfs-utils-1.3.3/utils/statd/statd.c	2015-11-06 13:12:24.620343918 +0100
-@@ -159,7 +159,7 @@
- 	fprintf(stderr,"      -H                   Specify a high-availability callout program.\n");
- }
- 
--static const char *pidfile = "/var/run/rpc.statd.pid";
-+static const char *pidfile = "/run/rpc.statd.pid";
- 
- int pidfd = -1;
- static void create_pidfile(void)
-diff -Nru nfs-utils-1.3.3.orig/utils/statd/statd.man nfs-utils-1.3.3/utils/statd/statd.man
---- nfs-utils-1.3.3.orig/utils/statd/statd.man	2015-09-26 16:01:11.000000000 +0200
-+++ nfs-utils-1.3.3/utils/statd/statd.man	2015-11-06 13:12:50.900116969 +0100
-@@ -398,7 +398,7 @@
- .I /var/lib/nfs/state
- NSM state number for this host
- .TP 2.5i
--.I /var/run/run.statd.pid
-+.I /run/run.statd.pid
- pid file
- .TP 2.5i
- .I /etc/netconfig

nfs-utils-2.4.1-arm-int64.patch

@@ -1,46 +0,0 @@
-diff -Nru nfs-utils-2.4.1.orig/utils/nfsdcld/cld-internal.h nfs-utils-2.4.1/utils/nfsdcld/cld-internal.h
---- nfs-utils-2.4.1.orig/utils/nfsdcld/cld-internal.h	2019-06-10 16:34:37.000000000 +0200
-+++ nfs-utils-2.4.1/utils/nfsdcld/cld-internal.h	2019-07-26 23:56:27.198358900 +0200
-@@ -24,8 +24,8 @@
- 	struct cld_msg	cl_msg;
- };
- 
--uint64_t current_epoch;
--uint64_t recovery_epoch;
-+long unsigned int current_epoch;
-+long unsigned int recovery_epoch;
- int first_time;
- int num_cltrack_records;
- int num_legacy_records;
-diff -Nru nfs-utils-2.4.1.orig/utils/nfsdcld/sqlite.c nfs-utils-2.4.1/utils/nfsdcld/sqlite.c
---- nfs-utils-2.4.1.orig/utils/nfsdcld/sqlite.c	2019-06-10 16:34:37.000000000 +0200
-+++ nfs-utils-2.4.1/utils/nfsdcld/sqlite.c	2019-07-26 23:57:54.812911667 +0200
-@@ -435,7 +435,7 @@
- 		goto out;
- 	}
- 
--	tcur = (uint64_t)sqlite3_column_int64(stmt, 0);
-+	tcur = sqlite3_column_int64(stmt, 0);
- 	trec = (uint64_t)sqlite3_column_int64(stmt, 1);
- 
- 	current_epoch = tcur;
-@@ -854,8 +854,8 @@
- {
- 	int ret, ret2;
- 	char *err;
--	uint64_t tcur = current_epoch;
--	uint64_t trec = recovery_epoch;
-+	unsigned long int tcur = current_epoch;
-+	unsigned long int trec = recovery_epoch;
- 
- 	/* begin transaction */
- 	ret = sqlite3_exec(dbh, "BEGIN EXCLUSIVE TRANSACTION;", NULL, NULL,
-@@ -875,7 +875,7 @@
- 
- 		ret = snprintf(buf, sizeof(buf), "UPDATE grace "
- 				"SET current = %" PRId64 ", recovery = %" PRId64 ";",
--				(int64_t)tcur, (int64_t)trec);
-+				(long int)tcur, (long int)trec);
- 		if (ret < 0) {
- 			xlog(L_ERROR, "sprintf failed!");
- 			goto rollback;

nfs-utils-2.4.1-arm-llx.patch

@@ -1,11 +0,0 @@
---- nfs-utils-2.4.1/utils/nfsdcld/sqlite.c.orig	2019-07-28 13:45:16.880331195 +0200
-+++ nfs-utils-2.4.1/utils/nfsdcld/sqlite.c	2019-07-28 13:48:29.268276675 +0200
-@@ -68,6 +68,8 @@
- #include "conffile.h"
- #include "legacy.h"
- 
-+#define PRIx64 "lx"
-+#define PRId64 "ld"
- #define CLD_SQLITE_LATEST_SCHEMA_VERSION 3
- #define CLTRACK_DEFAULT_STORAGEDIR NFS_STATEDIR "/nfsdcltrack"
- 

nfs-utils.spec

@@ -8,8 +8,8 @@
 %define with_mount     1
 
 Name:          nfs-utils
-Version:       2.7.1
+Version:       2.8.1
-Release:       2mamba
+Release:       1mamba
 Summary:       NFS utilities and supporting clients and daemons for the kernel NFS server
 Group:         Network/File Systems
 Vendor:        openmamba
@@ -20,10 +20,6 @@ Source0:       http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}
 Source1:       nfs-utils-sysconfig
 Source2:       nfs-utils_env.sh
 Source7:       nfs-utils-idmapd.conf
-Patch0:        %{name}-1.2.5-arm-PAGE_SIZE.patch
-Patch1:        nfs-utils-1.3.3-rundir.patch
-Patch2:        nfs-utils-2.4.1-arm-int64.patch
-Patch3:        nfs-utils-2.4.1-arm-llx.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -35,7 +31,9 @@ BuildRequires: libevent-devel
 BuildRequires: libkeyutils-devel
 BuildRequires: libkrb5-devel
 BuildRequires: libmount-devel
+BuildRequires: libnl-devel
 BuildRequires: libopenldap-devel
+BuildRequires: libreadline-devel
 BuildRequires: libsqlite-devel
 BuildRequires: libtirpc-devel
 BuildRequires: libuuid-devel
@@ -86,11 +84,6 @@ This package contains the files needed for development with this library.
 
 %prep
 %setup -q
-#%ifarch arm
-#%patch2 -p1
-#%patch3 -p1
-#%endif
-
 sed -i "s|/run/sysconfig|/run|" systemd/*
 
 %build
@@ -227,6 +220,7 @@ fi
 %{_sbindir}/fsidd
 %{_sbindir}/mountstats
 %{_sbindir}/nfsconf
+%{_sbindir}/nfsdctl
 %{_sbindir}/nfsref
 %{_sbindir}/nfsidmap
 %{_sbindir}/nfsiostat
@@ -235,11 +229,7 @@ fi
 %{_sbindir}/rpc.idmapd
 %if "%{stage1}" != "1"
 %{_sbindir}/rpc.gssd
-#%{_sbindir}/rpc.svcgssd
 %endif
-#%if %{with_rquotad}
-#%{_sbindir}/rpc.rquotad
-#%endif
 %{_sbindir}/rpc.statd
 %{_sbindir}/rpcctl
 %{_sbindir}/showmount
@@ -247,7 +237,6 @@ fi
 %{_sbindir}/start-statd
 %{_libexecdir}/nfsrahead
 %{_unitdir}/nfs-client.target
-#%{_unitdir}/nfs-config.service
 %{_unitdir}/rpc-statd.service
 %{_unitdir}/nfs-utils.service
 %{_unitdir}/nfs-blkmap.service
@@ -269,18 +258,19 @@ fi
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) /var/lib/nfs/state
 #%config(noreplace) /var/lib/nfs/xtab
-%{_mandir}/man5/nfs.5*
-%{_mandir}/man5/nfsmount.conf.5*
-%{_mandir}/man5/nfsrahead.5*
 %{_mandir}/man8/blkmapd.8*
 %{_mandir}/man8/gssd.8*
 %{_mandir}/man8/idmapd.8*
 %{_mandir}/man8/mount.nfs.8*
 %{_mandir}/man8/mountstats.8*
+%{_mandir}/man5/nfs.5*
+%{_mandir}/man8/nfsdctl.8*
 %{_mandir}/man8/nfsref.8*
 %{_mandir}/man8/nfsdcltrack.8*
 %{_mandir}/man8/nfsidmap.8*
 %{_mandir}/man8/nfsiostat.8*
+%{_mandir}/man5/nfsmount.conf.5*
+%{_mandir}/man5/nfsrahead.5*
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.gssd.8*
 %{_mandir}/man8/rpc.idmapd.8*
@@ -291,10 +281,8 @@ fi
 %{_mandir}/man8/showmount.8*
 %{_mandir}/man8/sm-notify.8*
 %{_mandir}/man8/statd.8*
-#%{_mandir}/man8/svcgssd.8*
 %{_mandir}/man8/umount.nfs.8*
 %doc COPYING
-#linux-nfs/*
 
 %files -n nfs-server
 %defattr(-,root,root)
@@ -354,6 +342,9 @@ fi
 %{_libdir}/pkgconfig/libnfsidmap.pc
 
 %changelog
+* Wed Oct 23 2024 Automatic Build System <autodist@openmamba.org> 2.8.1-1mamba
+- automatic version update by autodist
+
 * Tue Sep 03 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.7.1-2mamba
 - provide user and group rpcuser