From a92e291a443393857cbebcd56e63a96ae508d80f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 21 Sep 2014 03:35:14 +0000 Subject: Revbump so that people actually get the 'hacked up' systemd units, bug 523308. Package-Manager: portage-2.2.13/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- net-fs/nfs-utils/ChangeLog | 8 +- net-fs/nfs-utils/Manifest | 14 ++- net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild | 165 +++++++++++++++++++++++++++++ net-fs/nfs-utils/nfs-utils-1.3.0.ebuild | 165 ----------------------------- 4 files changed, 184 insertions(+), 168 deletions(-) create mode 100644 net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild delete mode 100644 net-fs/nfs-utils/nfs-utils-1.3.0.ebuild (limited to 'net-fs') diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 3d2cf7a88ca7..38965595753e 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.254 2014/08/25 17:21:36 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.255 2014/09/21 03:35:09 floppym Exp $ + +*nfs-utils-1.3.0-r1 (21 Sep 2014) + + 21 Sep 2014; Mike Gilbert +nfs-utils-1.3.0-r1.ebuild, + -nfs-utils-1.3.0.ebuild: + Revbump so that people actually get the 'hacked up' systemd units, bug 523308. 25 Aug 2014; Manuel Rüger -nfs-utils-1.1.6-r1.ebuild, -nfs-utils-1.2.0.ebuild: diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 9760c2202424..eed84e10cc0b 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 0001-mountd-Fix-is_subdirectory-again.patch 2704 SHA256 1c1204dc5fc62debb8cc66ca299a741a3d8e515f480ff7aecb4ad72819658de7 SHA512 59a29c72096357fc35e805f0a1e443c7a6ee9b07c96ed85481b1101a6090311937b39f45aefa60325f968a5c7d2bc5550c2a43f2f54bd8522b615b84bdf71c86 WHIRLPOOL fc0c806c3c68f6d215f24a418b92b94188e23cc9249a8e0cea6ec22a1139747ab05cccab253bddff6787a15301225792658dadc8d6d1c4c6aba5543ea893d600 AUX 0001-statd-exit-if-a-statd-is-already-running.patch 3593 SHA256 d3e402c73b204d4b5e161563005269318dad6e992792c902da76ff8368b872cb SHA512 e04d451618d6f6197dc0692844cc115fec93575525cd0569d582f9278007e2dbec692ef46065c675de13d608e034161f39a60d46766873933d05d18b94633f6c WHIRLPOOL fdf6de89a5ae3f26c1091f8b314684ba0cac3aab68731d3d56e5a909a2211b8f84b8212fbf0f7179427f98bdb102b9bb3d1c3828e66e283bc70abddc9ef3964d AUX exports 66 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5 SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 WHIRLPOOL 7cc6b59c1f7013a0ad98518623b03d1cba784ecaf6d6a085b85282192c6f41ac1c649a39dc6e1b42ff38a571c00a85aed6e04ea57d6339a072cc4f2c41d5d74e @@ -71,6 +74,13 @@ EBUILD nfs-utils-1.2.9-r1.ebuild 4068 SHA256 41d9d9f2580dc1554afecb787f657036800 EBUILD nfs-utils-1.2.9-r2.ebuild 4367 SHA256 eac06d8f714370e8b5f7be317bc7eb9f2fc4394dbb0631e4e7ed010ad5e929e8 SHA512 e4cfc841eec2e993deb1c352eb306eb96e9e6aab5d9d4c7ca2b01c16cb2c467813a6cde2999f1e81eeaa55199e1901cd07d36b185b44c944f6640e74b7da543f WHIRLPOOL 62cca1460fb134eff41a9b882bc752ca3522c86d5e1b2b2a1c131e5ae5855caf159843ce3015b2176b387b35a8cc53a73f4236482795f694af87cdfd9d432016 EBUILD nfs-utils-1.2.9-r3.ebuild 4445 SHA256 74f62cfc1e025ff045fa0312149bf4391caf65dd11c279d8913a02869b418eb2 SHA512 19bbed44740fbe7251df65340ee160d784971dca103001bb59f9bdbf2b13aa5165f671c571fb66d9fef6a007e321580dfaaf832993d872682d655db43809f70e WHIRLPOOL ca54acb7b6d282518ac3ab35c5ab04453ba7ba463de42252426845ba11d24f167d5b47a579463152054142dfa9bbabf14afd5fdc703b4d7dc06e97414c8da397 EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 0739c6faff846ab605635750fcb1a3ebdf24271833fa572a76217e8b7d79189b SHA512 3cca8936433fdfb0b2aa7cf23b0e92daeef1e094a3f9192e8bd61e6f92dbdf7c6544670828ae707a146044dd828074eac704fb58989e4f9a3b879f876502ab94 WHIRLPOOL 212d9f84f923b234e84238d7b0b9ddc1f6fa8f2f5c7cd47fe512e8173e603dd0a2dfa0e4a6dd8884c2026162cf1130fcfe07abbd53a9e12d24a92bd576f3c546 -EBUILD nfs-utils-1.3.0.ebuild 4844 SHA256 903535a267fa8a80edf8a8f534530b5868eefd4ffd6b57142e4fd15db1c8d8a3 SHA512 7d06b657cb89bc6ec82ed9a3e5d471dac55f579f42b6cff563d421c0d4b1f5eae75dae553fe76d8e52802d451773008bdc51ed2a16ff4695a1704d3b229ba2b3 WHIRLPOOL 63825f1d6c646c68e10aec6f58a4f4f906777069ea602b5c854ea7f52ead783417c06fcdc6312cde2cf4f96cf63211e8496e92c70951aaf9ce4894ad51fe2689 -MISC ChangeLog 39937 SHA256 d16750e3ec321fd21a6eaedc7128a49834b5598ff81a8a9dde163a48491595c6 SHA512 67521f3aa46c98c94e8100428193fb54d236b0043659309d412979f5bd64cc1407b0df458bc08d0d0be76470b0ac8bead515c979d1e5b06cccbfaa1208ec680e WHIRLPOOL 9460d5c91f6f4122026f745df9fbf812b864429b85733575f5946c6ba2af86e3f70b8210c5e53bc8d5edbb0d9925a54db9ff536d8a333f7f2627241576c92f1d +EBUILD nfs-utils-1.3.0-r1.ebuild 4849 SHA256 394dc906aff5464d37dbff06302251954a68180f797345c179e74d5a43a0c2a3 SHA512 3dc73e5491a46a84f81152562ea818ee47a61cd3e796636603fc2de3a3cf90e41c8219ad71e29e676492b9426e4a919bbeb16fa7f268bf6598e7e94c94e22a80 WHIRLPOOL 35973ecab423e10bab99eb0725173c5e77db78707f59cc61ae38fbd19c3563af306afb473b963da0cfb1f23befb512ff2bb2b935592033cab3a933405d5c6530 +MISC ChangeLog 40160 SHA256 81f0a0ea38e05d029e5d4858038abf5f04a997d2f9c9aa5a4558e0af20aa116b SHA512 00530e993d1c336cfc356c3b3d0ff9c97e77fc87a9b080308f164b21362e17c6f80584352b81313f083e5f4ed83cd3291be00ea3f72e498382cf382a03c8b60c WHIRLPOOL 906e91bcacb15287109e4b0f31429dd277e2a6ce8a68c90ccfdbffc799f929071f30008a00813bdeebbaaf31cfc33bacddb2999960d06b590d05c49c4bdf2d6a MISC metadata.xml 749 SHA256 aa6af1c43f6adcc82d29502f5945eb417485d609036983f9adda8b2529d66644 SHA512 aae31fb1933fa3b10e7e2c712cae0437929e183b009853adaaca94a95ea6902b0f9d67dfe0295df795b75b7f6d1d7e8b8e891a4543a51873bbfeaaffd90375ea WHIRLPOOL 2a4afdbb93a76c5b7fb4d3d7b72068cab8bed4e68c30d82dbffeea4fc778b7f695223d77d768f0ba01ebfc47b59b803e0bed71307c7474d051600aa8b9b61f33 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iF4EAREIAAYFAlQeR3EACgkQC77qH+pIQ6QHyQD/XvcWD54EGcP87Ck0haGV/lkz +whoTI27gHrKcKz7uuzgA/0B36Hd9Fw2Z2BqPK8omYTgIWLjxjfUdgmHgQ7XIviC8 +=IALT +-----END PGP SIGNATURE----- diff --git a/net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild new file mode 100644 index 000000000000..07dada5406a4 --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild,v 1.1 2014/09/21 03:35:09 floppym Exp $ + +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-1.5.9 + ) + ) + nfsv41? ( + sys-fs/lvm2 + ) + selinux? ( + sec-policy/selinux-rpc + sec-policy/selinux-rpcbind + ) + uuid? ( sys-apps/util-linux )" +RDEPEND="${DEPEND_COMMON} !net-nds/portmap" +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.0-gcc-4.9.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 + 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 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_dounit systemd/*.{mount,service,target} + if ! use nfsv4 || ! use kerberos ; then + rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || 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 + fi +} diff --git a/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild deleted file mode 100644 index 76ee39db1238..000000000000 --- a/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.3 2014/07/01 16:41:57 pacho Exp $ - -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-1.5.9 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} !net-nds/portmap" -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.0-gcc-4.9.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 - 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 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_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || 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 - fi -} -- cgit v1.2.3-65-gdbad