commit: 02e744449beb017b4796bf263b03a7a3227fe034 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Jan 23 11:56:56 2024 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Jan 23 11:56:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e74444
net-fs/nfs-utils: drop 2.6.2-r1, 2.6.4 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-fs/nfs-utils/Manifest | 1 - ...tils-2.6.2-clang-Wlogical-not-parentheses.patch | 28 --- ...utils-2.6.2-clang-fix-function-prototypes.patch | 78 ------- ...tils-2.6.2-clang-more-function-prototypes.patch | 39 ---- net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild | 231 -------------------- net-fs/nfs-utils/nfs-utils-2.6.4.ebuild | 233 --------------------- 6 files changed, 610 deletions(-) diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index aebdda16d856..9beb56b81fc1 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,3 +1,2 @@ -DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8 DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch deleted file mode 100644 index 2ba9a45a024b..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-Wlogical-not-parentheses.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=896946e3c7f8ec1a02d4dc3a039e6cbbd2f611a9 - -From 896946e3c7f8ec1a02d4dc3a039e6cbbd2f611a9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 13 Sep 2022 11:42:03 -0400 -Subject: [PATCH] mountd: Check for return of stat function - -simplify the check, stat() return 0 on success -1 on failure - -Fixes clang reported errors e.g. - -| v4clients.c:29:6: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses] -| if (!stat("/proc/fs/nfsd/clients", &sb) == 0 || -| ^ ~~ - -Signed-off-by: Khem Raj <[email protected]> -Signed-off-by: Steve Dickson <[email protected]> ---- a/support/export/v4clients.c -+++ b/support/export/v4clients.c -@@ -26,7 +26,7 @@ void v4clients_init(void) - { - struct stat sb; - -- if (!stat("/proc/fs/nfsd/clients", &sb) == 0 || -+ if (stat("/proc/fs/nfsd/clients", &sb) != 0 || - !S_ISDIR(sb.st_mode)) - return; - if (clients_fd >= 0) diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch deleted file mode 100644 index f223af883ad0..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-fix-function-prototypes.patch +++ /dev/null @@ -1,78 +0,0 @@ -https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=167f2336b06e1bcbf26f45f2ddc4a535fed4d393 -https://bugs.gentoo.org/869254 - -From 167f2336b06e1bcbf26f45f2ddc4a535fed4d393 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 13 Sep 2022 11:44:05 -0400 -Subject: [PATCH] Fix function prototypes - -Clang is now erroring out on functions with out parameter types - -Fixes errors like -error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] - -Signed-off-by: Khem Raj <[email protected]> -Signed-off-by: Steve Dickson <[email protected]> ---- a/support/export/auth.c -+++ b/support/export/auth.c -@@ -82,7 +82,7 @@ check_useipaddr(void) - } - - unsigned int --auth_reload() -+auth_reload(void) - { - struct stat stb; - static ino_t last_inode; ---- a/support/export/v4root.c -+++ b/support/export/v4root.c -@@ -198,7 +198,7 @@ static int v4root_add_parents(nfs_export *exp) - * looking for components of the v4 mount. - */ - void --v4root_set() -+v4root_set(void) - { - nfs_export *exp; - int i; ---- a/support/export/xtab.c -+++ b/support/export/xtab.c -@@ -135,7 +135,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export) - } - - int --xtab_export_write() -+xtab_export_write(void) - { - return xtab_write(etab.statefn, etab.tmpfn, etab.lockfn, 1); - } ---- a/utils/exportfs/exportfs.c -+++ b/utils/exportfs/exportfs.c -@@ -69,14 +69,14 @@ static int _lockfd = -1; - * need these additional lockfile() routines. - */ - static void --grab_lockfile() -+grab_lockfile(void) - { - _lockfd = open(lockfile, O_CREAT|O_RDWR, 0666); - if (_lockfd != -1) - lockf(_lockfd, F_LOCK, 0); - } - static void --release_lockfile() -+release_lockfile(void) - { - if (_lockfd != -1) { - lockf(_lockfd, F_ULOCK, 0); ---- a/utils/mount/network.c -+++ b/utils/mount/network.c -@@ -179,7 +179,7 @@ static const unsigned long probe_mnt3_only[] = { - - static const unsigned int *nfs_default_proto(void); - #ifdef MOUNT_CONFIG --static const unsigned int *nfs_default_proto() -+static const unsigned int *nfs_default_proto(void) - { - extern unsigned long config_default_proto; - /* diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch deleted file mode 100644 index 51bfb30f1e64..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.6.2-clang-more-function-prototypes.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://patchwork.kernel.org/project/linux-nfs/patch/[email protected]/ - -From daf6aa9b659078aebd202fffff59bd9a0ab685ce Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Fri, 16 Sep 2022 22:35:23 +0100 -Subject: [PATCH] Fix more function prototypes - -``` -regex.c:545:43: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] -struct trans_func *libnfsidmap_plugin_init() - ^ - void -1 error generated. -``` - -See: 167f2336b06e1bcbf26f45f2ddc4a535fed4d393 -Signed-off-by: Sam James <[email protected]> ---- a/support/nfsidmap/regex.c -+++ b/support/nfsidmap/regex.c -@@ -542,7 +542,7 @@ struct trans_func regex_trans = { - .gss_princ_to_grouplist = regex_gss_princ_to_grouplist, - }; - --struct trans_func *libnfsidmap_plugin_init() -+struct trans_func *libnfsidmap_plugin_init(void) - { - return (®ex_trans); - } ---- a/utils/idmapd/idmapd.c -+++ b/utils/idmapd/idmapd.c -@@ -867,7 +867,7 @@ nfsdreopen_one(struct idmap_client *ic) - } - - static void --nfsdreopen() -+nfsdreopen(void) - { - nfsdreopen_one(&nfsd_ic[IC_NAMEID]); - nfsdreopen_one(&nfsd_ic[IC_IDNAME]); diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild deleted file mode 100644 index 818d562e0db3..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2022 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 ~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 - caps? ( sys-libs/libcap ) - ldap? ( - net-nds/openldap:= - sasl? ( - app-crypt/mit-krb5 - dev-libs/cyrus-sasl:2 - ) - ) - libmount? ( sys-apps/util-linux ) - nfsv4? ( - dev-db/sqlite:3 - dev-libs/libevent:= - >=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}"/${P}-clang-Wlogical-not-parentheses.patch - "${FILESDIR}"/${P}-clang-fix-function-prototypes.patch - "${FILESDIR}"/${PN}-2.6.2-clang-more-function-prototypes.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) - ) - 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 -} diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild deleted file mode 100644 index a652b81eda7b..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# 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 -) - -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 -}
