nfs-utils: update to 2.4.3

srcpkgs/nfs-utils/patches/fix-int-formats.patch

@@ -1,97 +0,0 @@
---- a/utils/nfsdcld/nfsdcld.c	2019-11-13 18:09:41.000000000 +0100
-+++ b/utils/nfsdcld/nfsdcld.c	2020-01-17 20:01:32.335230045 +0100
-@@ -379,7 +379,7 @@
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize)
- 		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
--			 __func__, wsize);
-+			 __func__, (long int)wsize);
- 
- 	/* reopen pipe, just to be sure */
- 	ret = cld_pipe_open(clnt);
-@@ -410,7 +410,7 @@
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
- 		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
--			 __func__, wsize);
-+			 __func__, (long int)wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
- 			xlog(L_FATAL, "%s: unable to reopen pipe: %d",
-@@ -460,7 +460,7 @@
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
- 		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
--			 __func__, wsize);
-+			 __func__, (long int)wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
- 			xlog(L_FATAL, "%s: unable to reopen pipe: %d",
-@@ -499,7 +499,7 @@
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
- 		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
--			 __func__, wsize);
-+			 __func__, (long int)wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
- 			xlog(L_FATAL, "%s: unable to reopen pipe: %d",
-@@ -549,7 +549,7 @@
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
- 		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
--			 __func__, wsize);
-+			 __func__, (long int)wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
- 			xlog(L_FATAL, "%s: unable to reopen pipe: %d",
-@@ -608,7 +608,7 @@
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
- 		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
--			 __func__, wsize);
-+			 __func__, (long int)wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
- 			xlog(L_FATAL, "%s: unable to reopen pipe: %d",
-@@ -668,7 +668,7 @@
- 	wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
- 	if (wsize != bsize) {
- 		xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
--			 __func__, wsize);
-+			 __func__, (long int)wsize);
- 		ret = cld_pipe_open(clnt);
- 		if (ret) {
- 			xlog(L_FATAL, "%s: unable to reopen pipe: %d",
---- a/utils/nfsdcld/sqlite.c	2019-11-13 18:09:41.000000000 +0100
-+++ b/utils/nfsdcld/sqlite.c	2020-01-17 20:08:36.425251924 +0100
-@@ -512,7 +512,7 @@
- 	current_epoch = tcur;
- 	recovery_epoch = trec;
- 	ret = 0;
--	xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
--		__func__, current_epoch, recovery_epoch);
-+	xlog(D_GENERAL, "%s: current_epoch=%llu recovery_epoch=%llu",
-+		__func__, (long long unsigned int)current_epoch, (long long unsigned int)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",
--		__func__, current_epoch, recovery_epoch);
-+	xlog(D_GENERAL, "%s: current_epoch=%llu recovery_epoch=%llu",
-+		__func__, (long long unsigned int)current_epoch, (long long unsigned int)recovery_epoch);
- 
- out:
-@@ -1282,7 +1282,7 @@
- 	}
- 
- 	recovery_epoch = 0;
--	xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
--		__func__, current_epoch, recovery_epoch);
-+	xlog(D_GENERAL, "%s: current_epoch=%llu recovery_epoch=%llu",
-+		__func__, (long long unsigned int)current_epoch, (long long unsigned int)recovery_epoch);
- 
- out:

srcpkgs/nfs-utils/patches/nfs-utils-1.1.4-mtab-sym.patch

@@ -1,37 +0,0 @@
---- ./utils/mount/fstab.c
-+++ ./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;
---- ./utils/mount/fstab.h
-+++ ./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);
---- ./utils/mount/mount.c
-+++ ./utils/mount/mount.c
-@@ -204,6 +204,13 @@
- 	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+");

srcpkgs/nfs-utils/template

@@ -1,6 +1,6 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
-version=2.4.2
+version=2.4.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.linux-nfs.org/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038
+checksum=af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599
 patch_args="-Np1"
 replaces="rpcgen>=0"
 
@@ -36,7 +36,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 fi
 
 pre_configure() {
-	vsed -i '/SUBDIRS =/s/locktest//' tools/Makefile.in
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		vsed -i -e 's/__res_querydomain/res_querydomain/g' configure*