williamh 15/02/05 04:32:41 Modified: ChangeLog Added: nfs-utils-1.3.1-r5.ebuild nfs-utils-1.3.2-r6.ebuild Log: Fix the dependencies in nfsclient. There is no good way to detect whether the file systems are nfs3 or nfs4, so explain to the users what they need to turn on or off in the configuration file. Also remove the before netmount line; netmount should use nfsclient. (Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x30C46538)
Revision Changes Path 1.275 net-fs/nfs-utils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.275&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.275&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.274&r2=1.275 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- ChangeLog 3 Feb 2015 19:44:36 -0000 1.274 +++ ChangeLog 5 Feb 2015 04:32:41 -0000 1.275 @@ -1,6 +1,16 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.274 2015/02/03 19:44:36 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.275 2015/02/05 04:32:41 williamh Exp $ + +*nfs-utils-1.3.1-r5 (05 Feb 2015) +*nfs-utils-1.3.2-r6 (05 Feb 2015) + + 05 Feb 2015; William Hubbs <[email protected]> +nfs-utils-1.3.1-r5.ebuild, + +nfs-utils-1.3.2-r6.ebuild, files/nfsclient.confd, files/nfsclient.initd: + Fix the dependencies in nfsclient. There is no good way to detect whether the + file systems are nfs3 or nfs4, so explain to the users what they need to turn + on or off in the configuration file. Also remove the before netmount line; + netmount should use nfsclient. 03 Feb 2015; William Hubbs <[email protected]> -nfs-utils-1.3.1-r1.ebuild, -nfs-utils-1.3.1-r3.ebuild, -nfs-utils-1.3.2-r2.ebuild, 1.1 net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild?rev=1.1&content-type=text/plain Index: nfs-utils-1.3.1-r5.ebuild =================================================================== # Copyright 1999-2015 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.1-r5.ebuild,v 1.1 2015/02/05 04:32:41 williamh Exp $ 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-2.1 >=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 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 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 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 } 1.1 net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r6.ebuild?rev=1.1&content-type=text/plain Index: nfs-utils-1.3.2-r6.ebuild =================================================================== # Copyright 1999-2015 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.2-r6.ebuild,v 1.1 2015/02/05 04:32:41 williamh Exp $ 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 }
