From 952fdbfeb54d33019ef19a0a1116007da6bc82ab Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Fri, 14 Oct 2016 10:20:40 +0200
Subject: main/nfs-utils: upgrade to 1.3.4

---
 main/nfs-utils/APKBUILD | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'main/nfs-utils/APKBUILD')

diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index 3179dc101c..a4a326af0c 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
-pkgver=1.3.3
+pkgver=1.3.4
 _basever=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="kernel-mode NFS"
 url="http://nfs.sourceforge.net/"
 arch="all"
@@ -12,9 +12,8 @@ depends="rpcbind"
 options="suid"
 makedepends="util-linux-dev libtirpc-dev libcap-dev libevent-dev
 	libnfsidmap-dev keyutils-dev lvm2-dev krb5-dev sqlite-dev
-	autoconf automake libtool !rpcgen bsd-compat-headers"
-subpackages="$pkgname-doc $pkgname-dbg"
-[ "$ALPINE_LIBC" != "eglibc" ] && subpackages="$subpackages rpcgen"
+	autoconf automake libtool bsd-compat-headers"
+subpackages="$pkgname-doc $pkgname-dbg rpcgen"
 
 source="http://downloads.sourceforge.net/nfs/$pkgname-$_basever.tar.bz2
 	0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
@@ -33,20 +32,16 @@ source="http://downloads.sourceforge.net/nfs/$pkgname-$_basever.tar.bz2
 	nfs.exports
 	"
 
-prepare() {
-	cd "$srcdir/$pkgname-$_basever"
-	for i in $source; do
-		case $i in
-		*.patch) msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+builddir="$srcdir/$pkgname-$_basever"
 
+prepare() {
+	default_prepare || return 1
+	cd $builddir
 	./autogen.sh || return 1
 }
 
 build() {
-	cd "$srcdir/$pkgname-$_basever"
+	cd $builddir
 
 	./configure \
 		--build=$CBUILD \
@@ -67,7 +62,8 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$_basever"
+	cd $builddir
+
 	make -j1 DESTDIR="$pkgdir" install
 
 	for i in nfs rpc.pipefs rpc.svcgssd nfsmount rpc.idmapd rpc.gssd \
@@ -76,18 +72,17 @@ package() {
 			|| return 1
 	done
 
-
 	install -m644 -D "$srcdir"/nfs.confd "$pkgdir"/etc/conf.d/nfs
 	install -m644 -D "$srcdir"/nfs.exports "$pkgdir"/etc/exports
 }
 
 rpcgen() {
 	pkgdesc="Remote Procedure Call (RPC) protocol compiler"
-	cd "$srcdir/$pkgname-$_basever"
+	cd $builddir
 	install -m755 -D tools/rpcgen/rpcgen "$subpkgdir"/usr/bin/rpcgen
 }
 
-md5sums="9b87d890669eaaec8e97a2b0a35b2665  nfs-utils-1.3.3.tar.bz2
+md5sums="2fabdadb8ff415a1eafcfb12ab1bf781  nfs-utils-1.3.4.tar.bz2
 5994a46367486129e2892c73dcdc82c2  0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
 2b2d228f9947581c924a691a84664fa1  nfs-utils-mtab-sym.patch
 b2a716619a34194afbf0dc1c2371b478  musl-getservbyport.patch
@@ -100,7 +95,7 @@ ed57597c7b837ff447f476c4864b086e  nfs.initd
 7820607185d8f6b9b15ad841c8ac02fa  rpc.svcgssd.initd
 09135438d6df50b868bbe5a2260f973c  nfs.confd
 4f1bb7b2412ce5952ecb5ec22d8ed99d  nfs.exports"
-sha256sums="fe8e04f7a869975e11765085d27e91ca3f765e08811a527bb4e32056e41176eb  nfs-utils-1.3.3.tar.bz2
+sha256sums="c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590  nfs-utils-1.3.4.tar.bz2
 0bd62ea53c980369990f04b620db725259fa919a351b8ed44e081a8b7a1c221e  0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
 5a1c6875f43ecc93d5db7bcf84b4ceda16c09b6109c28696eb55d05247511706  nfs-utils-mtab-sym.patch
 ae46423ef3383f4a134f578c29a7100d58cde8d8853e88f3ffd66a261d436421  musl-getservbyport.patch
@@ -113,7 +108,7 @@ ae46423ef3383f4a134f578c29a7100d58cde8d8853e88f3ffd66a261d436421  musl-getservby
 4e819e297b405432685b76c9c542045024a06c704ae5a5c4ec33132e022136ec  rpc.svcgssd.initd
 9ca3b7dfbac5bedd818a3637805380f4e873ef8e809c21c26f410c86ac16e03e  nfs.confd
 f2aaf1c92e07172adeb65f7f2bc0140c533ae453a3477e99be677ef2e05f2d4b  nfs.exports"
-sha512sums="6361be1f8d5872a27d57b74fbf945177e8de233872f1504a7b8ac5adbb104f37113f2dfd28e5694f76f2becc8887f025ed27aad1280e781ab5c48408820d67eb  nfs-utils-1.3.3.tar.bz2
+sha512sums="765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c  nfs-utils-1.3.4.tar.bz2
 9561a979a2313f00c0bbb2ffb3193ca089e5de2f15cf5b6c142e65e04a9401bbc962e490e5b1de026750262a05e5258b286a79781444e7f2ac6bd581b426211a  0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
 5fd9039a61a0cdaeb57b5332ea545034101e6f15be200b7cf8fc7d0a3d22836a6fc778e0560656c1825808a4dc09046d9923d81b4d1324a6e526b226c657d064  nfs-utils-mtab-sym.patch
 a14fc747cc75f65bb206b28eb4f838ae85687c917893531318d3991adc3ed9914316b97fc507bf34881855c9978ad9d4617f33e464d1a0d746a65b31177687c1  musl-getservbyport.patch
-- 
cgit v1.2.3