main/nfs-utils: fix statd and remove glibc specific workaround

3 files changed, 55 insertions, 4 deletions

diff --git a/main/nfs-utils/0001-Only-work-around-glibc-bugs-on-glibc.patch b/main/nfs-utils/0001-Only-work-around-glibc-bugs-on-glibc.patch
new file mode 100644
index 0000000000..866173999e
--- /dev/null
+++ b/main/nfs-utils/0001-Only-work-around-glibc-bugs-on-glibc.patch
@@ -0,0 +1,25 @@
+From 94f241e2143090f4ea74b4a68cbb2bec54c5f229 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 24 Apr 2014 14:25:23 +0200
+Subject: [PATCH] Only work around glibc bugs on glibc
+
+---
+ utils/mountd/svc_run.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/mountd/svc_run.c b/utils/mountd/svc_run.c
+index 1938a67..a572441 100644
+--- a/utils/mountd/svc_run.c
++++ b/utils/mountd/svc_run.c
+@@ -60,7 +60,7 @@
+ void cache_set_fds(fd_set *fdset);
+ int cache_process_req(fd_set *readfds);
+ 
+-#if LONG_MAX != INT_MAX	
++#if defined(__GLIBC__) && LONG_MAX != INT_MAX
+ /* bug in glibc 2.3.6 and earlier, we need
+  * our own svc_getreqset
+  */
+-- 
+1.9.2
+
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index 41252806a9..23e228ad26 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.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="kernel-mode NFS"
 url="http://nfs.sourceforge.net/"
 arch="all"
@@ -26,6 +26,7 @@ source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2
 	nfs.confd
 	nfs.exports
 
+	0001-Only-work-around-glibc-bugs-on-glibc.patch
 	0001-conffile-use-standard-uint-_t-and-unsigned-char.patch
 	0001-nfsd-include-libgen.h-for-basename.patch
 	0002-Fix-header-include-for-definition-of-NULL.patch
@@ -37,6 +38,7 @@ source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2
 
 	nfs-utils-mtab-sym.patch
 	uclibc-getaddrinfo-canonname.patch
+	musl-getservbyport.patch
 	"
 
 prepare() {
@@ -114,6 +116,7 @@ d514fb87ce5de9909f43d99012352f09  nfsmount.initd
 20e71ab412555b2dc9b50f346f68e5c8  rpc.svcgssd.initd
 09135438d6df50b868bbe5a2260f973c  nfs.confd
 4f1bb7b2412ce5952ecb5ec22d8ed99d  nfs.exports
+879a1320eefb5a6261693d5dd87a4a09  0001-Only-work-around-glibc-bugs-on-glibc.patch
 e78522fa674479e26efbb07e1f533343  0001-conffile-use-standard-uint-_t-and-unsigned-char.patch
 72e31ddc393b69a11df5301a2ed30aac  0001-nfsd-include-libgen.h-for-basename.patch
 db146c3e263de1825ec94dd62167d79c  0002-Fix-header-include-for-definition-of-NULL.patch
@@ -123,7 +126,8 @@ db146c3e263de1825ec94dd62167d79c  0002-Fix-header-include-for-definition-of-NULL
 334e6124ce5cb3a1c75c426ab6669ba6  0006-mountd-define-_GNU_SOURCE-for-statfs64-and-use-stand.patch
 ed80396c06a84bb86d9f6a1f88b2afbc  0007-nfsstat-replace-the-legacy-SA_ONESHOT-with-standard-.patch
 2b2d228f9947581c924a691a84664fa1  nfs-utils-mtab-sym.patch
-37a82a3a81410b483790ca30d564f4ba  uclibc-getaddrinfo-canonname.patch"
+37a82a3a81410b483790ca30d564f4ba  uclibc-getaddrinfo-canonname.patch
+b2a716619a34194afbf0dc1c2371b478  musl-getservbyport.patch"
 sha256sums="25f1c974018c944347d74eebe89643e1004c822a6145153136b192d1acfaf60d  nfs-utils-1.3.0.tar.bz2
 81b546cb98be4678cd22f4da39927d2c79532717d927bfba055af447dbff26a5  nfs.initd
 f2f5b54fef59f24a1fc6a8b814dfe2cfdeeb02fd0d5041cff31650e626fe4b75  nfsmount.initd
@@ -134,6 +138,7 @@ a727948ccf665b6bb1977ac3014b7086ff654173d1a2be1e2b38a43e97f84ca8  rpc.statd.init
 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677  rpc.svcgssd.initd
 9ca3b7dfbac5bedd818a3637805380f4e873ef8e809c21c26f410c86ac16e03e  nfs.confd
 f2aaf1c92e07172adeb65f7f2bc0140c533ae453a3477e99be677ef2e05f2d4b  nfs.exports
+6c5be8ce258313d12c1e4ce6ea28d5dcde9c3abc047ac0d8d2bdbf58fe8746f6  0001-Only-work-around-glibc-bugs-on-glibc.patch
 a49a858dd127aeff608e2facd3734765e6113e2e26120d1b5a1a1feacb270157  0001-conffile-use-standard-uint-_t-and-unsigned-char.patch
 0abd3cc27e48b8792ec919b17d51456d3b2bd4e2853e9a1af242348eb8bd0f6f  0001-nfsd-include-libgen.h-for-basename.patch
 11ea62d8b2c5c9ea050ddd04c43cbe7169c097f2ba1402dff0b5340d88e7a972  0002-Fix-header-include-for-definition-of-NULL.patch
@@ -143,7 +148,8 @@ d0d76cbe0a7929019b29690e2a43bada5f51a18bb4db9172212969c32dfefd38  0003-replace-_
 ab843e7feb4d51d44bd4d185867b30ed0bbeec2d27ce947689b5b0cb072b0a15  0006-mountd-define-_GNU_SOURCE-for-statfs64-and-use-stand.patch
 47fc077b1093388f6a81bd69eb41dce624d4f5aa4c2cf66f192c23ddd9963f30  0007-nfsstat-replace-the-legacy-SA_ONESHOT-with-standard-.patch
 5a1c6875f43ecc93d5db7bcf84b4ceda16c09b6109c28696eb55d05247511706  nfs-utils-mtab-sym.patch
-7c7451365001f1672abd6fd6dd53da03617a9baa4758ec515b3adf8b7bb7ad93  uclibc-getaddrinfo-canonname.patch"
+7c7451365001f1672abd6fd6dd53da03617a9baa4758ec515b3adf8b7bb7ad93  uclibc-getaddrinfo-canonname.patch
+ae46423ef3383f4a134f578c29a7100d58cde8d8853e88f3ffd66a261d436421  musl-getservbyport.patch"
 sha512sums="9cb9efa26d2b1bd6ae3e0c516ac50b17b4c7993366ae36c7786da734dc8ea4dd7a05f0d6fabb6fba6df36ead8642341a095f1972cb46b400840705356d410a6a  nfs-utils-1.3.0.tar.bz2
 98eeae4b30fe13d6fdeb62d47e05fd5bc577946d84a3fe84703dcc90c58768f0d1886a0aa9262ead3aac5c4bd6d7b1cc2b703fb9603baffad4ac2ead635294f3  nfs.initd
 8e720417d7443c6bd4e3bda9e7bf4a61b073009fc1750ec0c7378fb01d726ee827a759c6bc10629606b4f2dbd7884807a9e0b8377382e4968f06ef8e938537ae  nfsmount.initd
@@ -154,6 +160,7 @@ cf0272e42310b1ff8d40ff37dc839df2dd4fba4cb408f8fa67ce445e2975b37cafbb35e6d41af2bb
 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157  rpc.svcgssd.initd
 1711803f848f73fef9fa74bd572fa7643c586f06eeedf62ed91bd2aa06ad59c7b1f1c585b6f7b7a8ce67ff7fd6b601d88dc99ca1000dd1d3f5991f420da9761b  nfs.confd
 70f96bb3a465ee0fa857a6e511051ca3ced9f5a5d1e6b8b32eec843a2067f2475d8979c724a3661de0a2b078eef143f55d75ed184d823841d9de5038da91fb91  nfs.exports
+9d0c4498691019a515cc194dd717d139230aa29ac1db4aa74beecd4817484f8b49632ddb33abd7d649940134f663e24a07fdf35fcaec72312aabc633e284e51e  0001-Only-work-around-glibc-bugs-on-glibc.patch
 1b59dcb7f7a11a0cd8ee4ab25f22f85a57a3e8fd5fb54eb6add1a4933b5a96d333b3bff3955d36999a1f9b0b312b52c83e4efc5ed0cdecbd305a95e676129f6d  0001-conffile-use-standard-uint-_t-and-unsigned-char.patch
 c56578c5b8c5f359471b69ffda4300e1aace9c1cf9687abae121f16f22542127252bcd62ae3b749377406de96c22fc0f5b4aebe056e0240470da25cf6f89eb0c  0001-nfsd-include-libgen.h-for-basename.patch
 18f5c50ace27d88984b85b0fa529257ba151ec2295af8f66b3637b32df817063426ab56d1c9eca4b6437614338ff74865cd918c12695927b4da6af6b639dd0ed  0002-Fix-header-include-for-definition-of-NULL.patch
@@ -163,4 +170,5 @@ bdef9397da387b51b9774e21c92b0850c082d6b250bfbecc680e5b22cd8fb7f14fea7e4f4febeefb
 c41e853bc156ab37cfe074a9c14d13fa94d3efff1351861668fe09cc6f1079b8d695ddb857a214db607500cef946d1aba45d748bd839a0184cd8ea5f34f8cb2d  0006-mountd-define-_GNU_SOURCE-for-statfs64-and-use-stand.patch
 939c11c66532c5a70699fa01744dfe2ffb2926307c771e055f4e04132b58f4715d7f81e233911a4ac1c0715190e64b7d2fff3a007c02cea939fee98351b3ca16  0007-nfsstat-replace-the-legacy-SA_ONESHOT-with-standard-.patch
 5fd9039a61a0cdaeb57b5332ea545034101e6f15be200b7cf8fc7d0a3d22836a6fc778e0560656c1825808a4dc09046d9923d81b4d1324a6e526b226c657d064  nfs-utils-mtab-sym.patch
-b9f0820773d3ab82cfa9ba603c83f98a71ad2e7205418c1223344b5b3e1bdfbb6aa183ab830df25ded660a4950d0e54098485fa08a4f6b6363a62c0f6c713489  uclibc-getaddrinfo-canonname.patch"
+b9f0820773d3ab82cfa9ba603c83f98a71ad2e7205418c1223344b5b3e1bdfbb6aa183ab830df25ded660a4950d0e54098485fa08a4f6b6363a62c0f6c713489  uclibc-getaddrinfo-canonname.patch
+a14fc747cc75f65bb206b28eb4f838ae85687c917893531318d3991adc3ed9914316b97fc507bf34881855c9978ad9d4617f33e464d1a0d746a65b31177687c1  musl-getservbyport.patch"
diff --git a/main/nfs-utils/musl-getservbyport.patch b/main/nfs-utils/musl-getservbyport.patch
new file mode 100644
index 0000000000..c9d02e4f9a
--- /dev/null
+++ b/main/nfs-utils/musl-getservbyport.patch
@@ -0,0 +1,18 @@
+Musl will always return something with getservbyport so we cannot skip
+ports that returns non-null.
+
+diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
+index fd576d9..d72a0bf 100644
+--- a/utils/statd/rmtcall.c
++++ b/utils/statd/rmtcall.c
+@@ -90,8 +90,10 @@ statd_get_socket(void)
+ 					__func__);
+ 			break;
+ 		}
++#if 0
+ 		se = getservbyport(sin.sin_port, "udp");
+ 		if (se == NULL)
++#endif
+ 			break;
+ 		/* rather not use that port, try again */
+