Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2014-06-18 10:59:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2014-05-14 10:50:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2014-06-18 10:59:30.000000000 +0200 @@ -1,0 +2,51 @@ +Tue Jun 10 07:19:06 UTC 2014 - [email protected] + +- Use start-statd and rpc-statd.service from upstream for running statd. + Our start-statd doesn't work in a systemd environment (bnc#852984) +- start-statd.patch - needed to make upstream start-statd work properly. +- use .xz from upstream, that is what kernel.org prefers and it is smaller + +------------------------------------------------------------------- +Wed Jun 4 01:59:27 UTC 2014 - [email protected] + +- Remove 0001-nfsidmap-Keys-need-to-be-invalidated-instead-of-revo.patch + Now that keyutils has been updated in Factory, this patch + is no longer needed. + +------------------------------------------------------------------- +Tue Jun 3 12:55:16 UTC 2014 - [email protected] + +- Check if systemd is listen on local socket 111 to trigger the + start of the rpcbind.service on demand (bnc#860246) +- There exists only nfs-utils-1.3.0.tar.gz at + http://kernel.org/pub/linux/utils/nfs-utils/1.3.0/ + +------------------------------------------------------------------- +Wed May 14 02:40:01 UTC 2014 - [email protected] + +- New upstream version 1.3.0. + Includes all our bugfix patches except 1. + Adds assorted other bugfixes and improvements including + initial support for NFSv4.2 + Prepares the way for better systemd integration. + Discards useless programs gss_clnt_send_err and gss_destroy_creds + +- Removes: 0001-mountd-Fix-is_subdirectory-again.patch +- Removes: 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch +- Removes: 0003-Fix-handling-of-preferred-realm-command-line-option.patch +- Removes: 0004-nfsiostat-restore-output-format.patch +- Removes: 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch +- Removes: 0006-gssd-fixed-typo-in-machine-cred-name.patch +- Removes: skip-on-ENOENT.patch +- Removes: mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch +- Removes: exportfs-exit-with-error-code-if-there-was-any-error.patch +- Removes: exportfs-report-failure-if-asked-to-unexport-somethi.patch +- Removes: gssd-mount-hang-fix.patch +- Removes: udp-fallback-fix.patch +- Removes: fedfs-lib-name.patch + +- 0001-nfsidmap-Keys-need-to-be-invalidated-instead-of-revo.patch + This upstream patch is currently reverted until we get a newer version + of keyutils. + +------------------------------------------------------------------- Old: ---- 0001-mountd-Fix-is_subdirectory-again.patch 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch 0003-Fix-handling-of-preferred-realm-command-line-option.patch 0004-nfsiostat-restore-output-format.patch 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch 0006-gssd-fixed-typo-in-machine-cred-name.patch exportfs-exit-with-error-code-if-there-was-any-error.patch exportfs-report-failure-if-asked-to-unexport-somethi.patch fedfs-lib-name.patch gssd-mount-hang-fix.patch mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch nfs-utils-1.2.8.tar.bz2 skip-on-ENOENT.patch start-statd udp-fallback-fix.patch New: ---- nfs-utils-1.3.0.tar.xz start-statd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.7Xeqtk/_old 2014-06-18 10:59:32.000000000 +0200 +++ /var/tmp/diff_new_pack.7Xeqtk/_new 2014-06-18 10:59:32.000000000 +0200 @@ -41,13 +41,13 @@ Summary: Support Utilities for Kernel nfsd License: GPL-2.0+ Group: Productivity/Networking/NFS -Version: 1.2.8 +Version: 1.3.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq %{?systemd_requires} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2 +Source0: http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz # Download does not work: # Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2 Source1: nfs.doc.tar.bz2 @@ -59,38 +59,12 @@ Source7: fw-client Source8: fw-server Source11: idmapd.conf -Source12: start-statd Source13: nfs-utils.rpmlintrc Patch0: nfs-utils-1.0.7-bind-syntax.patch -# PATCH-FIX-UPSTREAM 0001-mountd-Fix-is_subdirectory-again.patch upstream-bugfix [email protected] -Patch1: 0001-mountd-Fix-is_subdirectory-again.patch -# PATCH-FIX-UPSTREAM 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch upstream-bugfix [email protected] -Patch2: 0002-gssd-Fix-recent-fix-to-Avoid-DNS-reverse-resolution-.patch -# PATCH-FIX-UPSTREAM 0003-Fix-handling-of-preferred-realm-command-line-option.patch upstream-bugfix [email protected] -Patch3: 0003-Fix-handling-of-preferred-realm-command-line-option.patch -# PATCH-FIX-UPSTREAM 0004-nfsiostat-restore-output-format.patch upstream-bugfix [email protected] -Patch4: 0004-nfsiostat-restore-output-format.patch -# PATCH-FIX-UPSTREAM 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch upstream-bugfix [email protected] -Patch5: 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch -# PATCH-FIX-UPSTREAM 0006-gssd-fixed-typo-in-machine-cred-name.patch upstream-bugfix [email protected] -Patch6: 0006-gssd-fixed-typo-in-machine-cred-name.patch -# PATCH-FIX-UPSTREAM skip-on-ENOENT.patch [email protected] -Patch7: skip-on-ENOENT.patch -# PATCH-FIX-UPSTREAM mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch [email protected] -Patch8: mountd-fix-bug-affecting-exports-of-dirs-with-64bit-.patch -# PATCH-FIX-UPSTREAM exportfs-exit-with-error-code-if-there-was-any-error.patch [email protected] -Patch9: exportfs-exit-with-error-code-if-there-was-any-error.patch -# PATCH-FIX_UPSTREAM exportfs-report-failure-if-asked-to-unexport-somethi.patch [email protected] -Patch10: exportfs-report-failure-if-asked-to-unexport-somethi.patch -# PATCH-FIX-UPSTREAM gssd-mount-hang-fix.patch bnc#833543 [email protected] -Patch11: gssd-mount-hang-fix.patch -# PATCH-FIX-UPSTREAM udp-fallback-fix.patch bnc#863749 [email protected] -Patch12: udp-fallback-fix.patch -# PATCH-FIX-UPSTREAM fedfs-lib-name.patch [email protected] -Patch13: fedfs-lib-name.patch # PATCH-FIX-UPSTREAM nfsdcltrack.sbin.patch [email protected] -Patch14: nfsdcltrack.sbin.patch - +Patch1: nfsdcltrack.sbin.patch +# PATCH-FIX-OPENSUSE start-statd.patch [email protected] +Patch2: start-statd.patch Suggests: python-base %description @@ -144,18 +118,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 cp %{S:6} . %build @@ -181,7 +143,8 @@ %install make install DESTDIR=$RPM_BUILD_ROOT -rm -f linux-nfs/Makefile* +install -d $RPM_BUILD_ROOT/%{_unitdir} +install -m 644 systemd/rpc-statd.service $RPM_BUILD_ROOT/%{_unitdir} # rc-script install -d $RPM_BUILD_ROOT/etc/init.d install -m 744 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/nfsserver @@ -204,7 +167,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services install -m 0644 %{SOURCE7} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client install -m 0644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server -install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf # # hack to avoid automatic python dependency @@ -282,8 +244,6 @@ /sbin/umount.nfs /sbin/umount.nfs4 /sbin/osd_login -/usr/sbin/gss_clnt_send_err -/usr/sbin/gss_destroy_creds %attr(0755,root,root) /usr/sbin/mountstats %attr(0755,root,root) /usr/sbin/nfsiostat /usr/sbin/nfsidmap @@ -297,6 +257,7 @@ /usr/sbin/sm-notify /usr/sbin/start-statd /usr/sbin/blkmapd +%{_unitdir}/rpc-statd.service %{_mandir}/man5/nfsmount.conf.5.gz %{_mandir}/man5/nfs.5.gz %{_mandir}/man8/mount.nfs.8.gz ++++++ nfs.init ++++++ --- /var/tmp/diff_new_pack.7Xeqtk/_old 2014-06-18 10:59:32.000000000 +0200 +++ /var/tmp/diff_new_pack.7Xeqtk/_new 2014-06-18 10:59:32.000000000 +0200 @@ -117,7 +117,9 @@ check_portmap() { # check if either portmap or rpcbind is running - if test -x /sbin/portmap && checkproc /sbin/portmap + if test -x /sbin/rpcinfo && /sbin/rpcinfo -a 0.0.0.0.0.111 -T tcp 100000 > /dev/null 2>&1 + then true + elif test -x /sbin/portmap && checkproc /sbin/portmap then true elif test -x /sbin/rpcbind && checkproc /sbin/rpcbind then true ++++++ start-statd.patch ++++++ 1/ use correct patch for systemctl 2/ use correct name for rpc-statd.service --- utils/statd/start-statd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- nfs-utils-1.3.0.orig/utils/statd/start-statd +++ nfs-utils-1.3.0/utils/statd/start-statd @@ -4,8 +4,8 @@ # /var/run/rpc.statd.pid). # It should run statd with whatever flags are apropriate for this # site. -PATH=/sbin:/usr/sbin -if systemctl start statd.service +PATH=/bin:/usr/bin:/sbin:/usr/sbin +if systemctl start rpc-statd.service then : else exec rpc.statd --no-notify -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
