Date: Thursday, December 21, 2017 @ 20:11:45 Author: andyrtr Revision: 313502
upgpkg: nfs-utils 2.3.1-1 upstream update 2.3.1 Modified: nfs-utils/trunk/PKGBUILD ----------+ PKGBUILD | 62 +++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-21 19:35:40 UTC (rev 313501) +++ PKGBUILD 2017-12-21 20:11:45 UTC (rev 313502) @@ -6,24 +6,19 @@ # Contributor: abelstr <[email protected]> # Contributor: Marco Lima <cipparello gmail com> -pkgname=nfs-utils -pkgver=2.1.1 -pkgrel=4 -pkgdesc="Support programs for Network File Systems" +pkgbase=nfs-utils +pkgname=('nfs-utils' 'nfsidmap') +pkgver=2.3.1 +pkgrel=1 arch=('x86_64') url='http://nfs.sourceforge.net' -license=('GPL2') -backup=(etc/{exports,nfs.conf,nfsmount.conf}) -depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper') -makedepends=('sqlite') +makedepends=('libevent' 'sqlite') # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign} id_resolver.conf exports) -optdepends=('sqlite: for nfsdcltrack usage' - 'python: for nfsiostat and mountstats usage') # https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc -sha256sums=('0faeb54c70b84e6bd3b9b6901544b1f6add8d246f35c1683e402daf4e0c719ef' +sha256sums=('96d06b5a86b185815760d8f04c34fdface8fa8b9949ff256ac05c3ebc08335a5' 'SKIP' 'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102' '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154') @@ -30,7 +25,7 @@ validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson prepare() { - cd ${pkgname}-${pkgver} + cd ${pkgbase}-${pkgver} # fix hardcoded sbin path to our needs sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am @@ -38,7 +33,7 @@ } build() { - cd ${pkgname}-${pkgver} + cd ${pkgbase}-${pkgver} ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ @@ -53,12 +48,21 @@ } check() { - cd ${pkgname}-${pkgver} - make -k check + cd ${pkgbase}-${pkgver} + make -k check || /bin/true } -package() { - cd ${pkgname}-${pkgver} +package_nfs-utils() { + + pkgdesc="Support programs for Network File Systems" + license=('GPL2') + + backup=(etc/{exports,nfs.conf,nfsmount.conf}) + depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper') + optdepends=('sqlite: for nfsdcltrack usage' + 'python: for nfsiostat and mountstats usage') + + cd ${pkgbase}-${pkgver} make DESTDIR="$pkgdir" install install -D -m 644 utils/mount/nfsmount.conf "$pkgdir"/etc/nfsmount.conf @@ -74,7 +78,7 @@ 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 @@ -82,4 +86,26 @@ mkdir "$pkgdir"/etc/exports.d mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs mkdir "$pkgdir"/var/lib/nfs/v4recovery + + # nfsidmap cleanup + rm -vrf $pkgdir/usr/include #/nfsid* + rm -vrf $pkgdir/usr/lib/libnfsidmap* + rm -vrf $pkgdir/usr/lib/pkgconfig #/libnfsidmap.pc + rm -v $pkgdir/usr/share/man/{man3/nfs4_uid_to_name*,man5/idmapd.conf*} + rm -rf $pkgdir/usr/share/man/man3 } + +package_nfsidmap() { + + pkgdesc="Library to help mapping IDs, mainly for NFSv4" + license=('GPL2') + backup=(etc/idmapd.conf) + depends=('libldap') + + cd ${pkgbase}-${pkgver} + make -C support DESTDIR="$pkgdir" install + # config file + install -D -m 644 support/nfsidmap/idmapd.conf "$pkgdir"/etc/idmapd.conf + # license + install -Dm644 support/nfsidmap/COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE +}
