From d60afc72f780f99a895bde6e74898f4d619bd76f Mon Sep 17 00:00:00 2001 From: slin14 Date: Thu, 16 Aug 2018 05:01:10 +0800 Subject: [PATCH] rebase nfs-utils patch to CentOS7.5 Story: 2003389 Task: 24491 Change-Id: Iaae0db17a3ae20f741482372e49c87f85024e574 Signed-off-by: slin14 --- .../0001-TiS-nfs-utils-spec-add-scripts.patch | 38 +++++++++---------- ...te-package-versioning-for-TIS-format.patch | 14 +++---- .../0001-add-rpm-4.14-compatibility.patch | 17 ++++++++- ...date-nfsmount.conf-with-required-con.patch | 22 +++++------ filesystem/nfs-utils/centos/srpm_path | 2 +- 5 files changed, 53 insertions(+), 40 deletions(-) diff --git a/filesystem/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch b/filesystem/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch index 87205059f..954bd816c 100644 --- a/filesystem/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch +++ b/filesystem/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch @@ -1,7 +1,7 @@ -From b7c902072f15c14507ab837f769b6adcf299f2ed Mon Sep 17 00:00:00 2001 +From 535d4790b40ae2eaf9435ece40cf420165874877 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 15:19:43 -0400 -Subject: [PATCH 1/4] WRS: 0001-TiS-nfs-utils-spec-add-scripts.patch +Subject: [PATCH] WRS: 0001-TiS-nfs-utils-spec-add-scripts.patch Conflicts: SPECS/nfs-utils.spec @@ -10,7 +10,7 @@ Conflicts: 1 file changed, 29 insertions(+) diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec -index a8d651a..583990d 100644 +index 6dfddc0..282511e 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec @@ -15,6 +15,10 @@ Source2: nfs.sysconfig @@ -24,30 +24,30 @@ index a8d651a..583990d 100644 # # RHEL7.1 -@@ -131,6 +135,10 @@ 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 +@@ -145,6 +149,10 @@ Patch1001: nfs-utils-1.2.1-exp-subtree-warn-off.patch + Patch1002: nfs-utils-1.2.3-sm-notify-res_init.patch + Patch1003: nfs-utils-1.2.5-idmap-errmsg.patch +# Titanium Cloud Patches -+Patch200: nfs-utils-support-mountprog-and-nfsprog-options.patch -+Patch201: nfs-utils-do-not-pass-CFLAGS-to-native.patch ++Patch2000: nfs-utils-support-mountprog-and-nfsprog-options.patch ++Patch2001: nfs-utils-do-not-pass-CFLAGS-to-native.patch + Group: System Environment/Daemons Provides: exportfs = %{epoch}:%{version}-%{release} Provides: nfsstat = %{epoch}:%{version}-%{release} -@@ -382,6 +390,11 @@ This package also contains the mount.nfs and umount.nfs program. - %patch102 -p1 - %patch103 -p1 +@@ -418,6 +426,11 @@ This package also contains the mount.nfs and umount.nfs program. + %patch1002 -p1 + %patch1003 -p1 -+%patch200 -p1 ++%patch2000 -p1 +# Titanium Cloud support mountprog and nfsprog options -+%patch201 -p1 ++%patch2001 -p1 +# Titanium Cloud do not pass CFLAGS to native + # Remove .orig files find . -name "*.orig" | xargs rm -f -@@ -443,6 +456,13 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/nfs-utils_env. +@@ -479,6 +492,13 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/nfs-utils_env. install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy @@ -61,7 +61,7 @@ index a8d651a..583990d 100644 # # For backwards compatablity # -@@ -521,6 +541,9 @@ if [ $1 -eq 1 ] ; then +@@ -557,6 +577,9 @@ if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable nfs-client.target >/dev/null 2>&1 || : /bin/systemctl restart nfs-config >/dev/null 2>&1 || : @@ -71,7 +71,7 @@ index a8d651a..583990d 100644 fi %systemd_post nfs-config %systemd_post nfs-server -@@ -532,6 +555,9 @@ chown -R rpcuser:rpcuser /var/lib/nfs/statd +@@ -568,6 +591,9 @@ chown -R rpcuser:rpcuser /var/lib/nfs/statd if [ $1 -eq 0 ]; then %systemd_preun nfs-client.target %systemd_preun nfs-server.server @@ -81,7 +81,7 @@ index a8d651a..583990d 100644 /usr/sbin/userdel rpcuser 2>/dev/null || : /usr/sbin/groupdel rpcuser 2>/dev/null || : -@@ -618,6 +644,9 @@ fi +@@ -654,6 +680,9 @@ fi %{_sbindir}/nfsdcltrack %{_mandir}/*/* %{_unitdir}/* @@ -90,7 +90,7 @@ index a8d651a..583990d 100644 + %attr(755,root,root) /usr/lib/systemd/scripts/nfs-utils_env.sh %{_prefix}/lib/systemd/system-generators/nfs-server-generator - + %{_prefix}/lib/systemd/system-generators/rpc-pipefs-generator -- -1.9.1 +2.7.4 diff --git a/filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index ca2174bb6..69f42f4c2 100644 --- a/filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,7 +1,7 @@ -From c579b798af2fa3b5596bae14d506d1308e8766c6 Mon Sep 17 00:00:00 2001 +From c6c1fee74830348a437cf0b467d299e1f4c42391 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 15:19:43 -0400 -Subject: [PATCH 4/4] WRS: 0001-Update-package-versioning-for-TIS-format.patch +Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch Conflicts: SPECS/nfs-utils.spec @@ -10,19 +10,19 @@ Conflicts: 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec -index 8585c5d..029e2e3 100644 +index a947119..2602031 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec @@ -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: 1.3.0 --Release: 0.48%{?dist} -+Release: 0.48.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 0.54%{?dist} ++Release: 0.54.el7%{?_tis_dist}.%{tis_patch_ver} Epoch: 1 # group all 32bit related archs -@@ -150,6 +150,7 @@ Provides: rpc.mountd = %{epoch}:%{version}-%{release} +@@ -164,6 +164,7 @@ Provides: rpc.mountd = %{epoch}:%{version}-%{release} Provides: rpc.nfsd = %{epoch}:%{version}-%{release} Provides: rpc.statd = %{epoch}:%{version}-%{release} Provides: rpc.gssd = %{epoch}:%{version}-%{release} @@ -31,5 +31,5 @@ index 8585c5d..029e2e3 100644 Provides: mount.nfs4 = %{epoch}:%{version}-%{release} Provides: umount.nfs = %{epoch}:%{version}-%{release} -- -1.9.1 +2.7.4 diff --git a/filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch b/filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch index b5bf8a0a2..27de49ea1 100644 --- a/filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch +++ b/filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch @@ -1,8 +1,18 @@ +From bbd7bc3626b3af6543b66d23a965276bd29038b5 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Thu, 16 Aug 2018 21:07:20 +0800 +Subject: [PATCH] add-rpm-4.14-compatibility + +Signed-off-by: slin14 +--- + SPECS/nfs-utils.spec | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec -index d43ae40..e7011a2 100644 +index 2602031..75212eb 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec -@@ -601,14 +601,7 @@ if [ -h /etc/systemd/system/multi-user.target.wants/nfs.target ]; then +@@ -635,14 +635,7 @@ if [ -h /etc/systemd/system/multi-user.target.wants/nfs.target ]; then fi fi @@ -18,3 +28,6 @@ index d43ae40..e7011a2 100644 # reset configuration files and running daemons if [ $1 -eq 2 ] ; then /bin/systemctl enable nfs-client.target >/dev/null 2>&1 || : +-- +2.7.4 + diff --git a/filesystem/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch b/filesystem/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch index 6792c3a1c..fb45afdb7 100644 --- a/filesystem/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch +++ b/filesystem/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch @@ -1,7 +1,7 @@ -From 5a65c9efbbfed7914e3cabc4c68fac87f2a16a1f Mon Sep 17 00:00:00 2001 +From 545e646a80fed3dd353ac31d83b2c04f202f1bf5 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 15:19:43 -0400 -Subject: [PATCH 2/4] WRS: +Subject: [PATCH] WRS: 0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch --- @@ -9,25 +9,25 @@ Subject: [PATCH 2/4] WRS: 1 file changed, 2 insertions(+) diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec -index 583990d..1fecdba 100644 +index 282511e..7793ee1 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec -@@ -138,6 +138,7 @@ Patch103: nfs-utils-1.2.5-idmap-errmsg.patch +@@ -152,6 +152,7 @@ Patch1003: nfs-utils-1.2.5-idmap-errmsg.patch # Titanium Cloud Patches - Patch200: nfs-utils-support-mountprog-and-nfsprog-options.patch - Patch201: nfs-utils-do-not-pass-CFLAGS-to-native.patch -+Patch202: nfs-utils-update-nfsmount.conf-with-required-config.patch + Patch2000: nfs-utils-support-mountprog-and-nfsprog-options.patch + Patch2001: nfs-utils-do-not-pass-CFLAGS-to-native.patch ++Patch2002: nfs-utils-update-nfsmount.conf-with-required-config.patch Group: System Environment/Daemons Provides: exportfs = %{epoch}:%{version}-%{release} -@@ -394,6 +395,7 @@ This package also contains the mount.nfs and umount.nfs program. +@@ -430,6 +431,7 @@ This package also contains the mount.nfs and umount.nfs program. # Titanium Cloud support mountprog and nfsprog options - %patch201 -p1 + %patch2001 -p1 # Titanium Cloud do not pass CFLAGS to native -+%patch202 -p1 ++%patch2002 -p1 # Remove .orig files find . -name "*.orig" | xargs rm -f -- -1.9.1 +2.7.4 diff --git a/filesystem/nfs-utils/centos/srpm_path b/filesystem/nfs-utils/centos/srpm_path index 257b34aff..9e8d67122 100644 --- a/filesystem/nfs-utils/centos/srpm_path +++ b/filesystem/nfs-utils/centos/srpm_path @@ -1 +1 @@ -mirror:Source/nfs-utils-1.3.0-0.48.el7.src.rpm +mirror:Source/nfs-utils-1.3.0-0.54.el7.src.rpm