| 1 |
vapier 14/06/20 06:24:27 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: nfs-utils-1.3.0.ebuild |
| 5 |
Log: |
| 6 |
Version bump #506760 by Nenad Peric. Run keepdir on /etc/exports.d #470102 by Alon Bar-Lev. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.247 net-fs/nfs-utils/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.247&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.247&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.246&r2=1.247 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v |
| 20 |
retrieving revision 1.246 |
| 21 |
retrieving revision 1.247 |
| 22 |
diff -u -r1.246 -r1.247 |
| 23 |
--- ChangeLog 20 Jun 2014 06:21:22 -0000 1.246 |
| 24 |
+++ ChangeLog 20 Jun 2014 06:24:27 -0000 1.247 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for net-fs/nfs-utils |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.246 2014/06/20 06:21:22 vapier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.247 2014/06/20 06:24:27 vapier Exp $ |
| 30 |
+ |
| 31 |
+*nfs-utils-1.3.0 (20 Jun 2014) |
| 32 |
+ |
| 33 |
+ 20 Jun 2014; Mike Frysinger <vapier@g.o> |
| 34 |
+ +files/nfs-utils-1.3.0-gcc-4.9.patch, +nfs-utils-1.3.0.ebuild: |
| 35 |
+ Version bump #506760 by Nenad Peric. Run keepdir on /etc/exports.d #470102 by |
| 36 |
+ Alon Bar-Lev. |
| 37 |
|
| 38 |
20 Jun 2014; Mike Frysinger <vapier@g.o> files/nfs.initd: |
| 39 |
Drop rpc_pipefs creation as the rpc.pipefs.initd takes care of it. |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 net-fs/nfs-utils/nfs-utils-1.3.0.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: nfs-utils-1.3.0.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2014 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.1 2014/06/20 06:24:27 vapier Exp $ |
| 53 |
|
| 54 |
EAPI="4" |
| 55 |
|
| 56 |
inherit eutils flag-o-matic multilib autotools systemd |
| 57 |
|
| 58 |
DESCRIPTION="NFS client and server daemons" |
| 59 |
HOMEPAGE="http://linux-nfs.org/" |
| 60 |
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" |
| 61 |
|
| 62 |
LICENSE="GPL-2" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 65 |
IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" |
| 66 |
REQUIRED_USE="kerberos? ( nfsv4 )" |
| 67 |
RESTRICT="test" #315573 |
| 68 |
|
| 69 |
# kth-krb doesn't provide the right include |
| 70 |
# files, and nfs-utils doesn't build against heimdal either, |
| 71 |
# so don't depend on virtual/krb. |
| 72 |
# (04 Feb 2005 agriffis) |
| 73 |
DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) |
| 74 |
caps? ( sys-libs/libcap ) |
| 75 |
sys-libs/e2fsprogs-libs |
| 76 |
>=net-nds/rpcbind-0.2.0-r1 |
| 77 |
net-libs/libtirpc |
| 78 |
libmount? ( sys-apps/util-linux ) |
| 79 |
nfsdcld? ( >=dev-db/sqlite-3.3 ) |
| 80 |
nfsv4? ( |
| 81 |
>=dev-libs/libevent-1.0b |
| 82 |
>=net-libs/libnfsidmap-0.21-r1 |
| 83 |
kerberos? ( |
| 84 |
>=net-libs/libtirpc-0.2.4-r1[kerberos] |
| 85 |
app-crypt/mit-krb5 |
| 86 |
) |
| 87 |
nfsidmap? ( |
| 88 |
>=net-libs/libnfsidmap-0.24 |
| 89 |
>=sys-apps/keyutils-1.5.9 |
| 90 |
) |
| 91 |
) |
| 92 |
nfsv41? ( |
| 93 |
sys-fs/lvm2 |
| 94 |
) |
| 95 |
selinux? ( |
| 96 |
sec-policy/selinux-rpc |
| 97 |
sec-policy/selinux-rpcbind |
| 98 |
) |
| 99 |
uuid? ( sys-apps/util-linux )" |
| 100 |
RDEPEND="${DEPEND_COMMON} !net-nds/portmap" |
| 101 |
DEPEND="${DEPEND_COMMON} |
| 102 |
virtual/pkgconfig" |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch |
| 106 |
epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch |
| 107 |
epatch "${FILESDIR}"/${PN}-1.3.0-gcc-4.9.patch |
| 108 |
|
| 109 |
sed \ |
| 110 |
-e "/^sbindir/s:= := \"${EPREFIX}\":g" \ |
| 111 |
-i utils/*/Makefile.am || die |
| 112 |
|
| 113 |
eautoreconf |
| 114 |
} |
| 115 |
|
| 116 |
src_configure() { |
| 117 |
export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. |
| 118 |
export ac_cv_header_keyutils_h=$(usex nfsidmap) |
| 119 |
econf \ |
| 120 |
--with-statedir="${EPREFIX}"/var/lib/nfs \ |
| 121 |
--enable-tirpc \ |
| 122 |
--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \ |
| 123 |
$(use_enable libmount libmount-mount) \ |
| 124 |
$(use_with tcpd tcp-wrappers) \ |
| 125 |
$(use_enable nfsdcld nfsdcltrack) \ |
| 126 |
$(use_enable nfsv4) \ |
| 127 |
$(use_enable nfsv41) \ |
| 128 |
$(use_enable ipv6) \ |
| 129 |
$(use_enable caps) \ |
| 130 |
$(use_enable uuid) \ |
| 131 |
$(use_enable kerberos gss) \ |
| 132 |
--without-gssglue |
| 133 |
} |
| 134 |
|
| 135 |
src_compile(){ |
| 136 |
# remove compiled files bundled in the tarball |
| 137 |
emake clean |
| 138 |
default |
| 139 |
} |
| 140 |
|
| 141 |
src_install() { |
| 142 |
default |
| 143 |
rm linux-nfs/Makefile* || die |
| 144 |
dodoc -r linux-nfs README |
| 145 |
|
| 146 |
# Don't overwrite existing xtab/etab, install the original |
| 147 |
# versions somewhere safe... more info in pkg_postinst |
| 148 |
keepdir /var/lib/nfs/{,sm,sm.bak} |
| 149 |
mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die |
| 150 |
|
| 151 |
# Install some client-side binaries in /sbin |
| 152 |
dodir /sbin |
| 153 |
mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die |
| 154 |
|
| 155 |
if use nfsv4 && use nfsidmap ; then |
| 156 |
# Install a config file for idmappers in newer kernels. #415625 |
| 157 |
insinto /etc/request-key.d |
| 158 |
echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf |
| 159 |
doins id_resolver.conf |
| 160 |
fi |
| 161 |
|
| 162 |
insinto /etc |
| 163 |
doins "${FILESDIR}"/exports |
| 164 |
keepdir /etc/exports.d |
| 165 |
|
| 166 |
local f list=() opt_need="" |
| 167 |
if use nfsv4 ; then |
| 168 |
opt_need="rpc.idmapd" |
| 169 |
list+=( rpc.idmapd rpc.pipefs ) |
| 170 |
use kerberos && list+=( rpc.gssd rpc.svcgssd ) |
| 171 |
fi |
| 172 |
for f in nfs nfsmount rpc.statd "${list[@]}" ; do |
| 173 |
newinitd "${FILESDIR}"/${f}.initd ${f} |
| 174 |
done |
| 175 |
for f in nfs nfsmount ; do |
| 176 |
newconfd "${FILESDIR}"/${f}.confd ${f} |
| 177 |
done |
| 178 |
sed -i \ |
| 179 |
-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ |
| 180 |
"${ED}"/etc/conf.d/nfs || die #234132 |
| 181 |
|
| 182 |
systemd_dounit systemd/*.{mount,service,target} |
| 183 |
if ! use nfsv4 || ! use kerberos ; then |
| 184 |
rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die |
| 185 |
fi |
| 186 |
sed -i \ |
| 187 |
-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \ |
| 188 |
"${D}$(systemd_get_unitdir)"/* || die |
| 189 |
} |
| 190 |
|
| 191 |
pkg_postinst() { |
| 192 |
# Install default xtab and friends if there's none existing. In |
| 193 |
# src_install we put them in /usr/lib/nfs for safe-keeping, but |
| 194 |
# the daemons actually use the files in /var/lib/nfs. #30486 |
| 195 |
local f |
| 196 |
mkdir -p "${EROOT}"/var/lib/nfs #368505 |
| 197 |
for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do |
| 198 |
[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue |
| 199 |
einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" |
| 200 |
cp -pPR "${f}" "${EROOT}"/var/lib/nfs/ |
| 201 |
done |
| 202 |
} |
Archives