Date: Saturday, January 14, 2017 @ 15:25:24
Author: andyrtr
Revision: 286363
upgpkg: nfs-utils 2.1.1-1
upstream update 2.1.1
Modified:
nfs-utils/trunk/PKGBUILD
nfs-utils/trunk/nfs-utils.install
Deleted:
nfs-utils/trunk/nfs-utils.conf
nfs-utils/trunk/nfs-utils_env.sh
nfs-utils/trunk/nfs.sysconfig
-------------------+
PKGBUILD | 44 +++++++++++++++---------------------------
nfs-utils.conf | 1
nfs-utils.install | 7 ++++++
nfs-utils_env.sh | 54 ----------------------------------------------------
nfs.sysconfig | 42 ----------------------------------------
5 files changed, 23 insertions(+), 125 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-14 13:45:57 UTC (rev 286362)
+++ PKGBUILD 2017-01-14 15:25:24 UTC (rev 286363)
@@ -7,32 +7,27 @@
# Contributor: Marco Lima <cipparello gmail com>
pkgname=nfs-utils
-pkgver=1.3.4
+pkgver=2.1.1
pkgrel=1
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64')
url='http://nfs.sourceforge.net'
license=('GPL2')
-backup=(etc/{exports,nfsmount.conf} etc/sysconfig/nfs)
+backup=(etc/{exports,nfs.conf,nfsmount.conf})
depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper')
makedepends=('sqlite')
# http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary
-source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{bz2,sign}
+source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign}
id_resolver.conf
- nfs-utils_env.sh
- nfs.sysconfig
- exports
- #nfs-utils.conf
-)
+ exports)
install=nfs-utils.install
optdepends=('sqlite: for nfsdcltrack usage'
'python: for nfsiostat and mountstats usage')
-sha1sums=('f66ce79f6d2de8907e0e2f6b00f96d7486281cc5'
- 'SKIP'
- '24b3c10b47dc120b2d252cf1e5001effa8f76a62'
- '519eaaebecf423dcea156ed6e2c4f722236df0b2'
- 'e9648adc732f47f24da6d71e1729da5a7697e203'
- '170a929d9c0f22edb13b656648cadf372efea841')
+# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
+sha256sums=('0faeb54c70b84e6bd3b9b6901544b1f6add8d246f35c1683e402daf4e0c719ef'
+ 'SKIP'
+ 'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
+ '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
prepare() {
@@ -68,31 +63,24 @@
make DESTDIR="$pkgdir" install
install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf
+ install -D -m 644 nfs.conf "$pkgdir"/etc/nfs.conf
for i in systemd/{*.service,*.mount,*.target}; do
install -D -m 644 $i "$pkgdir"/usr/lib/systemd/system/$(basename $i)
done
-
- cd ..
-
- # distro specific daemon flags - files taken from Fedora ( = upstream
developer)
- install -D -m 755 nfs-utils_env.sh
"$pkgdir"/usr/lib/nfs-utils/nfs-utils_env.sh
- install -D -m 644 nfs.sysconfig "$pkgdir"/etc/sysconfig/nfs
+ install -d -m 644 "$pkgdir"/usr/share/doc/$pkgname
+ install -D -m 644 systemd/README
"$pkgdir"/usr/share/doc/$pkgname/README.systemd
- # fix path - this will be fixed in 1.3.5rc2 and later
- sed -i "s:libexec:lib:" "$pkgdir"/usr/lib/systemd/system/nfs-config.service
+ # docs
+ install -m 644 {NEWS,README} "$pkgdir"/usr/share/doc/$pkgname/
# empty exports file
- install -D -m 644 exports "$pkgdir"/etc/exports
+ install -D -m 644 ../exports "$pkgdir"/etc/exports
# config file for idmappers in newer kernels
- install -D -m 644 id_resolver.conf
"$pkgdir"/etc/request-key.d/id_resolver.conf
+ install -D -m 644 ../id_resolver.conf
"$pkgdir"/etc/request-key.d/id_resolver.conf
- # load kernel module - should be obsolete
-# install -D -m 644 nfs-utils.conf
"$pkgdir"/usr/lib/modules-load.d/nfs-utils.conf
-
mkdir "$pkgdir"/etc/exports.d
mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs
mkdir "$pkgdir"/var/lib/nfs/v4recovery
-
}
Deleted: nfs-utils.conf
===================================================================
--- nfs-utils.conf 2017-01-14 13:45:57 UTC (rev 286362)
+++ nfs-utils.conf 2017-01-14 15:25:24 UTC (rev 286363)
@@ -1 +0,0 @@
-nfs
Modified: nfs-utils.install
===================================================================
--- nfs-utils.install 2017-01-14 13:45:57 UTC (rev 286362)
+++ nfs-utils.install 2017-01-14 15:25:24 UTC (rev 286363)
@@ -18,4 +18,11 @@
==> /etc/conf.d/nfs-{common,server} into /etc/sysconfig/nfs
EOM
fi
+ if [ "$(vercmp $2 2.1.1-1)" -lt 0 ]; then
+cat << 'EOM'
+ ==> Configuration file has been changed again.
+ ==> All the daemon configurations now go through
+ ==> one file, /etc/nfs.conf. See nfs.conf(5).
+EOM
+ fi
}
Deleted: nfs-utils_env.sh
===================================================================
--- nfs-utils_env.sh 2017-01-14 13:45:57 UTC (rev 286362)
+++ nfs-utils_env.sh 2017-01-14 15:25:24 UTC (rev 286363)
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-#
-# Extract configuration from /etc/sysconfig/nfs and write
-# environment variables to /run/sysconfig/nfs-utils to be
-# used by systemd nfs-config service
-#
-
-nfs_config=/etc/sysconfig/nfs
-if test -r $nfs_config; then
- . $nfs_config
-fi
-
-[ -n "$LOCKDARG" ] && /usr/bin/modprobe lockd $LOCKDARG
-if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then
- [ -z "$LOCKDARG" ] && /usr/bin/modprobe lockd $LOCKDARG
- [ -n "$LOCKD_TCPPORT" ] && \
- /usr/bin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
- [ -n "$LOCKD_UDPPORT" ] && \
- /usr/bin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
-fi
-
-if [ -n "$NFSD_V4_GRACE" ]; then
- grace="-G $NFSD_V4_GRACE"
-fi
-
-if [ -n "$NFSD_V4_LEASE" ]; then
- lease="-L $NFSD_V4_LEASE"
-fi
-
-if [ -n "$RPCNFSDCOUNT" ]; then
- nfsds=$RPCNFSDCOUNT
-else
- nfsds=8
-fi
-
-if [ -n "$RPCNFSDARGS" ]; then
- nfsdargs="$RPCNFSDARGS $grace $lease $nfsds"
-else
- nfsdargs="$grace $lease $nfsds"
-fi
-
-mkdir -p /run/sysconfig
-{
-echo RPCNFSDARGS=\"$nfsdargs\"
-echo RPCMOUNTDARGS=\"$RPCMOUNTDOPTS\"
-echo STATDARGS=\"$STATDARG\"
-echo SMNOTIFYARGS=\"$SMNOTIFYARGS\"
-echo RPCIDMAPDARGS=\"$RPCIDMAPDARGS\"
-echo RPCGSSDARGS=\"$RPCGSSDARGS\"
-echo RPCSVCGSSDARGS=\"$RPCSVCGSSDARGS\"
-echo BLKMAPDARGS=\"$BLKMAPDARGS\"
-echo GSS_USE_PROXY=\"$GSS_USE_PROXY\"
-} > /run/sysconfig/nfs-utils
Deleted: nfs.sysconfig
===================================================================
--- nfs.sysconfig 2017-01-14 13:45:57 UTC (rev 286362)
+++ nfs.sysconfig 2017-01-14 15:25:24 UTC (rev 286363)
@@ -1,42 +0,0 @@
-#
-# 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=16
-#
-# Set V4 grace period in seconds
-#NFSD_V4_GRACE=90
-#
-# Set V4 lease period in seconds
-#NFSD_V4_LEASE=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 sm-notify. See sm-notify(8)
-SMNOTIFYARGS=""
-#
-#
-# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
-RPCIDMAPDARGS=""
-#
-# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
-RPCGSSDARGS=""
-# Enable usage of gssproxy. See gssproxy-mech(8).
-GSS_USE_PROXY="yes"
-#
-# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
-RPCSVCGSSDARGS=""
-#
-# Optional arguments passed to blkmapd. See blkmapd(8)
-BLKMAPDARGS=""
