From 55ec052d42a59ea205a50f84af3084efd19930fe Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 21 Nov 2013 12:28:58 +0100 Subject: [PATCH] update to 1.2.9 Package-Manager: portage-2.2.0_alpha188 RepoMan-Options: --force --- net-fs/nfs-utils/ChangeLog | 5 + net-fs/nfs-utils/Manifest | 4 +- net-fs/nfs-utils/nfs-utils-1.2.9.ebuild | 158 ++++++++++++++++++++++++ 3 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 net-fs/nfs-utils/nfs-utils-1.2.9.ebuild diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index bc0ca5b0..a15017cc 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.215 2013/04/13 20:02:02 vapier Exp $ +*nfs-utils-1.2.9 (21 Nov 2013) + + 21 Nov 2013; Mario Fetka +nfs-utils-1.2.9.ebuild: + update to 1.2.9 + 21 Nov 2013; Mario Fetka nfs-utils-1.2.8-r2.ebuild: detect correct kerberos implementation diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 7e99d92e..e5643f33 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -19,6 +19,8 @@ AUX rpc.pipefs.initd 822 SHA256 6503951b3c200ccf3f46396f7b9274f0a565807f7f6e561c AUX rpc.statd.initd 818 SHA256 0c7bd35a14da6c0c2577f09ae82a41ddb693a88157eeaf80684616f79be6c304 SHA512 e7c85a5437f65c82bcab6818fa3aa27fdf746ce745b41987d0e59d620b59529b7a8613aad59e831a5b46fee1fe4410d6982a3e76e7834c79675c4c271b0db3b0 WHIRLPOOL b3c6c4147634f3db39f0a50307a7433e0d28f8cf2d89452d90f9db1b56d55c41add68336640a442508ebfc75270dd627154af787b00f603659a5c730ab724340 AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 SHA512 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157 WHIRLPOOL f1e4a38168c112ce07e40432527a77e17aa80b4a37aeccb8b01a9e655f0437e67e4c12998d62ea7c162319cca956c18edd3cb3c64cfd8e17370782ea30fef677 DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1 +DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119 EBUILD nfs-utils-1.2.8-r2.ebuild 4609 SHA256 1dff97354a8fbc097d27b667dbf33e6743e519a367c3068a6d7f0df4b41263e0 SHA512 4a8eb8bf234ac09f8189b4bf10f4e6331a250876838f99eb718cde79416ff17cb429bcc3193e778123e95bfdaf575a280c5cca963842430f4024957fb6a967b6 WHIRLPOOL 203daea6f3e2dc32c2fa987973187a768d3db99d2a8264cbfc69922a0d32190448d8a20b800bdc4c0538ee7de12d2d5c438a33055fc6375a1de0023f6778172d -MISC ChangeLog 35802 SHA256 9584525f90adf61c39f2f84163d130d21092b0dbb6470b0b76e02643fb05cc8b SHA512 79870b0b0907bcf917c964b7270da0a38ad834af27d267a93954519391a5e3856ae7b073115558b1cab398109ad9eecd52f6174e891b74db6d99ee91e948a7c6 WHIRLPOOL 19c3fd184375902df46775ad629530ddc5115dc6c735f94ac790ce728c446c1f5ca16e2797339180ee91eaee3dad746ca8efc791fe9f98729a1ba18aa94066a2 +EBUILD nfs-utils-1.2.9.ebuild 4565 SHA256 c0f914fd7d223e279264577fc1f461146157292b204c2ccac0930f2b22f52ea9 SHA512 13d01077abc13bef80f2d5a5d44b6eec8e0988c7a4409c3781286e1d0386fda822dec7b429351a75f8399074179091609b5904837f971f91e38e3b8c447a26d5 WHIRLPOOL b86a97d54c31d0d3794cb38e6b3e998a4ac851e1ba8dc6b9af262298be3bd0ed118c40ad4bd5638567e0e42b860098aad36f8e3fcf65533e0c9f8832ce4d9cfd +MISC ChangeLog 35929 SHA256 a97456e480cd38032a603ce491820925ff5ee2ec09072a27f6f8436c34463291 SHA512 3e8f7c9aab443db18ea93b9bead7759d02b138a31c9b4189ad9ad742d509ebc98bfc96453acc0b73d8dec93d531f8cfdf867a62e4afeff1e32d12e246ae7e45b WHIRLPOOL 4cb555be0a3bc1005fbab2182e70955528a06c459f750548e07b6f6502ccdaed3d7b3ba01356ce72ebf13bc3d8fa4a57439784761dbad81c95b65a1b254d8578 MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild new file mode 100644 index 00000000..64eb107f --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2013 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.2.9.ebuild,v 1.1 2013/11/07 07:50:22 radhermit 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" +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/librpcsecgss + net-libs/libtirpc[kerberos] + || ( ( >=net-libs/libgssglue-0.3 app-crypt/mit-krb5 ) app-crypt/heimdal ) + ) + nfsidmap? ( + >=net-libs/libnfsidmap-0.24 + sys-apps/keyutils + ) + ) + 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 + eautoreconf +} + +src_configure() { + export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. + export ac_cv_header_keyutils_h=$(usex nfsidmap) + if has_version app-crypt/heimdal ; then + econf \ + --with-statedir=/var/lib/nfs \ + --enable-tirpc \ + --without-gssglue \ + $(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) \ + $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \ + $(usex nfsv4 "$(use_with kerberos krb5)" "--without-krb5") + else + econf \ + --with-statedir=/var/lib/nfs \ + --enable-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) \ + $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \ + $(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue") + fi + +} + +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_dounit "${FILESDIR}"/nfsd.service + systemd_dounit "${FILESDIR}"/rpc-statd.service + systemd_dounit "${FILESDIR}"/rpc-mountd.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 "${ROOT}"/var/lib/nfs #368505 + for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do + [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue + einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs" + cp -pPR "${f}" "${ROOT}"/var/lib/nfs/ + done +}