From 0184387f6a748c74c5d29cddf20289dc94f05ddc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2024 08:07:42 +0000 Subject: gentoo auto-resync : 19:01:2024 - 08:07:41 --- net-fs/Manifest.gz | Bin 3358 -> 3360 bytes net-fs/nfs-utils/Manifest | 2 + .../nfs-utils/files/nfs-utils-2.6.4-includes.patch | 41 ++++ net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild | 234 +++++++++++++++++++++ 4 files changed, 277 insertions(+) create mode 100644 net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch create mode 100644 net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild (limited to 'net-fs') diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz index 9eba423515ab..764e04e9c874 100644 Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index d16634da8b7d..4cc9e08ca298 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -3,6 +3,7 @@ AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3 AUX nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch 1040 BLAKE2B 29e3ebc44cb4a24765134ff11ccb258270e9bd8c26a02ec15b0e6e6600e530a70833609ca8508d691929ebf2cdf02e2230917f39e1e1d6aa05be169906f41906 SHA512 580aa6837760adb0ecda935a547ea204655850dac4b9c613679c77c4a4a98bff7d61cbfd3616fab8d2cb03b806c0b131ccd911bf933ab5cd9c2a242e6b921454 AUX nfs-utils-2.6.2-clang-fix-function-prototypes.patch 2118 BLAKE2B 182659cd4a0efc40b4574d3aaa534fcd2367db230c9ac1df9e3cb3a7f06436061e497dbeb9c77a61e7df4dd34e83b1a213acfb5b94e4a5794af9bd81d087eb27 SHA512 a9d762f91782bbe6c1329e90b558ab30aa7be60cb844046783243de493b9a798daf460078310f12c6c174d26b63607d294466bd02fb684b457e3e219dd4cadd0 AUX nfs-utils-2.6.2-clang-more-function-prototypes.patch 1222 BLAKE2B 1f1557ced63aaa8ab92a8e74126501ebcc77469c72e3cc4ad685ec046d78120f189b1195ba1766a525b7a52c11d0a795ed9bbd74b3e16f30b79295988decaad0 SHA512 f3340ddd67ebd6d28b6fc78b08ef8d87df9d0681143590548c1fb5d152287a5a235a92356e4a4d813d55095956dbf9fbec990481e775be2ffaf1e34a885145ab +AUX nfs-utils-2.6.4-includes.patch 1254 BLAKE2B b741302756690872ed218a830695abea740704e6e0850dacd17c471519337f22b268b6902849cfb83165f0dec9bd42badf2b67642564ba18c7d149d636fee55d SHA512 ec59556ac8c0626fbd37eb27e152d8994503ffc890eb95844bc705ea2241fe57a8ace109ffae4d1b2d4c36ad78994fd39f3b3bd5d7336a6cd02fddb1f3bf76e9 AUX nfs-utils-udev-sysctl.patch 1388 BLAKE2B 843cc5f0f00e665cbd731588784193b08b45a3e16aa79d303751f8b019083404db74e78f6bc35ca8f894ff0a60ee2f374c1108f21b13be66d7049b6e46609add SHA512 2d9b6189c2e6db96a487fbae2af80623c7157ee52a51cb63afba547f05f81ab8a291c7b7001b5faf8e58cef290fd23cc2d1892f97387fc842f230d23218d06a2 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 AUX nfs.initd 4018 BLAKE2B 87d9111c7961db63e6a2eba1788f2bd7113e14e96a203f2f0e2a551f64dd1e19b8f4ed6a62658f48bf88007c3e115916a4d24f3cd1983df25cd09f0a21cacf79 SHA512 840f62a16b3d4cf651011f49b76033c01033b18336b2798705449ed7b15c4e6f545fb318674868d6a223781a2752bdcef4c9c3435eddf11fd0416f2037591608 @@ -19,5 +20,6 @@ DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc7632 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533 EBUILD nfs-utils-2.6.2-r1.ebuild 6273 BLAKE2B 13c6ac04c9d4b5c7d117537f6a89c82c9978780f29f5ea1d8949585cc7823e0aae8dec0478d6f2aa07c34d3ec0e98c4ae16015ebbb05fd970ffcfa9300f1661a SHA512 b7d271c5b949d4e248f310016b85d4e3a29e873a7baff6b83bff5512f8f09313cadb6572133bea220970b4c29bdad171a1f8db8cd6031cbdf1287c384103cc5d EBUILD nfs-utils-2.6.3-r2.ebuild 6343 BLAKE2B 115b74d78136c8570796db5beda82359bc6abb5778be465acc9aa319e0ac13e3d49c74b28d47dc819765b162051a227f1b77e427bdc40bb8930e671c121d21e4 SHA512 721b754a0e5ca8344cee80d6ea8efb197e73daf5cd2b5824fef0ebba8442b6c2bbf7082ff37866ebd8a61772ca39ae48952d758a1106eef6cf8bb9dfb9a800e0 +EBUILD nfs-utils-2.6.4-r1.ebuild 6381 BLAKE2B dfddee04637316f0702afb9cb0b755c34f3a5eb7c6584c65eb1b13e44517bbefe417e0fa11eb522a15ad35ab7705b15d6dd20f6bc5732379e5d99287b1359905 SHA512 c2e0a5d46311af0bf90a9ef2301a1e848a720f096a7f54d052671fe75f142f41e1a8229de3de3b5d2e483e37d706eb33d8aeaa7aab5b25a85da6ca9949b0450f EBUILD nfs-utils-2.6.4.ebuild 6346 BLAKE2B 91ae0cda6bd03e0467f3e7ced4034bd0e0bdb6f9ebb9c7db93dfea17e045672f623b87d4998b702e752967b185c1fb730a0a1b7b9e699a08934bedef4c3039b4 SHA512 07ee60141ff50a05de2ef5c554c1165f82cc4eb5797a35adabd2f80b24afb82cf8a82286d681f496e02fd8788ce24a959bed929c0ca6686ccbea7c0f9cd6b0bc MISC metadata.xml 931 BLAKE2B 68fe90eceb28d3941cf4a8179320b5e5839b3d84dddab9509f9a1bb7c70f413acbb32ef6fda9cb94349193e258df71edb2a518568780177b4a8cfe155f9b57a9 SHA512 af2f74e21226176eb2873ea5de7f96996f54b73b742800adb444ced7485c8ae3556aba20b47c58c0694655f9a9b56447307483f98fc426b322fe05c56a2ce8a9 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch new file mode 100644 index 000000000000..0312ac1a8b37 --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/922373 +https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bb25f3f594ddf85e5826e931eaaa35874f6a4204 + +From bb25f3f594ddf85e5826e931eaaa35874f6a4204 Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Wed, 3 Jan 2024 19:07:43 -0500 +Subject: [PATCH] reexport/{fsidd,reexport}.c: Re-add missing includes + +Older uClibc-ng requires for close(2), unlink(2) and write(2), + for struct sockaddr_un. + +Fixes: 1a4edb2a ("reexport/fsidd.c: Remove unused headers") +Fixes: bdc79f02 ("support/reexport.c: Remove unused headers") + +Reviewed-by: Giulio Benetti +Tested-by: Giulio Benetti +Signed-off-by: Petr Vorel +Signed-off-by: Steve Dickson +--- a/support/reexport/fsidd.c ++++ b/support/reexport/fsidd.c +@@ -7,6 +7,8 @@ + #include + #endif + #include ++#include ++#include + + #include "conffile.h" + #include "reexport_backend.h" +--- a/support/reexport/reexport.c ++++ b/support/reexport/reexport.c +@@ -7,6 +7,7 @@ + #endif + #include + #include ++#include + #include + + #include "nfsd_path.h" +-- +1.8.3.1 diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild new file mode 100644 index 000000000000..987c49da9641 --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info systemd + +DESCRIPTION="NFS client and server daemons" +HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git" + +if [[ ${PV} == *_rc* ]] ; then + MY_PV="$(ver_rs 1- -)" + SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${PN}-${MY_PV}" +else + SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid" +REQUIRED_USE="kerberos? ( nfsv4 )" +# bug #315573 +RESTRICT="test" + +# kth-krb doesn't provide the right include +# files, and nfs-utils doesn't build against heimdal either, +# so don't depend on virtual/krb. +# (04 Feb 2005 agriffis) +COMMON_DEPEND=" + dev-libs/libxml2 + net-libs/libtirpc:= + >=net-nds/rpcbind-0.2.4 + sys-fs/e2fsprogs + dev-db/sqlite:3 + dev-libs/libevent:= + caps? ( sys-libs/libcap ) + ldap? ( + net-nds/openldap:= + sasl? ( + app-crypt/mit-krb5 + dev-libs/cyrus-sasl:2 + ) + ) + libmount? ( sys-apps/util-linux ) + nfsv4? ( + >=sys-apps/keyutils-1.5.9:= + kerberos? ( + >=net-libs/libtirpc-0.2.4-r1[kerberos] + app-crypt/mit-krb5 + ) + ) + nfsv41? ( + sys-fs/lvm2 + ) + tcpd? ( sys-apps/tcp-wrappers ) + uuid? ( sys-apps/util-linux )" +DEPEND="${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" +RDEPEND="${COMMON_DEPEND} + !net-libs/libnfsidmap + selinux? ( + sec-policy/selinux-rpc + sec-policy/selinux-rpcbind + ) +" +BDEPEND=" + net-libs/rpcsvc-proto + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.2-no-werror.patch + "${FILESDIR}"/${PN}-udev-sysctl.patch + "${FILESDIR}"/${P}-includes.patch +) + +pkg_setup() { + linux-info_pkg_setup + + if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then + ewarn "Your NFS server will be unable to track clients across server restarts!" + ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode" + ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" + ewarn "support the legacy, in-kernel client tracker." + fi +} + +src_prepare() { + default + + sed \ + -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ + -i utils/*/Makefile.am || die + + eautoreconf +} + +src_configure() { + # Our DEPEND forces this. + export libsqlite3_cv_is_recent=yes + export ac_cv_header_keyutils_h=$(usex nfsidmap) + + # SASL is consumed in a purely automagic way + export ac_cv_header_sasl_h=no + export ac_cv_header_sasl_sasl_h=$(usex sasl) + + local myeconfargs=( + --disable-static + --with-statedir="${EPREFIX}"/var/lib/nfs + --enable-tirpc + --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/ + --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap + --with-rpcgen + --with-systemd="$(systemd_get_systemunitdir)" + --without-gssglue + $(use_enable caps) + --enable-ipv6 + $(use_enable junction) + $(use_enable kerberos gss) + $(use_enable kerberos svcgss) + $(use_enable ldap) + $(use_enable libmount libmount-mount) + $(use_enable nfsdcld nfsdcltrack) + $(use_enable nfsv4) + $(use_enable nfsv41) + $(use_enable uuid) + $(use_with tcpd tcp-wrappers) + # XXX: Remove this hack after 2.6.3 + # See bug #904718. + # Patch: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca + LIBS="-lsqlite3 -levent_core" + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # Remove compiled files bundled in the tarball + emake clean + + default +} + +src_install() { + default + rm linux-nfs/Makefile* || die + dodoc -r linux-nfs README + + # Don't overwrite existing xtab/etab, install the original + # versions somewhere safe... more info in pkg_postinst + keepdir /var/lib/nfs/{,sm,sm.bak} + mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die + + # Install some client-side binaries in /sbin + dodir /sbin + mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die + + if use nfsv4 && use nfsidmap ; then + insinto /etc + doins support/nfsidmap/idmapd.conf + + # Install a config file for idmappers in newer kernels. bug #415625 + insinto /etc/request-key.d + echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf + doins id_resolver.conf + fi + + insinto /etc + doins "${FILESDIR}"/exports + keepdir /etc/exports.d + + local f list=() opt_need="" + if use nfsv4 ; then + opt_need="rpc.idmapd" + list+=( rpc.idmapd rpc.pipefs ) + use kerberos && list+=( rpc.gssd rpc.svcgssd ) + fi + for f in nfs nfsclient rpc.statd "${list[@]}" ; do + newinitd "${FILESDIR}"/${f}.initd ${f} + done + + # Nuke after 2015/08/01 + newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount + for f in nfs nfsclient ; do + newconfd "${FILESDIR}"/${f}.confd ${f} + done + + # bug #234132 + sed -i \ + -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ + "${ED}"/etc/conf.d/nfs || die + + local systemd_systemunitdir="$(systemd_get_systemunitdir)" + sed -i \ + -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ + "${ED}${systemd_systemunitdir}"/* || die + + # bug #368505 + keepdir /var/lib/nfs + # bug #603628 + keepdir /var/lib/nfs/v4recovery + + # No static archives + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + # Install default xtab and friends if there's none existing. In + # src_install we put them in /usr/lib/nfs for safe-keeping, but + # the daemons actually use the files in /var/lib/nfs. #30486 + local f + for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do + [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue + einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" + cp -pPR "${f}" "${EROOT}"/var/lib/nfs/ + done + + if systemd_is_booted; then + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 1.3.0; then + ewarn "We have switched to upstream systemd unit files. Since" + ewarn "they got renamed, you should probably enable the new ones." + ewarn "You can run 'equery files nfs-utils | grep systemd'" + ewarn "to know what services you need to enable now." + fi + done + else + ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." + ewarn "If you were using nfsmount, please add nfsclient and netmount to the" + ewarn "same runlevel as nfsmount." + fi +} -- cgit v1.2.3