summaryrefslogtreecommitdiff
path: root/user/nfs-utils
diff options
context:
space:
mode:
Diffstat (limited to 'user/nfs-utils')
-rw-r--r--user/nfs-utils/APKBUILD16
-rw-r--r--user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch39
-rw-r--r--user/nfs-utils/nfsdcld.patch21
-rw-r--r--user/nfs-utils/posixish.patch4
-rw-r--r--user/nfs-utils/time64.patch94
-rw-r--r--user/nfs-utils/undef-def.patch22
6 files changed, 102 insertions, 94 deletions
diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index 8b1039750..2d42c60ff 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.4.1
-pkgrel=1
+pkgver=2.4.3
+pkgrel=0
pkgdesc="NFS file sharing client and server"
url="http://nfs.sourceforge.net/"
arch="all"
@@ -13,10 +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
- undef-def.patch
+ time64.patch
exports
nfs.confd nfs.initd nfsclient.confd nfsclient.initd nfsmount.confd
@@ -59,11 +57,9 @@ package() {
done
}
-sha512sums="9aec8465be4bba300c5cd2e0d22f9f6db489a989bfbf01b10f62a7e628347dda06aa3079d18abc6ff5b0d5df54fdd9f27297e3e80b5f7fe525ab78df8fd88d8e nfs-utils-2.4.1.tar.xz
-1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 nfs-utils-1.1.4-mtab-sym.patch
-0275cacdaf399e9a9f132a79a6eab09aea176204181f2a1c1c7f062faeef5c4d979912aaf751bdfdfd3fc3d4dc166dca89ac1fabf2655d222379dd4e7ccab419 nfsdcld.patch
-db5927d533ff8c1bfd5f4948bc1ea6a375a779f3ab10f7520367556cf195245fbeaf28ff9974daeec319b47f1f0344c7f93a354e8ab28de5c4203f0d2b273a6b posixish.patch
-3436064c2aa8e8a645fdae11e87a1bc932cfe60883f1516a218fe3dc65d2abe962c9322dd1c59c2c117dd942e6b72d7311f51280d0d71fc69ed4ed543ac6d841 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 c9e60afc7..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
-@@ -230,6 +230,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 e80956bb8..000000000
--- a/user/nfs-utils/nfsdcld.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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 9bc817ad0..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
-@@ -20302,9 +20302,9 @@
+@@ -20596,9 +20596,9 @@
fi
fi
@@ -13,7 +13,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -20318,27 +20318,27 @@
+@@ -20612,27 +20612,27 @@
#ifdef __cplusplus
extern "C"
#endif
diff --git a/user/nfs-utils/time64.patch b/user/nfs-utils/time64.patch
new file mode 100644
index 000000000..b28ee2f44
--- /dev/null
+++ b/user/nfs-utils/time64.patch
@@ -0,0 +1,94 @@
+--- nfs-utils-2.4.2/support/nfs/cacheio.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/support/nfs/cacheio.c 2020-01-24 03:32:30.296395221 +0000
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
++#include <inttypes.h>
+
+ extern struct state_paths etab;
+
+@@ -234,7 +235,7 @@
+ stb.st_mtime > now)
+ stb.st_mtime = time(0);
+
+- sprintf(stime, "%ld\n", stb.st_mtime);
++ sprintf(stime, "%"PRId64"\n", stb.st_mtime);
+ for (c=0; cachelist[c]; c++) {
+ int fd;
+ sprintf(path, "/proc/net/rpc/%s/flush", cachelist[c]);
+--- nfs-utils-2.4.2/utils/idmapd/idmapd.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/utils/idmapd/idmapd.c 2020-01-24 03:35:05.459393437 +0000
+@@ -65,6 +65,7 @@
+ #include <ctype.h>
+ #include <libgen.h>
+ #include <nfsidmap.h>
++#include <inttypes.h>
+
+ #include "xlog.h"
+ #include "conffile.h"
+@@ -172,7 +173,7 @@
+ int fd;
+ char stime[32];
+
+- sprintf(stime, "%ld\n", now);
++ sprintf(stime, "%"PRId64"\n", now);
+ fd = open(path, O_RDWR);
+ if (fd == -1)
+ return -1;
+@@ -625,7 +626,7 @@
+ /* Name */
+ addfield(&bp, &bsiz, im.im_name);
+ /* expiry */
+- snprintf(buf1, sizeof(buf1), "%lu",
++ snprintf(buf1, sizeof(buf1), "%"PRIu64,
+ time(NULL) + cache_entry_expiration);
+ addfield(&bp, &bsiz, buf1);
+ /* Note that we don't want to write the id if the mapping
+@@ -653,7 +654,7 @@
+ snprintf(buf1, sizeof(buf1), "%u", im.im_id);
+ addfield(&bp, &bsiz, buf1);
+ /* expiry */
+- snprintf(buf1, sizeof(buf1), "%lu",
++ snprintf(buf1, sizeof(buf1), "%"PRIu64,
+ 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/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 @@
+ #include <sys/inotify.h>
+ #include <dirent.h>
+ #include <limits.h>
++#include <inttypes.h>
+ #ifdef HAVE_SYS_CAPABILITY_H
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
+@@ -525,7 +526,7 @@
+ if (*tail)
+ return -EINVAL;
+
+- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
++ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRId64, __func__, gracetime);
+
+ ret = sqlite_remove_unreclaimed(gracetime);
+
+--- nfs-utils-2.4.2/utils/nfsdcltrack/sqlite.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/utils/nfsdcltrack/sqlite.c 2020-01-24 04:40:31.519202517 +0000
+@@ -48,6 +48,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sqlite3.h>
++#include <inttypes.h>
+ #include <linux/limits.h>
+
+ #include "xlog.h"
+@@ -544,7 +545,7 @@
+ int ret;
+ char *err = NULL;
+
+- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
++ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRId64,
+ grace_start);
+ if (ret < 0) {
+ return ret;
diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch
deleted file mode 100644
index a8b03ac03..000000000
--- a/user/nfs-utils/undef-def.patch
+++ /dev/null
@@ -1,22 +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];
---- nfs-utils-2.3.3/utils/mount/network.c.old 2018-09-06 18:09:08.000000000 +0000
-+++ nfs-utils-2.3.3/utils/mount/network.c 2019-01-10 16:28:46.840000000 +0000
-@@ -39,7 +39,7 @@
- #include <sys/socket.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
--#if defined(__GLIBC__) && (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)
-+#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24))
- /* 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
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-27 09:21:10 +0000