main/nfs-utils: add some patches

1 files changed, 22 insertions, 13 deletions

diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index 300dfd25e1..189af42231 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
 pkgver=1.2.8
-pkgrel=0
+pkgrel=1
 pkgdesc="kernel-mode NFS"
 url="http://nfs.sourceforge.net/"
 arch="all"
@@ -25,14 +25,17 @@ source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2
 	nfs.confd
 	nfs.exports
 	nfs-utils-mtab-sym.patch
-	uclibc-getaddrinfo-canonname.patch"
+	uclibc-getaddrinfo-canonname.patch
+	0001-mountd-Fix-is_subdirectory-again.patch
+	0001-statd-exit-if-a-statd-is-already-running.patch
+	"
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
 	for i in $source; do
 		case $i in
 		*.patch) msg "Applying $i"
-			patch -p0 -i "$srcdir"/$i || return 1;;
+			patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
 	# fix build on eglibc
@@ -64,7 +67,7 @@ build() {
 		--enable-uuid \
 		--enable-gss \
 		--enable-libmount-mount \
-		--with-statedir=/var/lib/nfs \
+		--enable-mounting \
 		|| return 1
 
 	make || return 1
@@ -91,7 +94,7 @@ rpcgen() {
 	install -m755 -D tools/rpcgen/rpcgen "$subpkgdir"/usr/bin/rpcgen
 }
 
-md5sums="6e7d97de51e428a0b8698c16ca23db77  nfs-utils-1.2.8.tar.bz2
+md5sums="fb48630b7c145fb9d6602a79c6eaab11  nfs-utils-1.2.8.tar.bz2
 9e402e75f23b886fce2f53bec2c1d415  nfs.initd
 d514fb87ce5de9909f43d99012352f09  nfsmount.initd
 144b0e1f7d32265abe4c499a47af6154  rpc.gssd.initd
@@ -101,9 +104,11 @@ d514fb87ce5de9909f43d99012352f09  nfsmount.initd
 20e71ab412555b2dc9b50f346f68e5c8  rpc.svcgssd.initd
 09135438d6df50b868bbe5a2260f973c  nfs.confd
 4f1bb7b2412ce5952ecb5ec22d8ed99d  nfs.exports
-a3a7338f8de3ac37c1ffc05bdcb77d16  nfs-utils-mtab-sym.patch
-37a82a3a81410b483790ca30d564f4ba  uclibc-getaddrinfo-canonname.patch"
-sha256sums="1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6  nfs-utils-1.2.8.tar.bz2
+2b2d228f9947581c924a691a84664fa1  nfs-utils-mtab-sym.patch
+37a82a3a81410b483790ca30d564f4ba  uclibc-getaddrinfo-canonname.patch
+ddcfdb1106395d071ed917d968067b3d  0001-mountd-Fix-is_subdirectory-again.patch
+f19d520262214146ad5cab0f219fd9ca  0001-statd-exit-if-a-statd-is-already-running.patch"
+sha256sums="62ec061e32283699646515f6383cb54d0d88fb223343cec940a2701560b8b404  nfs-utils-1.2.8.tar.bz2
 81b546cb98be4678cd22f4da39927d2c79532717d927bfba055af447dbff26a5  nfs.initd
 f2f5b54fef59f24a1fc6a8b814dfe2cfdeeb02fd0d5041cff31650e626fe4b75  nfsmount.initd
 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d  rpc.gssd.initd
@@ -113,9 +118,11 @@ a727948ccf665b6bb1977ac3014b7086ff654173d1a2be1e2b38a43e97f84ca8  rpc.statd.init
 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677  rpc.svcgssd.initd
 9ca3b7dfbac5bedd818a3637805380f4e873ef8e809c21c26f410c86ac16e03e  nfs.confd
 f2aaf1c92e07172adeb65f7f2bc0140c533ae453a3477e99be677ef2e05f2d4b  nfs.exports
-fb5d228d2e9362fcc9a4702499334ba4a9109ee814c93f2e56e19903f12ba6eb  nfs-utils-mtab-sym.patch
-7c7451365001f1672abd6fd6dd53da03617a9baa4758ec515b3adf8b7bb7ad93  uclibc-getaddrinfo-canonname.patch"
-sha512sums="abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b  nfs-utils-1.2.8.tar.bz2
+5a1c6875f43ecc93d5db7bcf84b4ceda16c09b6109c28696eb55d05247511706  nfs-utils-mtab-sym.patch
+7c7451365001f1672abd6fd6dd53da03617a9baa4758ec515b3adf8b7bb7ad93  uclibc-getaddrinfo-canonname.patch
+1c1204dc5fc62debb8cc66ca299a741a3d8e515f480ff7aecb4ad72819658de7  0001-mountd-Fix-is_subdirectory-again.patch
+d3e402c73b204d4b5e161563005269318dad6e992792c902da76ff8368b872cb  0001-statd-exit-if-a-statd-is-already-running.patch"
+sha512sums="1b7269bca52b7c751976934a82bb5f2c3e171761c5009be803dc03d604f5f028fa3e17545a42bd0a1660546a6ff0b7287d9f7f6f2d262943d526d068c9c07bad  nfs-utils-1.2.8.tar.bz2
 98eeae4b30fe13d6fdeb62d47e05fd5bc577946d84a3fe84703dcc90c58768f0d1886a0aa9262ead3aac5c4bd6d7b1cc2b703fb9603baffad4ac2ead635294f3  nfs.initd
 8e720417d7443c6bd4e3bda9e7bf4a61b073009fc1750ec0c7378fb01d726ee827a759c6bc10629606b4f2dbd7884807a9e0b8377382e4968f06ef8e938537ae  nfsmount.initd
 cd4f763c7cced0eecb03e2d4c8fb1d5fbbddd119a014dee4e9cb881d3750fb01a50daa4475700914785cb1313ceef638b7de4d8dddac90cbab63888cc81938f6  rpc.gssd.initd
@@ -125,5 +132,7 @@ cf0272e42310b1ff8d40ff37dc839df2dd4fba4cb408f8fa67ce445e2975b37cafbb35e6d41af2bb
 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157  rpc.svcgssd.initd
 1711803f848f73fef9fa74bd572fa7643c586f06eeedf62ed91bd2aa06ad59c7b1f1c585b6f7b7a8ce67ff7fd6b601d88dc99ca1000dd1d3f5991f420da9761b  nfs.confd
 70f96bb3a465ee0fa857a6e511051ca3ced9f5a5d1e6b8b32eec843a2067f2475d8979c724a3661de0a2b078eef143f55d75ed184d823841d9de5038da91fb91  nfs.exports
-4549895ffe6fc91e500ead31b8e0bc552f00af285b949b0d0fd72cfa512e156578b924c1631d8e670e803999563c17bc33ca0c09800b80c28870eed08376e7f0  nfs-utils-mtab-sym.patch
-b9f0820773d3ab82cfa9ba603c83f98a71ad2e7205418c1223344b5b3e1bdfbb6aa183ab830df25ded660a4950d0e54098485fa08a4f6b6363a62c0f6c713489  uclibc-getaddrinfo-canonname.patch"
+5fd9039a61a0cdaeb57b5332ea545034101e6f15be200b7cf8fc7d0a3d22836a6fc778e0560656c1825808a4dc09046d9923d81b4d1324a6e526b226c657d064  nfs-utils-mtab-sym.patch
+b9f0820773d3ab82cfa9ba603c83f98a71ad2e7205418c1223344b5b3e1bdfbb6aa183ab830df25ded660a4950d0e54098485fa08a4f6b6363a62c0f6c713489  uclibc-getaddrinfo-canonname.patch
+59a29c72096357fc35e805f0a1e443c7a6ee9b07c96ed85481b1101a6090311937b39f45aefa60325f968a5c7d2bc5550c2a43f2f54bd8522b615b84bdf71c86  0001-mountd-Fix-is_subdirectory-again.patch
+e04d451618d6f6197dc0692844cc115fec93575525cd0569d582f9278007e2dbec692ef46065c675de13d608e034161f39a60d46766873933d05d18b94633f6c  0001-statd-exit-if-a-statd-is-already-running.patch"