1 |
pva 11/04/03 17:55:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: autofs-5.0.5-r2.ebuild |
5 |
Removed: autofs-5.0.5-r1.ebuild |
6 |
Log: |
7 |
Use proper if-logic in autofs.initd, bug #361787, thank Piotr Mitas for report Dustin Polke for fix |
8 |
|
9 |
(Portage version: 2.1.9.45/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.101 net-fs/autofs/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/ChangeLog?rev=1.101&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/ChangeLog?rev=1.101&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/ChangeLog?r1=1.100&r2=1.101 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v |
21 |
retrieving revision 1.100 |
22 |
retrieving revision 1.101 |
23 |
diff -u -r1.100 -r1.101 |
24 |
--- ChangeLog 3 Apr 2011 11:16:05 -0000 1.100 |
25 |
+++ ChangeLog 3 Apr 2011 17:55:17 -0000 1.101 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for net-fs/autofs |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.100 2011/04/03 11:16:05 pva Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.101 2011/04/03 17:55:17 pva Exp $ |
31 |
+ |
32 |
+*autofs-5.0.5-r2 (03 Apr 2011) |
33 |
+ |
34 |
+ 03 Apr 2011; Peter Volkov <pva@g.o> files/autofs5.initd, |
35 |
+ -autofs-5.0.5-r1.ebuild, +autofs-5.0.5-r2.ebuild: |
36 |
+ Use proper if-logic in autofs.initd, bug #361787, thank Piotr Mitas for |
37 |
+ report Dustin Polke for fix |
38 |
|
39 |
03 Apr 2011; Peter Volkov <pva@g.o> -autofs-3.1.7-r5.ebuild, |
40 |
-autofs-3.1.7-r6.ebuild, -autofs-5.0.4.ebuild, -autofs-5.0.4-r2.ebuild, |
41 |
|
42 |
|
43 |
|
44 |
1.1 net-fs/autofs/autofs-5.0.5-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/autofs-5.0.5-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/autofs-5.0.5-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: autofs-5.0.5-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2011 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5-r2.ebuild,v 1.1 2011/04/03 17:55:17 pva Exp $ |
54 |
|
55 |
EAPI="4" |
56 |
inherit eutils multilib autotools linux-info |
57 |
|
58 |
DESCRIPTION="Kernel based automounter" |
59 |
HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" |
60 |
PATCH_VER="3" |
61 |
SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2 |
62 |
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma" |
63 |
|
64 |
LICENSE="GPL-2" |
65 |
SLOT="0" |
66 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
67 |
IUSE="hesiod ldap sasl" |
68 |
|
69 |
# USE="sasl" adds SASL support to the LDAP module which will not be build. If |
70 |
# SASL support should be available, please add "ldap" to the USE flags. |
71 |
REQUIRED_USE="sasl? ( ldap )" |
72 |
|
73 |
# currently, sasl code assumes the presence of kerberosV |
74 |
RDEPEND="hesiod? ( net-dns/hesiod ) |
75 |
ldap? ( >=net-nds/openldap-2.0 |
76 |
sasl? ( dev-libs/cyrus-sasl |
77 |
dev-libs/libxml2 |
78 |
virtual/krb5 ) )" |
79 |
DEPEND="${RDEPEND}" |
80 |
|
81 |
src_prepare() { |
82 |
# Upstream's patchset |
83 |
EPATCH_SUFFIX="patch" \ |
84 |
epatch "${WORKDIR}"/patches |
85 |
|
86 |
# Fix for bug #210762 |
87 |
# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203 |
88 |
epatch "${FILESDIR}"/${PN}-5.0.3-heimdal.patch |
89 |
|
90 |
# Accumulated fixes for bugs |
91 |
# #154797: Respect CC and CFLAGS |
92 |
# #253412: Respect LDFLAGS |
93 |
# #247969: Link order for --as-needed |
94 |
epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded-v1.patch |
95 |
|
96 |
# do not include <nfs/nfs.h>, rather <linux/nfs.h>, |
97 |
# as the former is a lame header for the latter (bug #157968) |
98 |
sed 's@nfs/nfs.h@linux/nfs.h@' -i include/rpc_subs.h || die |
99 |
|
100 |
# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5591 |
101 |
epatch "${FILESDIR}"/${P}-fix-building-without-sasl.patch |
102 |
|
103 |
# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371 |
104 |
epatch "${FILESDIR}"/${P}-fix-install-deadlink.patch |
105 |
|
106 |
# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039 |
107 |
# Disable LDAP specific code if USE="-ldap", let's see what upstream says... |
108 |
epatch "${FILESDIR}"/${P}-fix-building-without-ldap.patch |
109 |
|
110 |
eautoreconf |
111 |
} |
112 |
|
113 |
src_configure() { |
114 |
# work around bug #355975 (mount modifies timestamp of /etc/mtab) |
115 |
# with >=sys-apps/util-linux-2.19, |
116 |
addpredict "/etc/mtab" |
117 |
|
118 |
# --with-confdir is for bug #361481 |
119 |
econf \ |
120 |
--with-confdir=/etc/conf.d \ |
121 |
$(use_with ldap openldap) \ |
122 |
$(use_with sasl) \ |
123 |
$(use_with hesiod) \ |
124 |
--enable-ignore-busy |
125 |
} |
126 |
|
127 |
src_install() { |
128 |
emake DESTDIR="${D}" install |
129 |
|
130 |
dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL |
131 |
|
132 |
# kernel patches |
133 |
docinto patches |
134 |
dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch |
135 |
|
136 |
newinitd "${FILESDIR}"/autofs5.initd autofs |
137 |
} |
138 |
|
139 |
pkg_postinst() { |
140 |
if kernel_is -lt 2 6 30; then |
141 |
elog "This version of ${PN} requires a kernel with autofs4 supporting" |
142 |
elog "protocol version 5.00. Patches for kernels older than 2.6.30 have" |
143 |
elog "been installed into" |
144 |
elog "${EROOT}usr/share/doc/${P}/patches." |
145 |
elog "For further instructions how to patch the kernel, please refer to" |
146 |
elog "${EROOT}usr/share/doc/${P}/INSTALL." |
147 |
elog |
148 |
fi |
149 |
elog "If you plan on using autofs for automounting remote NFS mounts," |
150 |
elog "please check that both portmap (or rpcbind) and rpc.statd/lockd" |
151 |
elog "are running." |
152 |
} |