main/nfs-utils: upgrade to 2.3.1

5 files changed, 33 insertions, 21 deletions

diff --git a/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch b/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
index 607afca289..2d4f613114 100644
--- a/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
+++ b/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
@@ -16,7 +16,7 @@ diff --git a/support/export/hostname.c b/support/export/hostname.c
 index d9153e1..30584b4 100644
 --- a/support/export/hostname.c
 +++ b/support/export/hostname.c
-@@ -382,6 +382,7 @@ host_numeric_addrinfo(const struct sockaddr *sap)
+@@ -384,6 +384,7 @@
  
  	ai = host_pton(buf);
  
@@ -24,7 +24,7 @@ index d9153e1..30584b4 100644
  	/*
  	 * getaddrinfo(AI_NUMERICHOST) never fills in ai_canonname
  	 */
-@@ -392,7 +393,9 @@ host_numeric_addrinfo(const struct sockaddr *sap)
+@@ -394,7 +395,9 @@
  			ai = NULL;
  		}
  	}
@@ -34,6 +34,3 @@ index d9153e1..30584b4 100644
  }
 +
  #endif	/* !HAVE_GETNAMEINFO */
--- 
-2.0.4
-
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index 4076fa1d48..75cb273cbf 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -1,11 +1,10 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
-pkgver=2.1.1
-_basever=$pkgver
-pkgrel=4
+pkgver=2.3.1
+pkgrel=0
 pkgdesc="kernel-mode NFS"
-url="http://nfs.sourceforge.net/"
+url="http://linux-nfs.org"
 arch="all"
 license="GPL"
 depends="rpcbind"
@@ -14,12 +13,12 @@ makedepends="util-linux-dev libtirpc-dev libcap-dev libevent-dev
 	libnfsidmap-dev keyutils-dev lvm2-dev krb5-dev sqlite-dev
 	autoconf automake libtool bsd-compat-headers"
 subpackages="$pkgname-doc $pkgname-dbg rpcgen"
-
-source="http://downloads.sourceforge.net/nfs/$pkgname-$_basever.tar.bz2
+source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgver.tar.gz
 	0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
 
 	nfs-utils-mtab-sym.patch
 	musl-getservbyport.patch
+	musl-res_querydomain.patch
 	idmapd-dnotify-to-inotify.patch
 
 	nfs.initd
@@ -35,8 +34,7 @@ source="http://downloads.sourceforge.net/nfs/$pkgname-$_basever.tar.bz2
 	nfsclient.initd
 	nfsclient.confd
 	"
-
-builddir="$srcdir/$pkgname-$_basever"
+builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	default_prepare
@@ -62,6 +60,12 @@ build() {
 	make
 }
 
+# Simple test, make tests does nothing
+check() {
+	cd $builddir
+	./utils/showmount/showmount -v
+}
+
 package() {
 	cd $builddir
 	make -j1 DESTDIR="$pkgdir" install
@@ -85,10 +89,11 @@ rpcgen() {
 		"$subpkgdir"/usr/bin/rpcgen
 }
 
-sha512sums="ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448  nfs-utils-2.1.1.tar.bz2
-9561a979a2313f00c0bbb2ffb3193ca089e5de2f15cf5b6c142e65e04a9401bbc962e490e5b1de026750262a05e5258b286a79781444e7f2ac6bd581b426211a  0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
-5fd9039a61a0cdaeb57b5332ea545034101e6f15be200b7cf8fc7d0a3d22836a6fc778e0560656c1825808a4dc09046d9923d81b4d1324a6e526b226c657d064  nfs-utils-mtab-sym.patch
-a14fc747cc75f65bb206b28eb4f838ae85687c917893531318d3991adc3ed9914316b97fc507bf34881855c9978ad9d4617f33e464d1a0d746a65b31177687c1  musl-getservbyport.patch
+sha512sums="340201a8e793de9a4755fbcbff6b364dfd13c01a961e34cc54d1c94b576cc10bf0076962b7fc02872aa75f65a25e80cdcd93df44fb7e438c685eb7e10f1afaea  nfs-utils-2.3.1.tar.gz
+e55dbcc6df1626f992b660ae4ca80eac07ad539f3660448a27b34b6cc63764d59074a10c34e97c1b05f356cf60f68ec724f3dbdc1986be024773a2fe957b55fa  0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch
+674ecf2c4bc8e9364ddd0f34cc03c96674753494cbc5a5d157bd70ed4342ff90356c3e85c544510648dbe90cb43b7fd83ba50653bddffc4b3b5550367b6d0b8e  nfs-utils-mtab-sym.patch
+94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748  musl-getservbyport.patch
+c86c2f01f5534d4cbd612b9f7fe11cb4cb0cdab81172be386ee97ca37e9cc099576c8087e0f52fefeacafad8022c98a1186b7c002366a5429f9c8ee59a17d161  musl-res_querydomain.patch
 33410c469348adf5e6b5ec91d8cda6b246f1a38a0b234a52f54a49ab8395ede43dfedd58914a59c342923ba45722f6fd4e4aebeffbe4a730f31c9d1ad19de9a9  idmapd-dnotify-to-inotify.patch
 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018  nfs.initd
 89259b9f0878658d48792b5b2f42b43c966ed098dba1fecf9e07fb0de4aab37ad67655ea8dbcc2361ddab2b5013b2de35a03048a513aaeedf790e4b416a35a54  nfsmount.initd
diff --git a/main/nfs-utils/musl-getservbyport.patch b/main/nfs-utils/musl-getservbyport.patch
index c9d02e4f9a..6fa589c7b7 100644
--- a/main/nfs-utils/musl-getservbyport.patch
+++ b/main/nfs-utils/musl-getservbyport.patch
@@ -5,7 +5,7 @@ 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)
+@@ -93,8 +93,10 @@
  					__func__);
  			break;
  		}
@@ -14,5 +14,5 @@ index fd576d9..d72a0bf 100644
  		if (se == NULL)
 +#endif
  			break;
- 		/* rather not use that port, try again */
  
+ 		if (retries == MAX_BRP_RETRIES) {
diff --git a/main/nfs-utils/musl-res_querydomain.patch b/main/nfs-utils/musl-res_querydomain.patch
new file mode 100644
index 0000000000..19f69f4976
--- /dev/null
+++ b/main/nfs-utils/musl-res_querydomain.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,7 +401,7 @@
+ fi
+ 
+ dnl libdnsidmap specific checks
+-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
++AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
+ 
+ AC_ARG_ENABLE([ldap],
+ 	[AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
diff --git a/main/nfs-utils/nfs-utils-mtab-sym.patch b/main/nfs-utils/nfs-utils-mtab-sym.patch
index 607e087ec9..ab66d8c1e3 100644
--- a/main/nfs-utils/nfs-utils-mtab-sym.patch
+++ b/main/nfs-utils/nfs-utils-mtab-sym.patch
@@ -21,7 +21,7 @@
  void reset_mtab_info(void);
 --- ./utils/mount/mount.c
 +++ ./utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
+@@ -204,6 +204,13 @@
  	int flags;
  	mntFILE *mfp;
  
@@ -35,4 +35,3 @@
  	lock_mtab();
  
  	mfp = nfs_setmntent (MOUNTED, "a+");
-