diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-04 10:44:43 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-04 10:44:43 +0200 |
commit | 64552a84f9eb436e191d738ef4ebc552a768048d (patch) | |
tree | 9a16774f362322e8aa58fc2971593ea690149b87 /core/nfs-utils | |
parent | aeb7c621efc55ae3b2761257f0fc307f097efec0 (diff) | |
parent | 5f3b2100b811506bec6bcf63b24d1c605dfe8cb6 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/gnome-nettool/PKGBUILD
Diffstat (limited to 'core/nfs-utils')
-rw-r--r-- | core/nfs-utils/PKGBUILD | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index c40aaf30a..132a2a196 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175118 2013-01-14 07:37:11Z tpowa $ +# $Id: PKGBUILD 184188 2013-05-03 10:22:57Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -6,8 +6,8 @@ # Contributor: Marco Lima <cipparello gmail com> pkgname=nfs-utils -pkgver=1.2.6 -pkgrel=4 +pkgver=1.2.7 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' @@ -16,9 +16,7 @@ backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs- 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 nfs-common.conf - nfs-server nfs-server.conf exports idmapd.conf @@ -37,10 +35,8 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('8be543ca270c2234ff18f8c8d35e0d37' - 'dd0d65fc6e8f422fa12520813098264b' +md5sums=('3b5ca797197765dc0c3a4122720c7716' 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' @@ -59,13 +55,16 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37' '8ffc2ebe932d29efe17d6f3f23d5b975' '8ac484023d786766d287ccbe878ae4ba') -build() { +prepare() { 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 # arch specific patch patch -Np0 -i $srcdir/start-statd.patch +} +build() { + cd $srcdir/${pkgname}-${pkgver} ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ --without-tcp-wrappers --with-statedir=/var/lib/nfs \ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ @@ -83,9 +82,6 @@ package() { # support python2 (FS#25120) sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server # Configuration install -D -m 644 ../exports "$pkgdir/"etc/exports install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf |