user/nfs-utils: Bump to 2.4.3

7 files changed, 6 insertions, 188 deletions

diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index c762afc58..2d42c60ff 100644
--- a/user/nfs-utils/APKBUILD
+++ b/user/nfs-utils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=nfs-utils
-pkgver=2.4.2
+pkgver=2.4.3
 pkgrel=0
 pkgdesc="NFS file sharing client and server"
 url="http://nfs.sourceforge.net/"
@@ -13,12 +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
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfsdcld.patch
 	posixish.patch
-	ssize_t.patch
 	time64.patch
-	undef-def.patch
 
 	exports
 	nfs.confd nfs.initd nfsclient.confd nfsclient.initd nfsmount.confd
@@ -61,13 +57,9 @@ package() {
 	done
 }
 
-sha512sums="60cd74294d0a68f481a962a0ece6ac6385b933d1f2b0e733ef098d6ce4d4177da81128884f9b1ae8299b5067dec717dfe9fee573d01629c1fffa226a3ba20c84  nfs-utils-2.4.2.tar.xz
-afa0b913a21880f91580a2953cbd9057310367d406d2fff9d9985ec24f20288191600d81bf58daf6e3de376866b02662e573e59478e859f455d94f225d884465  nfs-utils-1.1.4-mtab-sym.patch
-2f4c519cce81b2a29ffe2b7554cb5e524fde32db1338442f9ecbdf5d468552d1ad406918b3710340239bba741f5316742ee209fd5b76c5ccd10e466d7beaefa1  nfsdcld.patch
-10501b1956e81b3a3db0829fcfb6f25d734d33be1cbc9169ff45594d8db355a337f61f41ec59e51484e5c5bcb77b2f969527edd477528621f8866ae412ddf03f  posixish.patch
-7cb1de79c2a420ff5121e19e5fdcbc97d367451ec59bc2fc39c2d60dde8d7136b227fc88e16996ede8365ed512004269d4b47ee19c62c8f8e0266430b0b85f06  ssize_t.patch
-128fb10ca703a4e0d3dbd5f94d233e10cf917df7a565b8d3112f195d24697b96d71663459f7e7c2a4290ebe327762bfdc65e22a507a68a645dca1c3f13b08319  time64.patch
-1fbe6f017ddde9a2edc5b8a8a2958c8c4f8ccc8764e15b8817da3cc315a5529519782c34df6154d76e146c83ee9f911fa8590aefd6902c0de1f6e6d9855b9b04  undef-def.patch
+sha512sums="9b8065d9d3958e45021898e24574d1e6d59353f94c2f760df18a793a734d79d0047df95e2f9cdebfda58e3f68f52b2ef723df2261c10bbeb5b16fe1413c1b8d7  nfs-utils-2.4.3.tar.xz
+8ed36d22094eaca1a7b83fd5e840e774ee172ca81bf15215cf04127e45fc32ac75c3e0f3d8914370ac09c93d08a0fe8aa6d8f3eb7a8318db1e9ab7b2a05dee06  posixish.patch
+e85afa3ba90eeb48d3a571543ab1361a27b9c4148799548a6b0cd304cff3231235c09753268a1601bf793b1589eb320d7196d00e86ef5eb33aee466fa260dafd  time64.patch
 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220  exports
 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535  nfs.confd
 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018  nfs.initd
diff --git a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
deleted file mode 100644
index 0a7d70bc4..000000000
--- a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- 	return var_mtab_does_not_exist;
- }
- 
--static int
-+int
- mtab_is_a_symlink(void) {
-         get_mtab_info();
-         return var_mtab_is_a_symlink;
---- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
- 
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
---- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -204,6 +204,13 @@ create_mtab (void) {
- 	int flags;
- 	mntFILE *mfp;
- 
-+	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+	   that would create a file /proc/mounts in case the proc filesystem
-+	   is not mounted, and the fchmod below would also fail. */
-+	if (mtab_is_a_symlink()) {
-+		return EX_SUCCESS;
-+	}
-+
- 	lock_mtab();
- 
- 	mfp = nfs_setmntent (MOUNTED, "a+");
diff --git a/user/nfs-utils/nfsdcld.patch b/user/nfs-utils/nfsdcld.patch
deleted file mode 100644
index f5532e1d6..000000000
--- a/user/nfs-utils/nfsdcld.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-@@ -737,7 +737,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 d973bf9c7..d8802047d 100644
--- a/user/nfs-utils/posixish.patch
+++ b/user/nfs-utils/posixish.patch
@@ -1,6 +1,6 @@
 --- 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
-@@ -20594,9 +20594,9 @@
+@@ -20596,9 +20596,9 @@
    fi
  fi
  
@@ -13,7 +13,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -20610,27 +20610,27 @@
+@@ -20612,27 +20612,27 @@
  #ifdef __cplusplus
  extern "C"
  #endif
diff --git a/user/nfs-utils/ssize_t.patch b/user/nfs-utils/ssize_t.patch
deleted file mode 100644
index 16313890a..000000000
--- a/user/nfs-utils/ssize_t.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c.old	2020-01-24 03:35:27.856939255 +0000
-+++ nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c	2020-01-24 04:34:24.349432698 +0000
-@@ -378,7 +378,7 @@
- 	bsize = cld_message_size(cmsg);
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize)
--		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
-+		xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
- 			 __func__, wsize);
- 
- 	/* reopen pipe, just to be sure */
-@@ -409,7 +409,7 @@
- 	xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
--		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
-+		xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
- 			 __func__, wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
-@@ -459,7 +459,7 @@
- 	xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
--		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
-+		xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
- 			 __func__, wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
-@@ -498,7 +498,7 @@
- 			cmsg->cm_status);
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
--		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
-+		xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
- 			 __func__, wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
-@@ -548,7 +548,7 @@
- 			cmsg->cm_status);
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
--		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
-+		xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
- 			 __func__, wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
-@@ -607,7 +607,7 @@
- 	xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
--		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
-+		xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
- 			 __func__, wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
-@@ -667,7 +667,7 @@
- 	xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
--		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
-+		xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
- 			 __func__, wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
---- nfs-utils-2.4.2/tools/locktest/testlk.c.old	2019-11-13 17:09:41.000000000 +0000
-+++ nfs-utils-2.4.2/tools/locktest/testlk.c	2020-01-24 04:42:06.118844841 +0000
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <inttypes.h>
- #ifdef linux
- #include <getopt.h>
- #endif
-@@ -81,7 +82,7 @@
- 		if (fl.l_type == F_UNLCK) {
- 			printf("%s: no conflicting lock\n", fname);
- 		} else {
--			printf("%s: conflicting lock by %d on (%ld;%ld)\n",
-+			printf("%s: conflicting lock by %d on (%"PRId64";%"PRId64")\n",
- 				fname, fl.l_pid, fl.l_start, fl.l_len);
- 		}
- 		return 0;
diff --git a/user/nfs-utils/time64.patch b/user/nfs-utils/time64.patch
index 024402554..b28ee2f44 100644
--- a/user/nfs-utils/time64.patch
+++ b/user/nfs-utils/time64.patch
@@ -54,35 +54,6 @@
  			 time(NULL) + cache_entry_expiration);
  		addfield(&bp, &bsiz, buf1);
  		/* Note we're ignoring the status field in this case; we'll
---- nfs-utils-2.4.2/utils/nfsdcld/sqlite.c.old	2019-11-13 17:09:41.000000000 +0000
-+++ nfs-utils-2.4.2/utils/nfsdcld/sqlite.c	2020-01-24 04:35:02.235281405 +0000
-@@ -512,7 +512,7 @@
- 	current_epoch = tcur;
- 	recovery_epoch = trec;
- 	ret = 0;
--	xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
-+	xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
- 		__func__, current_epoch, recovery_epoch);
- out:
- 	sqlite3_finalize(stmt);
-@@ -1223,7 +1223,7 @@
- 
- 	current_epoch = tcur;
- 	recovery_epoch = trec;
--	xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
-+	xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
- 		__func__, current_epoch, recovery_epoch);
- 
- out:
-@@ -1282,7 +1282,7 @@
- 	}
- 
- 	recovery_epoch = 0;
--	xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
-+	xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
- 		__func__, current_epoch, recovery_epoch);
- 
- out:
 --- nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c.old	2019-11-13 17:09:41.000000000 +0000
 +++ nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c	2020-01-24 04:40:06.871901242 +0000
 @@ -38,6 +38,7 @@
diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch
deleted file mode 100644
index 8c1899ab5..000000000
--- a/user/nfs-utils/undef-def.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-@@ -446,7 +446,7 @@
- 	if (count_slashes(p) != count_slashes(parent))
- 		return 0;
- 
--#if HAVE_NAME_TO_HANDLE_AT
-+#ifdef HAVE_NAME_TO_HANDLE_AT
- 	struct {
- 		struct file_handle fh;
- 		unsigned char handle[128];