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

Updated to the latest RC release: nfs-utils-2-1-2-rc1

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2017-02-15 12:58:52 -05:00
parent e238a59b2a
commit d2d905a49d
3 changed files with 1065 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
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 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/configure.ac 2017-01-16 14:24:01.691124185 -0500 +++ nfs-utils-2.1.1/configure.ac 2017-02-15 10:53:12.623674876 -0500
@@ -518,6 +518,11 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) @@ -518,6 +518,11 @@ AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
# Make sure that $ACLOCAL_FLAGS are used during a rebuild # Make sure that $ACLOCAL_FLAGS are used during a rebuild
AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
@ -23,7 +23,7 @@ diff -up nfs-utils-2.1.1/configure.ac.orig nfs-utils-2.1.1/configure.ac
support/Makefile support/Makefile
diff -up nfs-utils-2.1.1/systemd/Makefile.am.orig nfs-utils-2.1.1/systemd/Makefile.am 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/Makefile.am 2017-01-16 14:24:01.691124185 -0500 +++ nfs-utils-2.1.1/systemd/Makefile.am 2017-02-15 10:53:12.623674876 -0500
@@ -5,6 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in @@ -5,6 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in
unit_files = \ unit_files = \
nfs-client.target \ nfs-client.target \
@ -34,7 +34,7 @@ diff -up nfs-utils-2.1.1/systemd/Makefile.am.orig nfs-utils-2.1.1/systemd/Makefi
nfs-utils.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 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/nfs-blkmap.service 2017-01-16 14:24:01.691124185 -0500 +++ nfs-utils-2.1.1/systemd/nfs-blkmap.service 2017-02-15 10:53:12.624674873 -0500
@@ -10,7 +10,8 @@ PartOf=nfs-utils.service @@ -10,7 +10,8 @@ PartOf=nfs-utils.service
[Service] [Service]
Type=forking 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] [Install]
WantedBy=nfs-client.target 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 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-01-16 14:24:01.691124185 -0500 --- 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-01-16 14:24:01.691124185 -0500 +++ nfs-utils-2.1.1/systemd/nfs-config.service.in 2017-02-15 10:53:12.624674873 -0500
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+[Unit] +[Unit]
+Description=Preprocess NFS configuration +Description=Preprocess NFS configuration
@ -64,7 +64,7 @@ diff -up nfs-utils-2.1.1/systemd/nfs-config.service.in.orig nfs-utils-2.1.1/syst
+ExecStart=@_libexecdir@/nfs-utils/nfs-utils_env.sh +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 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/nfs-idmapd.service 2017-01-16 14:24:01.691124185 -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 @@ -6,6 +6,10 @@ After=var-lib-nfs-rpc_pipefs.mount local
BindsTo=nfs-server.service BindsTo=nfs-server.service
@ -78,10 +78,10 @@ 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
+ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS +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 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-01-12 10:21:39.000000000 -0500 --- 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-01-16 14:24:01.691124185 -0500 +++ nfs-utils-2.1.1/systemd/nfs-mountd.service 2017-02-15 10:53:12.625674869 -0500
@@ -6,6 +6,10 @@ After=proc-fs-nfsd.mount @@ -7,6 +7,10 @@ After=network.target local-fs.target
After=network.target local-fs.target After=rpcbind.socket
BindsTo=nfs-server.service BindsTo=nfs-server.service
+Wants=nfs-config.service +Wants=nfs-config.service
@ -94,7 +94,7 @@ diff -up nfs-utils-2.1.1/systemd/nfs-mountd.service.orig nfs-utils-2.1.1/systemd
+ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDARGS +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 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/nfs-server.service 2017-01-16 14:24:01.692124186 -0500 +++ nfs-utils-2.1.1/systemd/nfs-server.service 2017-02-15 10:53:12.626674866 -0500
@@ -16,11 +16,16 @@ Before= rpc-statd-notify.service @@ -16,11 +16,16 @@ Before= rpc-statd-notify.service
Wants=auth-rpcgss-module.service Wants=auth-rpcgss-module.service
After=rpc-gssd.service gssproxy.service rpc-svcgssd.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 ExecStopPost=/usr/sbin/exportfs -f
diff -up nfs-utils-2.1.1/systemd/README.orig nfs-utils-2.1.1/systemd/README 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/README 2017-01-16 14:24:01.691124185 -0500 +++ nfs-utils-2.1.1/systemd/README 2017-02-15 10:53:12.626674866 -0500
@@ -19,8 +19,8 @@ by a suitable 'preset' setting: @@ -19,8 +19,8 @@ by a suitable 'preset' setting:
can work (if no type is given, ".service" is assumed). can work (if no type is given, ".service" is assumed).
@ -154,7 +154,7 @@ diff -up nfs-utils-2.1.1/systemd/README.orig nfs-utils-2.1.1/systemd/README
is present. 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 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/rpc-gssd.service.in 2017-01-16 14:24:01.692124186 -0500 +++ nfs-utils-2.1.1/systemd/rpc-gssd.service.in 2017-02-15 10:53:12.627674862 -0500
@@ -9,6 +9,11 @@ ConditionPathExists=@_sysconfdir@/krb5.k @@ -9,6 +9,11 @@ ConditionPathExists=@_sysconfdir@/krb5.k
PartOf=nfs-utils.service 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 +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 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/rpc-statd-notify.service 2017-01-16 14:24:01.692124186 -0500 +++ nfs-utils-2.1.1/systemd/rpc-statd-notify.service 2017-02-15 10:53:12.627674862 -0500
@@ -10,6 +10,10 @@ After=nfs-server.service @@ -10,6 +10,10 @@ After=nfs-server.service
PartOf=nfs-utils.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 +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 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.orig 2017-01-12 10:21:39.000000000 -0500
+++ nfs-utils-2.1.1/systemd/rpc-statd.service 2017-01-16 14:24:01.692124186 -0500 +++ nfs-utils-2.1.1/systemd/rpc-statd.service 2017-02-15 10:53:12.627674862 -0500
@@ -7,8 +7,12 @@ After=network.target nss-lookup.target r @@ -7,8 +7,12 @@ After=network.target nss-lookup.target r
PartOf=nfs-utils.service PartOf=nfs-utils.service

1040
nfs-utils-2.1.2-rc1.patch Normal file
View File

File diff suppressed because it is too large Load Diff

13
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 Name: nfs-utils
URL: http://sourceforge.net/projects/nfs URL: http://sourceforge.net/projects/nfs
Version: 2.1.1 Version: 2.1.1
Release: 2%{?dist} Release: 2.rc1%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -14,6 +14,8 @@ Source2: nfs.sysconfig
Source3: nfs-utils_env.sh Source3: nfs-utils_env.sh
Source4: lockd.conf Source4: lockd.conf
Patch001: nfs-utils-2.1.2-rc1.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
@ -71,6 +73,8 @@ 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
@ -277,6 +281,9 @@ fi
/sbin/umount.nfs4 /sbin/umount.nfs4
%changelog %changelog
* Wed Feb 15 2017 Steve Dickson <steved@redhat.com> 2.1.1-2.rc1
- Updated to the latest RC release: nfs-utils-2-1-2-rc1
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.1-2 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
@ -286,10 +293,10 @@ fi
* Thu Jan 19 2017 Steve Dickson <steved@redhat.com> 2.1.1-0 * Thu Jan 19 2017 Steve Dickson <steved@redhat.com> 2.1.1-0
- Updated to latest upstream release: nfs-utils-2-1-1 (bz 1413232) - Updated to latest upstream release: nfs-utils-2-1-1 (bz 1413232)
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1:1.3.4-1.rc3.1 * Mon Dec 19 2016 Miro Hronok <mhroncok@redhat.com> - 1:1.3.4-1.rc3.1
- Rebuild for Python 3.6 - Rebuild for Python 3.6
* Wed Nov 25 2016 Steve Dickson <steved@redhat.com> 1.3.4-1.rc3 * Fri Nov 25 2016 Steve Dickson <steved@redhat.com> 1.3.4-1.rc3
- Updated to the latest RC release: nfs-utils-1-3-5-rc3 - Updated to the latest RC release: nfs-utils-1-3-5-rc3
* Thu Aug 25 2016 Steve Dickson <steved@redhat.com> 1.3.4-1.rc2 * Thu Aug 25 2016 Steve Dickson <steved@redhat.com> 1.3.4-1.rc2