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

Updated to the latest RC release: nfs-utils-2-1-2-rc2 (bz 1419351)

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2017-04-10 09:40:23 -04:00
parent cd306a0409
commit 49f282cd14
3 changed files with 2363 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nfs-utils-2.1.1-nfs-config.patch
View File

@ -1,6 +1,6 @@
diff -up nfs-utils-2.1.1/configure.ac.orig nfs-utils-2.1.1/configure.ac
--- nfs-utils-2.1.1/configure.ac.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/configure.ac 2017-02-15 10:53:12.623674876 -0500
+++ nfs-utils-2.1.1/configure.ac 2017-04-09 15:30:50.812286349 -0400
@@ -518,6 +518,11 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
# Make sure that $ACLOCAL_FLAGS are used during a rebuild
AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
@ -22,19 +22,19 @@ diff -up nfs-utils-2.1.1/configure.ac.orig nfs-utils-2.1.1/configure.ac
linux-nfs/Makefile
support/Makefile
diff -up nfs-utils-2.1.1/systemd/Makefile.am.orig nfs-utils-2.1.1/systemd/Makefile.am
--- nfs-utils-2.1.1/systemd/Makefile.am.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/Makefile.am 2017-02-15 10:53:12.623674876 -0500
@@ -5,6 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in
unit_files = \
--- nfs-utils-2.1.1/systemd/Makefile.am.orig 2017-04-09 15:29:49.687515444 -0400
+++ nfs-utils-2.1.1/systemd/Makefile.am 2017-04-09 15:30:50.813286345 -0400
@@ -6,6 +6,7 @@ unit_files = \
nfs-client.target \
rpc_pipefs.target \
\
+ nfs-config.service \
nfs-mountd.service \
nfs-server.service \
nfs-utils.service \
diff -up nfs-utils-2.1.1/systemd/nfs-blkmap.service.orig nfs-utils-2.1.1/systemd/nfs-blkmap.service
--- nfs-utils-2.1.1/systemd/nfs-blkmap.service.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/nfs-blkmap.service 2017-02-15 10:53:12.624674873 -0500
--- nfs-utils-2.1.1/systemd/nfs-blkmap.service.orig 2017-04-09 15:29:49.687515444 -0400
+++ nfs-utils-2.1.1/systemd/nfs-blkmap.service 2017-04-09 15:30:50.813286345 -0400
@@ -10,7 +10,8 @@ PartOf=nfs-utils.service
[Service]
Type=forking
@ -46,8 +46,8 @@ diff -up nfs-utils-2.1.1/systemd/nfs-blkmap.service.orig nfs-utils-2.1.1/systemd
[Install]
WantedBy=nfs-client.target
diff -up nfs-utils-2.1.1/systemd/nfs-config.service.in.orig nfs-utils-2.1.1/systemd/nfs-config.service.in
--- nfs-utils-2.1.1/systemd/nfs-config.service.in.orig 2017-02-15 10:53:12.624674873 -0500
+++ nfs-utils-2.1.1/systemd/nfs-config.service.in 2017-02-15 10:53:12.624674873 -0500
--- nfs-utils-2.1.1/systemd/nfs-config.service.in.orig 2017-04-09 15:30:50.813286345 -0400
+++ nfs-utils-2.1.1/systemd/nfs-config.service.in 2017-04-09 15:30:50.813286345 -0400
@@ -0,0 +1,13 @@
+[Unit]
+Description=Preprocess NFS configuration
@ -63,9 +63,9 @@ diff -up nfs-utils-2.1.1/systemd/nfs-config.service.in.orig nfs-utils-2.1.1/syst
+RemainAfterExit=no
+ExecStart=@_libexecdir@/nfs-utils/nfs-utils_env.sh
diff -up nfs-utils-2.1.1/systemd/nfs-idmapd.service.orig nfs-utils-2.1.1/systemd/nfs-idmapd.service
--- nfs-utils-2.1.1/systemd/nfs-idmapd.service.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/nfs-idmapd.service 2017-02-15 10:53:12.625674869 -0500
@@ -6,6 +6,10 @@ After=var-lib-nfs-rpc_pipefs.mount local
--- nfs-utils-2.1.1/systemd/nfs-idmapd.service.orig 2017-04-09 15:29:49.687515444 -0400
+++ nfs-utils-2.1.1/systemd/nfs-idmapd.service 2017-04-09 15:30:50.813286345 -0400
@@ -6,6 +6,10 @@ After=rpc_pipefs.target local-fs.target
BindsTo=nfs-server.service
@ -78,8 +78,8 @@ diff -up nfs-utils-2.1.1/systemd/nfs-idmapd.service.orig nfs-utils-2.1.1/systemd
-ExecStart=/usr/sbin/rpc.idmapd
+ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS
diff -up nfs-utils-2.1.1/systemd/nfs-mountd.service.orig nfs-utils-2.1.1/systemd/nfs-mountd.service
--- nfs-utils-2.1.1/systemd/nfs-mountd.service.orig 2017-02-15 10:52:26.501835762 -0500
+++ nfs-utils-2.1.1/systemd/nfs-mountd.service 2017-02-15 10:53:12.625674869 -0500
--- nfs-utils-2.1.1/systemd/nfs-mountd.service.orig 2017-04-09 15:29:49.687515444 -0400
+++ nfs-utils-2.1.1/systemd/nfs-mountd.service 2017-04-09 15:30:50.814286341 -0400
@@ -7,6 +7,10 @@ After=network.target local-fs.target
After=rpcbind.socket
BindsTo=nfs-server.service
@ -93,8 +93,8 @@ diff -up nfs-utils-2.1.1/systemd/nfs-mountd.service.orig nfs-utils-2.1.1/systemd
-ExecStart=/usr/sbin/rpc.mountd
+ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS
diff -up nfs-utils-2.1.1/systemd/nfs-server.service.orig nfs-utils-2.1.1/systemd/nfs-server.service
--- nfs-utils-2.1.1/systemd/nfs-server.service.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/nfs-server.service 2017-02-15 10:53:12.626674866 -0500
--- nfs-utils-2.1.1/systemd/nfs-server.service.orig 2017-04-09 15:29:49.687515444 -0400
+++ nfs-utils-2.1.1/systemd/nfs-server.service 2017-04-09 15:30:50.814286341 -0400
@@ -16,11 +16,16 @@ Before= rpc-statd-notify.service
Wants=auth-rpcgss-module.service
After=rpc-gssd.service gssproxy.service rpc-svcgssd.service
@ -115,7 +115,7 @@ diff -up nfs-utils-2.1.1/systemd/nfs-server.service.orig nfs-utils-2.1.1/systemd
ExecStopPost=/usr/sbin/exportfs -f
diff -up nfs-utils-2.1.1/systemd/README.orig nfs-utils-2.1.1/systemd/README
--- nfs-utils-2.1.1/systemd/README.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/README 2017-02-15 10:53:12.626674866 -0500
+++ nfs-utils-2.1.1/systemd/README 2017-04-09 15:30:50.814286341 -0400
@@ -19,8 +19,8 @@ by a suitable 'preset' setting:
can work (if no type is given, ".service" is assumed).
@ -153,8 +153,8 @@ diff -up nfs-utils-2.1.1/systemd/README.orig nfs-utils-2.1.1/systemd/README
rpc.gssd and rpc.svcgssd are assumed to be needed if /etc/krb5.keytab
is present.
diff -up nfs-utils-2.1.1/systemd/rpc-gssd.service.in.orig nfs-utils-2.1.1/systemd/rpc-gssd.service.in
--- nfs-utils-2.1.1/systemd/rpc-gssd.service.in.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/rpc-gssd.service.in 2017-02-15 10:53:12.627674862 -0500
--- nfs-utils-2.1.1/systemd/rpc-gssd.service.in.orig 2017-04-09 15:29:49.687515444 -0400
+++ nfs-utils-2.1.1/systemd/rpc-gssd.service.in 2017-04-09 15:30:50.814286341 -0400
@@ -9,6 +9,11 @@ ConditionPathExists=@_sysconfdir@/krb5.k
PartOf=nfs-utils.service
@ -170,7 +170,7 @@ diff -up nfs-utils-2.1.1/systemd/rpc-gssd.service.in.orig nfs-utils-2.1.1/system
+ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS
diff -up nfs-utils-2.1.1/systemd/rpc-statd-notify.service.orig nfs-utils-2.1.1/systemd/rpc-statd-notify.service
--- nfs-utils-2.1.1/systemd/rpc-statd-notify.service.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/rpc-statd-notify.service 2017-02-15 10:53:12.627674862 -0500
+++ nfs-utils-2.1.1/systemd/rpc-statd-notify.service 2017-04-09 15:30:50.814286341 -0400
@@ -10,6 +10,10 @@ After=nfs-server.service
PartOf=nfs-utils.service
@ -185,7 +185,7 @@ diff -up nfs-utils-2.1.1/systemd/rpc-statd-notify.service.orig nfs-utils-2.1.1/s
+ExecStart=-/usr/sbin/sm-notify $SMNOTIFYARGS
diff -up nfs-utils-2.1.1/systemd/rpc-statd.service.orig nfs-utils-2.1.1/systemd/rpc-statd.service
--- nfs-utils-2.1.1/systemd/rpc-statd.service.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/rpc-statd.service 2017-02-15 10:53:12.627674862 -0500
+++ nfs-utils-2.1.1/systemd/rpc-statd.service 2017-04-09 15:30:50.815286338 -0400
@@ -7,8 +7,12 @@ After=network.target nss-lookup.target r
PartOf=nfs-utils.service

2338
nfs-utils-2.1.2-rc2.patch Normal file
View File

File diff suppressed because it is too large Load Diff

7
nfs-utils.spec
View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 2.1.1
Release: 4.rc1%{?dist}
Release: 4.rc2%{?dist}
Epoch: 1
# group all 32bit related archs
@ -15,7 +15,7 @@ Source3: nfs-utils_env.sh
Source4: lockd.conf
Source5: 24-nfs-server.conf
Patch001: nfs-utils-2.1.2-rc1.patch
Patch001: nfs-utils-2.1.2-rc2.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@ -285,7 +285,8 @@ fi
/sbin/umount.nfs4
%changelog
* Fri Apr 7 2017 Steve Dickson <steved@redhat.com> 2.1.1-4.rc1
* Mon Apr 10 2017 Steve Dickson <steved@redhat.com> 2.1.1-4.rc2
- Updated to the latest RC release: nfs-utils-2-1-2-rc2 (bz 1419351)
- Fixed typo in nfs.sysconfig (bz 1422249)
* Tue Mar 28 2017 Steve Dickson <steved@redhat.com> 2.1.1-3.rc1