From 2122c11e7cfcf5bc55dc59cec05594346303b103c8719973af93241864152819 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 27 Mar 2008 21:28:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=17 --- nfs-utils-1.0.7-bind-syntax.patch | 14 +++++++------ nfs-utils-1.1.0.tar.bz2 | 3 --- nfs-utils-1.1.2.tar.bz2 | 3 +++ nfs-utils-o_create-mode | 33 ------------------------------- nfs-utils.changes | 13 ++++++++++++ nfs-utils.spec | 17 ++++++++++------ nfs.init | 16 +++++++++++++-- nfsserver.init | 4 ++-- 8 files changed, 51 insertions(+), 52 deletions(-) delete mode 100644 nfs-utils-1.1.0.tar.bz2 create mode 100644 nfs-utils-1.1.2.tar.bz2 delete mode 100644 nfs-utils-o_create-mode diff --git a/nfs-utils-1.0.7-bind-syntax.patch b/nfs-utils-1.0.7-bind-syntax.patch index c616101..0fbc93b 100644 --- a/nfs-utils-1.0.7-bind-syntax.patch +++ b/nfs-utils-1.0.7-bind-syntax.patch @@ -2,14 +2,16 @@ support/include/misc.h | 3 support/include/nfslib.h | 1 ================================================================================ ---- nfs-utils-1.0.12/support/nfs/exports.c -+++ nfs-utils-1.0.12/support/nfs/exports.c -@@ -522,6 +522,8 @@ +Index: nfs-utils-1.1.2/support/nfs/exports.c +=================================================================== +--- nfs-utils-1.1.2.orig/support/nfs/exports.c ++++ nfs-utils-1.1.2/support/nfs/exports.c +@@ -627,6 +627,8 @@ bad_option: } else if (strncmp(opt, "replicas=", 9) == 0) { ep->e_fslocmethod = FSLOC_REPLICA; ep->e_fslocdata = strdup(opt+9); + } else if (strncmp(opt, "bind=/", 6) == 0) { + /* ignore this for now */ - } else { - xlog(L_ERROR, "%s:%d: unknown keyword \"%s\"\n", - flname, flline, opt); + } else if (strncmp(opt, "sec=", 4) == 0) { + active = parse_flavors(opt+4, ep); + if (!active) diff --git a/nfs-utils-1.1.0.tar.bz2 b/nfs-utils-1.1.0.tar.bz2 deleted file mode 100644 index 7fede15..0000000 --- a/nfs-utils-1.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5465ac4fac37888b25ddc12ab6c223641562c13042ad327fdb73e79e8bcc32a -size 558403 diff --git a/nfs-utils-1.1.2.tar.bz2 b/nfs-utils-1.1.2.tar.bz2 new file mode 100644 index 0000000..1cd8c08 --- /dev/null +++ b/nfs-utils-1.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af49737a7c7561968ebf6664de10aaf23871b5f31c8149bef0888cdaef92ef3e +size 573985 diff --git a/nfs-utils-o_create-mode b/nfs-utils-o_create-mode deleted file mode 100644 index a70b248..0000000 --- a/nfs-utils-o_create-mode +++ /dev/null @@ -1,33 +0,0 @@ -From: Jeff Mahoney -Subject: [PATCH] nfs-utils: open with O_CREAT needs valid mode - - This patch uses a valid mode to avoid an assertion check in STABLE. - -Signed-off-by: Jeff Mahoney ---- - nfs-utils-1.1.0/support/nfs/fstab.c | 2 +- - nfs-utils-1.1.0/support/nfs/xio.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- nfs-utils-1.1.0.orig/support/nfs/fstab.c 2007-05-11 05:40:57.000000000 +0200 -+++ nfs-utils-1.1.0/support/nfs/fstab.c 2008-02-13 20:49:37.689134000 +0100 -@@ -342,7 +342,7 @@ lock_mtab (void) { - - sprintf(linktargetfile, MOUNTLOCK_LINKTARGET, getpid ()); - -- i = open (linktargetfile, O_WRONLY|O_CREAT, 0); -+ i = open (linktargetfile, O_WRONLY|O_CREAT, 0600); - if (i < 0) { - int errsv = errno; - /* linktargetfile does not exist (as a file) ---- nfs-utils-1.1.0.orig/support/nfs/xio.c 2007-05-11 05:40:57.000000000 +0200 -+++ nfs-utils-1.1.0/support/nfs/xio.c 2008-02-13 20:53:03.611009000 +0100 -@@ -57,7 +57,7 @@ xflock(char *fname, char *type) - struct flock fl = { readonly? F_RDLCK : F_WRLCK, SEEK_SET, 0, 0, 0 }; - int fd; - -- if ((fd = open(fname, readonly? O_RDONLY : (O_RDWR|O_CREAT))) < 0) { -+ if ((fd = open(fname, readonly? O_RDONLY : (O_RDWR|O_CREAT), 0600)) < 0) { - xlog(L_WARNING, "could not open %s for locking", fname); - return -1; - } diff --git a/nfs-utils.changes b/nfs-utils.changes index 8c7495f..cf82311 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Mar 27 13:53:20 CET 2008 - mkoenig@suse.de + +- update to version 1.1.2 +- uses libgssglue instead of libgssapi +- remove patch + nfs-utils-o_create-mode + +------------------------------------------------------------------- +Wed Mar 26 17:11:33 CET 2008 - mkoenig@suse.de + +- add rpcbind support [fate#300607] + ------------------------------------------------------------------- Thu Feb 28 18:42:52 CET 2008 - ro@suse.de diff --git a/nfs-utils.spec b/nfs-utils.spec index f7dbd8f..cb55b55 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package nfs-utils (Version 1.1.0) +# spec file for package nfs-utils (Version 1.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,11 +12,11 @@ Name: nfs-utils -BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libevent libgssapi librpcsecgss nfsidmap-devel pkgconfig tcpd-devel +BuildRequires: e2fsprogs-devel gcc-c++ krb5-devel libevent libgssglue-devel librpcsecgss nfsidmap-devel pkgconfig tcpd-devel Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd -Version: 1.1.0 -Release: 12 +Version: 1.1.2 +Release: 1 Group: Productivity/Networking/NFS License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,7 +34,6 @@ Source7: fw-client Source8: fw-server Patch0: nfs-utils-largefiles.patch Patch1: nfs-utils-1.0.7-bind-syntax.patch -Patch2: nfs-utils-o_create-mode %description This package contains the NFS utilities. You can tune the number of @@ -107,7 +106,6 @@ Authors: %setup -q -n nfs-utils-%{version} -a 1 %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp %{S:6} . %build @@ -251,6 +249,13 @@ rm -rf $RPM_BUILD_ROOT %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4 %changelog +* Thu Mar 27 2008 mkoenig@suse.de +- update to version 1.1.2 +- uses libgssglue instead of libgssapi +- remove patch + nfs-utils-o_create-mode +* Wed Mar 26 2008 mkoenig@suse.de +- add rpcbind support [fate#300607] * Thu Feb 28 2008 ro@suse.de - added gssapi to buildrequires * Wed Feb 13 2008 jeffm@suse.com diff --git a/nfs.init b/nfs.init index 7f6bd31..47c941a 100644 --- a/nfs.init +++ b/nfs.init @@ -72,6 +72,18 @@ if [ "$NFS4_SUPPORT" = yes ]; then NEED_IDMAPD=yes fi +if [ -x /sbin/portmap ]; then + PORTMAP_BIN=/sbin/portmap +elif [ -x /sbin/rpcbind ]; then + PORTMAP_BIN=/sbin/rpcbind +else + echo "portmap/rpcbind is missing" + rc_failed 3 + rc_status -v + rc_exit +fi + + echo mount_rpc_pipefs() { # See if the file system is there yet case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs` in @@ -128,8 +140,8 @@ rc_reset case "$1" in start|reload) echo -n "Starting NFS client services:" - if ! checkproc /sbin/portmap ; then - echo "portmap is not running" + if ! checkproc $PORTMAP_BIN ; then + echo "portmap/rpcbind is not running" rc_failed 3 rc_status -v rc_exit diff --git a/nfsserver.init b/nfsserver.init index 6f8549c..cc7439c 100644 --- a/nfsserver.init +++ b/nfsserver.init @@ -10,8 +10,8 @@ # ### BEGIN INIT INFO # Provides: nfsserver -# Required-Start: $network $named portmap -# Required-Stop: $network portmap +# Required-Start: $network $named $portmap +# Required-Stop: $network $portmap # Should-Start: ypbind krb5kdc # Should-Stop: # Default-Start: 3 5