From 3f3ac3a07ce7edef0ff88317c22bc056d63d1b2c Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 13 Sep 2024 02:44:24 +0100 Subject: [PATCH] net-fs/nfs-utils: treeclean ::gentoo works fine. Signed-off-by: Sam James --- net-fs/nfs-utils/Manifest | 1 - net-fs/nfs-utils/files/exports | 1 - .../nfs-utils/files/musl-getservbyport.patch | 18 -- .../files/musl-svcgssd-sysconf.patch | 144 ------------ net-fs/nfs-utils/files/musl-time64.patch | 51 ----- ...-2.4.2-Ensure-consistent-struct-stat.patch | 115 ---------- .../files/nfs-utils-2.5.2-no-werror.patch | 68 ------ net-fs/nfs-utils/files/nfs.confd | 38 ---- net-fs/nfs-utils/files/nfs.initd | 156 ------------- net-fs/nfs-utils/files/nfsclient.confd | 18 -- net-fs/nfs-utils/files/nfsclient.initd | 33 --- net-fs/nfs-utils/files/nfsmount.initd-1.3.1 | 26 --- net-fs/nfs-utils/files/rpc.gssd.initd | 23 -- net-fs/nfs-utils/files/rpc.idmapd.initd | 25 -- net-fs/nfs-utils/files/rpc.pipefs.initd | 32 --- net-fs/nfs-utils/files/rpc.statd.initd | 32 --- net-fs/nfs-utils/files/rpc.svcgssd.initd | 23 -- net-fs/nfs-utils/metadata.xml | 21 -- net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild | 213 ------------------ 19 files changed, 1038 deletions(-) delete mode 100644 net-fs/nfs-utils/Manifest delete mode 100644 net-fs/nfs-utils/files/exports delete mode 100644 net-fs/nfs-utils/files/musl-getservbyport.patch delete mode 100644 net-fs/nfs-utils/files/musl-svcgssd-sysconf.patch delete mode 100644 net-fs/nfs-utils/files/musl-time64.patch delete mode 100644 net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch delete mode 100644 net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch delete mode 100644 net-fs/nfs-utils/files/nfs.confd delete mode 100644 net-fs/nfs-utils/files/nfs.initd delete mode 100644 net-fs/nfs-utils/files/nfsclient.confd delete mode 100644 net-fs/nfs-utils/files/nfsclient.initd delete mode 100644 net-fs/nfs-utils/files/nfsmount.initd-1.3.1 delete mode 100644 net-fs/nfs-utils/files/rpc.gssd.initd delete mode 100644 net-fs/nfs-utils/files/rpc.idmapd.initd delete mode 100644 net-fs/nfs-utils/files/rpc.pipefs.initd delete mode 100644 net-fs/nfs-utils/files/rpc.statd.initd delete mode 100644 net-fs/nfs-utils/files/rpc.svcgssd.initd delete mode 100644 net-fs/nfs-utils/metadata.xml delete mode 100644 net-fs/nfs-utils/nfs-utils-2.5.3-r2.ebuild diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest deleted file mode 100644 index 0ae2ec8ede..0000000000 --- a/net-fs/nfs-utils/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732 diff --git a/net-fs/nfs-utils/files/exports b/net-fs/nfs-utils/files/exports deleted file mode 100644 index 5102ef27c1..0000000000 --- a/net-fs/nfs-utils/files/exports +++ /dev/null @@ -1 +0,0 @@ -# /etc/exports: NFS file systems being exported. See exports(5). diff --git a/net-fs/nfs-utils/files/musl-getservbyport.patch b/net-fs/nfs-utils/files/musl-getservbyport.patch deleted file mode 100644 index 6fa589c7b7..0000000000 --- a/net-fs/nfs-utils/files/musl-getservbyport.patch +++ /dev/null @@ -1,18 +0,0 @@ -Musl will always return something with getservbyport so we cannot skip -ports that returns non-null. - -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 -@@ -93,8 +93,10 @@ - __func__); - break; - } -+#if 0 - se = getservbyport(sin.sin_port, "udp"); - if (se == NULL) -+#endif - break; - - if (retries == MAX_BRP_RETRIES) { diff --git a/net-fs/nfs-utils/files/musl-svcgssd-sysconf.patch b/net-fs/nfs-utils/files/musl-svcgssd-sysconf.patch deleted file mode 100644 index ec280ccaa8..0000000000 --- a/net-fs/nfs-utils/files/musl-svcgssd-sysconf.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- a/support/nfsidmap/libnfsidmap.c -+++ b/support/nfsidmap/libnfsidmap.c -@@ -432,11 +432,17 @@ int nfs4_init_name_mapping(char *conffil - - nobody_user = conf_get_str("Mapping", "Nobody-User"); - if (nobody_user) { -- size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETPW_R_SIZE_MAX*/ - struct passwd *buf; - struct passwd *pw = NULL; - int err; - -+ /*sysconf can return -1 when _SC_GETPW_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead -+ to an integer overflow, which leads to a buffer overflow and crashes svcgssd */ -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; -+ - buf = malloc(sizeof(*buf) + buflen); - if (buf) { - err = getpwnam_r(nobody_user, buf, ((char *)buf) + sizeof(*buf), buflen, &pw); -@@ -453,11 +459,17 @@ int nfs4_init_name_mapping(char *conffil - - nobody_group = conf_get_str("Mapping", "Nobody-Group"); - if (nobody_group) { -- size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ size_t buflen = 1024; /*value on my gentoo glibc system that has _SC_GETGR_R_SIZE_MAX*/ - struct group *buf; - struct group *gr = NULL; - int err; - -+ /*sysconf can return -1 when _SC_GETGR_R_SIZE_MAX is not defined, like on musl systems, if cast to size_t this will lead -+ to an integer overflow, which leads to a buffer overflow and crashes svcgssd */ -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; -+ - buf = malloc(sizeof(*buf) + buflen); - if (buf) { - err = getgrnam_r(nobody_group, buf, ((char *)buf) + sizeof(*buf), buflen, &gr); ---- a/support/nfsidmap/static.c -+++ b/support/nfsidmap/static.c -@@ -98,10 +98,14 @@ static struct passwd *static_getpwnam(co - { - struct passwd *pw; - struct pwbuf *buf; -- size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ size_t buflen = 1024; - char *localname; - int err; - -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; -+ - buf = malloc(sizeof(*buf) + buflen); - if (!buf) { - err = ENOMEM; -@@ -149,10 +153,14 @@ static struct group *static_getgrnam(con - { - struct group *gr; - struct grbuf *buf; -- size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ size_t buflen = 1024; - char *localgroup; - int err; - -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; -+ - buf = malloc(sizeof(*buf) + buflen); - if (!buf) { - err = ENOMEM; ---- a/support/nfsidmap/nss.c -+++ b/support/nfsidmap/nss.c -@@ -91,9 +91,13 @@ static int nss_uid_to_name(uid_t uid, ch - struct passwd *pw = NULL; - struct passwd pwbuf; - char *buf; -- size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ size_t buflen = 1024; - int err = -ENOMEM; - -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; -+ - buf = malloc(buflen); - if (!buf) - goto out; -@@ -119,9 +123,13 @@ static int nss_gid_to_name(gid_t gid, ch - struct group *gr = NULL; - struct group grbuf; - char *buf; -- size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ size_t buflen = 1024; - int err; - -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; -+ - if (domain == NULL) - domain = get_default_domain(); - -@@ -192,12 +200,13 @@ static struct passwd *nss_getpwnam(const - { - struct passwd *pw; - struct pwbuf *buf; -- size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); -+ size_t buflen = 1024; - char *localname; - int err = ENOMEM; - -- if (buflen > UINT_MAX) -- goto err; -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; - - buf = malloc(sizeof(*buf) + buflen); - if (buf == NULL) -@@ -301,7 +310,8 @@ static int _nss_name_to_gid(char *name, - struct group *gr = NULL; - struct group grbuf; - char *buf, *domain; -- size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); -+ size_t buflen = 1024; - int err = -EINVAL; - char *localname = NULL; - char *ref_name = NULL; -@@ -327,8 +337,8 @@ static int _nss_name_to_gid(char *name, - } - - err = -ENOMEM; -- if (buflen > UINT_MAX) -- goto out_name; -+ if (scbuflen > 0) -+ buflen = (size_t)scbuflen; - - do { - buf = malloc(buflen); diff --git a/net-fs/nfs-utils/files/musl-time64.patch b/net-fs/nfs-utils/files/musl-time64.patch deleted file mode 100644 index 62a1d1e11a..0000000000 --- a/net-fs/nfs-utils/files/musl-time64.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c -index b45a904..6b1049f 100644 ---- a/utils/nfsdcltrack/nfsdcltrack.c -+++ b/utils/nfsdcltrack/nfsdcltrack.c -@@ -25,9 +25,11 @@ - - #include - #include --#include - #include - #include -+#include -+#include -+#include - #include - #include - #include -@@ -525,7 +527,8 @@ cltrack_gracedone(const char *timestr) - if (*tail) - return -EINVAL; - -- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); -+ xlog(D_GENERAL, "%s: grace done. gracetime=%" PRId64, __func__, -+ (int64_t)gracetime); - - ret = sqlite_remove_unreclaimed(gracetime); - -diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c -index 2801201..c4e0cdf 100644 ---- a/utils/nfsdcltrack/sqlite.c -+++ b/utils/nfsdcltrack/sqlite.c -@@ -42,6 +42,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include -@@ -544,8 +546,8 @@ sqlite_remove_unreclaimed(time_t grace_start) - int ret; - char *err = NULL; - -- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", -- grace_start); -+ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %" PRId64, -+ (int64_t)grace_start); - if (ret < 0) { - return ret; - } else if ((size_t)ret >= sizeof(buf)) { diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch deleted file mode 100644 index 8541a985ff..0000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 1378280398ef9f5cd45f5542ae2945b9a360b132 Mon Sep 17 00:00:00 2001 -From: Doug Nazar -Date: Sun, 17 Nov 2019 14:31:33 -0500 -Subject: [PATCH] Ensure consistent struct stat definition - -Although 2fbc62e2a13fc ("Fix include order between config.h and stat.h") -reorganized those files that were already including config.h, not all -files were including config.h. - -Fixes at least stack smashing crashes in mountd on 32-bit systems. - -Signed-off-by: Doug Nazar -Signed-off-by: Steve Dickson ---- - support/junction/junction.c | 4 ++++ - support/misc/file.c | 4 ++++ - support/misc/mountpoint.c | 4 ++++ - support/nfs/cacheio.c | 4 ++++ - utils/mount/fstab.c | 4 ++++ - utils/nfsdcld/legacy.c | 4 ++++ - 6 files changed, 24 insertions(+) - -diff --git a/support/junction/junction.c b/support/junction/junction.c -index ab6caa6..41cce26 100644 ---- a/support/junction/junction.c -+++ b/support/junction/junction.c -@@ -27,6 +27,10 @@ - #include - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - -diff --git a/support/misc/file.c b/support/misc/file.c -index e7c3819..06f6bb2 100644 ---- a/support/misc/file.c -+++ b/support/misc/file.c -@@ -22,6 +22,10 @@ - #include - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - - #include -diff --git a/support/misc/mountpoint.c b/support/misc/mountpoint.c -index c6217f2..14d6731 100644 ---- a/support/misc/mountpoint.c -+++ b/support/misc/mountpoint.c -@@ -7,6 +7,10 @@ - #include - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include "xcommon.h" - #include -diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c -index 9dc4cf1..7c4cf37 100644 ---- a/support/nfs/cacheio.c -+++ b/support/nfs/cacheio.c -@@ -19,6 +19,10 @@ - #include - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - #include -diff --git a/utils/mount/fstab.c b/utils/mount/fstab.c -index eedbdda..8b0aaf1 100644 ---- a/utils/mount/fstab.c -+++ b/utils/mount/fstab.c -@@ -11,6 +11,10 @@ - #include - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - #include -diff --git a/utils/nfsdcld/legacy.c b/utils/nfsdcld/legacy.c -index 07f477a..3c6bea6 100644 ---- a/utils/nfsdcld/legacy.c -+++ b/utils/nfsdcld/legacy.c -@@ -19,6 +19,10 @@ - #include - #endif - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #include - #include - #include --- -1.8.3.1 - diff --git a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch deleted file mode 100644 index a7226db249..0000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6ab8c7c186bd4a547a0ca435ecabe10ee50039c5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 22 Oct 2020 19:44:34 +0200 -Subject: [PATCH] Don't build with -Werror flags - -https://bugs.gentoo.org/656984 - -Signed-off-by: Lars Wendler ---- - configure.ac | 34 +--------------------------------- - 1 file changed, 1 insertion(+), 33 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 50847d8a..6bc18e93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -631,47 +631,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD) - AC_SUBST(LDFLAGS_FOR_BUILD) - - my_am_cflags="\ -- -pipe \ - -Wall \ - -Wextra \ - $rpcgen_cflags \ -- -Werror=missing-prototypes \ -- -Werror=missing-declarations \ -- -Werror=format=2 \ -- -Werror=undef \ -- -Werror=missing-include-dirs \ -- -Werror=strict-aliasing=2 \ -- -Werror=init-self \ -- -Werror=implicit-function-declaration \ -- -Werror=return-type \ -- -Werror=switch \ -- -Werror=overflow \ -- -Werror=parentheses \ -- -Werror=aggregate-return \ -- -Werror=unused-result \ - -fno-strict-aliasing \ - " - --AC_DEFUN([CHECK_CCSUPPORT], [ -- my_save_cflags="$CFLAGS" -- CFLAGS="-Werror $1" -- AC_MSG_CHECKING([whether CC supports $1]) -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], -- [AC_MSG_RESULT([yes])] -- [$2+=$1], -- [AC_MSG_RESULT([no])] -- ) -- CFLAGS="$my_save_cflags" --]) -- --CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1]) --CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) --CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3]) --CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4]) --CHECK_CCSUPPORT([-Wno-cast-function-type], [flg5]) - AX_GCC_FUNC_ATTRIBUTE([format]) - --AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4 $flg5"]) -+AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) - - # Make sure that $ACLOCAL_FLAGS are used during a rebuild - AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) --- -2.29.0 - diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd deleted file mode 100644 index 9dc14058c1..0000000000 --- a/net-fs/nfs-utils/files/nfs.confd +++ /dev/null @@ -1,38 +0,0 @@ -# /etc/conf.d/nfs - -# If you wish to set the port numbers for lockd, -# please see /etc/sysctl.conf - -# Optional services to include in default `/etc/init.d/nfs start` -# For NFSv4 users, you'll want to add "rpc.idmapd" here. -NFS_NEEDED_SERVICES="" - -# Options to pass to rpc.nfsd -OPTS_RPC_NFSD="8" - -# Options to pass to rpc.mountd -# ex. OPTS_RPC_MOUNTD="-p 32767" -OPTS_RPC_MOUNTD="" - -# Options to pass to rpc.statd -# ex. OPTS_RPC_STATD="-p 32765 -o 32766" -OPTS_RPC_STATD="" - -# Options to pass to rpc.idmapd -OPTS_RPC_IDMAPD="" - -# Options to pass to rpc.gssd -OPTS_RPC_GSSD="" - -# Options to pass to rpc.svcgssd -OPTS_RPC_SVCGSSD="" - -# Options to pass to rpc.rquotad (requires sys-fs/quota) -OPTS_RPC_RQUOTAD="" - -# Timeout (in seconds) for exportfs -EXPORTFS_TIMEOUT=30 - -# Options to set in the nfsd filesystem (/proc/fs/nfsd/). -# Format is