[arch-commits] Commit in nfs-utils/trunk (2 files)

[Andreas Radke]

    Date: Friday, September 7, 2018 @ 18:04:17
  Author: andyrtr
Revision: 333831

upgpkg: nfs-utils 2.3.3-1

upstream update 2.3.3

Modified:
  nfs-utils/trunk/PKGBUILD
Deleted:
  nfs-utils/trunk/0001-Only_compile_the_command_when_configured.diff

----------------------------------------------------+
 0001-Only_compile_the_command_when_configured.diff |   33 -------------------
 PKGBUILD                                           |   15 ++------
 2 files changed, 5 insertions(+), 43 deletions(-)

Deleted: 0001-Only_compile_the_command_when_configured.diff
===================================================================
--- 0001-Only_compile_the_command_when_configured.diff	2018-09-07 17:46:10 UTC (rev 333830)
+++ 0001-Only_compile_the_command_when_configured.diff	2018-09-07 18:04:17 UTC (rev 333831)
@@ -1,33 +0,0 @@
-From fd5ccdc449a0ef79498191aecb3e44120e813618 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved at 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 <steved at 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-09-07 17:46:10 UTC (rev 333830)
+++ PKGBUILD	2018-09-07 18:04:17 UTC (rev 333831)
@@ -8,8 +8,8 @@
 
 pkgbase=nfs-utils
 pkgname=('nfs-utils' 'nfsidmap')
-pkgver=2.3.2
-pkgrel=2
+pkgver=2.3.3
+pkgrel=1
 arch=('x86_64')
 url='http://nfs.sourceforge.net'
 makedepends=('libevent' 'sqlite' 'rpcsvc-proto')
@@ -16,22 +16,17 @@
 # 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)
+        exports)
 # https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
-sha256sums=('3cfe50805c4c9f57bec845eaa28dfbe5a8acb90a8d21d8d56d2840e424335b19'
+sha256sums=('f68b34793831b05f1fd5760d6bdec92772c7684177586a99a61e7b444f336322'
             'SKIP'
             'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
-            '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154'
-            '6d1ddd597e7371afae92727cd6620631d9c5acaba1565e4a8f7998c97bb89783')
+            '610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
 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