user/nfs-utils: bump to 2.4.1, fix bugs in nfsdcld

5 files changed, 29 insertions, 179 deletions

diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index 6ca30bbad..ca02a8688 100644
--- a/user/nfs-utils/APKBUILD
+++ b/user/nfs-utils/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=nfs-utils
-pkgver=2.3.3
-pkgrel=1
+pkgver=2.4.1
+pkgrel=0
 pkgdesc="NFS file sharing client and server"
 url="http://nfs.sourceforge.net/"
 arch="all"
@@ -13,8 +13,8 @@ makedepends="keyutils-dev krb5-dev libevent-dev libtirpc-dev lvm2-dev
 	rpcsvc-proto sqlite-dev util-linux-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz
-	freeaddrinfo-properly.patch
 	nfs-utils-1.1.4-mtab-sym.patch
+	nfsdcld.patch
 	posixish.patch
 	undef-def.patch
 
@@ -25,7 +25,6 @@ source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -43,13 +42,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	local _initd _confd
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -D -m644 "$srcdir"/exports "$pkgdir"/etc/exports
@@ -63,11 +59,11 @@ package() {
 	done
 }
 
-sha512sums="5025ccd7699ac1a0fdbd8b18ed8b33ea89230158320d809ec51e73f831100db75dceaddde481d911eeca9059caa521d155c2d14d014d75f091f432aad92a9716  nfs-utils-2.3.3.tar.xz
-7e1472989374cf8a8dbd4944bbd5deaa5520f12ea3627709be037fb78febec531b373c6e05004f27046d1e3842f5cc7ce024f4db65cf656864bda85db529b451  freeaddrinfo-properly.patch
+sha512sums="9aec8465be4bba300c5cd2e0d22f9f6db489a989bfbf01b10f62a7e628347dda06aa3079d18abc6ff5b0d5df54fdd9f27297e3e80b5f7fe525ab78df8fd88d8e  nfs-utils-2.4.1.tar.xz
 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998  nfs-utils-1.1.4-mtab-sym.patch
-f0b87ff4229d96a46e3f0c17f87dcd3ce5c51651ee036d935c1481b421cd7e5b6a048a082b4f8115a969fe6e85cc871df7658bf5d80c480095b69f29fd6b085d  posixish.patch
-2e54efa2cac0522f549e8bed45147676d10b299b5060eda305da8767feb55d37627259196d89c295e8d5f4fbbb7c9e791a53dddd579187600f1717968049aa6a  undef-def.patch
+0275cacdaf399e9a9f132a79a6eab09aea176204181f2a1c1c7f062faeef5c4d979912aaf751bdfdfd3fc3d4dc166dca89ac1fabf2655d222379dd4e7ccab419  nfsdcld.patch
+db5927d533ff8c1bfd5f4948bc1ea6a375a779f3ab10f7520367556cf195245fbeaf28ff9974daeec319b47f1f0344c7f93a354e8ab28de5c4203f0d2b273a6b  posixish.patch
+3436064c2aa8e8a645fdae11e87a1bc932cfe60883f1516a218fe3dc65d2abe962c9322dd1c59c2c117dd942e6b72d7311f51280d0d71fc69ed4ed543ac6d841  undef-def.patch
 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220  exports
 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535  nfs.confd
 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018  nfs.initd
diff --git a/user/nfs-utils/freeaddrinfo-properly.patch b/user/nfs-utils/freeaddrinfo-properly.patch
deleted file mode 100644
index 7ddcde004..000000000
--- a/user/nfs-utils/freeaddrinfo-properly.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur nfs-utils-2.3.3-orig/support/export/client.c nfs-utils-2.3.3/support/export/client.c
---- nfs-utils-2.3.3-orig/support/export/client.c	2018-09-06 13:09:08.000000000 -0500
-+++ nfs-utils-2.3.3/support/export/client.c	2019-04-21 02:48:45.676838188 -0500
-@@ -309,7 +309,8 @@
- 		init_addrlist(clp, ai);
- 
- out:
--	freeaddrinfo(ai);
-+	if (ai != NULL)
-+		freeaddrinfo(ai);
- 	return clp;
- }
- 
-diff -Naur nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c nfs-utils-2.3.3/tests/nsm_client/nsm_client.c
---- nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c	2018-09-06 13:09:08.000000000 -0500
-+++ nfs-utils-2.3.3/tests/nsm_client/nsm_client.c	2019-04-21 02:35:53.139552780 -0500
-@@ -243,7 +243,8 @@
- 		printf("RPC client creation failed\n");
- 	}
- out:
--	freeaddrinfo(ai);
-+	if (ai != NULL)
-+		freeaddrinfo(ai);
- 	return client;
- }
- 
-diff -Naur nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c nfs-utils-2.3.3/utils/exportfs/exportfs.c
---- nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c	2018-09-06 13:09:08.000000000 -0500
-+++ nfs-utils-2.3.3/utils/exportfs/exportfs.c	2019-04-21 02:40:07.432327005 -0500
-@@ -282,7 +282,8 @@
- 	validate_export(exp);
- 
- out:
--	freeaddrinfo(ai);
-+	if (ai != NULL)
-+		freeaddrinfo(ai);
- }
- 
- static int exportfs_generic(char *arg, char *options, int verbose)
-@@ -395,7 +396,8 @@
- 	if (!success)
- 		xlog(L_ERROR, "Could not find '%s:%s' to unexport.", hname, path);
- 
--	freeaddrinfo(ai);
-+	if (ai != NULL)
-+		freeaddrinfo(ai);
- }
- 
- static int unexportfs_generic(char *arg, int verbose)
-@@ -639,8 +641,10 @@
- 			}
- 
- out:
--	freeaddrinfo(results1);
--	freeaddrinfo(results2);
-+	if (results1 != NULL)
-+		freeaddrinfo(results1);
-+	if (results2 != NULL)
-+		freeaddrinfo(results2);
- 	return result;
- }
- 
-diff -Naur nfs-utils-2.3.3-orig/utils/mount/stropts.c nfs-utils-2.3.3/utils/mount/stropts.c
---- nfs-utils-2.3.3-orig/utils/mount/stropts.c	2018-09-06 13:09:08.000000000 -0500
-+++ nfs-utils-2.3.3/utils/mount/stropts.c	2019-04-21 02:43:18.451874403 -0500
-@@ -1263,7 +1263,8 @@
- 	} else
- 		nfs_error(_("%s: internal option parsing error"), progname);
- 
--	freeaddrinfo(mi.address);
-+	if (mi.address != NULL)
-+		freeaddrinfo(mi.address);
- 	free(mi.hostname);
- 	return retval;
- }
-diff -Naur nfs-utils-2.3.3-orig/utils/mountd/cache.c nfs-utils-2.3.3/utils/mountd/cache.c
---- nfs-utils-2.3.3-orig/utils/mountd/cache.c	2019-04-21 02:33:43.603417171 -0500
-+++ nfs-utils-2.3.3/utils/mountd/cache.c	2019-04-21 02:45:11.289792765 -0500
-@@ -834,7 +834,8 @@
- out:
- 	if (found_path)
- 		free(found_path);
--	freeaddrinfo(ai);
-+	if (ai != NULL)
-+		freeaddrinfo(ai);
- 	free(dom);
- 	xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL);
- }
-@@ -1355,7 +1356,7 @@
- 	xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL);
- 	if (dom) free(dom);
- 	if (path) free(path);
--	freeaddrinfo(ai);
-+	if (ai) freeaddrinfo(ai);
- }
- 
- 
-diff -Naur nfs-utils-2.3.3-orig/utils/mountd/mountd.c nfs-utils-2.3.3/utils/mountd/mountd.c
---- nfs-utils-2.3.3-orig/utils/mountd/mountd.c	2018-09-06 13:09:08.000000000 -0500
-+++ nfs-utils-2.3.3/utils/mountd/mountd.c	2019-04-21 02:45:41.796526387 -0500
-@@ -581,7 +581,8 @@
- 				freeaddrinfo(ai);
- 				continue;
- 			}
--			freeaddrinfo(ai);
-+			if (ai != NULL)
-+				freeaddrinfo(ai);
- 		}
- 		cp = &(c->gr_next);
- 	}
-diff -Naur nfs-utils-2.3.3-orig/utils/statd/hostname.c nfs-utils-2.3.3/utils/statd/hostname.c
---- nfs-utils-2.3.3-orig/utils/statd/hostname.c	2018-09-06 13:09:08.000000000 -0500
-+++ nfs-utils-2.3.3/utils/statd/hostname.c	2019-04-21 02:41:39.712446505 -0500
-@@ -308,8 +308,10 @@
- 			}
- 
- out:
--	freeaddrinfo(results2);
--	freeaddrinfo(results1);
-+	if (results2 != NULL)
-+		freeaddrinfo(results2);
-+	if (results1 != NULL)
-+		freeaddrinfo(results1);
- 
- 	xlog(D_CALL, "%s: hostnames %s and %s %s", __func__,
- 			hostname1, hostname2,
diff --git a/user/nfs-utils/nfsdcld.patch b/user/nfs-utils/nfsdcld.patch
new file mode 100644
index 000000000..e80956bb8
--- /dev/null
+++ b/user/nfs-utils/nfsdcld.patch
@@ -0,0 +1,21 @@
+--- nfs-utils-2.4.1/utils/nfsdcld/legacy.c.old	2019-06-10 14:34:37.000000000 +0000
++++ nfs-utils-2.4.1/utils/nfsdcld/legacy.c	2019-06-20 00:29:10.493973462 +0000
+@@ -24,6 +24,7 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <limits.h>
+ #include "cld.h"
+ #include "sqlite.h"
+ #include "xlog.h"
+--- nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c.old	2019-06-10 14:34:37.000000000 +0000
++++ nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c	2019-06-20 00:28:42.926915402 +0000
+@@ -645,7 +645,7 @@
+ int
+ main(int argc, char **argv)
+ {
+-	char arg;
++	int arg;
+ 	int rc = 0;
+ 	bool foreground = false;
+ 	char *progname;
diff --git a/user/nfs-utils/posixish.patch b/user/nfs-utils/posixish.patch
index 0f1a7cdee..9bc817ad0 100644
--- a/user/nfs-utils/posixish.patch
+++ b/user/nfs-utils/posixish.patch
@@ -1,24 +1,3 @@
---- nfs-utils-2.3.1/configure.ac.orig	2018-05-21 11:05:01.939912918 -0700
-+++ nfs-utils-2.3.1/configure.ac	2018-05-21 11:05:10.531968707 -0700
-@@ -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@:>@])])
---- nfs-utils-2.3.1/support/misc/file.c.orig	2018-05-21 18:15:37.572007979 +0000
-+++ nfs-utils-2.3.1/support/misc/file.c	2018-05-21 18:15:43.668047008 +0000
-@@ -27,6 +27,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#include <limits.h> /* PATH_MAX */
- 
- #include "xlog.h"
- #include "misc.h"
 --- nfs-utils-2.3.3/configure.old	2018-09-06 18:10:07.000000000 +0000
 +++ nfs-utils-2.3.3/configure	2019-01-10 16:01:32.110000000 +0000
 @@ -20302,9 +20302,9 @@
diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch
index 12bff6ddf..a8b03ac03 100644
--- a/user/nfs-utils/undef-def.patch
+++ b/user/nfs-utils/undef-def.patch
@@ -1,17 +1,6 @@
---- nfs-utils-2.3.3/support/nfs/svc_socket.c.old	2018-09-06 18:09:08.000000000 +0000
-+++ nfs-utils-2.3.3/support/nfs/svc_socket.c	2019-01-10 16:17:02.270000000 +0000
-@@ -46,7 +46,7 @@
- 	struct rpcent *rpcp;
- 	struct servent servbuf, *servp = NULL;
- 	int ret = 0;
--#if HAVE_GETRPCBYNUMBER_R
-+#ifdef HAVE_GETRPCBYNUMBER_R
- 	char rpcdata[1024];
- 	struct rpcent rpcbuf;
- 
 --- nfs-utils-2.3.3/utils/mountd/cache.c.old	2018-09-06 18:09:08.000000000 +0000
 +++ nfs-utils-2.3.3/utils/mountd/cache.c	2019-01-10 16:26:22.750000000 +0000
-@@ -426,7 +426,7 @@
+@@ -446,7 +446,7 @@
  	if (count_slashes(p) != count_slashes(parent))
  		return 0;
  
@@ -31,12 +20,3 @@
  /* Cannot safely include linux/in6.h in old glibc, so hardcode the needed values */
  # define IPV6_PREFER_SRC_PUBLIC 2
  # define IPV6_ADDR_PREFERENCES 72
-@@ -1062,7 +1062,7 @@
- 	if (caddr) {
- 		/* Get the address of our end of this connection */
- 		socklen_t len = sizeof(*caddr);
--		if (getsockname(sock, caddr, &len) != 0)
-+		if (getsockname(sock, (struct sockaddr *)caddr, &len) != 0)
- 			caddr->sin_family = 0;
- 	}
-