commit: d603c7b09ac6232d452a8e7a6d7360281d9a8e2c Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Feb 11 11:40:16 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Feb 11 11:40:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d603c7b0
net-fs/nfs-utils: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-fs/nfs-utils/Manifest | 3 - .../files/nfs-utils-1.3.2-background-statd.patch | 30 ---- .../files/nfs-utils-1.3.3-sysmacros.patch | 78 --------- net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild | 153 ------------------ net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild | 177 --------------------- net-fs/nfs-utils/nfs-utils-1.3.3.ebuild | 177 --------------------- 6 files changed, 618 deletions(-) diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 5434beb750..5d85242d65 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,6 +1,3 @@ -DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119 DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9 WHIRLPOOL 6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592 -DIST nfs-utils-1.3.2.tar.bz2 789540 SHA256 5b9c72eef260b86a84619771e11bb013b99431e6b7ff0bbdc03fee90dba591f7 SHA512 65633db58bbc5b6bff6acab412dc085affc61e0a6e0aef72d630e67d05a8d08012dced81178a4c7af65c967c25b48161f8d887d261fdf5ce505b719dbdab757c WHIRLPOOL eee615f032987aee71adf04a3ad5f5b8f79dc4487f1be1a7fb87c42918a12ef9397ba990b02d4adb02265706df9f1e3ef409c141491759c65b8037693b9b06c9 -DIST nfs-utils-1.3.3.tar.bz2 790969 SHA256 fe8e04f7a869975e11765085d27e91ca3f765e08811a527bb4e32056e41176eb SHA512 6361be1f8d5872a27d57b74fbf945177e8de233872f1504a7b8ac5adbb104f37113f2dfd28e5694f76f2becc8887f025ed27aad1280e781ab5c48408820d67eb WHIRLPOOL fb7eec9fe3893cb196160056476342a8a0f62d0e93fa7a9cf49c990763cfe7caa326b938e470bd3a84804fe745c31db87a4f12b58f0fbb1cac9b89faf0405e87 DIST nfs-utils-1.3.4.tar.bz2 814545 SHA256 c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590 SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c WHIRLPOOL 6dc556ef7d00a583c222eb62a600b0d83c6f91ad65d89ca14e1fb3c8aaacf4fbae492e6f0ca3fb0821e2b666f0806ad5fddec041a1124b86b9941540cdfb08b4 DIST nfs-utils-2.1.1.tar.bz2 820083 SHA256 0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09 SHA512 ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448 WHIRLPOOL bb28ae312b64c3493a1393a5b41eda457367594a71e230379ec04ffea3eb29d60ab8254e4981b0aa9cbe778dc1fbe9b08dc8615184a35cdb22bf4e5e04e56a6c diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch b/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch deleted file mode 100644 index 393f70b87a..0000000000 --- a/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001 -From: Chris Mayo <[email protected]> -Date: Sun, 1 Feb 2015 12:03:46 -0500 -Subject: [PATCH] statd: Fix test for foreground mode - -daemon_init parameter has the opposite sense -to code removed in commit 7addf9d - -Signed-off-by: Chris Mayo <[email protected]> -Signed-off-by: Steve Dickson <[email protected]> ---- - utils/statd/statd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/statd/statd.c b/utils/statd/statd.c -index 60ce6d1..2b7a167 100644 ---- a/utils/statd/statd.c -+++ b/utils/statd/statd.c -@@ -393,7 +393,7 @@ int main (int argc, char **argv) - simulator (--argc, ++argv); /* simulator() does exit() */ - #endif - -- daemon_init(!(run_mode & MODE_NODAEMON)); -+ daemon_init((run_mode & MODE_NODAEMON)); - - if (run_mode & MODE_LOG_STDERR) { - xlog_syslog(0); --- -2.2.2 - diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch b/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch deleted file mode 100644 index 638442563c..0000000000 --- a/net-fs/nfs-utils/files/nfs-utils-1.3.3-sysmacros.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 187f0e8298a3dd405b5aa817df129198d6f66eeb Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Thu, 14 Apr 2016 00:01:05 -0400 -Subject: [PATCH nfs-utils] fix building w/newer C libraries - -Linux C libraries are moving away from implicitly including the header -sys/sysmacros.h via sys/types.h. We would like to do this for glibc -now, but others (musl/etc...) have been doing it already. This means -any code using major/minor/makedevs functions will fail to build when -they don't include that header. - -Leverage the AC_HEADER_MAJOR macro that configure is already using to -pull in the right header. - -Signed-off-by: Mike Frysinger <[email protected]> ---- - support/include/xcommon.h | 6 ++++++ - support/nfs/nfsexport.c | 1 + - utils/blkmapd/device-discovery.c | 1 + - utils/mountd/cache.c | 1 + - 4 files changed, 9 insertions(+) - -diff --git a/support/include/xcommon.h b/support/include/xcommon.h -index d1a4b18..23c9a13 100644 ---- a/support/include/xcommon.h -+++ b/support/include/xcommon.h -@@ -17,6 +17,12 @@ - #include <stdlib.h> - #include <string.h> - -+#ifdef MAJOR_IN_MKDEV -+#include <sys/mkdev.h> -+#elif defined(MAJOR_IN_SYSMACROS) -+#include <sys/sysmacros.h> -+#endif -+ - #define streq(s, t) (strcmp ((s), (t)) == 0) - - /* Functions in sundries.c that are used in mount.c and umount.c */ -diff --git a/support/nfs/nfsexport.c b/support/nfs/nfsexport.c -index afd7c90..4b13265 100644 ---- a/support/nfs/nfsexport.c -+++ b/support/nfs/nfsexport.c -@@ -19,6 +19,7 @@ - - #include "nfslib.h" - #include "misc.h" -+#include "xcommon.h" - - /* if /proc/net/rpc/... exists, then - * write to it, as that interface is more stable. -diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c -index b010628..052d582 100644 ---- a/utils/blkmapd/device-discovery.c -+++ b/utils/blkmapd/device-discovery.c -@@ -51,6 +51,7 @@ - #include <libdevmapper.h> - - #include "device-discovery.h" -+#include "xcommon.h" - - #define EVENT_SIZE (sizeof(struct inotify_event)) - #define EVENT_BUFSIZE (1024 * EVENT_SIZE) -diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c -index 7847446..ec86a22 100644 ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -31,6 +31,7 @@ - #include "mountd.h" - #include "fsloc.h" - #include "pseudoflavors.h" -+#include "xcommon.h" - - #ifdef USE_BLKID - #include "blkid/blkid.h" --- -2.7.4 - diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild deleted file mode 100644 index d0ac413673..0000000000 --- a/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic multilib autotools systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/"; -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# 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) -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) - caps? ( sys-libs/libcap ) - sys-libs/e2fsprogs-libs - >=net-nds/rpcbind-0.2.0-r1 - net-libs/libtirpc - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - >=dev-libs/libevent-1.0b - >=net-libs/libnfsidmap-0.21-r1 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - nfsidmap? ( - >=net-libs/libnfsidmap-0.24 - sys-apps/keyutils - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-nds/portmap - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - econf \ - --with-statedir="${EPREFIX}"/var/lib/nfs \ - --enable-tirpc \ - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \ - $(use_enable libmount libmount-mount) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable nfsdcld nfsdcltrack) \ - $(use_enable nfsv4) \ - $(use_enable nfsv41) \ - $(use_enable ipv6) \ - $(use_enable caps) \ - $(use_enable uuid) \ - $(use_enable kerberos gss) \ - --without-gssglue -} - -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 "${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 - # Install a config file for idmappers in newer kernels. #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 - - 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 nfsmount rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - for f in nfs nfsmount ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 - - systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf - systemd_newunit "${FILESDIR}"/nfsd.service-r1 nfsd.service - systemd_newunit "${FILESDIR}"/rpc-statd.service-r2 rpc-statd.service - systemd_newunit "${FILESDIR}"/rpc-mountd.service-r1 rpc-mountd.service - systemd_dounit "${FILESDIR}"/rpc-idmapd.service - systemd_dounit "${FILESDIR}"/{proc-fs-nfsd,var-lib-nfs-rpc_pipefs}.mount - use nfsv4 && use kerberos && systemd_dounit "${FILESDIR}"/rpc-{gssd,svcgssd}.service -} - -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 - mkdir -p "${EROOT}"/var/lib/nfs #368505 - 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-1.3.2-r6.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild deleted file mode 100644 index c471363066..0000000000 --- a/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic multilib autotools systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/"; -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# 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) -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) - caps? ( sys-libs/libcap ) - sys-libs/e2fsprogs-libs - >=net-nds/rpcbind-0.2.0-r1 - net-libs/libtirpc - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=net-libs/libnfsidmap-0.21-r1 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - nfsidmap? ( - >=net-libs/libnfsidmap-0.24 - >=sys-apps/keyutils-1.5.9 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - epatch "${FILESDIR}"/${PN}-1.3.2-background-statd.patch - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - epatch_user - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - econf \ - --with-statedir="${EPREFIX}"/var/lib/nfs \ - --enable-tirpc \ - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \ - $(use_enable libmount libmount-mount) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable nfsdcld nfsdcltrack) \ - $(use_enable nfsv4) \ - $(use_enable nfsv41) \ - $(use_enable ipv6) \ - $(use_enable caps) \ - $(use_enable uuid) \ - $(use_enable kerberos gss) \ - --without-gssglue -} - -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 "${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 - # Install a config file for idmappers in newer kernels. #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 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 - - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die - fi - rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die - sed -i -r \ - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \ - -e '/^(After|Wants)=nfs-config.service$/d' \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${D}$(systemd_get_unitdir)"/* || 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 - mkdir -p "${EROOT}"/var/lib/nfs #368505 - 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 - if [[ ${REPLACING_VERSIONS} < 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 - 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-1.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild deleted file mode 100644 index 67a50093a0..0000000000 --- a/net-fs/nfs-utils/nfs-utils-1.3.3.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic multilib autotools systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/"; -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# 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) -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) - caps? ( sys-libs/libcap ) - sys-libs/e2fsprogs-libs - >=net-nds/rpcbind-0.2.0-r1 - net-libs/libtirpc:= - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=net-libs/libnfsidmap-0.21-r1 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - nfsidmap? ( - >=net-libs/libnfsidmap-0.24 - >=sys-apps/keyutils-1.5.9 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - epatch "${FILESDIR}"/${PN}-1.3.3-sysmacros.patch #579884 - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - epatch_user - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - econf \ - --with-statedir="${EPREFIX}"/var/lib/nfs \ - --enable-tirpc \ - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \ - $(use_enable libmount libmount-mount) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable nfsdcld nfsdcltrack) \ - $(use_enable nfsv4) \ - $(use_enable nfsv41) \ - $(use_enable ipv6) \ - $(use_enable caps) \ - $(use_enable uuid) \ - $(use_enable kerberos gss) \ - --without-gssglue -} - -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 "${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 - # Install a config file for idmappers in newer kernels. #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 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 - - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die - fi - rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die - sed -i -r \ - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \ - -e '/^(After|Wants)=nfs-config.service$/d' \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${D}$(systemd_get_unitdir)"/* || 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 - mkdir -p "${EROOT}"/var/lib/nfs #368505 - 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 - if [[ ${REPLACING_VERSIONS} < 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 - 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 -}
