floppym 14/09/21 03:35:09 Modified: ChangeLog Added: nfs-utils-1.3.0-r1.ebuild Removed: nfs-utils-1.3.0.ebuild Log: Revbump so that people actually get the 'hacked up' systemd units, bug 523308. (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.255 net-fs/nfs-utils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.255&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.255&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.254&r2=1.255 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- ChangeLog 25 Aug 2014 17:21:36 -0000 1.254 +++ ChangeLog 21 Sep 2014 03:35:09 -0000 1.255 @@ -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 <[email protected]> +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 <[email protected]> -nfs-utils-1.1.6-r1.ebuild, -nfs-utils-1.2.0.ebuild: 1.1 net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0-r1.ebuild?rev=1.1&content-type=text/plain Index: nfs-utils-1.3.0-r1.ebuild =================================================================== # 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 }
