From c6baeee0845a6d9a230e785fe9b3ac0f00d4477d Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Thu, 19 Jan 2017 14:19:05 -0500 Subject: [PATCH] Updated to latest upstream release: nfs-utils-2-1-1 Signed-off-by: Steve Dickson --- .gitignore | 2 ++ nfs-utils-1.2.1-statdpath-man.patch | 20 ++++++++++---------- nfs-utils-1.2.3-sm-notify-res_init.patch | 10 +++++----- nfs-utils-1.3.2-systemd-gssargs.patch | 9 --------- nfs-utils.spec | 16 +++++++--------- sources | 2 +- 6 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 nfs-utils-1.3.2-systemd-gssargs.patch diff --git a/.gitignore b/.gitignore index 42e9b4b..817fe1d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ x86_64 Makefile nfs-utils-1.3.4/ /nfs-utils-1.3.4.tar.xz +/nfs-utils-2.1.1.tar.xz +nfs-utils-2.1.1/ diff --git a/nfs-utils-1.2.1-statdpath-man.patch b/nfs-utils-1.2.1-statdpath-man.patch index 3e4bac2..4b58483 100644 --- a/nfs-utils-1.2.1-statdpath-man.patch +++ b/nfs-utils-1.2.1-statdpath-man.patch @@ -1,6 +1,6 @@ -diff -up nfs-utils-1.2.8/utils/statd/sm-notify.man.orig nfs-utils-1.2.8/utils/statd/sm-notify.man ---- nfs-utils-1.2.8/utils/statd/sm-notify.man.orig 2013-04-22 12:47:20.000000000 -0400 -+++ nfs-utils-1.2.8/utils/statd/sm-notify.man 2013-09-18 15:32:01.511494000 -0400 +diff -up nfs-utils-1.3.4/utils/statd/sm-notify.man.orig nfs-utils-1.3.4/utils/statd/sm-notify.man +--- nfs-utils-1.3.4/utils/statd/sm-notify.man.orig 2016-12-17 14:07:32.571455752 -0500 ++++ nfs-utils-1.3.4/utils/statd/sm-notify.man 2016-12-17 14:10:58.429723983 -0500 @@ -184,7 +184,7 @@ where NSM state information resides. If this option is not specified, .B sm-notify @@ -10,7 +10,7 @@ diff -up nfs-utils-1.2.8/utils/statd/sm-notify.man.orig nfs-utils-1.2.8/utils/st by default. .IP After starting, -@@ -285,13 +285,13 @@ Currently, the +@@ -312,13 +312,13 @@ Currently, the command supports sending notification only via datagram transport protocols. .SH FILES .TP 2.5i @@ -27,10 +27,10 @@ diff -up nfs-utils-1.2.8/utils/statd/sm-notify.man.orig nfs-utils-1.2.8/utils/st NSM state number for this host .TP 2.5i .I /proc/sys/fs/nfs/nsm_local_state -diff -up nfs-utils-1.2.8/utils/statd/statd.man.orig nfs-utils-1.2.8/utils/statd/statd.man ---- nfs-utils-1.2.8/utils/statd/statd.man.orig 2013-04-22 12:47:20.000000000 -0400 -+++ nfs-utils-1.2.8/utils/statd/statd.man 2013-09-18 15:32:01.520491000 -0400 -@@ -233,7 +233,7 @@ where NSM state information resides. +diff -up nfs-utils-1.3.4/utils/statd/statd.man.orig nfs-utils-1.3.4/utils/statd/statd.man +--- nfs-utils-1.3.4/utils/statd/statd.man.orig 2016-12-17 14:07:32.572455749 -0500 ++++ nfs-utils-1.3.4/utils/statd/statd.man 2016-12-17 14:10:58.430723979 -0500 +@@ -253,7 +253,7 @@ where NSM state information resides. If this option is not specified, .B rpc.statd uses @@ -39,8 +39,8 @@ diff -up nfs-utils-1.2.8/utils/statd/statd.man.orig nfs-utils-1.2.8/utils/statd/ by default. .IP After starting, -@@ -357,13 +357,13 @@ As long as at least one network transpor - will operate. +@@ -425,13 +425,13 @@ If set to a positive integer, has the sa + .IR \-\-no\-notify . .SH FILES .TP 2.5i -.I /var/lib/nfs/sm diff --git a/nfs-utils-1.2.3-sm-notify-res_init.patch b/nfs-utils-1.2.3-sm-notify-res_init.patch index 02b192a..752bfc7 100644 --- a/nfs-utils-1.2.3-sm-notify-res_init.patch +++ b/nfs-utils-1.2.3-sm-notify-res_init.patch @@ -1,6 +1,6 @@ -diff -up nfs-utils-1.2.8/utils/statd/sm-notify.c.orig nfs-utils-1.2.8/utils/statd/sm-notify.c ---- nfs-utils-1.2.8/utils/statd/sm-notify.c.orig 2013-04-22 12:47:20.000000000 -0400 -+++ nfs-utils-1.2.8/utils/statd/sm-notify.c 2013-09-18 15:36:42.373803000 -0400 +diff -up nfs-utils-1.3.4/utils/statd/sm-notify.c.orig nfs-utils-1.3.4/utils/statd/sm-notify.c +--- nfs-utils-1.3.4/utils/statd/sm-notify.c.orig 2016-12-17 14:13:50.148087245 -0500 ++++ nfs-utils-1.3.4/utils/statd/sm-notify.c 2016-12-17 14:14:13.278001479 -0500 @@ -28,6 +28,9 @@ #include #include @@ -9,9 +9,9 @@ diff -up nfs-utils-1.2.8/utils/statd/sm-notify.c.orig nfs-utils-1.2.8/utils/stat +#include +#include + #include "conffile.h" #include "sockaddr.h" - #include "xlog.h" -@@ -85,6 +88,7 @@ smn_lookup(const char *name) +@@ -89,6 +92,7 @@ smn_lookup(const char *name) }; int error; diff --git a/nfs-utils-1.3.2-systemd-gssargs.patch b/nfs-utils-1.3.2-systemd-gssargs.patch deleted file mode 100644 index 6057848..0000000 --- a/nfs-utils-1.3.2-systemd-gssargs.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up nfs-utils-1.3.4/systemd/rpc-gssd.service.in.orig nfs-utils-1.3.4/systemd/rpc-gssd.service.in ---- nfs-utils-1.3.4/systemd/rpc-gssd.service.in.orig 2016-08-25 07:50:22.502919854 -0400 -+++ nfs-utils-1.3.4/systemd/rpc-gssd.service.in 2016-08-25 07:53:42.807160300 -0400 -@@ -16,4 +16,4 @@ After=nfs-config.service - EnvironmentFile=-/run/sysconfig/nfs-utils - - Type=forking --ExecStart=/usr/sbin/rpc.gssd $GSSDARGS -+ExecStart=/usr/sbin/rpc.gssd $RPCSVCGSSDARGS diff --git a/nfs-utils.spec b/nfs-utils.spec index a16e881..94a1a2b 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,27 +1,23 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Name: nfs-utils URL: http://sourceforge.net/projects/nfs -Version: 1.3.4 -Release: 1.rc3%{?dist}.1 +Version: 2.1.1 +Release: 0%{?dist} Epoch: 1 # group all 32bit related archs %define all_32bit_archs i386 i486 i586 i686 athlon ppc sparcv9 Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz - Source1: id_resolver.conf Source2: nfs.sysconfig Source3: nfs-utils_env.sh Source4: lockd.conf -Patch001: nfs-utils-1.3.5-rc3.patch - Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch Patch103: nfs-utils-1.2.5-idmap-errmsg.patch -Patch104: nfs-utils-1.3.2-systemd-gssargs.patch Group: System Environment/Daemons Provides: exportfs = %{epoch}:%{version}-%{release} @@ -74,13 +70,10 @@ This package also contains the mount.nfs and umount.nfs program. %prep %setup -q -%patch001 -p1 - %patch100 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 -%patch104 -p1 # Remove .orig files find . -name "*.orig" | xargs rm -f @@ -131,6 +124,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/ make DESTDIR=$RPM_BUILD_ROOT install install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT%{_sbindir} install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT%{_sysconfdir} +install -m 644 nfs.conf $RPM_BUILD_ROOT%{_sysconfdir} install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs @@ -254,6 +248,7 @@ fi %config(noreplace) %{_sharedstatedir}/nfs/rmtab %config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf %config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf +%config(noreplace) %{_sysconfdir}/nfs.conf %doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README %doc linux-nfs/THANKS linux-nfs/TODO /sbin/rpc.statd @@ -283,6 +278,9 @@ fi /sbin/umount.nfs4 %changelog +* Thu Jan 19 2017 Steve Dickson 2.1.1-0 +- Updated to latest upstream release: nfs-utils-2-1-1 + * Mon Dec 19 2016 Miro Hrončok - 1:1.3.4-1.rc3.1 - Rebuild for Python 3.6 diff --git a/sources b/sources index f48711d..c1d024c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54e4119043ec8507a2a0e054cf2889a4 nfs-utils-1.3.4.tar.xz +SHA512 (nfs-utils-2.1.1.tar.xz) = 8798bd4e844dae63f1568534a6625e2c9c9bfa01b268fa223b57959cf62e11478556382e08db3abbc8c9652eeb84a6c5f4887d2006f2a66c8a5eb9fd3f0dde45