Date: Thursday, June 7, 2018 @ 17:18:34 Author: andyrtr Revision: 326438
archrelease: copy trunk to testing-x86_64 Added: nfs-utils/repos/testing-x86_64/0001-Only_compile_the_command_when_configured.diff (from rev 326437, nfs-utils/trunk/0001-Only_compile_the_command_when_configured.diff) nfs-utils/repos/testing-x86_64/PKGBUILD (from rev 326437, nfs-utils/trunk/PKGBUILD) nfs-utils/repos/testing-x86_64/exports (from rev 326437, nfs-utils/trunk/exports) nfs-utils/repos/testing-x86_64/id_resolver.conf (from rev 326437, nfs-utils/trunk/id_resolver.conf) Deleted: nfs-utils/repos/testing-x86_64/PKGBUILD nfs-utils/repos/testing-x86_64/exports nfs-utils/repos/testing-x86_64/id_resolver.conf ----------------------------------------------------+ 0001-Only_compile_the_command_when_configured.diff | 33 ++ PKGBUILD | 230 +++++++++---------- exports | 24 - id_resolver.conf | 18 - 4 files changed, 170 insertions(+), 135 deletions(-) Copied: nfs-utils/repos/testing-x86_64/0001-Only_compile_the_command_when_configured.diff (from rev 326437, nfs-utils/trunk/0001-Only_compile_the_command_when_configured.diff) =================================================================== --- 0001-Only_compile_the_command_when_configured.diff (rev 0) +++ 0001-Only_compile_the_command_when_configured.diff 2018-06-07 17:18:34 UTC (rev 326438) @@ -0,0 +1,33 @@ +From fd5ccdc449a0ef79498191aecb3e44120e813618 Mon Sep 17 00:00:00 2001 +From: Steve Dickson <ste...@redhat.com> +Date: Thu, 31 May 2018 11:02:58 -0400 +Subject: [PATCH] rpcgen: Only compile the command when configured. + +Only compile and use the internal rpcgen +when required via the --with-rpcgen flag + +It is strongly suggested to use the rpcgen from +the new created rpcsvc-proto package be used. + +Signed-off-by: Steve Dickson <ste...@redhat.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 276dec3..4b698dd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -157,7 +157,7 @@ AC_ARG_WITH(rpcgen, + RPCGEN_PATH=$rpcgen_path + fi + AC_SUBST(RPCGEN_PATH) +- AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = ""]) ++ AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = "internal"]) + AC_ARG_ENABLE(uuid, + [AC_HELP_STRING([--disable-uuid], + [Exclude uuid support to avoid buggy libblkid. @<:@default=no@:>@])], +-- +1.8.3.1 + + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-07 17:18:23 UTC (rev 326437) +++ PKGBUILD 2018-06-07 17:18:34 UTC (rev 326438) @@ -1,114 +0,0 @@ -# $Id$ -# Maintainer: AndyRTR <andy...@archlinux.org> -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: John Proctor <jproc...@prium.net> -# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> -# Contributor: abelstr <a...@pinklf.eu> -# Contributor: Marco Lima <cipparello gmail com> - -pkgbase=nfs-utils -pkgname=('nfs-utils' 'nfsidmap') -pkgver=2.3.2 -pkgrel=1 -arch=('x86_64') -url='http://nfs.sourceforge.net' -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) -# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc -sha256sums=('3cfe50805c4c9f57bec845eaa28dfbe5a8acb90a8d21d8d56d2840e424335b19' - 'SKIP' - 'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102' - '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154') -validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson - -prepare() { - cd ${pkgbase}-${pkgver} - - # fix build - sed -i "/-Werror=strict-prototypes/d" configure.ac - - # 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 326437, nfs-utils/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-07 17:18:34 UTC (rev 326438) @@ -0,0 +1,116 @@ +# $Id$ +# Maintainer: AndyRTR <andy...@archlinux.org> +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: John Proctor <jproc...@prium.net> +# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> +# Contributor: abelstr <a...@pinklf.eu> +# Contributor: Marco Lima <cipparello gmail com> + +pkgbase=nfs-utils +pkgname=('nfs-utils' 'nfsidmap') +pkgver=2.3.2 +pkgrel=2 +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 + 0001-Only_compile_the_command_when_configured.diff) +# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc +sha256sums=('3cfe50805c4c9f57bec845eaa28dfbe5a8acb90a8d21d8d56d2840e424335b19' + 'SKIP' + 'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102' + '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154' + '6d1ddd597e7371afae92727cd6620631d9c5acaba1565e4a8f7998c97bb89783') +validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson + +prepare() { + cd ${pkgbase}-${pkgver} + + # fix build + patch -Np1 -i ../0001-Only_compile_the_command_when_configured.diff + + # 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 +} Deleted: exports =================================================================== --- exports 2018-06-07 17:18:23 UTC (rev 326437) +++ exports 2018-06-07 17:18:34 UTC (rev 326438) @@ -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 326437, nfs-utils/trunk/exports) =================================================================== --- exports (rev 0) +++ exports 2018-06-07 17:18:34 UTC (rev 326438) @@ -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 2018-06-07 17:18:23 UTC (rev 326437) +++ id_resolver.conf 2018-06-07 17:18:34 UTC (rev 326438) @@ -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 Copied: nfs-utils/repos/testing-x86_64/id_resolver.conf (from rev 326437, nfs-utils/trunk/id_resolver.conf) =================================================================== --- id_resolver.conf (rev 0) +++ id_resolver.conf 2018-06-07 17:18:34 UTC (rev 326438) @@ -0,0 +1,9 @@ +# +# 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