From 31ae0b926ab85f6fdfd25faa76c3b4be4b3ad73f98146e5505c3a50c3faddbd1 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 22 Oct 2015 06:46:26 +0000 Subject: [PATCH] - update upstream version from 1.3.1 to 1.3.3. This contains lots of bugfixes but not significant new features. - use "make install" to install systemd files instead of hand-code. - retain rpc-svcgssd for now until gss-proxy is packaged. OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=145 --- ...t-Removed-a-ordering-cycle-with-nfs-.patch | 37 -------- ...ralize-dependencies-on-the-auth-unit.patch | 87 ------------------- nfs-utils-1.3.1.tar.xz | 3 - nfs-utils-1.3.3.tar.xz | 3 + nfs-utils-no-svcgss.service | 19 ++++ nfs-utils.changes | 8 ++ nfs-utils.spec | 20 ++--- 7 files changed, 38 insertions(+), 139 deletions(-) delete mode 100644 0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch delete mode 100644 0002-Centralize-dependencies-on-the-auth-unit.patch delete mode 100644 nfs-utils-1.3.1.tar.xz create mode 100644 nfs-utils-1.3.3.tar.xz create mode 100644 nfs-utils-no-svcgss.service diff --git a/0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch b/0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch deleted file mode 100644 index b380cb8..0000000 --- a/0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 12a95edae598ba0c63a30b07d7b3529871e145e2 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Mon, 29 Sep 2014 11:23:39 -0400 -Subject: [PATCH 1/2] nfs-client.target: Removed a ordering cycle with - nfs-server.service - -On a VM that boots very fast and with out kerberos -enabled a systemd ordering cycle happens between -nfs-client and nfs-server units when both were -enabled. - -Having nfs-client start the gssd daemons in the -same matter as the nfs-server does ('After=') seemed -to eliminated the ordering cycle. - -Acked-by: J. Bruce Fields -Signed-off-by: Steve Dickson ---- - systemd/nfs-client.target | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd/nfs-client.target b/systemd/nfs-client.target -index 474f5e9ad74b..87a1ce8cec8f 100644 ---- a/systemd/nfs-client.target -+++ b/systemd/nfs-client.target -@@ -7,7 +7,7 @@ Wants=remote-fs-pre.target - # start that on demand if needed. - Wants=rpc-gssd.service rpc-svcgssd.service auth-rpcgss-module.service - Wants=nfs-blkmap.service rpc-statd-notify.service --Before=rpc-gssd.service rpc-svcgssd.service nfs-blkmap.service -+After=rpc-gssd.service rpc-svcgssd.service nfs-blkmap.service - - [Install] - WantedBy=multi-user.target --- -2.1.1 - diff --git a/0002-Centralize-dependencies-on-the-auth-unit.patch b/0002-Centralize-dependencies-on-the-auth-unit.patch deleted file mode 100644 index f22d4a9..0000000 --- a/0002-Centralize-dependencies-on-the-auth-unit.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 8d51c77c81f0cd5b0b8508eb50d5a53d6d2375ae Mon Sep 17 00:00:00 2001 -From: Simo Sorce -Date: Tue, 30 Sep 2014 15:33:10 -0400 -Subject: [PATCH 2/2] Centralize dependencies on the auth unit. - -With this patch either gssproxy or rpc.svcgssd are started only if the -auth module is requested, and it finds a keytab. -If the wants are in the main nfs-client or nfs-server unit files then -the two deamons are started unconditionally and would require -conditions which we can test once and for all in a single unit file -instead. - -Change also Before and After statments accordingly to properly -serialize loading modules and starting daemons in 3 steps -1. load kernel GSS auth module -2. start GSS handling daemons -3. start NFS client/server daemons - -Signed-off-by: Simo Sorce -Signed-off-by: Steve Dickson ---- - systemd/auth-rpcgss-module.service | 3 ++- - systemd/nfs-client.target | 7 +++++-- - systemd/nfs-server.service | 8 +++++--- - 3 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/systemd/auth-rpcgss-module.service b/systemd/auth-rpcgss-module.service -index 3fc2f4ac924f..0355e13e0095 100644 ---- a/systemd/auth-rpcgss-module.service -+++ b/systemd/auth-rpcgss-module.service -@@ -6,7 +6,8 @@ - # unit will fail. But that's OK.) - [Unit] - Description=Kernel Module supporting RPCSEC_GSS --Before=gssproxy.service rpc-svcgssd.service -+Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service -+Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service - ConditionPathExists=/etc/krb5.keytab - - [Service] -diff --git a/systemd/nfs-client.target b/systemd/nfs-client.target -index 87a1ce8cec8f..9b792a363e14 100644 ---- a/systemd/nfs-client.target -+++ b/systemd/nfs-client.target -@@ -5,9 +5,12 @@ Wants=remote-fs-pre.target - - # Note: we don't "Wants=rpc-statd.service" as "mount.nfs" will arrange to - # start that on demand if needed. --Wants=rpc-gssd.service rpc-svcgssd.service auth-rpcgss-module.service - Wants=nfs-blkmap.service rpc-statd-notify.service --After=rpc-gssd.service rpc-svcgssd.service nfs-blkmap.service -+After=nfs-blkmap.service -+ -+# GSS services dependencies and ordering -+Wants=auth-rpcgss-module.service -+After=rpc-gssd.service rpc-svcgssd.service gssproxy.service - - [Install] - WantedBy=multi-user.target -diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service -index 1048c5cbbf68..8010aadc4870 100644 ---- a/systemd/nfs-server.service -+++ b/systemd/nfs-server.service -@@ -2,15 +2,17 @@ - Description=NFS server and services - Requires= network.target proc-fs-nfsd.mount rpcbind.target - Requires= nfs-mountd.service --Wants=rpc-statd.service nfs-idmapd.service auth-rpcgss-module.service --Wants=rpc-gssd.service gssproxy.service rpc-svcgssd.service -+Wants=rpc-statd.service nfs-idmapd.service - Wants=rpc-statd-notify.service - - After= network.target proc-fs-nfsd.mount rpcbind.target nfs-mountd.service - After= nfs-idmapd.service rpc-statd.service --After= rpc-gssd.service gssproxy.service rpc-svcgssd.service - Before= rpc-statd-notify.service - -+# GSS services dependencies and ordering -+Wants=auth-rpcgss-module.service -+After=rpc-gssd.service gssproxy.service rpc-svcgssd.service -+ - Wants=nfs-config.service - After=nfs-config.service - --- -2.1.1 - diff --git a/nfs-utils-1.3.1.tar.xz b/nfs-utils-1.3.1.tar.xz deleted file mode 100644 index 7ede2f9..0000000 --- a/nfs-utils-1.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff79d70b7b58b2c8f9b798c58721127e82bb96022adc04a5c4cb251630e696b8 -size 583124 diff --git a/nfs-utils-1.3.3.tar.xz b/nfs-utils-1.3.3.tar.xz new file mode 100644 index 0000000..bdaac06 --- /dev/null +++ b/nfs-utils-1.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:700d689c5622c87953c34102e5befafc4d3c811e676852238f0dd79c9c0c084d +size 588468 diff --git a/nfs-utils-no-svcgss.service b/nfs-utils-no-svcgss.service new file mode 100644 index 0000000..eb2bb59 --- /dev/null +++ b/nfs-utils-no-svcgss.service @@ -0,0 +1,19 @@ +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index 0331926dcc03..03f96e93dccf 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -28,9 +28,13 @@ endif + if CONFIG_GSS + unit_files += \ + auth-rpcgss-module.service \ +- rpc-gssd.service \ ++ rpc-gssd.service ++ ++if CONFIG_SVCGSS ++unit_files += \ + rpc-svcgssd.service + endif ++endif + + EXTRA_DIST = $(unit_files) + diff --git a/nfs-utils.changes b/nfs-utils.changes index 2ffd4c5..c1bd5f7 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 22 06:35:02 UTC 2015 - nfbrown@suse.com + +- update upstream version from 1.3.1 to 1.3.3. + This contains lots of bugfixes but not significant new features. +- use "make install" to install systemd files instead of hand-code. +- retain rpc-svcgssd for now until gss-proxy is packaged. + ------------------------------------------------------------------- Thu Oct 15 03:32:53 UTC 2015 - nfbrown@suse.com diff --git a/nfs-utils.spec b/nfs-utils.spec index 45c0f2a..615513e 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -41,7 +41,7 @@ Url: http://kernel.org/pub/linux/utils/nfs-utils/ Summary: Support Utilities for Kernel nfsd License: GPL-2.0+ Group: Productivity/Networking/NFS -Version: 1.3.1 +Version: 1.3.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq @@ -65,10 +65,7 @@ Source16: nfs.service Source17: nfs-server.nfsserver.conf Source18: nfs-client.nfs.conf Patch0: nfs-utils-1.0.7-bind-syntax.patch -# PATCH-FIX-UPSTREAM 0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch nfbrown@suse.de -Patch1: 0001-nfs-client.target-Removed-a-ordering-cycle-with-nfs-.patch -# PATCH-FIX-UPSTREAM 0002-Centralize-dependencies-on-the-auth-unit.patch nfbrown@suse.de -Patch2: 0002-Centralize-dependencies-on-the-auth-unit.patch +Patch1: nfs-utils-no-svcgss.service Suggests: python-base %description @@ -120,15 +117,16 @@ This package contains additional NFS documentation. %setup -q -n nfs-utils-%{version} -a 1 %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp %{S:6} . %build rm -f configure; autoreconf -fi CFLAGS="$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing" LDFLAGS="-pie" ./configure \ --mandir=%{_mandir} \ + --with-systemd \ --enable-nfsv4 \ --enable-gss \ + --enable-svcgss \ --enable-ipv6 \ --enable-nfsdcltrack \ --enable-mount \ @@ -147,7 +145,6 @@ done %install make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_unitdir} -install -m 644 systemd/*.{service,target,mount} $RPM_BUILD_ROOT/%{_unitdir} install -m 644 %{S:15} $RPM_BUILD_ROOT%{_unitdir}/nfsserver.service install -m 644 %{S:16} $RPM_BUILD_ROOT%{_unitdir}/nfs.service install -d $RPM_BUILD_ROOT%{_unitdir}/nfs-server.service.d @@ -158,10 +155,10 @@ install -d $RPM_BUILD_ROOT/usr/lib/systemd/scripts install -m 755 %{S:14} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/nfs-utils_env.sh install -d $RPM_BUILD_ROOT%{_unitdir}/nfs-config.service.d install -m 644 %{S:12} $RPM_BUILD_ROOT%{_unitdir}/nfs-config.service.d/restart.conf -ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfsserver -ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-server -ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs -ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-client +ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfsserver +ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-server +ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs +ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-client # sysconfig-data mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/var/adm/fillup-templates @@ -270,7 +267,6 @@ fi /usr/sbin/blkmapd %{_unitdir}/auth-rpcgss-module.service %{_unitdir}/nfs-blkmap.service -%{_unitdir}/nfs-blkmap.target %{_unitdir}/nfs-client.target %{_unitdir}/nfs-config.service %{_unitdir}/nfs-idmapd.service