rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to latest upstream release: nfs-utils-2-1-1

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2017-01-19 14:19:05 -05:00
parent d49b0b1bf1
commit c6baeee084
6 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,3 +2,5 @@ x86_64
Makefile Makefile
nfs-utils-1.3.4/ nfs-utils-1.3.4/
/nfs-utils-1.3.4.tar.xz /nfs-utils-1.3.4.tar.xz
/nfs-utils-2.1.1.tar.xz
nfs-utils-2.1.1/

20
nfs-utils-1.2.1-statdpath-man.patch
View File

@ -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 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.2.8/utils/statd/sm-notify.man.orig 2013-04-22 12:47:20.000000000 -0400 --- nfs-utils-1.3.4/utils/statd/sm-notify.man.orig 2016-12-17 14:07:32.571455752 -0500
+++ nfs-utils-1.2.8/utils/statd/sm-notify.man 2013-09-18 15:32:01.511494000 -0400 +++ 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. @@ -184,7 +184,7 @@ where NSM state information resides.
If this option is not specified, If this option is not specified,
.B sm-notify .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. by default.
.IP .IP
After starting, After starting,
@@ -285,13 +285,13 @@ Currently, the @@ -312,13 +312,13 @@ Currently, the
command supports sending notification only via datagram transport protocols. command supports sending notification only via datagram transport protocols.
.SH FILES .SH FILES
.TP 2.5i .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 NSM state number for this host
.TP 2.5i .TP 2.5i
.I /proc/sys/fs/nfs/nsm_local_state .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 diff -up nfs-utils-1.3.4/utils/statd/statd.man.orig nfs-utils-1.3.4/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.3.4/utils/statd/statd.man.orig 2016-12-17 14:07:32.572455749 -0500
+++ nfs-utils-1.2.8/utils/statd/statd.man 2013-09-18 15:32:01.520491000 -0400 +++ nfs-utils-1.3.4/utils/statd/statd.man 2016-12-17 14:10:58.430723979 -0500
@@ -233,7 +233,7 @@ where NSM state information resides. @@ -253,7 +253,7 @@ where NSM state information resides.
If this option is not specified, If this option is not specified,
.B rpc.statd .B rpc.statd
uses 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. by default.
.IP .IP
After starting, After starting,
@@ -357,13 +357,13 @@ As long as at least one network transpor @@ -425,13 +425,13 @@ If set to a positive integer, has the sa
will operate. .IR \-\-no\-notify .
.SH FILES .SH FILES
.TP 2.5i .TP 2.5i
-.I /var/lib/nfs/sm -.I /var/lib/nfs/sm

10
nfs-utils-1.2.3-sm-notify-res_init.patch
View File

@ -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 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.2.8/utils/statd/sm-notify.c.orig 2013-04-22 12:47:20.000000000 -0400 --- nfs-utils-1.3.4/utils/statd/sm-notify.c.orig 2016-12-17 14:13:50.148087245 -0500
+++ nfs-utils-1.2.8/utils/statd/sm-notify.c 2013-09-18 15:36:42.373803000 -0400 +++ nfs-utils-1.3.4/utils/statd/sm-notify.c 2016-12-17 14:14:13.278001479 -0500
@@ -28,6 +28,9 @@ @@ -28,6 +28,9 @@
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>
@ -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 <arpa/nameser.h> +#include <arpa/nameser.h>
+#include <resolv.h> +#include <resolv.h>
#include "conffile.h"
#include "sockaddr.h" #include "sockaddr.h"
#include "xlog.h" @@ -89,6 +92,7 @@ smn_lookup(const char *name)
@@ -85,6 +88,7 @@ smn_lookup(const char *name)
}; };
int error; int error;

9
nfs-utils-1.3.2-systemd-gssargs.patch
View File

@ -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

16
nfs-utils.spec
View File

@ -1,27 +1,23 @@
Summary: NFS utilities and supporting clients and daemons for the kernel NFS server Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
Name: nfs-utils Name: nfs-utils
URL: http://sourceforge.net/projects/nfs URL: http://sourceforge.net/projects/nfs
Version: 1.3.4 Version: 2.1.1
Release: 1.rc3%{?dist}.1 Release: 0%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
%define all_32bit_archs i386 i486 i586 i686 athlon ppc sparcv9 %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 Source0: https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
Source1: id_resolver.conf Source1: id_resolver.conf
Source2: nfs.sysconfig Source2: nfs.sysconfig
Source3: nfs-utils_env.sh Source3: nfs-utils_env.sh
Source4: lockd.conf Source4: lockd.conf
Patch001: nfs-utils-1.3.5-rc3.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
Patch103: nfs-utils-1.2.5-idmap-errmsg.patch Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
Patch104: nfs-utils-1.3.2-systemd-gssargs.patch
Group: System Environment/Daemons Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release} Provides: exportfs = %{epoch}:%{version}-%{release}
@ -74,13 +70,10 @@ This package also contains the mount.nfs and umount.nfs program.
%prep %prep
%setup -q %setup -q
%patch001 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
%patch104 -p1
# Remove .orig files # Remove .orig files
find . -name "*.orig" | xargs rm -f find . -name "*.orig" | xargs rm -f
@ -131,6 +124,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT%{_sbindir} 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 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 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs
@ -254,6 +248,7 @@ fi
%config(noreplace) %{_sharedstatedir}/nfs/rmtab %config(noreplace) %{_sharedstatedir}/nfs/rmtab
%config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf %config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/lockd.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/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
%doc linux-nfs/THANKS linux-nfs/TODO %doc linux-nfs/THANKS linux-nfs/TODO
/sbin/rpc.statd /sbin/rpc.statd
@ -283,6 +278,9 @@ fi
/sbin/umount.nfs4 /sbin/umount.nfs4
%changelog %changelog
* Thu Jan 19 2017 Steve Dickson <steved@redhat.com> 2.1.1-0
- Updated to latest upstream release: nfs-utils-2-1-1
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1:1.3.4-1.rc3.1 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1:1.3.4-1.rc3.1
- Rebuild for Python 3.6 - Rebuild for Python 3.6

2
sources
View File

@ -1 +1 @@
54e4119043ec8507a2a0e054cf2889a4 nfs-utils-1.3.4.tar.xz SHA512 (nfs-utils-2.1.1.tar.xz) = 8798bd4e844dae63f1568534a6625e2c9c9bfa01b268fa223b57959cf62e11478556382e08db3abbc8c9652eeb84a6c5f4887d2006f2a66c8a5eb9fd3f0dde45