From f5731c9a4f8f10e2407b5aa5d5b8f424a5635b72 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 16 Sep 2026 16:16:42 +0200 Subject: [PATCH] net-fs/nfs-utils: drop 2.6.4-r12, 2.7.1-r1 Signed-off-by: David Seifert --- net-fs/nfs-utils/Manifest | 2 - .../files/nfs-utils-2.6.4-includes.patch | 41 ---- net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild | 214 ------------------ net-fs/nfs-utils/nfs-utils-2.7.1-r1.ebuild | 214 ------------------ 4 files changed, 471 deletions(-) delete mode 100644 net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch delete mode 100644 net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild delete mode 100644 net-fs/nfs-utils/nfs-utils-2.7.1-r1.ebuild diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index b77fd3af1574d..c0023cf0e76b3 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,3 +1 @@ -DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533 -DIST nfs-utils-2.7.1.tar.bz2 1001424 BLAKE2B 176c5559c23c2761c1f2beed068fda8bdd39ac9fa09b4b223552c1455152c410d8925adf8d0023300d4355338e9dc8f6b2774ba71488e795945e5f1fee2b305c SHA512 9e55d4a0d672dbb0e20f8ea0213355a0bec054124c2a9437b3e4b81214c24ef5adb43914bd8606d4af14801ec8e6a4f849c9a97d76ae0879566792bbc960845a DIST nfs-utils-2.8.5.tar.bz2 1001261 BLAKE2B 68ab063257222107e79f792c92103a98779e3401284395bef1f2a3cf37bfc73c984e8e5d60ee820882cb92fbb371dd5a72ffa28738274b66e8f269324cdf3e19 SHA512 a42612c5611f7de5fe8170f3059b96e4c15ab8ad2be19aa83f9117efa4207b3fec0629ea11864ee9b8ff267dcb5328a5295e8995a6f2cf500361ab38f91ad65a 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 deleted file mode 100644 index 0312ac1a8b372..0000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch +++ /dev/null @@ -1,41 +0,0 @@ -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-r12.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild deleted file mode 100644 index e2d1bd84fa56b..0000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2025 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="https://downloads.sourceforge.net/nfs/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps junction kerberos ldap +libmount +nfsv3 +nfsv4 sasl selinux tcpd +uuid" -REQUIRED_USE="|| ( nfsv3 nfsv4 ) 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:= - 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 ) - nfsv3? ( >=net-nds/rpcbind-0.2.4 ) - nfsv4? ( - >=sys-apps/keyutils-1.5.9:= - sys-fs/lvm2 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - 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 - nfsv3? ( 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 - "${FILESDIR}"/${P}-C99-inline.patch -) - -pkg_setup() { - linux-info_pkg_setup - - if use nfsv4 && 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 ${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 nfsv4) - - # 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 nfsv4) - $(use_enable nfsv4 nfsdcld) - $(use_enable nfsv4 nfsdcltrack) - $(use_enable nfsv4 nfsv41) - $(use_enable nfsv4 nfsv4server) - $(use_enable uuid) - $(use_with tcpd tcp-wrappers) - ) - 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 ; 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=() - if use nfsv4 ; then - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - - local sedexp=( -e '#placehoder' ) - use nfsv3 || sedexp+=( -e '/need portmap/d' ) - - mkdir -p "${T}/init.d" || die - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die - doinitd "${T}/init.d/${f}" - done - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED}${systemd_systemunitdir}"/* || die - - # Remove legacy service if not requested (as it will be broken without rpcbind) - if ! use nfsv3; then - rm "${ED}${systemd_systemunitdir}/nfs-server.service" || die - fi - - # 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 -} diff --git a/net-fs/nfs-utils/nfs-utils-2.7.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.7.1-r1.ebuild deleted file mode 100644 index ff7994e98bc7d..0000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.7.1-r1.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2025 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="https://downloads.sourceforge.net/nfs/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps junction kerberos ldap +libmount +nfsv3 +nfsv4 sasl selinux tcpd +uuid" -REQUIRED_USE="|| ( nfsv3 nfsv4 ) 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:= - 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 ) - nfsv3? ( >=net-nds/rpcbind-0.2.4 ) - nfsv4? ( - >=sys-apps/keyutils-1.5.9:= - sys-fs/lvm2 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - 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 - nfsv3? ( 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}"/${PN}-2.6.4-C99-inline.patch -) - -pkg_setup() { - linux-info_pkg_setup - - if use nfsv4 && 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 CONFIG_CRYPTO_MD5 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 nfsv4) - - # 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 nfsv4) - $(use_enable nfsv4 nfsdcld) - $(use_enable nfsv4 nfsdcltrack) - $(use_enable nfsv4 nfsv41) - $(use_enable nfsv4 nfsv4server) - $(use_enable uuid) - $(use_with kerberos krb5 "${ESYSROOT}"/usr) - $(use_with tcpd tcp-wrappers) - ) - 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 ; 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=() - if use nfsv4 ; then - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - - local sedexp=( -e '#placehoder' ) - use nfsv3 || sedexp+=( -e '/need portmap/d' ) - - mkdir -p "${T}/init.d" || die - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die - doinitd "${T}/init.d/${f}" - done - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED}${systemd_systemunitdir}"/* || die - - # Remove legacy service if not requested (as it will be broken without rpcbind) - if ! use nfsv3; then - rm "${ED}${systemd_systemunitdir}/nfs-server.service" || die - fi - - # 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 -}