[arch-commits] Commit in nfs-utils/repos (44 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Wed Nov 13 11:13:39 UTC 2013
Date: Wednesday, November 13, 2013 @ 12:13:38
Author: tpowa
Revision: 199472
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nfs-utils/repos/testing-i686/
nfs-utils/repos/testing-i686/PKGBUILD
(from rev 199471, nfs-utils/trunk/PKGBUILD)
nfs-utils/repos/testing-i686/blkmapd.service
(from rev 199471, nfs-utils/trunk/blkmapd.service)
nfs-utils/repos/testing-i686/exports
(from rev 199471, nfs-utils/trunk/exports)
nfs-utils/repos/testing-i686/id_resolver.conf
(from rev 199471, nfs-utils/trunk/id_resolver.conf)
nfs-utils/repos/testing-i686/idmapd.conf
(from rev 199471, nfs-utils/trunk/idmapd.conf)
nfs-utils/repos/testing-i686/nfs
(from rev 199471, nfs-utils/trunk/nfs)
nfs-utils/repos/testing-i686/nfs-common.conf
(from rev 199471, nfs-utils/trunk/nfs-common.conf)
nfs-utils/repos/testing-i686/nfs-server.conf
(from rev 199471, nfs-utils/trunk/nfs-server.conf)
nfs-utils/repos/testing-i686/nfs-utils-1.1.4-mtab-sym.patch
(from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-mtab-sym.patch)
nfs-utils/repos/testing-i686/nfs-utils-1.1.4-no-exec.patch
(from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-no-exec.patch)
nfs-utils/repos/testing-i686/nfs-utils.conf
(from rev 199471, nfs-utils/trunk/nfs-utils.conf)
nfs-utils/repos/testing-i686/nfs-utils.install
(from rev 199471, nfs-utils/trunk/nfs-utils.install)
nfs-utils/repos/testing-i686/nfsd.service
(from rev 199471, nfs-utils/trunk/nfsd.service)
nfs-utils/repos/testing-i686/proc-fs-nfsd.mount
(from rev 199471, nfs-utils/trunk/proc-fs-nfsd.mount)
nfs-utils/repos/testing-i686/rpc-gssd.service
(from rev 199471, nfs-utils/trunk/rpc-gssd.service)
nfs-utils/repos/testing-i686/rpc-idmapd.service
(from rev 199471, nfs-utils/trunk/rpc-idmapd.service)
nfs-utils/repos/testing-i686/rpc-mountd.service
(from rev 199471, nfs-utils/trunk/rpc-mountd.service)
nfs-utils/repos/testing-i686/rpc-statd.service
(from rev 199471, nfs-utils/trunk/rpc-statd.service)
nfs-utils/repos/testing-i686/rpc-svcgssd.service
(from rev 199471, nfs-utils/trunk/rpc-svcgssd.service)
nfs-utils/repos/testing-i686/start-statd.patch
(from rev 199471, nfs-utils/trunk/start-statd.patch)
nfs-utils/repos/testing-i686/var-lib-nfs-rpc_pipefs.mount
(from rev 199471, nfs-utils/trunk/var-lib-nfs-rpc_pipefs.mount)
nfs-utils/repos/testing-x86_64/
nfs-utils/repos/testing-x86_64/PKGBUILD
(from rev 199471, nfs-utils/trunk/PKGBUILD)
nfs-utils/repos/testing-x86_64/blkmapd.service
(from rev 199471, nfs-utils/trunk/blkmapd.service)
nfs-utils/repos/testing-x86_64/exports
(from rev 199471, nfs-utils/trunk/exports)
nfs-utils/repos/testing-x86_64/id_resolver.conf
(from rev 199471, nfs-utils/trunk/id_resolver.conf)
nfs-utils/repos/testing-x86_64/idmapd.conf
(from rev 199471, nfs-utils/trunk/idmapd.conf)
nfs-utils/repos/testing-x86_64/nfs
(from rev 199471, nfs-utils/trunk/nfs)
nfs-utils/repos/testing-x86_64/nfs-common.conf
(from rev 199471, nfs-utils/trunk/nfs-common.conf)
nfs-utils/repos/testing-x86_64/nfs-server.conf
(from rev 199471, nfs-utils/trunk/nfs-server.conf)
nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch
(from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-mtab-sym.patch)
nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-no-exec.patch
(from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-no-exec.patch)
nfs-utils/repos/testing-x86_64/nfs-utils.conf
(from rev 199471, nfs-utils/trunk/nfs-utils.conf)
nfs-utils/repos/testing-x86_64/nfs-utils.install
(from rev 199471, nfs-utils/trunk/nfs-utils.install)
nfs-utils/repos/testing-x86_64/nfsd.service
(from rev 199471, nfs-utils/trunk/nfsd.service)
nfs-utils/repos/testing-x86_64/proc-fs-nfsd.mount
(from rev 199471, nfs-utils/trunk/proc-fs-nfsd.mount)
nfs-utils/repos/testing-x86_64/rpc-gssd.service
(from rev 199471, nfs-utils/trunk/rpc-gssd.service)
nfs-utils/repos/testing-x86_64/rpc-idmapd.service
(from rev 199471, nfs-utils/trunk/rpc-idmapd.service)
nfs-utils/repos/testing-x86_64/rpc-mountd.service
(from rev 199471, nfs-utils/trunk/rpc-mountd.service)
nfs-utils/repos/testing-x86_64/rpc-statd.service
(from rev 199471, nfs-utils/trunk/rpc-statd.service)
nfs-utils/repos/testing-x86_64/rpc-svcgssd.service
(from rev 199471, nfs-utils/trunk/rpc-svcgssd.service)
nfs-utils/repos/testing-x86_64/start-statd.patch
(from rev 199471, nfs-utils/trunk/start-statd.patch)
nfs-utils/repos/testing-x86_64/var-lib-nfs-rpc_pipefs.mount
(from rev 199471, nfs-utils/trunk/var-lib-nfs-rpc_pipefs.mount)
-----------------------------------------------+
testing-i686/PKGBUILD | 111 ++++++++++++++++++++++++
testing-i686/blkmapd.service | 11 ++
testing-i686/exports | 15 +++
testing-i686/id_resolver.conf | 1
testing-i686/idmapd.conf | 14 +++
testing-i686/nfs | 40 ++++++++
testing-i686/nfs-common.conf | 40 ++++++++
testing-i686/nfs-server.conf | 29 ++++++
testing-i686/nfs-utils-1.1.4-mtab-sym.patch | 39 ++++++++
testing-i686/nfs-utils-1.1.4-no-exec.patch | 15 +++
testing-i686/nfs-utils.conf | 1
testing-i686/nfs-utils.install | 32 ++++++
testing-i686/nfsd.service | 16 +++
testing-i686/proc-fs-nfsd.mount | 8 +
testing-i686/rpc-gssd.service | 13 ++
testing-i686/rpc-idmapd.service | 13 ++
testing-i686/rpc-mountd.service | 12 ++
testing-i686/rpc-statd.service | 13 ++
testing-i686/rpc-svcgssd.service | 12 ++
testing-i686/start-statd.patch | 10 ++
testing-i686/var-lib-nfs-rpc_pipefs.mount | 7 +
testing-x86_64/PKGBUILD | 111 ++++++++++++++++++++++++
testing-x86_64/blkmapd.service | 11 ++
testing-x86_64/exports | 15 +++
testing-x86_64/id_resolver.conf | 1
testing-x86_64/idmapd.conf | 14 +++
testing-x86_64/nfs | 40 ++++++++
testing-x86_64/nfs-common.conf | 40 ++++++++
testing-x86_64/nfs-server.conf | 29 ++++++
testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch | 39 ++++++++
testing-x86_64/nfs-utils-1.1.4-no-exec.patch | 15 +++
testing-x86_64/nfs-utils.conf | 1
testing-x86_64/nfs-utils.install | 32 ++++++
testing-x86_64/nfsd.service | 16 +++
testing-x86_64/proc-fs-nfsd.mount | 8 +
testing-x86_64/rpc-gssd.service | 13 ++
testing-x86_64/rpc-idmapd.service | 13 ++
testing-x86_64/rpc-mountd.service | 12 ++
testing-x86_64/rpc-statd.service | 13 ++
testing-x86_64/rpc-svcgssd.service | 12 ++
testing-x86_64/start-statd.patch | 10 ++
testing-x86_64/var-lib-nfs-rpc_pipefs.mount | 7 +
42 files changed, 904 insertions(+)
Copied: nfs-utils/repos/testing-i686/PKGBUILD (from rev 199471, nfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
+# Contributor: abelstr <abel at pinklf.eu>
+# Contributor: Marco Lima <cipparello gmail com>
+
+pkgname=nfs-utils
+pkgver=1.2.9
+pkgrel=1
+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' 'libgssglue' 'device-mapper')
+makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite')
+source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+ nfs-common.conf
+ nfs-server.conf
+ exports
+ idmapd.conf
+ nfs
+ nfs-utils-1.1.4-mtab-sym.patch
+ nfs-utils-1.1.4-no-exec.patch
+ rpc-gssd.service
+ rpc-mountd.service
+ rpc-svcgssd.service
+ rpc-idmapd.service
+ rpc-statd.service
+ nfsd.service
+ var-lib-nfs-rpc_pipefs.mount
+ proc-fs-nfsd.mount
+ blkmapd.service
+ nfs-utils.conf
+ id_resolver.conf
+ start-statd.patch)
+install=nfs-utils.install
+optdepends=('sqlite: for nfsdcltrack usage')
+
+md5sums=('18869d16db3f49c053f8c68eba3fe2e0'
+ 'f73f197a16b02c3e248488ec35c4cf43'
+ '9cef69bc686cc5dcac23fbb51450747d'
+ 'ff585faf410a62c4333a027c50b56bae'
+ 'eb4f4027fab6fc1201f1ca04f5954c76'
+ 'f5e7bba09a46c5c5d7007cac6eff9df5'
+ '7674106eaaa4c149bccd4f05fe3604e9'
+ '4f4827dfc93008dfadd0a530ad0872b2'
+ '6aeb4a80b2a5162f5951438474ea22f3'
+ 'ff95ad9275ef774e0a2ea8adfe55ee66'
+ '2e991f0e440b4809e22b6c7689544fc0'
+ '42d0088add3beab0284be1379391382b'
+ '60d82e2d2d19d21ceb72665e54bf913e'
+ '3bcc9901478f4f9ea0a03b67171c13e3'
+ '1cd65909fa0983047f3f06a3ab352401'
+ '8f1b5282795895c9b8ce8430d20cdda6'
+ '8f03e708b230619ffc2a799a48bffb53'
+ '8ac484023d786766d287ccbe878ae4ba'
+ 'bed57f7c3911af695ec7b469248c104a'
+ 'f8bb29c2ca1ce178e6371091a3e1090d')
+
+prepare() {
+ cd $srcdir/${pkgname}-${pkgver}
+ patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
+ # fix /usr/bin in start-statd shell script
+ patch -Np1 -i ../start-statd.patch
+ #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
+}
+
+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 \
+ --with-gssglue \
+ --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
+ make
+}
+
+package() {
+ cd $srcdir/${pkgname}-${pkgver}
+ # fix make install
+ make DESTDIR=$pkgdir install
+
+ # support python2 (FS#25120)
+ sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
+
+ # Configuration
+ install -D -m 644 ../exports "$pkgdir/"etc/exports
+ install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
+ install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
+ install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
+ install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
+ install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
+ # keyutils id_resolver #35463
+ install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf
+ # systemd files
+ for i in ${srcdir}/*.{service,mount}; do
+ install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
+ done
+ install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
+ # directories
+ mkdir "$pkgdir/"etc/exports.d
+ mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs
+ mkdir "$pkgdir/"var/lib/nfs/v4recovery
+}
+
Copied: nfs-utils/repos/testing-i686/blkmapd.service (from rev 199471, nfs-utils/trunk/blkmapd.service)
===================================================================
--- testing-i686/blkmapd.service (rev 0)
+++ testing-i686/blkmapd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,11 @@
+[Unit]
+Description=pNFS block layout mapping daemon
+After=var-lib-nfs-rpc_pipefs.mount nfsd.service
+Requires=var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/blkmapd
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-i686/exports (from rev 199471, nfs-utils/trunk/exports)
===================================================================
--- testing-i686/exports (rev 0)
+++ testing-i686/exports 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,15 @@
+# /etc/exports
+#
+# List of directories exported to NFS clients. See exports(5).
+# Use exportfs -arv to reread.
+#
+# Example for NFSv2 and NFSv3:
+# /srv/home hostname1(rw,sync) hostname2(ro,sync)
+#
+# Example for NFSv4:
+# /srv/nfs4 hostname1(rw,sync,fsid=0)
+# /srv/nfs4/home hostname1(rw,sync,nohide)
+# Using Kerberos and integrity checking:
+# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt)
+# /srv/nfs4/home gss/krb5i(rw,sync,nohide)
+#
Copied: nfs-utils/repos/testing-i686/id_resolver.conf (from rev 199471, nfs-utils/trunk/id_resolver.conf)
===================================================================
--- testing-i686/id_resolver.conf (rev 0)
+++ testing-i686/id_resolver.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1 @@
+create id_resolver * * /usr/bin/nfsidmap %k %d
\ No newline at end of file
Copied: nfs-utils/repos/testing-i686/idmapd.conf (from rev 199471, nfs-utils/trunk/idmapd.conf)
===================================================================
--- testing-i686/idmapd.conf (rev 0)
+++ testing-i686/idmapd.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,14 @@
+[General]
+
+Verbosity = 0
+Pipefs-Directory = /var/lib/nfs/rpc_pipefs
+Domain = localdomain
+
+[Mapping]
+
+Nobody-User = nobody
+Nobody-Group = nobody
+
+[Translation]
+
+Method = nsswitch
Copied: nfs-utils/repos/testing-i686/nfs (from rev 199471, nfs-utils/trunk/nfs)
===================================================================
--- testing-i686/nfs (rev 0)
+++ testing-i686/nfs 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,40 @@
+#
+# Optinal options passed to rquotad
+RPCRQUOTADOPTS=""
+#
+# Optional arguments passed to in-kernel lockd
+#LOCKDARG=
+# TCP port rpc.lockd should listen on.
+#LOCKD_TCPPORT=32803
+# UDP port rpc.lockd should listen on.
+#LOCKD_UDPPORT=32769
+#
+# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
+RPCNFSDARGS=""
+# Number of nfs server processes to be started.
+# The default is 8.
+RPCNFSDCOUNT=8
+# Set V4 grace period in seconds
+#NFSD_V4_GRACE=90
+#
+# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
+RPCMOUNTDOPTS=""
+#
+# Optional arguments passed to rpc.statd. See rpc.statd(8)
+STATDARG=""
+#
+# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
+RPCIDMAPDARGS=""
+#
+# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
+RPCGSSDARGS=""
+#
+# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
+RPCSVCGSSDARGS=""
+#
+# To enable RDMA support on the server by setting this to
+# the port the server should listen on
+#RDMA_PORT=20049
+#
+# Optional arguments passed to blkmapd. See blkmapd(8)
+BLKMAPDARGS=""
Copied: nfs-utils/repos/testing-i686/nfs-common.conf (from rev 199471, nfs-utils/trunk/nfs-common.conf)
===================================================================
--- testing-i686/nfs-common.conf (rev 0)
+++ testing-i686/nfs-common.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,40 @@
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# See rpc.statd(8) for more details.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
+
+# Options to pass to sm-notify
+# e.g. SMNOTIFY_OPTS="-p 32764"
+SMNOTIFY_OPTS=""
+
+# Do you want to start the idmapd daemon? It is only needed for NFSv4.
+NEED_IDMAPD=""
+
+# Options to pass to rpc.idmapd.
+# See rpc.idmapd(8) for more details.
+IDMAPD_OPTS=""
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=""
+
+# Options to pass to rpc.gssd.
+# See rpc.gssd(8) for more details.
+GSSD_OPTS=""
+
+# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
+PIPEFS_MOUNTPOINT=""
+
+# Options used to mount rpc_pipefs filesystem; the default is "defaults".
+PIPEFS_MOUNTOPTS=""
Copied: nfs-utils/repos/testing-i686/nfs-server.conf (from rev 199471, nfs-utils/trunk/nfs-server.conf)
===================================================================
--- testing-i686/nfs-server.conf (rev 0)
+++ testing-i686/nfs-server.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,29 @@
+# Parameters to be passed to nfs-server init script.
+#
+
+# Options to pass to rpc.nfsd.
+# See rpc.nfsd(8) for more details.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option.
+# See rpc.mountd(8) for more details.
+MOUNTD_OPTS=""
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=""
+
+# Options to pass to rpc.svcgssd.
+# See rpc.svcgssd(8) for more details.
+SVCGSSD_OPTS=""
Copied: nfs-utils/repos/testing-i686/nfs-utils-1.1.4-mtab-sym.patch (from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-mtab-sym.patch)
===================================================================
--- testing-i686/nfs-utils-1.1.4-mtab-sym.patch (rev 0)
+++ testing-i686/nfs-utils-1.1.4-mtab-sym.patch 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,39 @@
+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+");
Copied: nfs-utils/repos/testing-i686/nfs-utils-1.1.4-no-exec.patch (from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-no-exec.patch)
===================================================================
--- testing-i686/nfs-utils-1.1.4-no-exec.patch (rev 0)
+++ testing-i686/nfs-utils-1.1.4-no-exec.patch 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,15 @@
+ripped from Debian
+
+--- nfs-utils-1.1.2/utils/mount/mount.c
++++ nfs-utils-1.1.2/utils/mount/mount.c
+@@ -381,10 +381,6 @@
+ mount_error(NULL, mount_point, ENOTDIR);
+ return 1;
+ }
+- if (access(mount_point, X_OK) < 0) {
+- mount_error(NULL, mount_point, errno);
+- return 1;
+- }
+
+ return 0;
+ }
Copied: nfs-utils/repos/testing-i686/nfs-utils.conf (from rev 199471, nfs-utils/trunk/nfs-utils.conf)
===================================================================
--- testing-i686/nfs-utils.conf (rev 0)
+++ testing-i686/nfs-utils.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1 @@
+nfs
Copied: nfs-utils/repos/testing-i686/nfs-utils.install (from rev 199471, nfs-utils/trunk/nfs-utils.install)
===================================================================
--- testing-i686/nfs-utils.install (rev 0)
+++ testing-i686/nfs-utils.install 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,32 @@
+## arg 1: the new package version
+post_install() {
+cat << 'EOM'
+ ==> PLEASE NOTE:
+ ==> Extended configuration options for NFS (clients & server) are available in
+ ==> /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
+EOM
+}
+
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
+cat << 'EOM'
+ ==> IMPORTANT NFS UTILS CHANGES:
+ ==> This is a rather important upgrade, you are going to have to change config files.
+ ==> /etc/rc.conf daemons changes:
+ ==> Change portmap to rpcbind
+ ==> Change nfslock to nfs-common
+ ==> Change nfsd to nfs-server
+ ==>
+ ==> Extended configuration options for NFS (clients & server) are available in:
+ ==> /etc/conf.d/nfs-common
+ ==> /etc/conf.d/nfs-server
+ ==> Please change them to your needs.
+EOM
+ fi
+}
Copied: nfs-utils/repos/testing-i686/nfsd.service (from rev 199471, nfs-utils/trunk/nfsd.service)
===================================================================
--- testing-i686/nfsd.service (rev 0)
+++ testing-i686/nfsd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,16 @@
+[Unit]
+Description=NFS server
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStartPost=/usr/bin/exportfs -a
+ExecStop=/usr/bin/rpc.nfsd 0
+ExecStopPost=/usr/bin/exportfs -a -u
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-i686/proc-fs-nfsd.mount (from rev 199471, nfs-utils/trunk/proc-fs-nfsd.mount)
===================================================================
--- testing-i686/proc-fs-nfsd.mount (rev 0)
+++ testing-i686/proc-fs-nfsd.mount 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPC Pipe File System
+DefaultDependencies=no
+
+[Mount]
+What=sunrpc
+Where=/proc/fs/nfsd
+Type=nfsd
Copied: nfs-utils/repos/testing-i686/rpc-gssd.service (from rev 199471, nfs-utils/trunk/rpc-gssd.service)
===================================================================
--- testing-i686/rpc-gssd.service (rev 0)
+++ testing-i686/rpc-gssd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,13 @@
+[Unit]
+Description=RPC GSS-API client-side daemon
+After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/bin/rpc.gssd $GSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-i686/rpc-idmapd.service (from rev 199471, nfs-utils/trunk/rpc-idmapd.service)
===================================================================
--- testing-i686/rpc-idmapd.service (rev 0)
+++ testing-i686/rpc-idmapd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,13 @@
+[Unit]
+Description=NFSv4 ID-name mapping daemon
+After=var-lib-nfs-rpc_pipefs.mount nfsd.service
+Requires=var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/bin/rpc.idmapd $IDMAPD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-i686/rpc-mountd.service (from rev 199471, nfs-utils/trunk/rpc-mountd.service)
===================================================================
--- testing-i686/rpc-mountd.service (rev 0)
+++ testing-i686/rpc-mountd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFS Mount Daemon
+After=rpcbind.service nfsd.service
+Requires=rpcbind.service nfsd.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/bin/rpc.mountd $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-i686/rpc-statd.service (from rev 199471, nfs-utils/trunk/rpc-statd.service)
===================================================================
--- testing-i686/rpc-statd.service (rev 0)
+++ testing-i686/rpc-statd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,13 @@
+[Unit]
+Description=NFSv2/3 Network Status Monitor Daemon
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/bin/rpc.statd $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-i686/rpc-svcgssd.service (from rev 199471, nfs-utils/trunk/rpc-svcgssd.service)
===================================================================
--- testing-i686/rpc-svcgssd.service (rev 0)
+++ testing-i686/rpc-svcgssd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,12 @@
+[Unit]
+Description=RPC GSS-API server-side daemon
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/bin/rpc.svcgssd $SVCGSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-i686/start-statd.patch (from rev 199471, nfs-utils/trunk/start-statd.patch)
===================================================================
--- testing-i686/start-statd.patch (rev 0)
+++ testing-i686/start-statd.patch 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,10 @@
+--- nfs-utils-1.2.8/utils/statd/start-statd.old 2013-05-23 11:35:10.408221686 +0200
++++ nfs-utils-1.2.8/utils/statd/start-statd 2013-05-23 11:35:22.191356904 +0200
+@@ -4,6 +4,6 @@
+ # /var/run/rpc.statd.pid).
+ # It should run statd with whatever flags are apropriate for this
+ # site.
+-PATH=/sbin:/usr/sbin
++PATH=/sbin:/usr/sbin:/usr/bin
+ exec rpc.statd --no-notify
+
Copied: nfs-utils/repos/testing-i686/var-lib-nfs-rpc_pipefs.mount (from rev 199471, nfs-utils/trunk/var-lib-nfs-rpc_pipefs.mount)
===================================================================
--- testing-i686/var-lib-nfs-rpc_pipefs.mount (rev 0)
+++ testing-i686/var-lib-nfs-rpc_pipefs.mount 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,7 @@
+[Unit]
+Description=RPC pipe filesystem
+
+[Mount]
+What=rpc_pipefs
+Where=/var/lib/nfs/rpc_pipefs
+Type=rpc_pipefs
Copied: nfs-utils/repos/testing-x86_64/PKGBUILD (from rev 199471, nfs-utils/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,111 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
+# Contributor: abelstr <abel at pinklf.eu>
+# Contributor: Marco Lima <cipparello gmail com>
+
+pkgname=nfs-utils
+pkgver=1.2.9
+pkgrel=1
+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' 'libgssglue' 'device-mapper')
+makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite')
+source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+ nfs-common.conf
+ nfs-server.conf
+ exports
+ idmapd.conf
+ nfs
+ nfs-utils-1.1.4-mtab-sym.patch
+ nfs-utils-1.1.4-no-exec.patch
+ rpc-gssd.service
+ rpc-mountd.service
+ rpc-svcgssd.service
+ rpc-idmapd.service
+ rpc-statd.service
+ nfsd.service
+ var-lib-nfs-rpc_pipefs.mount
+ proc-fs-nfsd.mount
+ blkmapd.service
+ nfs-utils.conf
+ id_resolver.conf
+ start-statd.patch)
+install=nfs-utils.install
+optdepends=('sqlite: for nfsdcltrack usage')
+
+md5sums=('18869d16db3f49c053f8c68eba3fe2e0'
+ 'f73f197a16b02c3e248488ec35c4cf43'
+ '9cef69bc686cc5dcac23fbb51450747d'
+ 'ff585faf410a62c4333a027c50b56bae'
+ 'eb4f4027fab6fc1201f1ca04f5954c76'
+ 'f5e7bba09a46c5c5d7007cac6eff9df5'
+ '7674106eaaa4c149bccd4f05fe3604e9'
+ '4f4827dfc93008dfadd0a530ad0872b2'
+ '6aeb4a80b2a5162f5951438474ea22f3'
+ 'ff95ad9275ef774e0a2ea8adfe55ee66'
+ '2e991f0e440b4809e22b6c7689544fc0'
+ '42d0088add3beab0284be1379391382b'
+ '60d82e2d2d19d21ceb72665e54bf913e'
+ '3bcc9901478f4f9ea0a03b67171c13e3'
+ '1cd65909fa0983047f3f06a3ab352401'
+ '8f1b5282795895c9b8ce8430d20cdda6'
+ '8f03e708b230619ffc2a799a48bffb53'
+ '8ac484023d786766d287ccbe878ae4ba'
+ 'bed57f7c3911af695ec7b469248c104a'
+ 'f8bb29c2ca1ce178e6371091a3e1090d')
+
+prepare() {
+ cd $srcdir/${pkgname}-${pkgver}
+ patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
+ # fix /usr/bin in start-statd shell script
+ patch -Np1 -i ../start-statd.patch
+ #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
+}
+
+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 \
+ --with-gssglue \
+ --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
+ make
+}
+
+package() {
+ cd $srcdir/${pkgname}-${pkgver}
+ # fix make install
+ make DESTDIR=$pkgdir install
+
+ # support python2 (FS#25120)
+ sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats}
+
+ # Configuration
+ install -D -m 644 ../exports "$pkgdir/"etc/exports
+ install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
+ install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
+ install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
+ install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
+ install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
+ # keyutils id_resolver #35463
+ install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf
+ # systemd files
+ for i in ${srcdir}/*.{service,mount}; do
+ install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
+ done
+ install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
+ # directories
+ mkdir "$pkgdir/"etc/exports.d
+ mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs
+ mkdir "$pkgdir/"var/lib/nfs/v4recovery
+}
+
Copied: nfs-utils/repos/testing-x86_64/blkmapd.service (from rev 199471, nfs-utils/trunk/blkmapd.service)
===================================================================
--- testing-x86_64/blkmapd.service (rev 0)
+++ testing-x86_64/blkmapd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,11 @@
+[Unit]
+Description=pNFS block layout mapping daemon
+After=var-lib-nfs-rpc_pipefs.mount nfsd.service
+Requires=var-lib-nfs-rpc_pipefs.mount
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/blkmapd
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-x86_64/exports (from rev 199471, nfs-utils/trunk/exports)
===================================================================
--- testing-x86_64/exports (rev 0)
+++ testing-x86_64/exports 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,15 @@
+# /etc/exports
+#
+# List of directories exported to NFS clients. See exports(5).
+# Use exportfs -arv to reread.
+#
+# Example for NFSv2 and NFSv3:
+# /srv/home hostname1(rw,sync) hostname2(ro,sync)
+#
+# Example for NFSv4:
+# /srv/nfs4 hostname1(rw,sync,fsid=0)
+# /srv/nfs4/home hostname1(rw,sync,nohide)
+# Using Kerberos and integrity checking:
+# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt)
+# /srv/nfs4/home gss/krb5i(rw,sync,nohide)
+#
Copied: nfs-utils/repos/testing-x86_64/id_resolver.conf (from rev 199471, nfs-utils/trunk/id_resolver.conf)
===================================================================
--- testing-x86_64/id_resolver.conf (rev 0)
+++ testing-x86_64/id_resolver.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1 @@
+create id_resolver * * /usr/bin/nfsidmap %k %d
\ No newline at end of file
Copied: nfs-utils/repos/testing-x86_64/idmapd.conf (from rev 199471, nfs-utils/trunk/idmapd.conf)
===================================================================
--- testing-x86_64/idmapd.conf (rev 0)
+++ testing-x86_64/idmapd.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,14 @@
+[General]
+
+Verbosity = 0
+Pipefs-Directory = /var/lib/nfs/rpc_pipefs
+Domain = localdomain
+
+[Mapping]
+
+Nobody-User = nobody
+Nobody-Group = nobody
+
+[Translation]
+
+Method = nsswitch
Copied: nfs-utils/repos/testing-x86_64/nfs (from rev 199471, nfs-utils/trunk/nfs)
===================================================================
--- testing-x86_64/nfs (rev 0)
+++ testing-x86_64/nfs 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,40 @@
+#
+# Optinal options passed to rquotad
+RPCRQUOTADOPTS=""
+#
+# Optional arguments passed to in-kernel lockd
+#LOCKDARG=
+# TCP port rpc.lockd should listen on.
+#LOCKD_TCPPORT=32803
+# UDP port rpc.lockd should listen on.
+#LOCKD_UDPPORT=32769
+#
+# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
+RPCNFSDARGS=""
+# Number of nfs server processes to be started.
+# The default is 8.
+RPCNFSDCOUNT=8
+# Set V4 grace period in seconds
+#NFSD_V4_GRACE=90
+#
+# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
+RPCMOUNTDOPTS=""
+#
+# Optional arguments passed to rpc.statd. See rpc.statd(8)
+STATDARG=""
+#
+# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
+RPCIDMAPDARGS=""
+#
+# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
+RPCGSSDARGS=""
+#
+# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
+RPCSVCGSSDARGS=""
+#
+# To enable RDMA support on the server by setting this to
+# the port the server should listen on
+#RDMA_PORT=20049
+#
+# Optional arguments passed to blkmapd. See blkmapd(8)
+BLKMAPDARGS=""
Copied: nfs-utils/repos/testing-x86_64/nfs-common.conf (from rev 199471, nfs-utils/trunk/nfs-common.conf)
===================================================================
--- testing-x86_64/nfs-common.conf (rev 0)
+++ testing-x86_64/nfs-common.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,40 @@
+# Parameters to be passed to nfs-common (nfs clients & server) init script.
+#
+
+# If you do not set values for the NEED_ options, they will be attempted
+# autodetected; this should be sufficient for most people. Valid alternatives
+# for the NEED_ options are "yes" and "no".
+
+# Do you want to start the statd daemon? It is not needed for NFSv4.
+NEED_STATD=""
+
+# Options to pass to rpc.statd.
+# See rpc.statd(8) for more details.
+# N.B. statd normally runs on both client and server, and run-time
+# options should be specified accordingly.
+# STATD_OPTS="-p 32765 -o 32766"
+STATD_OPTS=""
+
+# Options to pass to sm-notify
+# e.g. SMNOTIFY_OPTS="-p 32764"
+SMNOTIFY_OPTS=""
+
+# Do you want to start the idmapd daemon? It is only needed for NFSv4.
+NEED_IDMAPD=""
+
+# Options to pass to rpc.idmapd.
+# See rpc.idmapd(8) for more details.
+IDMAPD_OPTS=""
+
+# Do you want to start the gssd daemon? It is required for Kerberos mounts.
+NEED_GSSD=""
+
+# Options to pass to rpc.gssd.
+# See rpc.gssd(8) for more details.
+GSSD_OPTS=""
+
+# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
+PIPEFS_MOUNTPOINT=""
+
+# Options used to mount rpc_pipefs filesystem; the default is "defaults".
+PIPEFS_MOUNTOPTS=""
Copied: nfs-utils/repos/testing-x86_64/nfs-server.conf (from rev 199471, nfs-utils/trunk/nfs-server.conf)
===================================================================
--- testing-x86_64/nfs-server.conf (rev 0)
+++ testing-x86_64/nfs-server.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,29 @@
+# Parameters to be passed to nfs-server init script.
+#
+
+# Options to pass to rpc.nfsd.
+# See rpc.nfsd(8) for more details.
+NFSD_OPTS=""
+
+# Number of servers to start up; the default is 8 servers.
+NFSD_COUNT=""
+
+# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
+PROCNFSD_MOUNTPOINT=""
+
+# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
+PROCNFSD_MOUNTOPTS=""
+
+# Options for rpc.mountd.
+# If you have a port-based firewall, you might want to set up
+# a fixed port here using the --port option.
+# See rpc.mountd(8) for more details.
+MOUNTD_OPTS=""
+
+# Do you want to start the svcgssd daemon? It is only required for Kerberos
+# exports. Valid alternatives are "yes" and "no"; the default is "no".
+NEED_SVCGSSD=""
+
+# Options to pass to rpc.svcgssd.
+# See rpc.svcgssd(8) for more details.
+SVCGSSD_OPTS=""
Copied: nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch (from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-mtab-sym.patch)
===================================================================
--- testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch (rev 0)
+++ testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,39 @@
+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+");
Copied: nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-no-exec.patch (from rev 199471, nfs-utils/trunk/nfs-utils-1.1.4-no-exec.patch)
===================================================================
--- testing-x86_64/nfs-utils-1.1.4-no-exec.patch (rev 0)
+++ testing-x86_64/nfs-utils-1.1.4-no-exec.patch 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,15 @@
+ripped from Debian
+
+--- nfs-utils-1.1.2/utils/mount/mount.c
++++ nfs-utils-1.1.2/utils/mount/mount.c
+@@ -381,10 +381,6 @@
+ mount_error(NULL, mount_point, ENOTDIR);
+ return 1;
+ }
+- if (access(mount_point, X_OK) < 0) {
+- mount_error(NULL, mount_point, errno);
+- return 1;
+- }
+
+ return 0;
+ }
Copied: nfs-utils/repos/testing-x86_64/nfs-utils.conf (from rev 199471, nfs-utils/trunk/nfs-utils.conf)
===================================================================
--- testing-x86_64/nfs-utils.conf (rev 0)
+++ testing-x86_64/nfs-utils.conf 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1 @@
+nfs
Copied: nfs-utils/repos/testing-x86_64/nfs-utils.install (from rev 199471, nfs-utils/trunk/nfs-utils.install)
===================================================================
--- testing-x86_64/nfs-utils.install (rev 0)
+++ testing-x86_64/nfs-utils.install 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,32 @@
+## arg 1: the new package version
+post_install() {
+cat << 'EOM'
+ ==> PLEASE NOTE:
+ ==> Extended configuration options for NFS (clients & server) are available in
+ ==> /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
+EOM
+}
+
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
+cat << 'EOM'
+ ==> IMPORTANT NFS UTILS CHANGES:
+ ==> This is a rather important upgrade, you are going to have to change config files.
+ ==> /etc/rc.conf daemons changes:
+ ==> Change portmap to rpcbind
+ ==> Change nfslock to nfs-common
+ ==> Change nfsd to nfs-server
+ ==>
+ ==> Extended configuration options for NFS (clients & server) are available in:
+ ==> /etc/conf.d/nfs-common
+ ==> /etc/conf.d/nfs-server
+ ==> Please change them to your needs.
+EOM
+ fi
+}
Copied: nfs-utils/repos/testing-x86_64/nfsd.service (from rev 199471, nfs-utils/trunk/nfsd.service)
===================================================================
--- testing-x86_64/nfsd.service (rev 0)
+++ testing-x86_64/nfsd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,16 @@
+[Unit]
+Description=NFS server
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
+ExecStartPost=/usr/bin/exportfs -a
+ExecStop=/usr/bin/rpc.nfsd 0
+ExecStopPost=/usr/bin/exportfs -a -u
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-x86_64/proc-fs-nfsd.mount (from rev 199471, nfs-utils/trunk/proc-fs-nfsd.mount)
===================================================================
--- testing-x86_64/proc-fs-nfsd.mount (rev 0)
+++ testing-x86_64/proc-fs-nfsd.mount 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,8 @@
+[Unit]
+Description=RPC Pipe File System
+DefaultDependencies=no
+
+[Mount]
+What=sunrpc
+Where=/proc/fs/nfsd
+Type=nfsd
Copied: nfs-utils/repos/testing-x86_64/rpc-gssd.service (from rev 199471, nfs-utils/trunk/rpc-gssd.service)
===================================================================
--- testing-x86_64/rpc-gssd.service (rev 0)
+++ testing-x86_64/rpc-gssd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,13 @@
+[Unit]
+Description=RPC GSS-API client-side daemon
+After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/bin/rpc.gssd $GSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-x86_64/rpc-idmapd.service (from rev 199471, nfs-utils/trunk/rpc-idmapd.service)
===================================================================
--- testing-x86_64/rpc-idmapd.service (rev 0)
+++ testing-x86_64/rpc-idmapd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,13 @@
+[Unit]
+Description=NFSv4 ID-name mapping daemon
+After=var-lib-nfs-rpc_pipefs.mount nfsd.service
+Requires=var-lib-nfs-rpc_pipefs.mount
+Before=remote-fs-pre.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/bin/rpc.idmapd $IDMAPD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-x86_64/rpc-mountd.service (from rev 199471, nfs-utils/trunk/rpc-mountd.service)
===================================================================
--- testing-x86_64/rpc-mountd.service (rev 0)
+++ testing-x86_64/rpc-mountd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,12 @@
+[Unit]
+Description=NFS Mount Daemon
+After=rpcbind.service nfsd.service
+Requires=rpcbind.service nfsd.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/bin/rpc.mountd $MOUNTD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-x86_64/rpc-statd.service (from rev 199471, nfs-utils/trunk/rpc-statd.service)
===================================================================
--- testing-x86_64/rpc-statd.service (rev 0)
+++ testing-x86_64/rpc-statd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,13 @@
+[Unit]
+Description=NFSv2/3 Network Status Monitor Daemon
+After=rpcbind.service
+Requires=rpcbind.service
+Before=remote-fs-pre.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-common.conf
+ExecStart=/usr/bin/rpc.statd $STATD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-x86_64/rpc-svcgssd.service (from rev 199471, nfs-utils/trunk/rpc-svcgssd.service)
===================================================================
--- testing-x86_64/rpc-svcgssd.service (rev 0)
+++ testing-x86_64/rpc-svcgssd.service 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,12 @@
+[Unit]
+Description=RPC GSS-API server-side daemon
+After=rpcbind.service
+Requires=rpcbind.service
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/nfs-server.conf
+ExecStart=/usr/bin/rpc.svcgssd $SVCGSSD_OPTS
+
+[Install]
+WantedBy=multi-user.target
Copied: nfs-utils/repos/testing-x86_64/start-statd.patch (from rev 199471, nfs-utils/trunk/start-statd.patch)
===================================================================
--- testing-x86_64/start-statd.patch (rev 0)
+++ testing-x86_64/start-statd.patch 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,10 @@
+--- nfs-utils-1.2.8/utils/statd/start-statd.old 2013-05-23 11:35:10.408221686 +0200
++++ nfs-utils-1.2.8/utils/statd/start-statd 2013-05-23 11:35:22.191356904 +0200
+@@ -4,6 +4,6 @@
+ # /var/run/rpc.statd.pid).
+ # It should run statd with whatever flags are apropriate for this
+ # site.
+-PATH=/sbin:/usr/sbin
++PATH=/sbin:/usr/sbin:/usr/bin
+ exec rpc.statd --no-notify
+
Copied: nfs-utils/repos/testing-x86_64/var-lib-nfs-rpc_pipefs.mount (from rev 199471, nfs-utils/trunk/var-lib-nfs-rpc_pipefs.mount)
===================================================================
--- testing-x86_64/var-lib-nfs-rpc_pipefs.mount (rev 0)
+++ testing-x86_64/var-lib-nfs-rpc_pipefs.mount 2013-11-13 11:13:38 UTC (rev 199472)
@@ -0,0 +1,7 @@
+[Unit]
+Description=RPC pipe filesystem
+
+[Mount]
+What=rpc_pipefs
+Where=/var/lib/nfs/rpc_pipefs
+Type=rpc_pipefs
More information about the arch-commits
mailing list