diff options
Diffstat (limited to 'net-fs/autofs')
24 files changed, 399 insertions, 152 deletions
diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index 69d4fc0ce8a2..d4a638dc09c1 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,6 +1,201 @@ # ChangeLog for net-fs/autofs -# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ + + 06 Jul 2005; Robin H. Johnson <robbat2@gentoo.org> -files/auto.home, + -files/ldap.diff, -files/open_max.diff: + These FILESDIR items are not used anymore. Bump. + + 06 Jun 2005; Markus Rothe <corsair@gentoo.org> autofs-4.1.3-r4.ebuild: + Stable on ppc64 + + 17 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> + autofs-4.1.3-r4.ebuild: + marked stable on ppc, closes bug #92808 + + 17 Apr 2005; Aron Griffis <agriffis@gentoo.org> autofs-4.1.3-r4.ebuild: + Stable on alpha amd64 ia64 + + 12 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> + autofs-4.1.3-r4.ebuild: + Stable on sparc + + 11 Apr 2005; Robin H. Johnson <robbat2@gentoo.org> autofs-4.1.3-r4.ebuild: + Stable on x86. + + 09 Apr 2005; Markus Rothe <corsair@gentoo.org> autofs-4.1.3-r2.ebuild: + Stable on ppc64 + + 09 Apr 2005; Simon Stelling <blubb@gentoo.org> autofs-4.1.3-r4.ebuild: + fixed multilib-strict issues + + 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> autofs-4.1.3-r2.ebuild: + stable on ia64 + + 23 Mar 2005; <agriffis@gentoo.org> autofs-4.1.3-r2.ebuild: + Stable on amd64 + + 19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> autofs-4.1.3-r2.ebuild: + Stable on alpha. + +*autofs-4.1.3-r4 (14 Mar 2005) + + 14 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> +files/autofs.rc10, + +files/autofs.rc11, +files/autofs.rc12, files/autofs.rc9, + +autofs-4.1.3-r4.ebuild: + Bug #82086 - totally revamp the init script, now supports all daemon + options. Also cleanup all usage of unsafe sub-shells. + + 05 Feb 2005; Maurice van der Pot <griffon26@gentoo.org> + +files/autofs-4.1.3-signal-race-fix.patch, autofs-4.1.3-r3.ebuild: + Added hopefully corrected version of signal-race-fix patch for bug #77077. + +*autofs-4.1.3-r3 (05 Feb 2005) + + 05 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +autofs-4.1.3-r3.ebuild: + Try to fix bug #77077, by removing signal-race-fix.patch. + + 10 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> autofs-4.1.3-r2.ebuild: + Stable on sparc + + 07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> autofs-4.1.3-r2.ebuild: + 4.1.3-r2 Stable on x86. + + 16 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> files/autofs.rc8, + files/autofs.rc9: + Bug #74662, add use portmap again. + +*autofs-4.1.3-r2 (09 Dec 2004) + + 09 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> files/auto.master, + files/auto.net, files/autofs.rc9, +autofs-4.1.3-r2.ebuild: + Added some of the debian patches that fix up LDAP and Hesiod in 4.1.3. + +*autofs-4.1.3-r1 (08 Dec 2004) + + 08 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> files/auto.master, + +files/auto.net, +files/autofs.confd9, +files/autofs.rc9, + +autofs-4.1.3-r1.ebuild: + Fixed bugs 16320,49477,58292,62819,65626,69309,70827. Apply upstream patches. + + 02 Sep 2004; Sven Wegener <swegener@gentoo.org> -files/autofs, + files/autofs.rc6, files/autofs.rc7, files/autofs.rc8: + tail +2 -> tail -n +2 to be compatible with latest coreutils. Closes bug + #62606. + + 27 Jul 2004; <agriffis@gentoo.org> autofs-3.1.7-r5.ebuild: + stable on ia64 + + 17 Jul 2004; Tom Gall <tgall@gentoo.org> autofs-4.1.3.ebuild: + stable on ppc64, bug #56994 + +*autofs-4.1.3 (26 May 2004) + + 26 May 2004; Michael Imhof <tantive@gentoo.org> autofs-4.1.3.ebuild: + Version bumped. + + 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> autofs-3.1.7-r6.ebuild, + autofs-4.0.0.ebuild: + Add inherit eutils + + 20 Apr 2004; <agriffis@gentoo.org> autofs-4.0.0.ebuild: + Add ~ia64 + + 02 Mar 2004; <augustus@gentoo.org> autofs-4.0.0.ebuild: + Added ~amd64 keyword. + + 16 Jan 2004; <rphillips@gentoo.org> autofs-4.0.0.ebuild: + changed configuration file paths in man files + + 05 Jan 2004; zhen <zhen@gentoo.org> metadata.xml: + changed herd to net-fs + + 21 Nov 2003; <rphillips@gentoo.org> autofs-4.0.0.ebuild: + added Ervin Nemeth's sed entry to allow for portage controlled CFLAGS. + +*autofs-4.0.0 (27 Oct 2003) + + 27 Oct 2003; Ryan Phillips <rphillips@gentoo.org> autofs-4.0.0.ebuild: + version bump. added as unstable. Thanks to Gregory Shimansky + +*autofs-3.1.7-r6 (25 Sep 2003) + + 25 Sep 2003; Martin Holzer <mholzer@gentoo.org> autofs-3.1.7-r6.ebuild: + Added autoconf for ldap. Closes #27369. + + 26 Jul 2003; Stefan Jones <cretin@gentoo.org> files/autofs.rc8 + files/autofs.confd: + Fixed the --timeout options, can be specified in daemonoptions in + autofs.confd or via the last option in the misc.master file. + + 25 May 2003; Martin Holzer <mholzer@gentoo.org> autofs-3.1.7-r3.ebuild, + autofs-3.1.7-r4.ebuild, autofs-3.1.7-r5.ebuild: + now uses mirror://kernel + + 12 May 2003; Jason Wever <weeve@gentoo.org> autofs-3.1.7-r5.ebuild: + Changed ~sparc keyword to sparc. + + 05 May 2003; Jason Wever <weeve@gentoo.org> autofs-3.1.7-r5.ebuild: + Added ~sparc to keywords. + + 09 Jan 2003; Kain <kain@kain.org> autofs-3.1.7-r5.ebuild: + Add ppc to KEYWORDS + + 07 Jan 2003; Aron Griffis <agriffis@gentoo.org> autofs-3.1.7-r5.ebuild: + Add alpha to KEYWORDS + +*autofs-3.1.7-r5 (17 Nov 2002) + + 17 Nov 2002; Brad Cowan <bcowan@gebtoo.org> autofs-3.1.7-r5.ebuild, + files/digest-autofs-3.1.7-r5, files/ldap_config.patch, files/autofs.rc8 : + + More ldap fixes, init script still needs some tweaking. + +*autofs-3.1.7-r4 (27 Oct 2002) + + 20 Sep 2002; Brad Cowan <bradlyatc@cowancomputers.com> autofs-3.1.7-r4.ebuild : + files/digest-autofs-3.1.7-r4, files/nisyp.patch, files/autofs1.confd, + files/autofs.rc7, files/automount.diff. + + Added net-nds/portmap and net-nds/ypbind as RDEPEND, updated init scripts + remove old files, and Updated ChangeLog. Init script now has a working + stats option to display current autofs state (as status seems to be a + predefined function that only displays the whether the daemon is running or + stopped). Added einfo to ebuild noting to start portmap for NFS support without + NFS started on current setup. Hopefully fixed some library compile problems. + +*autofs-3.1.7-r3 (16 Apr 2002) + + 16 Jul 2002; Ben Lutgens <lamer@gentoo.org> files/autofs.rc6 : + + made the initscript depend on ypbind + + 30 Apr 2002; William McArthur <sandymac@gentoo.org> autofs-3.1.7-r3.ebuild : + + Added HOMEPAGE, LICENSE and made the DESCRIPTION a little more so. + + + 21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> files/autofs.rc6 : + + added a /g to the pidfile variable + + 16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> autofs-3.1.7-r3.ebuild + files/digest-autofs-3.1.7-r3 : + + I did not bump the revision number up last time. That would have been a good + idea to do. + +*autofs-3.1.7-r2 (11 Apr 2002) + + 11 Apr 2002; Seemant Kulleen <seemant@gentoo.org> files/autofs : + + xevol@newtonave.net (David Snopek) in bug #1432 gave us a more modern + gentoofied script. + + 2 Feb 2002; Donny Davies <woodchip@gentoo.org> files/autofs.rc6 : + + Added patch, contributed through bugzilla (Bug #444), which supposedly fixes + problem with timeouts. Hope everything is OK now. *autofs-3.1.7-r2 (1 Feb 2002) diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 5d924c547e20..65393290cf59 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,21 +1,39 @@ -MD5 be8d4d4ff58bf2309e9cc71faee833dc ChangeLog 3006 -MD5 f48c4af742364185c7cc612f1fa87ff5 autofs-3.1.7-r3.ebuild 1311 -MD5 2a71fd0ca35d1c720cad185678b771e0 autofs-3.1.7-r4.ebuild 1764 -MD5 d499a7df94496fb9d4cc5a164f2b17b1 autofs-3.1.7-r5.ebuild 1784 -MD5 256e713e8b47896dd2049326ec26fc78 files/auto.home 239 -MD5 7dfc74b098600c091681c950b67b1022 files/auto.master 237 -MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319 -MD5 17069c72cadc641378d58ec1d0910647 files/autofs 3569 -MD5 d4034f19318f0595b2065e474571412e files/autofs.confd 125 -MD5 fd7e79d67508e701a1ed7cf630047097 files/autofs.rc6 3747 -MD5 c6cb109b55bf405262d053651485c165 files/autofs.rc7 3637 -MD5 920a82cac4940ba4981df4b69dd56595 files/autofs.rc8 5176 +MD5 755272708a0c1bf9d7500355cae8a259 autofs-4.1.3-r2.ebuild 2923 +MD5 d3574f8185d41bdb815a1a3ea90d177f autofs-4.0.0.ebuild 1930 +MD5 25496cb18a229b633f0b0a207e8a3acc autofs-4.1.3.ebuild 1933 +MD5 8cfa18e9b94510d2a2ed5e128f28dfe0 autofs-3.1.7-r6.ebuild 1784 +MD5 1298ee0b877a4ce11e1f69bd57265df4 autofs-4.1.3-r4.ebuild 2975 +MD5 44f4d9269d0d413a5705c63763d13b89 autofs-3.1.7-r3.ebuild 1285 +MD5 0747442a4bf2d9358fe4cb5ba3edf9e2 autofs-4.1.3-r1.ebuild 2865 +MD5 273b8d80da0015d4784c4e944dab4098 autofs-3.1.7-r5.ebuild 1750 +MD5 d088786415a46eef0b0dbf5074e9f4b2 autofs-4.1.3-r3.ebuild 2953 +MD5 4bbe41387fda834fa11a17755e347647 ChangeLog 7467 +MD5 3281a009cd789c5c937c9e6a3124e792 metadata.xml 287 +MD5 517e323f25fec842b06d2fe2dd3fbe4a autofs-3.1.7-r4.ebuild 1735 +MD5 a132f5883b92e2b509fa66e429f913ab files/autofs.confd 186 +MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785 +MD5 759f43aeed6787d6b6d7556d03afe782 files/auto.master 267 +MD5 b7b301269f0796121d1f29c4a128b79e files/auto.net 1132 +MD5 be9e796b14bbb9f659368203127602c4 files/autofs-4.1.3-signal-race-fix.patch 426 +MD5 7873ddfcc4d52b6ca78d4e8faebe8cfc files/autofs.rc10 6373 +MD5 2b16150b63dd0701d0a973b027550512 files/autofs.rc11 7469 +MD5 3333b278adbd13edd82115ea686763f9 files/autofs.rc12 7807 MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137 -MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322 +MD5 2f74c237baee9004a019d3365ab04c0d files/digest-autofs-4.1.3-r1 586 +MD5 f311a86fdf3a03702afac9cf4fd74528 files/digest-autofs-4.1.3-r2 660 +MD5 4e3ad0d70f88a0cb691ea5442f95421f files/digest-autofs-4.1.3-r3 584 +MD5 4e3ad0d70f88a0cb691ea5442f95421f files/digest-autofs-4.1.3-r4 584 +MD5 1b6efbe0072911c5c960a27e09a9d024 files/autofs.rc6 3717 +MD5 4cc7219397b1bdb60da3f150bd7d9230 files/autofs.rc7 3624 +MD5 539a3f843f501558cb01ca8c124e83f4 files/autofs.rc8 5186 +MD5 d90bdf558a0602f0e37aa0b42ff8bbfd files/autofs.rc9 5617 +MD5 7b562ed7d75738124cadc9de83d4a335 files/digest-autofs-4.0.0 66 +MD5 ba9378bfaf4e17d13789ac9a056ddb3b files/digest-autofs-4.1.3 65 +MD5 552ad0cdacd4354b83dba94670ec0e99 files/autofs.confd9 799 +MD5 aa40e8bef91418943312910e73d05eed files/auto.misc 319 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r3 64 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r4 64 MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r5 64 -MD5 a872a3743192bbca4f78ecec7f74df03 files/ldap.diff 367 -MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785 +MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r6 64 +MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322 MD5 77884391a3fbf365a88f5d2230b548d9 files/nisyp.patch 419 -MD5 39ac8cc927dab754a7694abdb1a2cdc5 files/open_max.diff 408 diff --git a/net-fs/autofs/autofs-3.1.7-r3.ebuild b/net-fs/autofs/autofs-3.1.7-r3.ebuild index eeae50a8ffed..eefec21582e2 100644 --- a/net-fs/autofs/autofs-3.1.7-r3.ebuild +++ b/net-fs/autofs/autofs-3.1.7-r3.ebuild @@ -1,14 +1,18 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author: Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r3.ebuild,v 1.1 2002/04/17 04:34:25 seemant Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="Automounter" -SRC_URI="ftp://ftp.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2 - ftp://ftp.de.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2 - ftp://ftp.uk.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2" -DEPEND="virtual/glibc ldap? ( ~net-nds/openldap-1.2 )" +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r3.ebuild,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ + +IUSE="ldap" + +DESCRIPTION="Kernel based automounter" +HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" +SRC_URI="mirror://kernel/linux/daemons/autofs/${P}.tar.bz2" + +DEPEND="ldap? ( >=net-nds/openldap-1.2 )" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86" src_unpack() { unpack ${A} ; cd ${S}/include @@ -18,6 +22,9 @@ src_unpack() { src_compile() { local myconf use ldap || myconf="--without-openldap" + export HAVE_LDAP=1 + export LIBLDAP="$LIBLDAP -lldap -llber" + export LIBS="-lldap -llber $LIBS" ./configure --host=${HOST} --prefix=/usr ${myconf} || die emake || die } diff --git a/net-fs/autofs/autofs-3.1.7-r4.ebuild b/net-fs/autofs/autofs-3.1.7-r4.ebuild index 92d357f4fe82..c66750e949a2 100644 --- a/net-fs/autofs/autofs-3.1.7-r4.ebuild +++ b/net-fs/autofs/autofs-3.1.7-r4.ebuild @@ -1,13 +1,10 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r4.ebuild,v 1.1 2002/10/27 05:21:15 bcowan Exp $ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r4.ebuild,v 1.1.1.1 2005/11/30 09:45:45 chriswhite Exp $ -S=${WORKDIR}/${P} DESCRIPTION="Kernel based automounter" HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI="ftp://ftp.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2 - ftp://ftp.de.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2 - ftp://ftp.uk.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2" +SRC_URI="mirror://kernel/linux/daemons/autofs/${P}.tar.bz2" DEPEND="ldap? ( >=net-nds/openldap-1.2 )" RDEPEND=">=net-nds/portmap-5b-r6 @@ -15,12 +12,13 @@ RDEPEND=">=net-nds/portmap-5b-r6 SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86" +KEYWORDS="x86" +IUSE="ldap" src_unpack() { - unpack ${A} + unpack ${A} patch -p0 < ${FILESDIR}/nisyp.patch || die - + cd ${S}/include patch -p0 < ${FILESDIR}/automount.diff || die } @@ -28,7 +26,7 @@ src_unpack() { src_compile() { local myconf use ldap || myconf="--without-openldap" - export HAVE_LDAP=1 + export HAVE_LDAP=1 export LIBLDAP="$LIBLDAP -lldap -llber -lresolv" export LIBS="-lldap -llber -lresolv $LIBS" ./configure --host=${HOST} --prefix=/usr ${myconf} || die @@ -63,4 +61,4 @@ pkg_postinst() { echo "" einfo "Also the normal autofs status has been renamed stats" einfo "as there is already a predefined Gentoo status" -}
\ No newline at end of file +} diff --git a/net-fs/autofs/autofs-3.1.7-r5.ebuild b/net-fs/autofs/autofs-3.1.7-r5.ebuild index 9a6c73575598..2e699e44eeff 100644 --- a/net-fs/autofs/autofs-3.1.7-r5.ebuild +++ b/net-fs/autofs/autofs-3.1.7-r5.ebuild @@ -1,39 +1,36 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r5.ebuild,v 1.1 2002/11/18 02:00:18 bcowan Exp $ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r5.ebuild,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ IUSE="ldap" -S=${WORKDIR}/${P} DESCRIPTION="Kernel based automounter" HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI="ftp://ftp.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2 - ftp://ftp.de.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2 - ftp://ftp.uk.kernel.org/pub/linux/daemons/autofs/${P}.tar.bz2" +SRC_URI="mirror://kernel/linux/daemons/autofs/${P}.tar.bz2" DEPEND="ldap? ( >=net-nds/openldap-1.2 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86" +KEYWORDS="alpha ia64 ppc sparc x86" src_unpack() { - unpack ${A} + unpack ${A} cd ${S} patch -p0 < ${FILESDIR}/ldap_config.patch || die - + cd ${S}/include patch -p0 < ${FILESDIR}/automount.diff || die cd ${S}/daemon mv Makefile Makefile.orig - sed -e 's/LIBS \= \-ldl/LIBS \= \-ldl \-lnsl \$\{LIBLDAP\}/' Makefile.orig > Makefile + sed -e 's/LIBS \= \-ldl/LIBS \= \-ldl \-lnsl \$\{LIBLDAP\}/' Makefile.orig > Makefile } src_compile() { local myconf use ldap || myconf="--without-openldap" - + ./configure \ --host=${HOST} \ --prefix=/usr \ @@ -69,4 +66,4 @@ pkg_postinst() { echo "" einfo "Also the normal autofs status has been renamed stats" einfo "as there is already a predefined Gentoo status" -}
\ No newline at end of file +} diff --git a/net-fs/autofs/autofs-3.1.7-r6.ebuild b/net-fs/autofs/autofs-3.1.7-r6.ebuild index 3e041ad435e8..3dc1677cf599 100644 --- a/net-fs/autofs/autofs-3.1.7-r6.ebuild +++ b/net-fs/autofs/autofs-3.1.7-r6.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r6.ebuild,v 1.1 2003/09/24 17:16:28 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r6.ebuild,v 1.1.1.1 2005/11/30 09:45:45 chriswhite Exp $ + +inherit eutils IUSE="ldap" -S=${WORKDIR}/${P} DESCRIPTION="Kernel based automounter" HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" SRC_URI="mirror://kernel/linux/daemons/${PN}/${P}.tar.bz2" @@ -13,7 +14,7 @@ DEPEND="ldap? ( >=net-nds/openldap-1.2 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~alpha ~ppc ~sparc" +KEYWORDS="~alpha ~ppc ~sparc ~x86" src_unpack() { unpack ${A} diff --git a/net-fs/autofs/autofs-4.0.0.ebuild b/net-fs/autofs/autofs-4.0.0.ebuild index a3c31fce285e..dbdce1aaa73e 100644 --- a/net-fs/autofs/autofs-4.0.0.ebuild +++ b/net-fs/autofs/autofs-4.0.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.0.0.ebuild,v 1.1 2003/10/28 00:33:08 rphillips Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.0.0.ebuild,v 1.1.1.1 2005/11/30 09:45:45 chriswhite Exp $ + +inherit eutils IUSE="ldap" -S=${WORKDIR}/${P} DESCRIPTION="Kernel based automounter" HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" SRC_URI="mirror://kernel/linux/daemons/${PN}/v4/${P}-1.tar.bz2" @@ -13,7 +14,7 @@ DEPEND="ldap? ( >=net-nds/openldap-1.2 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~alpha ~ppc ~sparc" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" src_unpack() { unpack ${A} @@ -38,6 +39,7 @@ src_compile() { --host=${HOST} \ --prefix=/usr \ ${myconf} || die + sed -i -e '/^\(CFLAGS\|CXXFLAGS\|LDFLAGS\)[[:space:]]*=/d' Makefile.rules make || die "make failed" } @@ -50,6 +52,7 @@ src_install() { dodoc COPYING COPYRIGHT NEWS README* TODO cd man + sed -i 's:\/etc\/:\/etc\/autofs\/:g' *.8 *.5 *.in doman auto.master.5 autofs.5 autofs.8 automount.8 cd ../samples diff --git a/net-fs/autofs/autofs-4.1.3-r1.ebuild b/net-fs/autofs/autofs-4.1.3-r1.ebuild index d0b047ac5199..c4459ccb6860 100644 --- a/net-fs/autofs/autofs-4.1.3-r1.ebuild +++ b/net-fs/autofs/autofs-4.1.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r1.ebuild,v 1.1 2004/12/09 07:25:12 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r1.ebuild,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ inherit eutils @@ -10,18 +10,18 @@ DESCRIPTION="Kernel based automounter" HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v4" SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2 - ${SRC_URI_BASE}/${P}-strict.patch - ${SRC_URI_BASE}/${P}-mtab_lock.patch - ${SRC_URI_BASE}/${P}-bad_chdir.patch - ${SRC_URI_BASE}/${P}-non_block_ping.patch - ${SRC_URI_BASE}/${P}-signal-race-fix.patch - ${SRC_URI_BASE}/${P}-sock-leak-fix.patch - ${SRC_URI_BASE}/${P}-replicated_server_select.patch" + ${SRC_URI_BASE}/${P}-strict.patch + ${SRC_URI_BASE}/${P}-mtab_lock.patch + ${SRC_URI_BASE}/${P}-bad_chdir.patch + ${SRC_URI_BASE}/${P}-non_block_ping.patch + ${SRC_URI_BASE}/${P}-signal-race-fix.patch + ${SRC_URI_BASE}/${P}-sock-leak-fix.patch + ${SRC_URI_BASE}/${P}-replicated_server_select.patch" DEPEND="virtual/libc ldap? ( >=net-nds/openldap-2.0 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ia64 ~ppc64" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" src_unpack() { unpack ${P}.tar.bz2 @@ -54,14 +54,14 @@ src_install() { dodoc COPYING COPYRIGHT NEWS README* TODO CHANGELOG CREDITS cd ${S}/samples - docinto samples ; dodoc auto.misc auto.master + docinto samples ; dodoc auto.misc auto.master cd ${S}/man sed -i 's:\/etc\/:\/etc\/autofs\/:g' *.8 *.5 *.in || die "Failed to update path in manpages" doman auto.master.5 autofs.5 autofs.8 automount.8 dodir /etc/autofs /etc/init.d /etc/conf.d - insinto /etc/autofs ; doins ${FILESDIR}/auto.master - insinto /etc/autofs ; doins ${FILESDIR}/auto.misc + insinto /etc/autofs ; doins ${FILESDIR}/auto.master + insinto /etc/autofs ; doins ${FILESDIR}/auto.misc exeinto /etc/autofs ; doexe ${FILESDIR}/auto.net # chmod 755 is important! exeinto /etc/init.d ; newexe ${FILESDIR}/autofs.rc9 autofs diff --git a/net-fs/autofs/autofs-4.1.3-r2.ebuild b/net-fs/autofs/autofs-4.1.3-r2.ebuild index 18d684f9de8c..498d1ecd47c7 100644 --- a/net-fs/autofs/autofs-4.1.3-r2.ebuild +++ b/net-fs/autofs/autofs-4.1.3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r2.ebuild,v 1.1 2004/12/09 08:25:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r2.ebuild,v 1.1.1.1 2005/11/30 09:45:45 chriswhite Exp $ inherit eutils @@ -21,7 +21,7 @@ DEPEND="virtual/libc ldap? ( >=net-nds/openldap-2.0 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ia64 ~ppc64" +KEYWORDS="alpha amd64 ia64 ~ppc ppc64 sparc x86" src_unpack() { unpack ${P}.tar.bz2 diff --git a/net-fs/autofs/autofs-4.1.3-r3.ebuild b/net-fs/autofs/autofs-4.1.3-r3.ebuild index 80dd1f839c59..d5d86de24cc2 100644 --- a/net-fs/autofs/autofs-4.1.3-r3.ebuild +++ b/net-fs/autofs/autofs-4.1.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r3.ebuild,v 1.1 2005/02/05 10:39:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r3.ebuild,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ inherit eutils @@ -20,7 +20,7 @@ DEPEND="virtual/libc ldap? ( >=net-nds/openldap-2.0 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ia64 ~ppc64" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" src_unpack() { unpack ${P}.tar.bz2 @@ -29,6 +29,9 @@ src_unpack() { EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i} done + # Upstream version of this patch is incorrect + epatch ${FILESDIR}/${P}-signal-race-fix.patch + cd ${S} autoconf || die "Autoconf failed" diff --git a/net-fs/autofs/autofs-4.1.3-r4.ebuild b/net-fs/autofs/autofs-4.1.3-r4.ebuild index f26d103f68c2..b90d18316585 100644 --- a/net-fs/autofs/autofs-4.1.3-r4.ebuild +++ b/net-fs/autofs/autofs-4.1.3-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r4.ebuild,v 1.1 2005/03/15 04:18:38 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r4.ebuild,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ -inherit eutils +inherit eutils multilib IUSE="ldap" DESCRIPTION="Kernel based automounter" @@ -20,7 +20,7 @@ DEPEND="virtual/libc ldap? ( >=net-nds/openldap-2.0 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ia64 ~ppc64" +KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" src_unpack() { unpack ${P}.tar.bz2 @@ -51,7 +51,7 @@ src_compile() { src_install() { into /usr dosbin daemon/automount - exeinto /usr/lib/autofs + exeinto /usr/$(get_libdir)/autofs doexe modules/*.so dodoc COPYING COPYRIGHT NEWS README* TODO CHANGELOG CREDITS @@ -72,7 +72,7 @@ src_install() { cd ${S}/samples docinto samples ; dodoc ldap* auto.master.ldap insinto /etc/openldap/schema ; doins autofs.schema - exeinto /usr/lib/autofs ; doexe autofs-ldap-auto-master + exeinto /usr/$(get_libdir)/autofs ; doexe autofs-ldap-auto-master fi } diff --git a/net-fs/autofs/autofs-4.1.3.ebuild b/net-fs/autofs/autofs-4.1.3.ebuild index 520a52cc5214..18d63e83911a 100644 --- a/net-fs/autofs/autofs-4.1.3.ebuild +++ b/net-fs/autofs/autofs-4.1.3.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3.ebuild,v 1.1 2004/05/26 16:34:00 tantive Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3.ebuild,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ inherit eutils IUSE="ldap" -S=${WORKDIR}/${P} DESCRIPTION="Kernel based automounter" HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" SRC_URI="mirror://kernel/linux/daemons/${PN}/v4/${P}.tar.bz2" @@ -15,7 +14,7 @@ DEPEND="ldap? ( >=net-nds/openldap-1.2 )" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ia64" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86" src_unpack() { unpack ${A} diff --git a/net-fs/autofs/files/auto.master b/net-fs/autofs/files/auto.master index 9f32a7cad4b8..0b9e83e9481d 100644 --- a/net-fs/autofs/files/auto.master +++ b/net-fs/autofs/files/auto.master @@ -1,8 +1,9 @@ -# $Id: auto.master,v 1.1 2000/08/08 17:53:33 achim Exp $ +# $Id: auto.master,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # Sample auto.master file # Format of this file: # mountpoint map options # For details of the format look at autofs(8). -/misc /etc/autofs/auto.misc +#/net /etc/autofs/auto.net +#/misc /etc/autofs/auto.misc #/home /etc/autofs/auto.home diff --git a/net-fs/autofs/files/auto.misc b/net-fs/autofs/files/auto.misc index cc20091c5621..2c3781448e36 100644 --- a/net-fs/autofs/files/auto.misc +++ b/net-fs/autofs/files/auto.misc @@ -1,7 +1,7 @@ -# $Id: auto.misc,v 1.1 2000/08/08 17:53:33 achim Exp $ +# $Id: auto.misc,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # This is an automounter map and it has the following format # key [ -mount-options-separated-by-comma ] location # Details may be found in the autofs(5) manpage -boot -fstype=ext2 :/dev/hda1 -cd -fstype=iso9660,ro :/dev/cdrom -floppy -fstype=auto :/dev/fd0 +#boot -fstype=ext2 :/dev/hda1 +#cd -fstype=iso9660,ro :/dev/cdrom +#floppy -fstype=auto :/dev/fd0 diff --git a/net-fs/autofs/files/auto.net b/net-fs/autofs/files/auto.net index 11bcc30e6bb8..a592163b3c70 100644 --- a/net-fs/autofs/files/auto.net +++ b/net-fs/autofs/files/auto.net @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: auto.net,v 1.1 2004/12/09 07:25:12 robbat2 Exp $ +# $Id: auto.net,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ # This file must be executable to work! chmod 755! @@ -22,7 +22,7 @@ opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict" # Newer distributions get this right SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key" -$SHOWMOUNT | sort +0 | \ +$SHOWMOUNT | LC_ALL=C sort +0 | \ awk -v key="$key" -v opts="$opts" -- ' BEGIN { ORS=""; first=1 } { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } diff --git a/net-fs/autofs/files/autofs.confd b/net-fs/autofs/files/autofs.confd index 228bc6b8a609..33a3d07a5de7 100644 --- a/net-fs/autofs/files/autofs.confd +++ b/net-fs/autofs/files/autofs.confd @@ -1,9 +1,12 @@ # Config file for /etc/init.d/autofs -FLAGS="defaults 21" - # # e.g. localoptions='rsize=8192,wsize=8192' # localoptions='' +# +# additional options for automount, ie. timeout +# +daemonoptions='--timeout 60' + diff --git a/net-fs/autofs/files/autofs.rc10 b/net-fs/autofs/files/autofs.rc10 index 9e6b167595e9..88ce42399e74 100644 --- a/net-fs/autofs/files/autofs.rc10 +++ b/net-fs/autofs/files/autofs.rc10 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc10,v 1.1 2005/03/15 04:18:38 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc10,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/autofs/auto.master, then a YP diff --git a/net-fs/autofs/files/autofs.rc11 b/net-fs/autofs/files/autofs.rc11 index ad85f5bf0dad..c3f33b187c33 100644 --- a/net-fs/autofs/files/autofs.rc11 +++ b/net-fs/autofs/files/autofs.rc11 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc11,v 1.1 2005/03/15 04:18:38 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc11,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/autofs/auto.master, then a YP diff --git a/net-fs/autofs/files/autofs.rc12 b/net-fs/autofs/files/autofs.rc12 index 9fdfc20bdd98..dd67c60c21f5 100644 --- a/net-fs/autofs/files/autofs.rc12 +++ b/net-fs/autofs/files/autofs.rc12 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc12,v 1.1 2005/03/15 04:18:38 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc12,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/autofs/auto.master, then a YP diff --git a/net-fs/autofs/files/autofs.rc6 b/net-fs/autofs/files/autofs.rc6 index d8fd1a7337de..08be51ab7da9 100644 --- a/net-fs/autofs/files/autofs.rc6 +++ b/net-fs/autofs/files/autofs.rc6 @@ -1,13 +1,14 @@ #!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc6,v 1.1 2002/01/26 01:03:32 woodchip Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc6,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/auto.master, then a YP # map with that name depend() { + need ypbind need net } @@ -24,20 +25,21 @@ getmounts() { # if [ -f /etc/autofs/auto.master ] then - cat /etc/autofs/auto.master | sed -e '/^#/d' -e '/^$/d'| ( + cat /etc/autofs/auto.master | sed -e '/^ *[^# ]/!d'| ( while read dir map options do if [ ! -z "$dir" -a ! -z "$map" \ -a x`echo "$map" | cut -c1` != 'x-' ] then map=`echo "/etc/$map" | sed -e 's:^/etc//:/:'` - options=`echo "$options" | sed -e 's/\(^\|[ \t]\)-/\1/g'` + timeout=`echo $options | sed --silent -e 's/\(.*\)\(--timeout=[0-9]\+\)\(.*\)/\2/g ; /--timeout=[0-9]\+/ p'` + options=`echo $options | sed -e 's/\(.*\)\(--timeout=[0-9]\+\)\(.*\)/\1\3/g ; s/\(^\|[ \t]\)-/\1/g'` if [ -x $map ]; then - echo "/usr/sbin/automount $dir program $map $options $localoptions" + echo "/usr/sbin/automount $timeout $dir program $map $options $localoptions" elif [ -f $map ]; then - echo "/usr/sbin/automount $dir file $map $options $localoptions" + echo "/usr/sbin/automount $timeout $dir file $map $options $localoptions" else - echo "/usr/sbin/automount $dir `basename $map` $options $localoptions" + echo "/usr/sbin/automount $timeout $dir `basename $map` $options $localoptions" fi fi done @@ -49,12 +51,12 @@ fi # if [ -e /usr/bin/ypcat ] && [ `ypcat -k auto.master 2>/dev/null | wc -l` -gt 0 ] then - ypcat -k auto.master | ( + ypcat -k auto.master | ( while read dir map options do - if [ ! -z "$dir" -a ! -z "$map" \ + if [ ! -z "$dir" -a ! -z "$map" \ -a x`echo "$map" | cut -c1` != 'x-' ] - then + then map=`echo "$map" | sed -e 's/^auto_/auto./'` if echo $options | grep -- '-t' >/dev/null 2>&1 ; then mountoptions="--timeout $(echo $options | \ @@ -63,26 +65,33 @@ then options=`echo "$options" | sed -e ' s/--*t\(imeout\)*[ \t]*[0-9][0-9]*//g s/\(^\|[ \t]\)-/\1/g'` - echo "/usr/sbin/automount $dir yp $map $options $localoptions" - fi + echo "/usr/sbin/automount $mountoptions $dir yp $map $options $localoptions" + fi done - ) + ) fi } start() { ebegin "Starting automounter" - getmounts | while read cmd mnt rest + getmounts | while read cmd timeout mnt rest do + #FIXME: this works but it really sucks + if echo $timeout|grep -v -- '--timeout' >/dev/null ; then + rest="$mnt $rest" + mnt="$timeout" + timeout="" + fi + echo -n " $mnt" - pidfile=/var/run/autofs`echo $mnt | sed 's/\//./'`.pid + pidfile=/var/run/autofs`echo $mnt | sed 's/\//./g'`.pid start-stop-daemon --start --pidfile $pidfile --quiet \ - --exec /usr/sbin/automount -- $mnt $rest + --exec /usr/sbin/automount -- $timeout $mnt $rest # # Automount needs a '--pidfile' or '-p' option. # For now we look for the pid ourself. # - ps ax | grep "[0-9]:[0-9][0-9] /usr/sbin/automount $mnt" | ( + ps ax | grep "[0-9]:[0-9][0-9] /usr/sbin/automount $timeout \?$mnt" | ( read pid rest echo $pid > $pidfile echo "$mnt $rest" >> $pidfile @@ -117,7 +126,7 @@ reload() { do pid=`head -n 1 $i 2>/dev/null` [ "$pid" = "" ] && continue - command=`tail +2 $i` + command=`tail -n +2 $i` if ! grep -q "^$command" $TMP then echo "Stopping automounter: $command" diff --git a/net-fs/autofs/files/autofs.rc7 b/net-fs/autofs/files/autofs.rc7 index b85a2b0b43e4..8925639280c5 100644 --- a/net-fs/autofs/files/autofs.rc7 +++ b/net-fs/autofs/files/autofs.rc7 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc7,v 1.1 2002/10/27 05:21:15 bcowan Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc7,v 1.1.1.1 2005/11/30 09:45:46 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/auto.master, then a YP @@ -119,7 +119,7 @@ reload() { do pid=`head -n 1 $i 2>/dev/null` [ "$pid" = "" ] && continue - command=`tail +2 $i` + command=`tail -n +2 $i` if ! grep -q "^$command" $TMP then echo "Stopping automounter: $command" @@ -133,4 +133,4 @@ reload() { restart() { svc_stop svc_start -}
\ No newline at end of file +} diff --git a/net-fs/autofs/files/autofs.rc8 b/net-fs/autofs/files/autofs.rc8 index 7ec686a3a377..61064a783161 100644 --- a/net-fs/autofs/files/autofs.rc8 +++ b/net-fs/autofs/files/autofs.rc8 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc8,v 1.1 2002/11/18 02:00:18 bcowan Exp $ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc8,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/auto.master, then a YP @@ -10,8 +10,8 @@ DAEMON=/usr/sbin/automount depend() { - need net ypbind - use portmap + need localmount + use ypbind nfs portmap } opts="start stop status stats reload restart" @@ -82,7 +82,7 @@ function getmounts() # pull those particular options out. # echo DAEMONOPTIONS OPTIONS $daemonoptions $options startupoptions= - if echo $options | grep -q -- '-t' ; then + if echo $options $daemonoptions | grep -q -- '-t' ; then startupoptions="--timeout $(echo $daemonoptions $options | \ sed 's/.*--*t\(imeout\)*[ \t=]*\([0-9][0-9]*\).*$/\2/g')" fi @@ -116,14 +116,14 @@ function getmounts() fi map=`echo $map | cut -f2- -d:` - echo STARTUPOPTIONS $startupoptions > /tmp/debug - echo DIR $dir >> /tmp/debug - echo MAPTYPE $maptype >> /tmp/debug - echo MAP $map >> /tmp/debug - echo MAPOPTIONS $mapoptions >> /tmp/debug - echo LOCALOPTIONS $localoptions >> /tmp/debug + #echo STARTUPOPTIONS $startupoptions > /tmp/debug + #echo DIR $dir >> /tmp/debug + #echo MAPTYPE $maptype >> /tmp/debug + #echo MAP $map >> /tmp/debug + #echo MAPOPTIONS $mapoptions >> /tmp/debug + #echo LOCALOPTIONS $localoptions >> /tmp/debug - echo "$DAEMON $dir $maptype $map $mapoptions $localoptions" | sed -e 's/ / /g' -e 's/ / /g' + echo "$DAEMON $startupoptions $dir $maptype $map $mapoptions $localoptions" | sed -e 's/ / /g' -e 's/ / /g' # echo ------------------------ fi @@ -135,29 +135,31 @@ function getmounts() start() { ebegin "Starting automounter" - getmounts | while read cmd timeout mnt rest + getmounts | while read cmd timeout time mnt rest do #FIXME: this works but it really sucks if echo $timeout|grep -v -- '--timeout' >/dev/null ; then - rest="$mnt $rest" + rest="$time $mnt $rest" mnt="$timeout" + time="" timeout="" fi echo -n " $mnt" pidfile=/var/run/autofs`echo $mnt | sed 's/\//./g'`.pid start-stop-daemon --start --pidfile $pidfile --quiet \ - --exec /usr/sbin/automount -- $timeout $mnt $rest + --exec /usr/sbin/automount -- $timeout $time $mnt $rest # # Automount needs a '--pidfile' or '-p' option. # For now we look for the pid ourself. # - ps ax | grep "[0-9]:[0-9][0-9] /usr/sbin/automount $timeout \?$mnt" | ( + ps ax | grep "[0-9]:[0-9][0-9] /usr/sbin/automount $timeout $time \?$mnt" | ( read pid rest echo $pid > $pidfile echo "$mnt $rest" >> $pidfile ) done + echo eend $? } @@ -174,7 +176,7 @@ stats() { echo "" echo "Active Mount Points:" echo "--------------------" - ps ax|grep "[0-9]:[0-9][0-9] automount " | ( + ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | ( while read pid tt stat time command; do echo $command; done ) } @@ -187,7 +189,7 @@ reload() { do pid=`head -n 1 $i 2>/dev/null` [ "$pid" = "" ] && continue - command=`tail +2 $i` + command=`tail -n +2 $i` if ! grep -q "^$command" $TMP then echo "Stopping automounter: $command" @@ -201,4 +203,4 @@ reload() { restart() { svc_stop svc_start -}
\ No newline at end of file +} diff --git a/net-fs/autofs/files/autofs.rc9 b/net-fs/autofs/files/autofs.rc9 index ea0235fc1c51..a86e55811725 100644 --- a/net-fs/autofs/files/autofs.rc9 +++ b/net-fs/autofs/files/autofs.rc9 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc9,v 1.1 2004/12/09 07:25:12 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc9,v 1.1.1.1 2005/11/30 09:45:47 chriswhite Exp $ # rc file for automount using a Sun-style "master map". # We first look for a local /etc/autofs/auto.master, then a YP @@ -11,7 +11,7 @@ DAEMON=/usr/sbin/automount depend() { need localmount - use ypbind nfs slapd + use ypbind nfs slapd portmap net } opts="start stop status stats reload restart" @@ -138,10 +138,18 @@ function getmounts() start() { ebegin "Starting automounter" + # Check that maps exist + if [ -z "$(getmounts)" ]; then + eend 1 "No automount maps defined" + exit 1 + fi # ensure autofs support is loaded - grep -q autofs /proc/filesystems || modprobe -q autofs - [ $? -ne 0 ] && eend 1 "No autofs support available" - # now start working + grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs + if [ $? -ne 0 ]; then + eend 1 "No autofs support available" + exit 1 + fi + # Now go getmounts | while read cmd timeout time mnt rest do #FIXME: this works but it really sucks diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml index fc52d7ba53dd..caa0b0c8e131 100644 --- a/net-fs/autofs/metadata.xml +++ b/net-fs/autofs/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>no-herd</herd> +<herd>net-fs</herd> <maintainer> <email>rphillips@gentoo.org</email> </maintainer> +<maintainer> + <email>robbat2@gentoo.org</email> +</maintainer> </pkgmetadata> |