Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at 2012-11-28 16:19:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old) and /work/SRC/openSUSE:Factory/.nfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2012-10-25 12:10:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nfs-utils.new/nfs-utils.changes 2012-11-28 16:19:09.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Nov 28 00:08:55 UTC 2012 - [email protected] + +- New upstream release 1.2.7. Adds FedFD support + to mounted and replaces nfsdcld with + nfsdcltrack. This is used to manage client state + on NFSv4 servers. + Incorporates more local patches. + +- Replace "/var/run" with "/run" in various scripts. + +- nfsserver.init: Generate message that "bind=" is deprecated + if it is used. + +------------------------------------------------------------------- Old: ---- mkdir-sbin mount-exit-code.fix nfs-utils-1.2.6.tar.bz2 nfs4-no-umount remove_pretty_sig.patch New: ---- nfs-utils-1.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.wrZOpY/_old 2012-11-28 16:19:11.000000000 +0100 +++ /var/tmp/diff_new_pack.wrZOpY/_new 2012-11-28 16:19:11.000000000 +0100 @@ -31,16 +31,16 @@ BuildRequires: pkgconfig BuildRequires: sqlite3-devel BuildRequires: tcpd-devel -Url: http://nfs.sourceforge.net +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.2.6 +Version: 1.2.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2 +Source0: http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2 # Download does not work: # Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2 Source1: nfs.doc.tar.bz2 @@ -57,10 +57,6 @@ Source12: start-statd Source13: nfs-utils.rpmlintrc Patch0: nfs-utils-1.0.7-bind-syntax.patch -Patch1: remove_pretty_sig.patch -Patch2: mkdir-sbin -Patch3: mount-exit-code.fix -Patch4: nfs4-no-umount Suggests: python-base %description @@ -139,10 +135,6 @@ %prep %setup -q -n nfs-utils-%{version} -a 1 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 cp %{S:6} . %build @@ -153,7 +145,7 @@ --enable-nfsv4 \ --enable-gss \ --enable-ipv6 \ - --enable-nfsdcld \ + --enable-nfsdcltrack \ --enable-mount \ --enable-libmount-mount \ --enable-mountconfig \ @@ -213,12 +205,12 @@ chown statd:nogroup /var/lib/nfs chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || : ### migrate from /var/lock/subsys -[ -d /var/run/nfs ] || mkdir /var/run/nfs +[ -d /run/nfs ] || mkdir /run/nfs if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then - mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs + mv /var/lock/subsys/nfs-rpc.idmapd /run/nfs fi if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then - mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs + mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs fi ### [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -242,12 +234,12 @@ %post -n nfs-kernel-server ### migrate from /var/lock/subsys -[ -d /var/run/nfs ] || mkdir /var/run/nfs +[ -d /run/nfs ] || mkdir /run/nfs if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then - mv /var/lock/subsys/nfs-rpc.idmapd /var/run/nfs + mv /var/lock/subsys/nfs-rpc.idmapd /run/nfs fi if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then - mv /var/lock/subsys/nfsserver-rpc.idmapd /var/run/nfs + mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs fi ### %{fillup_and_insserv nfsserver} @@ -322,7 +314,7 @@ /usr/sbin/rpc.mountd /usr/sbin/rpc.nfsd /usr/sbin/rpc.svcgssd -/usr/sbin/nfsdcld +/usr/sbin/nfsdcltrack %{_mandir}/man5/exports.5.gz %{_mandir}/man7/nfsd.7.gz %{_mandir}/man8/exportfs.8.gz @@ -331,7 +323,7 @@ %{_mandir}/man8/rpc.mountd.8.gz %{_mandir}/man8/rpc.nfsd.8.gz %{_mandir}/man8/rpc.svcgssd.8.gz -%{_mandir}/man8/nfsdcld.8.gz +%{_mandir}/man8/nfsdcltrack.8.gz /usr/share/omc/svcinfo.d/nfs-kernel-server.xml %config(noreplace) /var/lib/nfs/xtab %config(noreplace) /var/lib/nfs/etab ++++++ nfs-utils-1.0.7-bind-syntax.patch ++++++ --- /var/tmp/diff_new_pack.wrZOpY/_old 2012-11-28 16:19:12.000000000 +0100 +++ /var/tmp/diff_new_pack.wrZOpY/_new 2012-11-28 16:19:12.000000000 +0100 @@ -6,9 +6,9 @@ support/nfs/exports.c | 2 ++ 1 file changed, 2 insertions(+) ---- nfs-utils-1.2.3.orig/support/nfs/exports.c -+++ nfs-utils-1.2.3/support/nfs/exports.c -@@ -626,6 +626,8 @@ bad_option: +--- nfs-utils-1.2.7.orig/support/nfs/exports.c ++++ nfs-utils-1.2.7/support/nfs/exports.c +@@ -628,6 +628,8 @@ bad_option: } else if (strncmp(opt, "replicas=", 9) == 0) { ep->e_fslocmethod = FSLOC_REPLICA; ep->e_fslocdata = strdup(opt+9); ++++++ nfs-utils-1.2.6.tar.bz2 -> nfs-utils-1.2.7.tar.bz2 ++++++ ++++ 68253 lines of diff (skipped) ++++++ nfs.init ++++++ --- /var/tmp/diff_new_pack.wrZOpY/_old 2012-11-28 16:19:12.000000000 +0100 +++ /var/tmp/diff_new_pack.wrZOpY/_new 2012-11-28 16:19:12.000000000 +0100 @@ -29,8 +29,8 @@ GSSD_BIN=/usr/sbin/rpc.gssd STATD_BIN=/usr/sbin/rpc.statd -IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd -IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd +IDMAPD_CLIENT_STATE=/run/nfs/nfs-rpc.idmapd +IDMAPD_SERVER_STATE=/run/nfs/nfsserver-rpc.idmapd if [ -z "$RPC_PIPEFS_DIR" ]; then RPC_PIPEFS_DIR=/var/lib/nfs/rpc_pipefs @@ -219,7 +219,7 @@ rc_status -v rc_exit } - [ -d /var/run/nfs ] || mkdir /var/run/nfs + [ -d /run/nfs ] || mkdir /run/nfs echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE fi ++++++ nfsserver.init ++++++ --- /var/tmp/diff_new_pack.wrZOpY/_old 2012-11-28 16:19:12.000000000 +0100 +++ /var/tmp/diff_new_pack.wrZOpY/_new 2012-11-28 16:19:12.000000000 +0100 @@ -55,9 +55,9 @@ IDMAPD_BIN=/usr/sbin/rpc.idmapd NFSD_BIN=/usr/sbin/rpc.nfsd -IDMAPD_CLIENT_STATE=/var/run/nfs/nfs-rpc.idmapd -IDMAPD_SERVER_STATE=/var/run/nfs/nfsserver-rpc.idmapd -NFSD_BIND_MOUNTS=/var/run/nfs/bind.mounts +IDMAPD_CLIENT_STATE=/run/nfs/nfs-rpc.idmapd +IDMAPD_SERVER_STATE=/run/nfs/nfsserver-rpc.idmapd +NFSD_BIND_MOUNTS=/run/nfs/bind.mounts NEED_SVCGSSD=no NEED_IDMPAPD=no @@ -94,14 +94,21 @@ } nfs4_bind_mounts() { - [ -d /var/run/nfs ] || mkdir /var/run/nfs - + [ -d /run/nfs ] || mkdir /run/nfs + warned=no # In case of doubt, try "man sed" :-) cat /etc/exports | sed -n 'H;g;s/\\$//;h;t;s/^\n//;s/\n[[:space:]]*//g;s/#.*//;p;s/.*//;h' | sed 's/^\([^[:space:]]*\).*bind=\([^,)]*\).*/\1 \2/;t;d' | sort | while read export dir; do + if [ $warned = no ] ; then + echo + echo "NFS: The usage of 'bind=' in /etc/exports is deprecated." + echo "NFS: Is it no longer needed and may cease to work." + echo "NFS: Please remove these settings." + warned=yes + fi test -d "$export" || mkdir -p "$export" mount -o bind "$dir" "$export" echo "$dir" "$export" @@ -200,7 +207,7 @@ rc_status -v rc_exit } - [ -d /var/run/nfs ] || mkdir /var/run/nfs + [ -d /run/nfs ] || mkdir /run/nfs echo $IDMAPD_BIN > $IDMAPD_SERVER_STATE fi # exportfs @@ -252,7 +259,7 @@ killproc -n -KILL lockd fi # make sure sm-notify is run on restart, as we have dropped some locks - rm -f /var/run/sm-notify.pid + rm -f /run/sm-notify.pid # # rpc.mountd echo -n " mountd" @@ -318,7 +325,7 @@ # Status has a slightly different for the status command: # 0 - service running - # 1 - service dead, but /var/run/ pid file exists + # 1 - service dead, but /run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running ++++++ start-statd ++++++ --- /var/tmp/diff_new_pack.wrZOpY/_old 2012-11-28 16:19:12.000000000 +0100 +++ /var/tmp/diff_new_pack.wrZOpY/_new 2012-11-28 16:19:12.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh -p # nfsmount calls this script when mounting a filesystem with locking # enabled, but when statd does not seem to be running (based on -# /var/run/rpc.statd.pid). +# /run/rpc.statd.pid). # It should run run statd with whatever flags are apropriate for this # site. PATH=/sbin:/usr/sbin:/bin:/usr/bin -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
