[arch-commits] Commit in nfs-utils/repos/testing-x86_64 (5 files)
Andreas Radke
andyrtr at archlinux.org
Fri Nov 15 17:22:00 UTC 2019
Date: Friday, November 15, 2019 @ 17:21:59
Author: andyrtr
Revision: 368929
archrelease: copy trunk to testing-x86_64
Added:
nfs-utils/repos/testing-x86_64/PKGBUILD
(from rev 368928, nfs-utils/trunk/PKGBUILD)
nfs-utils/repos/testing-x86_64/exports
(from rev 368928, nfs-utils/trunk/exports)
Deleted:
nfs-utils/repos/testing-x86_64/PKGBUILD
nfs-utils/repos/testing-x86_64/exports
nfs-utils/repos/testing-x86_64/id_resolver.conf
------------------+
PKGBUILD | 219 ++++++++++++++++++++++++++---------------------------
exports | 24 ++---
id_resolver.conf | 9 --
3 files changed, 121 insertions(+), 131 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-15 17:21:43 UTC (rev 368928)
+++ PKGBUILD 2019-11-15 17:21:59 UTC (rev 368929)
@@ -1,110 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# 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>
-
-pkgbase=nfs-utils
-pkgname=('nfs-utils' 'nfsidmap')
-pkgver=2.4.1
-pkgrel=3
-arch=('x86_64')
-url='http://nfs.sourceforge.net'
-makedepends=('libevent' 'sqlite' 'rpcsvc-proto')
-# 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)
-# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
-sha256sums=('85274ada94479b1beba9f8eeffd19f477c53a6710b9998d1192c807854087736'
- 'SKIP'
- 'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
- '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
-validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
-
-prepare() {
- cd "${pkgbase}"-${pkgver}
-
- # fix hardcoded sbin path to our needs
- sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
- autoreconf -vfi
-}
-
-build() {
- cd "${pkgbase}"-${pkgver}
- ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --enable-gss \
- --without-tcp-wrappers \
- --with-statedir=/var/lib/nfs \
- --enable-ipv6 \
- --enable-libmount-mount \
- --enable-mountconfig \
- --with-start-statd=/usr/bin/start-statd
- make
-}
-
-check() {
- cd "${pkgbase}"-${pkgver}
- make -k check || /bin/true
-}
-
-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
- 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
- install -d -m 755 "$pkgdir"/usr/share/doc/$pkgname
- install -D -m 644 systemd/README "$pkgdir"/usr/share/doc/$pkgname/README.systemd
-
- # docs
- install -m 644 {NEWS,README} "$pkgdir"/usr/share/doc/$pkgname/
-
- # empty exports file
- 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
-
- 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
-}
Copied: nfs-utils/repos/testing-x86_64/PKGBUILD (from rev 368928, nfs-utils/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-15 17:21:59 UTC (rev 368929)
@@ -0,0 +1,109 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# 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>
+
+pkgbase=nfs-utils
+pkgname=('nfs-utils' 'nfsidmap')
+pkgver=2.4.2
+pkgrel=1
+arch=('x86_64')
+url='http://nfs.sourceforge.net'
+makedepends=('libevent' 'sqlite' 'rpcsvc-proto')
+# 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}
+ exports)
+# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
+sha256sums=('4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038'
+ 'SKIP'
+ '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
+validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
+
+prepare() {
+ cd "${pkgbase}"-${pkgver}
+
+ # fix hardcoded sbin path to our needs
+ sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+ sed -i "s|sbin|bin|" utils/nfsidmap/id_resolver.conf
+ autoreconf -vfi
+}
+
+build() {
+ cd "${pkgbase}"-${pkgver}
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --enable-gss \
+ --without-tcp-wrappers \
+ --with-statedir=/var/lib/nfs \
+ --enable-ipv6 \
+ --enable-libmount-mount \
+ --enable-mountconfig \
+ --with-start-statd=/usr/bin/start-statd
+ make
+}
+
+check() {
+ cd "${pkgbase}"-${pkgver}
+ make -k check || /bin/true
+}
+
+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
+ 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
+ install -d -m 755 "$pkgdir"/usr/share/doc/$pkgname
+ install -D -m 644 systemd/README "$pkgdir"/usr/share/doc/$pkgname/README.systemd
+
+ # docs
+ install -m 644 {NEWS,README} "$pkgdir"/usr/share/doc/$pkgname/
+
+ # empty exports file
+ install -D -m 644 ../exports "$pkgdir"/etc/exports
+
+ # config file for idmappers in newer kernels
+ install -D -m 644 utils/nfsidmap/id_resolver.conf "$pkgdir"/etc/request-key.d/id_resolver.conf
+
+ 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
+}
Deleted: exports
===================================================================
--- exports 2019-11-15 17:21:43 UTC (rev 368928)
+++ exports 2019-11-15 17:21:59 UTC (rev 368929)
@@ -1,12 +0,0 @@
-# /etc/exports - exports(5) - directories exported to NFS clients
-#
-# 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 *(rw,sync,sec=krb5i,fsid=0)
-# /srv/nfs4/home *(rw,sync,sec=krb5i,nohide)
-#
-# Use `exportfs -arv` to reload.
Copied: nfs-utils/repos/testing-x86_64/exports (from rev 368928, nfs-utils/trunk/exports)
===================================================================
--- exports (rev 0)
+++ exports 2019-11-15 17:21:59 UTC (rev 368929)
@@ -0,0 +1,12 @@
+# /etc/exports - exports(5) - directories exported to NFS clients
+#
+# 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 *(rw,sync,sec=krb5i,fsid=0)
+# /srv/nfs4/home *(rw,sync,sec=krb5i,nohide)
+#
+# Use `exportfs -arv` to reload.
Deleted: id_resolver.conf
===================================================================
--- id_resolver.conf 2019-11-15 17:21:43 UTC (rev 368928)
+++ id_resolver.conf 2019-11-15 17:21:59 UTC (rev 368929)
@@ -1,9 +0,0 @@
-#
-# nfsidmap(5) - The NFS idmapper upcall program
-# Summary: Used by NFSv4 to map user/group ids into
-# user/group names and names into in ids
-# Options:
-# -v Increases the verbosity of the output to syslog
-# -t timeout Set the expiration timer, in seconds, on the key
-#
-create id_resolver * * /usr/bin/nfsidmap %k %d
More information about the arch-commits
mailing list