|
Line
Link Here
|
| 0 |
-- a/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild |
0 |
++ b/net-fs/nfs-utils/nfs-utils-2.5.4.ebuild |
|
Lines 19-28
fi
Link Here
|
| 19 |
|
19 |
|
| 20 |
LICENSE="GPL-2" |
20 |
LICENSE="GPL-2" |
| 21 |
SLOT="0" |
21 |
SLOT="0" |
| 22 |
IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" |
22 |
IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 +nfsv41 selinux tcpd +uuid" |
| 23 |
REQUIRED_USE="kerberos? ( nfsv4 )" |
23 |
REQUIRED_USE="kerberos? ( nfsv4 nfsv41 )" |
| 24 |
RESTRICT="test" #315573 |
24 |
RESTRICT="test" #315573 |
| 25 |
|
25 |
|
|
|
26 |
# +nfsv4 or +nfsv41 |
| 27 |
NFSV4_DEPEND=" |
| 28 |
dev-libs/libevent:= |
| 29 |
>=sys-apps/keyutils-1.5.9:= |
| 30 |
kerberos? ( |
| 31 |
>=net-libs/libtirpc-0.2.4-r1[kerberos] |
| 32 |
app-crypt/mit-krb5 |
| 33 |
) |
| 34 |
" |
| 35 |
|
| 26 |
# kth-krb doesn't provide the right include |
36 |
# kth-krb doesn't provide the right include |
| 27 |
# files, and nfs-utils doesn't build against heimdal either, |
37 |
# files, and nfs-utils doesn't build against heimdal either, |
| 28 |
# so don't depend on virtual/krb. |
38 |
# so don't depend on virtual/krb. |
|
Lines 36-50
DEPEND="
Link Here
|
| 36 |
caps? ( sys-libs/libcap ) |
46 |
caps? ( sys-libs/libcap ) |
| 37 |
ldap? ( net-nds/openldap ) |
47 |
ldap? ( net-nds/openldap ) |
| 38 |
libmount? ( sys-apps/util-linux ) |
48 |
libmount? ( sys-apps/util-linux ) |
| 39 |
nfsv4? ( |
49 |
nfsv4? ( ${NFSV4_DEPEND} ) |
| 40 |
dev-libs/libevent:= |
|
|
| 41 |
>=sys-apps/keyutils-1.5.9:= |
| 42 |
kerberos? ( |
| 43 |
>=net-libs/libtirpc-0.2.4-r1[kerberos] |
| 44 |
app-crypt/mit-krb5 |
| 45 |
) |
| 46 |
) |
| 47 |
nfsv41? ( |
50 |
nfsv41? ( |
|
|
51 |
${NFSV4_DEPEND} |
| 48 |
sys-fs/lvm2 |
52 |
sys-fs/lvm2 |
| 49 |
) |
53 |
) |
| 50 |
tcpd? ( sys-apps/tcp-wrappers ) |
54 |
tcpd? ( sys-apps/tcp-wrappers ) |
|
Lines 70-76
PATCHES=(
Link Here
|
| 70 |
|
74 |
|
| 71 |
pkg_setup() { |
75 |
pkg_setup() { |
| 72 |
linux-info_pkg_setup |
76 |
linux-info_pkg_setup |
| 73 |
if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then |
77 |
if ( use nfsv4 || use nfsv41 ) && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then |
| 74 |
ewarn "Your NFS server will be unable to track clients across server restarts!" |
78 |
ewarn "Your NFS server will be unable to track clients across server restarts!" |
| 75 |
ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode" |
79 |
ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode" |
| 76 |
ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" |
80 |
ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" |
|
Lines 136-142
src_install() {
Link Here
|
| 136 |
dodir /sbin |
140 |
dodir /sbin |
| 137 |
mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die |
141 |
mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die |
| 138 |
|
142 |
|
| 139 |
if use nfsv4 && use nfsidmap ; then |
143 |
if ( use nfsv4 || use nfsv41 ) && use nfsidmap ; then |
| 140 |
insinto /etc |
144 |
insinto /etc |
| 141 |
doins support/nfsidmap/idmapd.conf |
145 |
doins support/nfsidmap/idmapd.conf |
| 142 |
|
146 |
|
|
Lines 151-157
src_install() {
Link Here
|
| 151 |
keepdir /etc/exports.d |
155 |
keepdir /etc/exports.d |
| 152 |
|
156 |
|
| 153 |
local f list=() opt_need="" |
157 |
local f list=() opt_need="" |
| 154 |
if use nfsv4 ; then |
158 |
if use nfsv4 || use nfsv41 ; then |
| 155 |
opt_need="rpc.idmapd" |
159 |
opt_need="rpc.idmapd" |
| 156 |
list+=( rpc.idmapd rpc.pipefs ) |
160 |
list+=( rpc.idmapd rpc.pipefs ) |
| 157 |
use kerberos && list+=( rpc.gssd rpc.svcgssd ) |
161 |
use kerberos && list+=( rpc.gssd rpc.svcgssd ) |
|
Lines 159-165
src_install() {
Link Here
|
| 159 |
for f in nfs nfsclient rpc.statd "${list[@]}" ; do |
163 |
for f in nfs nfsclient rpc.statd "${list[@]}" ; do |
| 160 |
newinitd "${FILESDIR}"/${f}.initd ${f} |
164 |
newinitd "${FILESDIR}"/${f}.initd ${f} |
| 161 |
done |
165 |
done |
| 162 |
newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 |
166 |
|
|
|
167 |
#537996 #406021 #426944 |
| 168 |
# this patch adds a no-op /etc/init.d/nfsmount that produces a warning: |
| 169 |
# "This migration script will be removed after 01 Aug 2015." |
| 170 |
#newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 |
| 171 |
|
| 163 |
for f in nfs nfsclient ; do |
172 |
for f in nfs nfsclient ; do |
| 164 |
newconfd "${FILESDIR}"/${f}.confd ${f} |
173 |
newconfd "${FILESDIR}"/${f}.confd ${f} |
| 165 |
done |
174 |
done |
|
Lines 202-207
pkg_postinst() {
Link Here
|
| 202 |
else |
211 |
else |
| 203 |
ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." |
212 |
ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." |
| 204 |
ewarn "If you were using nfsmount, please add nfsclient and netmount to the" |
213 |
ewarn "If you were using nfsmount, please add nfsclient and netmount to the" |
| 205 |
ewarn "same runlevel as nfsmount." |
214 |
ewarn "same runlevel as nfsmount and 'rc-update del nfsmount'." |
| 206 |
fi |
215 |
fi |
| 207 |
} |
216 |
} |
