Date: Thursday, June 7, 2018 @ 17:18:23 Author: andyrtr Revision: 326437
upgpkg: nfs-utils 2.3.2-2 use rpcsvc-proto - not internal rpcgen per upstream recommendation - apply a build fix from upstream git Added: nfs-utils/trunk/0001-Only_compile_the_command_when_configured.diff Modified: nfs-utils/trunk/PKGBUILD ----------------------------------------------------+ 0001-Only_compile_the_command_when_configured.diff | 33 +++++++++++++++++++ PKGBUILD | 12 ++++-- 2 files changed, 40 insertions(+), 5 deletions(-) Added: 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:23 UTC (rev 326437) @@ -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 + + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-06-07 17:01:26 UTC (rev 326436) +++ PKGBUILD 2018-06-07 17:18:23 UTC (rev 326437) @@ -9,19 +9,21 @@ pkgbase=nfs-utils pkgname=('nfs-utils' 'nfsidmap') pkgver=2.3.2 -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://nfs.sourceforge.net' -makedepends=('libevent' 'sqlite') +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) + 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') + '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154' + '6d1ddd597e7371afae92727cd6620631d9c5acaba1565e4a8f7998c97bb89783') validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson prepare() { @@ -28,7 +30,7 @@ cd ${pkgbase}-${pkgver} # fix build - sed -i "/-Werror=strict-prototypes/d" configure.ac + 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