summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-10-06 23:14:37 +0000
committerroot <root@rshg054.dnsready.net>2011-10-06 23:14:37 +0000
commit5442e9b8f357932ed5d6cb46e90fcbf6f453469f (patch)
treee2393e2f381e2e539810e51c34e56c8f687c153c /core
parent068f1f30c0bba25b6b88cefbe982a72535fa1951 (diff)
Thu Oct 6 23:14:37 UTC 2011
Diffstat (limited to 'core')
-rw-r--r--core/nfs-utils/PKGBUILD22
-rw-r--r--core/nfs-utils/start-statd.patch4
2 files changed, 12 insertions, 14 deletions
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 1bb34eb31..cdcbf3e86 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136623 2011-08-31 07:26:31Z tpowa $
+# $Id: PKGBUILD 139845 2011-10-05 07:58:34Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,14 +6,14 @@
# Contributor: Marco Lima <cipparello gmail com>
pkgname=nfs-utils
-pkgver=1.2.4
-pkgrel=3
+pkgver=1.2.5
+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} 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')
+depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
makedepends=('pkgconfig' 'autoconf' 'automake')
source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
nfs-common
@@ -24,31 +24,29 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
idmapd.conf
start-statd.patch
nfs-utils-1.1.4-mtab-sym.patch
- nfs-utils-1.1.4-no-exec.patch
- kernel-3.0-segfault.patch)
+ nfs-utils-1.1.4-no-exec.patch)
install=nfs-utils.install
-md5sums=('938dc0574f3eb9891a8ed4746f806277'
+md5sums=('8395ac770720b83c5c469f88306d7765'
'dd0d65fc6e8f422fa12520813098264b'
'f73f197a16b02c3e248488ec35c4cf43'
'e619f18354ff958ed624d05d08853d8f'
'2bf71def3263325643a09458635520f0'
'ff585faf410a62c4333a027c50b56bae'
'eb4f4027fab6fc1201f1ca04f5954c76'
- 'e24f81a8c8657672e262c61235d34b4a'
+ 'e9144277a89a620d9bc80413158a7d27'
'7674106eaaa4c149bccd4f05fe3604e9'
- '4f4827dfc93008dfadd0a530ad0872b2'
- 'ab92e67f3d0ee2935faab9cdabef8003')
+ '4f4827dfc93008dfadd0a530ad0872b2')
build() {
cd $srcdir/${pkgname}-${pkgver}
patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
#patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
- patch -Np1 -i ../kernel-3.0-segfault.patch
# arch specific patch
patch -Np0 -i $srcdir/start-statd.patch
./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
- --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc
+ --without-tcp-wrappers --with-statedir=/var/lib/nfs \
+ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount
make
}
diff --git a/core/nfs-utils/start-statd.patch b/core/nfs-utils/start-statd.patch
index 38c60a784..5d73b6e35 100644
--- a/core/nfs-utils/start-statd.patch
+++ b/core/nfs-utils/start-statd.patch
@@ -1,7 +1,7 @@
--- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100
+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100
@@ -1,9 +1,16 @@
--#!/bin/sh -p
+-#!/bin/bash -p
+#!/bin/sh
+
+# Original script provided by the NFS project
@@ -10,7 +10,7 @@
# nfsmount calls this script when mounting a filesystem with locking
# enabled, but when statd does not seem to be running (based on
# /var/run/rpc.statd.pid).
- # It should run run statd with whatever flags are apropriate for this
+ # It should run statd with whatever flags are apropriate for this
# site.
-PATH=/sbin:/usr/sbin
-exec rpc.statd --no-notify