Date: Thursday, February 26, 2015 @ 00:10:46
Author: andyrtr
Revision: 231985
upgpkg: nfs-utils 1.3.2-5
drop the ancient mtab symlink patch that never went upstream; drop idmapd.conf
- mapping is done via id_resolver.conf now for a long time; add dep on
gssproxy; cosmetic cleanups
Added:
nfs-utils/trunk/nfs-utils-1.3.2-statd-bg.patch
(from rev 231983, nfs-utils/trunk/nfs-utils-1.2.1-statd-bg.patch)
Modified:
nfs-utils/trunk/PKGBUILD
nfs-utils/trunk/id_resolver.conf
nfs-utils/trunk/nfs-utils.install
Deleted:
nfs-utils/trunk/idmapd.conf
nfs-utils/trunk/nfs-utils-1.1.4-mtab-sym.patch
nfs-utils/trunk/nfs-utils-1.2.1-statd-bg.patch
nfs-utils/trunk/nfs-utils-1.3.1-rc2.patch
--------------------------------+
PKGBUILD | 74 ++--
id_resolver.conf | 9
idmapd.conf | 14
nfs-utils-1.1.4-mtab-sym.patch | 39 --
nfs-utils-1.2.1-statd-bg.patch | 25 -
nfs-utils-1.3.1-rc2.patch | 674 ---------------------------------------
nfs-utils-1.3.2-statd-bg.patch | 25 +
nfs-utils.install | 6
8 files changed, 70 insertions(+), 796 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-25 20:44:29 UTC (rev 231984)
+++ PKGBUILD 2015-02-25 23:10:46 UTC (rev 231985)
@@ -1,4 +1,5 @@
# $Id$
+# Maintainer: AndyRTR <[email protected]>
# Maintainer: Tobias Powalowski <[email protected]>
# Contributor: John Proctor <[email protected]>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,24 +8,19 @@
pkgname=nfs-utils
pkgver=1.3.2
-pkgrel=4
+pkgrel=5
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64')
url='http://nfs.sourceforge.net'
-license=('GPL')
-backup=(etc/{exports,idmapd.conf,nfsmount.conf}
etc/conf.d/{nfs-common.conf,nfs-server.conf})
-depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1'
'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'device-mapper')
-makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite')
+license=('GPL2')
+backup=(etc/{exports,nfsmount.conf}
etc/conf.d/{nfs-common.conf,nfs-server.conf})
+depends=('rpcbind' 'librpcsecgss>=0.19-2' 'nfsidmap' 'gssproxy'
+ 'libevent>=2.0.10' 'device-mapper' 'python2')
+makedepends=('sqlite')
source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{bz2,sign}
- nfs-common.conf
- nfs-server.conf
- exports
- idmapd.conf
- nfs-utils-1.1.4-mtab-sym.patch
- nfs-utils.conf
- id_resolver.conf
+ nfs-common.conf nfs-server.conf exports nfs-utils.conf id_resolver.conf
nfs-utils_env.sh
- nfs-utils-1.2.1-statd-bg.patch
+ nfs-utils-1.3.2-statd-bg.patch
nfs-utils-1.3.2-statd-nowait.patch)
install=nfs-utils.install
optdepends=('sqlite: for nfsdcltrack usage')
@@ -33,48 +29,51 @@
'95129639a19da1f262d4eb3ac73e0bdb'
'7bd61e84ee05054f5232b2e8063ea08d'
'e6ad3c7a59c7e4c24965a0e7da35026c'
- 'eb4f4027fab6fc1201f1ca04f5954c76'
- '7674106eaaa4c149bccd4f05fe3604e9'
'8ac484023d786766d287ccbe878ae4ba'
- 'a43aabf0b8d02406b1babc3a206d952a'
+ '2e203f35ee753f5264a951cf43d4168e'
'c6c9c32f153dfa6c0477ea6b99354288'
'45f55a5d581b2527b453c3a0816add24'
'dde4e23776a2425d2a1241eb2daf8b7c')
-validpgpkeys=(
- E1B71E339E20A10A676F7CB69AFB1D681A125177 # Steve Dickson
-)
+validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
prepare() {
- cd $srcdir/${pkgname}-${pkgver}
- patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
+ cd ${pkgname}-${pkgver}
# fix rpc.statd starting
- patch -Np1 -i ../nfs-utils-1.2.1-statd-bg.patch
+ patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-bg.patch
# don't wait for online target on statd
- patch -Np1 -i ../nfs-utils-1.3.2-statd-nowait.patch
+ patch -Np1 -i $srcdir/nfs-utils-1.3.2-statd-nowait.patch
- ./autogen.sh
+ # fix hardcoded sbin path to our needs
+ sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+ autoreconf -vfi
}
build() {
- cd $srcdir/${pkgname}-${pkgver}
- ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41
--enable-gss \
- --without-tcp-wrappers --with-statedir=/var/lib/nfs \
- --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
- --enable-mountconfig --with-start-statd=/usr/bin/start-statd
- # move mount helpers to /usr/bin
- sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile
- # move osd_login to /usr/bin
- sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/osd_login/Makefile
- # move nfsdcltrack to /usr/bin
- sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/nfsdcltrack/Makefile
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --enable-gss \
+ --without-tcp-wrappers \
+ --with-statedir=/var/lib/nfs \
+ --enable-ipv6 \
+ --enable-libmount-mount \
+ --enable-mountconfig \
+ --with-start-statd=/usr/bin/start-statd
make
}
+check() {
+ cd ${pkgname}-${pkgver}
+ make -k check
+}
+
package() {
- cd $srcdir/${pkgname}-${pkgver}
-
+ cd ${pkgname}-${pkgver}
make DESTDIR="$pkgdir" install
+
sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
+
install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
for i in systemd/{*.service,*.mount,*.target}; do
@@ -86,7 +85,6 @@
install -D -m 644 nfs-server.conf "$pkgdir"/etc/conf.d/nfs-server.conf
install -D -m 755 nfs-utils_env.sh
"$pkgdir"/usr/lib/systemd/scripts/nfs-utils_env.sh
install -D -m 644 exports "$pkgdir"/etc/exports
- install -D -m 644 idmapd.conf "$pkgdir"/etc/idmapd.conf
install -D -m 644 id_resolver.conf
"$pkgdir"/etc/request-key.d/id_resolver.conf
install -D -m 644 nfs-utils.conf
"$pkgdir"/usr/lib/modules-load.d/nfs-utils.conf
mkdir "$pkgdir"/etc/exports.d
Modified: id_resolver.conf
===================================================================
--- id_resolver.conf 2015-02-25 20:44:29 UTC (rev 231984)
+++ id_resolver.conf 2015-02-25 23:10:46 UTC (rev 231985)
@@ -1,2 +1,9 @@
+#
+# nfsidmap(5) - The NFS idmapper upcall program
+# Summary: Used by NFSv4 to map user/group ids into
+# user/group names and names into in ids
+# Options:
+# -v Increases the verbosity of the output to syslog
+# -t timeout Set the expiration timer, in seconds, on the key
+#
create id_resolver * * /usr/bin/nfsidmap %k %d
-
Deleted: idmapd.conf
===================================================================
--- idmapd.conf 2015-02-25 20:44:29 UTC (rev 231984)
+++ idmapd.conf 2015-02-25 23:10:46 UTC (rev 231985)
@@ -1,14 +0,0 @@
-[General]
-
-Verbosity = 0
-Pipefs-Directory = /var/lib/nfs/rpc_pipefs
-Domain = localdomain
-
-[Mapping]
-
-Nobody-User = nobody
-Nobody-Group = nobody
-
-[Translation]
-
-Method = nsswitch
Deleted: nfs-utils-1.1.4-mtab-sym.patch
===================================================================
--- nfs-utils-1.1.4-mtab-sym.patch 2015-02-25 20:44:29 UTC (rev 231984)
+++ nfs-utils-1.1.4-mtab-sym.patch 2015-02-25 23:10:46 UTC (rev 231985)
@@ -1,39 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- return var_mtab_does_not_exist;
- }
-
--static int
-+int
- mtab_is_a_symlink(void) {
- get_mtab_info();
- return var_mtab_is_a_symlink;
---- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
-
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
---- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
- int flags;
- mntFILE *mfp;
-
-+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+ that would create a file /proc/mounts in case the proc filesystem
-+ is not mounted, and the fchmod below would also fail. */
-+ if (mtab_is_a_symlink()) {
-+ return EX_SUCCESS;
-+ }
-+
- lock_mtab();
-
- mfp = nfs_setmntent (MOUNTED, "a+");
Deleted: nfs-utils-1.2.1-statd-bg.patch
===================================================================
--- nfs-utils-1.2.1-statd-bg.patch 2015-02-25 20:44:29 UTC (rev 231984)
+++ nfs-utils-1.2.1-statd-bg.patch 2015-02-25 23:10:46 UTC (rev 231985)
@@ -1,25 +0,0 @@
-commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50
-Author: Chris Mayo <[email protected]>
-Date: Sun Feb 1 12:03:46 2015 -0500
-
- statd: Fix test for foreground mode
-
- daemon_init parameter has the opposite sense
- to code removed in commit 7addf9d
-
- Signed-off-by: Chris Mayo <[email protected]>
- Signed-off-by: Steve Dickson <[email protected]>
-
-diff --git a/utils/statd/statd.c b/utils/statd/statd.c
-index 60ce6d1..2b7a167 100644
---- a/utils/statd/statd.c
-+++ b/utils/statd/statd.c
-@@ -393,7 +393,7 @@ int main (int argc, char **argv)
- simulator (--argc, ++argv); /* simulator() does exit() */
- #endif
-
-- daemon_init(!(run_mode & MODE_NODAEMON));
-+ daemon_init((run_mode & MODE_NODAEMON));
-
- if (run_mode & MODE_LOG_STDERR) {
- xlog_syslog(0);
Deleted: nfs-utils-1.3.1-rc2.patch
===================================================================
--- nfs-utils-1.3.1-rc2.patch 2015-02-25 20:44:29 UTC (rev 231984)
+++ nfs-utils-1.3.1-rc2.patch 2015-02-25 23:10:46 UTC (rev 231985)
@@ -1,674 +0,0 @@
-diff --git a/support/export/client.c b/support/export/client.c
-index dbf47b9..f85e11c 100644
---- a/support/export/client.c
-+++ b/support/export/client.c
-@@ -482,8 +482,12 @@ add_name(char *old, const char *add)
- else
- cp = cp + strlen(cp);
- }
-- strncpy(new, old, cp-old);
-- new[cp-old] = 0;
-+ if (old) {
-+ strncpy(new, old, cp-old);
-+ new[cp-old] = 0;
-+ } else {
-+ new[0] = 0;
-+ }
- if (cp != old && !*cp)
- strcat(new, ",");
- strcat(new, add);
-diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
-index 341cdbf..b324cd8 100644
---- a/tools/nfs-iostat/nfs-iostat.py
-+++ b/tools/nfs-iostat/nfs-iostat.py
-@@ -243,27 +243,15 @@ class DeviceData:
- """Print attribute cache efficiency stats
- """
- nfs_stats = self.__nfs_data
-- getattr_stats = self.__rpc_data['GETATTR']
--
-- if nfs_stats['inoderevalidates'] != 0:
-- getattr_ops = float(getattr_stats[1])
-- opens = float(nfs_stats['vfsopen'])
-- revalidates = float(nfs_stats['inoderevalidates']) - opens
-- if revalidates != 0:
-- ratio = ((revalidates - getattr_ops) * 100) / revalidates
-- else:
-- ratio = 0.0
--
-- data_invalidates = float(nfs_stats['datainvalidates'])
-- attr_invalidates = float(nfs_stats['attrinvalidates'])
-
-- print()
-- print('%d inode revalidations, hitting in cache %4.2f%% of the
time' % \
-- (revalidates, ratio))
-- print('%d open operations (mandatory GETATTR requests)' % opens)
-- if getattr_ops != 0:
-- print('%4.2f%% of GETATTRs resulted in data cache
invalidations' % \
-- ((data_invalidates * 100) / getattr_ops))
-+ print()
-+ print('%d VFS opens' % (nfs_stats['vfsopen']))
-+ print('%d inoderevalidates (forced GETATTRs)' % \
-+ (nfs_stats['inoderevalidates']))
-+ print('%d page cache invalidations' % \
-+ (nfs_stats['datainvalidates']))
-+ print('%d attribute cache invalidations' % \
-+ (nfs_stats['attrinvalidates']))
-
- def __print_dir_cache_stats(self, sample_time):
- """Print directory stats
-@@ -353,15 +341,21 @@ class DeviceData:
- exe_per_op = 0.0
-
- op += ':'
-- print('%s' % op.lower().ljust(15), end='')
-- print(' ops/s\t\t kB/s\t\t kB/op\t\tretrans\t\tavg RTT (ms)\tavg
exe (ms)')
--
-- print('\t\t%7.3f' % (ops / sample_time), end='')
-- print('\t%7.3f' % (kilobytes / sample_time), end='')
-- print('\t%7.3f' % kb_per_op, end='')
-- print(' %7d (%3.1f%%)' % (retrans, retrans_percent), end='')
-- print('\t%7.3f' % rtt_per_op, end='')
-- print('\t%7.3f' % exe_per_op)
-+ print(format(op.lower(), '<16s'), end='')
-+ print(format('ops/s', '>8s'), end='')
-+ print(format('kB/s', '>16s'), end='')
-+ print(format('kB/op', '>16s'), end='')
-+ print(format('retrans', '>16s'), end='')
-+ print(format('avg RTT (ms)', '>16s'), end='')
-+ print(format('avg exe (ms)', '>16s'))
-+
-+ print(format((ops / sample_time), '>24.3f'), end='')
-+ print(format((kilobytes / sample_time), '>16.3f'), end='')
-+ print(format(kb_per_op, '>16.3f'), end='')
-+ retransmits = '{0:>10.0f} ({1:>3.1f}%)'.format(retrans,
retrans_percent).strip()
-+ print(format(retransmits, '>16'), end='')
-+ print(format(rtt_per_op, '>16.3f'), end='')
-+ print(format(exe_per_op, '>16.3f'))
-
- def ops(self, sample_time):
- sends = float(self.__rpc_data['rpcsends'])
-@@ -391,9 +385,10 @@ class DeviceData:
- (self.__nfs_data['export'], self.__nfs_data['mountpoint']))
- print()
-
-- print(' op/s\t\trpc bklog')
-- print('%7.2f' % (sends / sample_time), end='')
-- print('\t%7.2f' % backlog)
-+ print(format('ops/s', '>16') + format('rpc bklog', '>16'))
-+ print(format((sends / sample_time), '>16.3f'), end='')
-+ print(format(backlog, '>16.3f'))
-+ print()
-
- if which == 0:
- self.__print_rpc_op_stats('READ', sample_time)
-diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
-index a9a3e42..af59791 100644
---- a/utils/gssd/Makefile.am
-+++ b/utils/gssd/Makefile.am
-@@ -18,11 +18,13 @@ COMMON_SRCS = \
- context_lucid.c \
- gss_util.c \
- gss_oids.c \
-+ gss_names.c \
- err_util.c \
- \
- context.h \
- err_util.h \
- gss_oids.h \
-+ gss_names.h \
- gss_util.h
-
- gssd_SOURCES = \
-diff --git a/utils/gssd/gss_names.c b/utils/gssd/gss_names.c
-new file mode 100644
-index 0000000..047069d
---- /dev/null
-+++ b/utils/gssd/gss_names.c
-@@ -0,0 +1,138 @@
-+/*
-+ Copyright (c) 2000 The Regents of the University of Michigan.
-+ All rights reserved.
-+
-+ Copyright (c) 2002 Bruce Fields <[email protected]>
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+
-+ 1. Redistributions of source code must retain the above copyright
-+ notice, this list of conditions and the following disclaimer.
-+ 2. Redistributions in binary form must reproduce the above copyright
-+ notice, this list of conditions and the following disclaimer in the
-+ documentation and/or other materials provided with the distribution.
-+ 3. Neither the name of the University nor the names of its
-+ contributors may be used to endorse or promote products derived
-+ from this software without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
-+#include <sys/param.h>
-+#include <sys/stat.h>
-+#include <rpc/rpc.h>
-+
-+#include <pwd.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+#include <nfsidmap.h>
-+#include <nfslib.h>
-+#include <time.h>
-+
-+#include "svcgssd.h"
-+#include "gss_util.h"
-+#include "err_util.h"
-+#include "context.h"
-+#include "misc.h"
-+#include "gss_oids.h"
-+#include "svcgssd_krb5.h"
-+
-+static int
-+get_krb5_hostbased_name(gss_buffer_desc *name, char **hostbased_name)
-+{
-+ char *p, *sname = NULL;
-+ if (strchr(name->value, '@') && strchr(name->value, '/')) {
-+ if ((sname = calloc(name->length, 1)) == NULL) {
-+ printerr(0, "ERROR: get_krb5_hostbased_name failed "
-+ "to allocate %d bytes\n", name->length);
-+ return -1;
-+ }
-+ /* read in name and instance and replace '/' with '@' */
-+ sscanf(name->value, "%[^@]", sname);
-+ p = strrchr(sname, '/');
-+ if (p == NULL) { /* The '@' preceeded the '/' */
-+ free(sname);
-+ return -1;
-+ }
-+ *p = '@';
-+ }
-+ *hostbased_name = sname;
-+ return 0;
-+}
-+
-+int
-+get_hostbased_client_name(gss_name_t client_name, gss_OID mech,
-+ char **hostbased_name)
-+{
-+ u_int32_t maj_stat, min_stat;
-+ gss_buffer_desc name;
-+ gss_OID name_type = GSS_C_NO_OID;
-+ char *cname;
-+ int res = -1;
-+
-+ *hostbased_name = NULL; /* preset in case we fail */
-+
-+ /* Get the client's gss authenticated name */
-+ maj_stat = gss_display_name(&min_stat, client_name, &name, &name_type);
-+ if (maj_stat != GSS_S_COMPLETE) {
-+ pgsserr("get_hostbased_client_name: gss_display_name",
-+ maj_stat, min_stat, mech);
-+ goto out_err;
-+ }
-+ if (name.length >= 0xffff) { /* don't overflow */
-+ printerr(0, "ERROR: get_hostbased_client_name: "
-+ "received gss_name is too long (%d bytes)\n",
-+ name.length);
-+ goto out_rel_buf;
-+ }
-+
-+ /* For Kerberos, transform the NT_KRB5_PRINCIPAL name to
-+ * an NT_HOSTBASED_SERVICE name */
-+ if (g_OID_equal(&krb5oid, mech)) {
-+ if (get_krb5_hostbased_name(&name, &cname) == 0)
-+ *hostbased_name = cname;
-+ } else {
-+ printerr(1, "WARNING: unknown/unsupport mech OID\n");
-+ }
-+
-+ res = 0;
-+out_rel_buf:
-+ gss_release_buffer(&min_stat, &name);
-+out_err:
-+ return res;
-+}
-+
-+void
-+get_hostbased_client_buffer(gss_name_t client_name, gss_OID mech,
-+ gss_buffer_t buf)
-+{
-+ char *hname;
-+
-+ if (!get_hostbased_client_name(client_name, mech, &hname)) {
-+ buf->length = strlen(hname) + 1;
-+ buf->value = hname;
-+ } else {
-+ buf->length = 0;
-+ buf->value = NULL;
-+ }
-+}
-diff --git a/utils/gssd/gss_names.h b/utils/gssd/gss_names.h
-new file mode 100644
-index 0000000..ce182f7
---- /dev/null
-+++ b/utils/gssd/gss_names.h
-@@ -0,0 +1,36 @@
-+/*
-+ Copyright (c) 2000 The Regents of the University of Michigan.
-+ All rights reserved.
-+
-+ Copyright (c) 2002 Bruce Fields <[email protected]>
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+
-+ 1. Redistributions of source code must retain the above copyright
-+ notice, this list of conditions and the following disclaimer.
-+ 2. Redistributions in binary form must reproduce the above copyright
-+ notice, this list of conditions and the following disclaimer in the
-+ documentation and/or other materials provided with the distribution.
-+ 3. Neither the name of the University nor the names of its
-+ contributors may be used to endorse or promote products derived
-+ from this software without specific prior written permission.
-+
-+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+extern int get_hostbased_client_name(gss_name_t client_name, gss_OID mech,
-+ char **hostbased_name);
-+extern void get_hostbased_client_buffer(gss_name_t client_name,
-+ gss_OID mech, gss_buffer_t buf);
-diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
-index 33cfeb2..40ff188 100644
---- a/utils/gssd/gssd_proc.c
-+++ b/utils/gssd/gssd_proc.c
-@@ -77,6 +77,7 @@
- #include "context.h"
- #include "nfsrpc.h"
- #include "nfslib.h"
-+#include "gss_names.h"
-
- /*
- * pollarray:
-@@ -681,19 +682,25 @@ parse_enctypes(char *enctypes)
- return 0;
- }
-
--static int
-+static void
- do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
-- gss_buffer_desc *context_token, OM_uint32 lifetime_rec)
-+ gss_buffer_desc *context_token, OM_uint32 lifetime_rec,
-+ gss_buffer_desc *acceptor)
- {
- char *buf = NULL, *p = NULL, *end = NULL;
- unsigned int timeout = context_timeout;
- unsigned int buf_size = 0;
-
-- printerr(1, "doing downcall lifetime_rec %u\n", lifetime_rec);
-+ printerr(1, "doing downcall: lifetime_rec=%u acceptor=%.*s\n",
-+ lifetime_rec, acceptor->length, acceptor->value);
- buf_size = sizeof(uid) + sizeof(timeout) + sizeof(pd->pd_seq_win) +
- sizeof(pd->pd_ctx_hndl.length) + pd->pd_ctx_hndl.length +
-- sizeof(context_token->length) + context_token->length;
-+ sizeof(context_token->length) + context_token->length +
-+ sizeof(acceptor->length) + acceptor->length;
- p = buf = malloc(buf_size);
-+ if (!buf)
-+ goto out_err;
-+
- end = buf + buf_size;
-
- /* context_timeout set by -t option overrides context lifetime */
-@@ -704,14 +711,15 @@ do_downcall(int k5_fd, uid_t uid, struct
authgss_private_data *pd,
- if (WRITE_BYTES(&p, end, pd->pd_seq_win)) goto out_err;
- if (write_buffer(&p, end, &pd->pd_ctx_hndl)) goto out_err;
- if (write_buffer(&p, end, context_token)) goto out_err;
-+ if (write_buffer(&p, end, acceptor)) goto out_err;
-
- if (write(k5_fd, buf, p - buf) < p - buf) goto out_err;
-- if (buf) free(buf);
-- return 0;
-+ free(buf);
-+ return;
- out_err:
-- if (buf) free(buf);
-+ free(buf);
- printerr(1, "Failed to write downcall!\n");
-- return -1;
-+ return;
- }
-
- static int
-@@ -1031,6 +1039,9 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid,
int fd, char *tgtname,
- gss_cred_id_t gss_cred;
- OM_uint32 maj_stat, min_stat, lifetime_rec;
- pid_t pid;
-+ gss_name_t gacceptor = GSS_C_NO_NAME;
-+ gss_OID mech;
-+ gss_buffer_desc acceptor = {0};
-
- pid = fork();
- switch(pid) {
-@@ -1171,15 +1182,24 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid,
int fd, char *tgtname,
- goto out_return_error;
- }
-
-- /* Grab the context lifetime to pass to the kernel. lifetime_rec
-- * is set to zero on error */
-- maj_stat = gss_inquire_context(&min_stat, pd.pd_ctx, NULL, NULL,
-- &lifetime_rec, NULL, NULL, NULL, NULL);
-+ /* Grab the context lifetime and acceptor name out of the ctx. */
-+ maj_stat = gss_inquire_context(&min_stat, pd.pd_ctx, NULL, &gacceptor,
-+ &lifetime_rec, &mech, NULL, NULL, NULL);
-
-- if (maj_stat)
-- printerr(1, "WARNING: Failed to inquire context for lifetme "
-- "maj_stat %u\n", maj_stat);
-+ if (maj_stat != GSS_S_COMPLETE) {
-+ printerr(1, "WARNING: Failed to inquire context "
-+ "maj_stat (0x%x)\n", maj_stat);
-+ lifetime_rec = 0;
-+ } else {
-+ get_hostbased_client_buffer(gacceptor, mech, &acceptor);
-+ gss_release_name(&min_stat, &gacceptor);
-+ }
-
-+ /*
-+ * The serialization can mean turning pd.pd_ctx into a lucid context. If
-+ * that happens then the pd.pd_ctx will be unusable, so we must never
-+ * try to use it after this point.
-+ */
- if (serialize_context_for_kernel(&pd.pd_ctx, &token, &krb5oid, NULL)) {
- printerr(0, "WARNING: Failed to serialize krb5 context for "
- "user with uid %d for server %s\n",
-@@ -1187,9 +1207,10 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid,
int fd, char *tgtname,
- goto out_return_error;
- }
-
-- do_downcall(fd, uid, &pd, &token, lifetime_rec);
-+ do_downcall(fd, uid, &pd, &token, lifetime_rec, &acceptor);
-
- out:
-+ gss_release_buffer(&min_stat, &acceptor);
- if (token.value)
- free(token.value);
- #ifdef HAVE_AUTHGSS_FREE_PRIVATE_DATA
-diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
-index 3757d51..5bdb438 100644
---- a/utils/gssd/svcgssd_proc.c
-+++ b/utils/gssd/svcgssd_proc.c
-@@ -59,6 +59,7 @@
- #include "misc.h"
- #include "gss_oids.h"
- #include "svcgssd_krb5.h"
-+#include "gss_names.h"
-
- extern char * mech2file(gss_OID mech);
- #define SVCGSSD_CONTEXT_CHANNEL "/proc/net/rpc/auth.rpcsec.context/channel"
-@@ -315,71 +316,6 @@ print_hexl(const char *description, unsigned char *cp,
int length)
- }
- #endif
-
--static int
--get_krb5_hostbased_name (gss_buffer_desc *name, char **hostbased_name)
--{
-- char *p, *sname = NULL;
-- if (strchr(name->value, '@') && strchr(name->value, '/')) {
-- if ((sname = calloc(name->length, 1)) == NULL) {
-- printerr(0, "ERROR: get_krb5_hostbased_name failed "
-- "to allocate %d bytes\n", name->length);
-- return -1;
-- }
-- /* read in name and instance and replace '/' with '@' */
-- sscanf(name->value, "%[^@]", sname);
-- p = strrchr(sname, '/');
-- if (p == NULL) { /* The '@' preceeded the '/' */
-- free(sname);
-- return -1;
-- }
-- *p = '@';
-- }
-- *hostbased_name = sname;
-- return 0;
--}
--
--static int
--get_hostbased_client_name(gss_name_t client_name, gss_OID mech,
-- char **hostbased_name)
--{
-- u_int32_t maj_stat, min_stat;
-- gss_buffer_desc name;
-- gss_OID name_type = GSS_C_NO_OID;
-- char *cname;
-- int res = -1;
--
-- *hostbased_name = NULL; /* preset in case we fail */
--
-- /* Get the client's gss authenticated name */
-- maj_stat = gss_display_name(&min_stat, client_name, &name, &name_type);
-- if (maj_stat != GSS_S_COMPLETE) {
-- pgsserr("get_hostbased_client_name: gss_display_name",
-- maj_stat, min_stat, mech);
-- goto out_err;
-- }
-- if (name.length >= 0xffff) { /* don't overflow */
-- printerr(0, "ERROR: get_hostbased_client_name: "
-- "received gss_name is too long (%d bytes)\n",
-- name.length);
-- goto out_rel_buf;
-- }
--
-- /* For Kerberos, transform the NT_KRB5_PRINCIPAL name to
-- * an NT_HOSTBASED_SERVICE name */
-- if (g_OID_equal(&krb5oid, mech)) {
-- if (get_krb5_hostbased_name(&name, &cname) == 0)
-- *hostbased_name = cname;
-- } else {
-- printerr(1, "WARNING: unknown/unsupport mech OID\n");
-- }
--
-- res = 0;
--out_rel_buf:
-- gss_release_buffer(&min_stat, &name);
--out_err:
-- return res;
--}
--
- void
- handle_nullreq(FILE *f) {
- /* XXX initialize to a random integer to reduce chances of unnecessary
-diff --git a/utils/mount/error.c b/utils/mount/error.c
-index f8fc13f..e06f598 100644
---- a/utils/mount/error.c
-+++ b/utils/mount/error.c
-@@ -215,8 +215,12 @@ void mount_error(const char *spec, const char
*mount_point, int error)
- progname);
- break;
- case ENOTDIR:
-- nfs_error(_("%s: mount point %s is not a directory"),
-- progname, mount_point);
-+ if (spec)
-+ nfs_error(_("%s: mount spec %s or point %s is not a "
-+ "directory"), progname, spec, mount_point);
-+ else
-+ nfs_error(_("%s: mount point %s is not a directory"),
-+ progname, mount_point);
- break;
- case EBUSY:
- nfs_error(_("%s: %s is busy or already mounted"),
-diff --git a/utils/mount/nfsmount.conf b/utils/mount/nfsmount.conf
-index 9b8ff4a..aeb3023 100644
---- a/utils/mount/nfsmount.conf
-+++ b/utils/mount/nfsmount.conf
-@@ -133,3 +133,12 @@
- # RPCGSS security flavors
- # [none, sys, krb5, krb5i, krb5p ]
- # Sec=sys
-+#
-+# Allow Signals to interrupt file operations
-+# Intr=True
-+#
-+# Specifies how the kernel manages its cache of directory
-+# Lookupcache=all|none|pos|positive
-+#
-+# Turn of the caching of that access time
-+# noatime=True
-diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
-index 73d6a92..03e3c81 100644
---- a/utils/nfsd/nfsd.c
-+++ b/utils/nfsd/nfsd.c
-@@ -101,7 +101,7 @@ main(int argc, char **argv)
- int count = NFSD_NPROC, c, i, error = 0, portnum = 0, fd, found_one;
- char *p, *progname, *port, *rdma_port = NULL;
- char **haddr = NULL;
-- unsigned int hcounter = 0;
-+ int hcounter = 0;
- int socket_up = 0;
- unsigned int minorvers = 0;
- unsigned int minorversset = 0;
-diff --git a/utils/nfsdcltrack/Makefile.am b/utils/nfsdcltrack/Makefile.am
-index a860ffb..7524295 100644
---- a/utils/nfsdcltrack/Makefile.am
-+++ b/utils/nfsdcltrack/Makefile.am
-@@ -1,5 +1,9 @@
- ## Process this file with automake to produce Makefile.in
-
-+# These binaries go in /sbin (not /usr/sbin), and that cannot be
-+# overridden at config time. The kernel "knows" the /sbin name.
-+sbindir = /sbin
-+
- man8_MANS = nfsdcltrack.man
- EXTRA_DIST = $(man8_MANS)
-
-diff --git a/utils/statd/callback.c b/utils/statd/callback.c
-index d1cc139..bb7c590 100644
---- a/utils/statd/callback.c
-+++ b/utils/statd/callback.c
-@@ -10,11 +10,13 @@
- #include <config.h>
- #endif
-
-+#include <unistd.h>
- #include <netdb.h>
-
- #include "rpcmisc.h"
- #include "statd.h"
- #include "notlist.h"
-+#include "ha-callout.h"
-
- /* Callback notify list. */
- /* notify_list *cbnl = NULL; ... never used */
-@@ -87,6 +89,13 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req
*rqstp)
- xlog(D_CALL, "Received SM_NOTIFY from %s, state: %d",
- argp->mon_name, argp->state);
-
-+ if (!statd_present_address(sap, ip_addr, sizeof(ip_addr))) {
-+ xlog_warn("Unrecognized sender address");
-+ return ((void *) &result);
-+ }
-+
-+ ha_callout("sm-notify", argp->mon_name, ip_addr, argp->state);
-+
- /* quick check - don't bother if we're not monitoring anyone */
- if (rtnl == NULL) {
- xlog_warn("SM_NOTIFY from %s while not monitoring any hosts",
-@@ -94,11 +103,6 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req
*rqstp)
- return ((void *) &result);
- }
-
-- if (!statd_present_address(sap, ip_addr, sizeof(ip_addr))) {
-- xlog_warn("Unrecognized sender address");
-- return ((void *) &result);
-- }
--
- /* okir change: statd doesn't remove the remote host from its
- * internal monitor list when receiving an SM_NOTIFY call from
- * it. Lockd will want to continue monitoring the remote host
-diff --git a/utils/statd/start-statd b/utils/statd/start-statd
-index cde3583..dcdaf77 100644
---- a/utils/statd/start-statd
-+++ b/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="/sbin:/usr/sbin:/bin:/usr/bin"
-+if systemctl start rpc-statd.service
- then :
- else
- exec rpc.statd --no-notify
-diff --git a/utils/statd/statd.man b/utils/statd/statd.man
-index 896c2f8..1e5520c 100644
---- a/utils/statd/statd.man
-+++ b/utils/statd/statd.man
-@@ -346,7 +346,8 @@ points due to inactivity.
- .SS High-availability callouts
- .B rpc.statd
- can exec a special callout program during processing of
--successful SM_MON, SM_UNMON, and SM_UNMON_ALL requests.
-+successful SM_MON, SM_UNMON, and SM_UNMON_ALL requests,
-+or when it receives SM_NOTIFY.
- Such a program may be used in High Availability NFS (HA-NFS)
- environments to track lock state that may need to be migrated after
- a system reboot.
-@@ -357,15 +358,26 @@ option.
- The program is run with 3 arguments:
- The first is either
- .B add-client
--or
- .B del-client
-+or
-+.B sm-notify
- depending on the reason for the callout.
- The second is the
- .I mon_name
- of the monitored peer.
- The third is the
--.I caller_name
--of the requesting lock manager.
-+.I caller_name
-+of the requesting lock manager for
-+.B add-client
-+or
-+.B del-client
-+, otherwise it is
-+.I IP_address
-+of the caller sending SM_NOTIFY.
-+The forth is the
-+.I state_value
-+in the SM_NOTIFY request.
-+
- .SS IPv6 and TI-RPC support
- TI-RPC is a pre-requisite for supporting NFS on IPv6.
- If TI-RPC support is built into
Copied: nfs-utils/trunk/nfs-utils-1.3.2-statd-bg.patch (from rev 231983,
nfs-utils/trunk/nfs-utils-1.2.1-statd-bg.patch)
===================================================================
--- nfs-utils-1.3.2-statd-bg.patch (rev 0)
+++ nfs-utils-1.3.2-statd-bg.patch 2015-02-25 23:10:46 UTC (rev 231985)
@@ -0,0 +1,25 @@
+commit 17a3e5bffb7110d46de1bf42b64b90713ff5ea50
+Author: Chris Mayo <[email protected]>
+Date: Sun Feb 1 12:03:46 2015 -0500
+
+ statd: Fix test for foreground mode
+
+ daemon_init parameter has the opposite sense
+ to code removed in commit 7addf9d
+
+ Signed-off-by: Chris Mayo <[email protected]>
+ Signed-off-by: Steve Dickson <[email protected]>
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ simulator (--argc, ++argv); /* simulator() does exit() */
+ #endif
+
+- daemon_init(!(run_mode & MODE_NODAEMON));
++ daemon_init((run_mode & MODE_NODAEMON));
+
+ if (run_mode & MODE_LOG_STDERR) {
+ xlog_syslog(0);
Modified: nfs-utils.install
===================================================================
--- nfs-utils.install 2015-02-25 20:44:29 UTC (rev 231984)
+++ nfs-utils.install 2015-02-25 23:10:46 UTC (rev 231985)
@@ -1,4 +1,3 @@
-## arg 1: the new package version
post_install() {
cat << 'EOM'
==> PLEASE NOTE:
@@ -6,13 +5,10 @@
==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf
==>
==> Please refer to http://wiki.archlinux.org/index.php/NFS
- ==> for further information on NFS4; for NFSv3, refer to
- ==> http://wiki.archlinux.org/index.php/NFSv3
+ ==> for further information.
EOM
}
-## arg 1: the new package version
-## arg 2: the old package version
post_upgrade() {
if [ "$(vercmp $2 1.3.0-3)" -lt 0 ]; then
cat << 'EOM'
