[gentoo-commits] proj/musl:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/
commit: 3f3ac3a07ce7edef0ff88317c22bc056d63d1b2c Author: Sam James gentoo org> AuthorDate: Fri Sep 13 01:44:24 2024 + Commit: Sam James gentoo org> CommitDate: Fri Sep 13 01:44:24 2024 + URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=3f3ac3a0 net-fs/nfs-utils: treeclean ::gentoo works fine. Signed-off-by: Sam James gentoo.org> net-fs/nfs-utils/Manifest | 1 - net-fs/nfs-utils/files/exports | 1 - net-fs/nfs-utils/files/musl-getservbyport.patch| 18 -- net-fs/nfs-utils/files/musl-svcgssd-sysconf.patch | 144 -- net-fs/nfs-utils/files/musl-time64.patch | 51 - ...utils-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(-) diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest deleted file mode 100644 index 0ae2ec8e.. --- 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 5102ef27.. --- 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 6fa589c7.. --- 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 ec280cca.. --- 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 = NUL
[gentoo-commits] proj/musl:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/
commit: e073f305fcd007b55c9ed9a8533ca3baea795f8d Author: Necktwi Ozfguah ferryfair com> AuthorDate: Wed May 8 15:37:02 2019 + Commit: Anthony G. Basile gentoo org> CommitDate: Wed May 8 20:39:19 2019 + URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=e073f305 net-fs/nfs-utils: fixed repoman fatals added the missing 2.3.2 patch files Signed-off-by: Necktwi Ozfguah ferryfair.com> Signed-off-by: Anthony G. Basile gentoo.org> .../files/nfs-utils-2.3.2-junction_libs.patch | 45 ++ .../files/nfs-utils-2.3.2-no-werror.patch | 53 ++ net-fs/nfs-utils/metadata.xml | 1 + net-fs/nfs-utils/nfs-utils-2.3.3.ebuild| 2 +- 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch new file mode 100644 index 000..f13f07a --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch @@ -0,0 +1,45 @@ +From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Mon, 28 May 2018 12:13:10 +0200 +Subject: [PATCH] Fix undefined references and bad include when build with + junction support + +--- + support/junction/Makefile.am | 2 +- + utils/nfsref/Makefile.am | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/support/junction/Makefile.am b/support/junction/Makefile.am +index 97e7426..89cb532 100644 +--- a/support/junction/Makefile.am b/support/junction/Makefile.am +@@ -31,4 +31,4 @@ libjunction_la_SOURCES = display.c export-cache.c junction.c \ + + MAINTAINERCLEANFILES = Makefile.in + +-AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2 ++AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2 @TIRPC_CFLAGS@ +diff --git a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am +index 2b2bb53..a652b03 100644 +--- a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am +@@ -27,13 +27,13 @@ noinst_HEADERS = nfsref.h + + sbin_PROGRAMS = nfsref + nfsref_SOURCES= add.c lookup.c nfsref.c remove.c +-LDADD = $(LIBXML2) $(LIBCAP) \ +-../../support/nfs/libnfs.la \ ++LIBS += $(LIBXML2) $(LIBCAP) ++LDADD = ../../support/nfs/libnfs.la \ + ../../support/junction/libjunction.la + + man8_MANS = nfsref.man + + MAINTAINERCLEANFILES = Makefile.in + +-AM_CPPFLAGS = -I. -I../../support/include ++AM_CPPFLAGS = -I. -I../../support/include @TIRPC_CFLAGS@ + ##AM_LDFLAGS = -Wl,--as-needed +-- +2.17.0 + diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch new file mode 100644 index 000..d06fc4c --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/656984 + +Don't build with -Werror flags. + +--- a/configure.ac b/configure.ac +@@ -544,45 +544,11 @@ + AC_SUBST(LDFLAGS_FOR_BUILD) + + my_am_cflags="\ +- -pipe \ + -Wall \ + -Wextra \ +- -Werror=strict-prototypes \ +- -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=$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]) +- +-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"]) ++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)"]) diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml index 34459d2..45351e4 100644 --- a/net-fs/nfs-utils/metadata.xml +++ b/net-fs/nfs-utils/metadata.xml @@ -7,6 +7,7 @@ NFS client and server daemons +Enable NFS junction support in nfsref Add ldap support Link mount.nfs with libmount Enable nfsdcld NFSv4 clientid tracking daemon diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild index a324c7e..be26330 100644 --- a/net-fs/nfs-utils/nfs-utils-2.3.3.
[gentoo-commits] proj/musl:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/
commit: ce2a8c9d93374d9ecd2576a9eb94c5d7751011d7 Author: S. Lockwood-Childs vctlabs com> AuthorDate: Wed May 23 09:15:29 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Thu May 24 00:27:10 2018 + URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=ce2a8c9d net-fs/nfs-utils: add package * configure check needs to be for res_querydomain() not internal glibc function __res_querydomain() * missing limits.h header for PATH_MAX net-fs/nfs-utils/Manifest | 2 + net-fs/nfs-utils/files/exports | 1 + .../nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch | 39 + .../files/nfs-utils-1.2.8-cross-build.patch| 48 ++ ...s-utils-2.3.1-svcgssd_undefined_reference.patch | 40 + net-fs/nfs-utils/files/nfs-utils-musl.patch| 21 +++ net-fs/nfs-utils/files/nfs-utils.conf | 3 + net-fs/nfs-utils/files/nfs.confd | 38 + net-fs/nfs-utils/files/nfs.initd | 162 ++ net-fs/nfs-utils/files/nfsclient.confd | 18 ++ net-fs/nfs-utils/files/nfsclient.initd | 33 net-fs/nfs-utils/files/nfsmount.confd | 7 + net-fs/nfs-utils/files/nfsmount.initd | 47 ++ 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-1.3.4-r1.ebuild | 182 net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild | 187 + 22 files changed, 1010 insertions(+) diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest new file mode 100644 index 000..47f42dd --- /dev/null +++ b/net-fs/nfs-utils/Manifest @@ -0,0 +1,2 @@ +DIST nfs-utils-1.3.4.tar.bz2 814545 BLAKE2B 4b8c5fa4c1c21858e19d05f973c6d94185cf6a15c88348dda5e47c6714f9dba00dfa05237d908479970440b2ea57287600e92cb4d49872127b3801e075d6bf1a SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c +DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3 diff --git a/net-fs/nfs-utils/files/exports b/net-fs/nfs-utils/files/exports new file mode 100644 index 000..5102ef2 --- /dev/null +++ b/net-fs/nfs-utils/files/exports @@ -0,0 +1 @@ +# /etc/exports: NFS file systems being exported. See exports(5). diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch new file mode 100644 index 000..c9e60af --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch @@ -0,0 +1,39 @@ +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/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch new file mode 100644 index 000..7317115 --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch @@ -0,0 +1,48 @@ +this is kind of hacky, but automake doesn't make this easy +for us atm, so hack away :( + +(recent autotools will always add $(CFLAGS)/etc... to the compile) + +--- a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am +@@ -1,12 +1,11 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) +-LIBTOOL = @LIBTOOL@ --tag=CC