diff options
author | 2011-04-02 16:14:29 +0000 | |
---|---|---|
committer | 2011-04-02 16:14:29 +0000 | |
commit | d4128c518d66cf940e5e376b2fec5a15fbe947f2 (patch) | |
tree | 83d6ef524a7496408dfa85fa711809385ad95f30 | |
parent | sys-fs/ocfs2-tools: update INSTALL.GENTOO (diff) | |
download | pva-d4128c518d66cf940e5e376b2fec5a15fbe947f2.tar.gz pva-d4128c518d66cf940e5e376b2fec5a15fbe947f2.tar.bz2 pva-d4128c518d66cf940e5e376b2fec5a15fbe947f2.zip |
net-fs/autofs: revbump for bug 346537.
svn path=/; revision=478
-rw-r--r-- | net-fs/autofs/ChangeLog | 434 | ||||
-rw-r--r-- | net-fs/autofs/Manifest | 13 | ||||
-rw-r--r-- | net-fs/autofs/README | 4 | ||||
-rw-r--r-- | net-fs/autofs/autofs-5.0.5-r1.ebuild | 103 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.3-heimdal.patch | 35 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch | 58 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch | 16 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch | 12 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch | 166 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch | 144 | ||||
-rw-r--r-- | net-fs/autofs/files/autofs5.initd | 68 | ||||
-rw-r--r-- | net-fs/autofs/metadata.xml | 22 |
12 files changed, 1075 insertions, 0 deletions
diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog new file mode 100644 index 0000000..bbd014a --- /dev/null +++ b/net-fs/autofs/ChangeLog @@ -0,0 +1,434 @@ +# ChangeLog for net-fs/autofs +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.98 2010/09/29 16:54:27 jer Exp $ + + 29 Sep 2010; Jeroen Roovers <jer@gentoo.org> autofs-5.0.4-r5.ebuild: + Stable for HPPA (bug #292147). + + 21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + autofs-4.1.3-r7.ebuild, autofs-5.0.3-r6.ebuild: + Revert to ~ppc64 wrt #292147. + + 18 Jul 2010; <nixnut@gentoo.org> autofs-5.0.4-r5.ebuild: + ppc stable #292147 + + 25 Jun 2010; Raúl Porcel <armin76@gentoo.org> autofs-5.0.4-r5.ebuild: + alpha/arm/ia64/sparc stable wrt #292147 + + 20 Jun 2010; Markus Meier <maekke@gentoo.org> autofs-5.0.4-r5.ebuild: + amd64/x86 stable, bug #292147 + +*autofs-5.0.5 (09 Jun 2010) + + 09 Jun 2010; Peter Volkov <pva@gentoo.org> +autofs-5.0.5.ebuild, + +files/autofs-5.0.5-fix-building-without-sasl.patch, + +files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch, + metadata.xml: + Version bump, bug #296357, thank Dustin Polke for this work. + + 01 Jun 2010; Peter Volkov <pva@gentoo.org> autofs-5.0.4-r5.ebuild: + Wrong patch was applied and that cause build issue, bug #292147#c15, thank + Christian Ruppert (idl0r) for report and Dustin Polke for this fix. + + 28 May 2010; Peter Volkov <pva@gentoo.org> autofs-5.0.4-r5.ebuild, + metadata.xml: + Added missed dependenices, disabled automagic hesiod, bug 292147, thank + Dustin Polke for this job. Dustin stepped in as co-maintainer (/me proxy). + + 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> autofs-4.1.3-r7.ebuild, + autofs-4.1.3-r9.ebuild, autofs-5.0.3-r6.ebuild, autofs-5.0.4.ebuild, + autofs-5.0.4-r2.ebuild, autofs-5.0.4-r3.ebuild, autofs-5.0.4-r4.ebuild, + autofs-5.0.4-r5.ebuild: + Remove virtual/libc + +*autofs-5.0.4-r5 (14 Jun 2009) + + 14 Jun 2009; Stefaan De Roeck <stefaan@gentoo.org> + +autofs-5.0.4-r5.ebuild: + Revision bump - include latest upstream patches, probably fixes #269004 + + 11 Jun 2009; Stefaan De Roeck <stefaan@gentoo.org> + -autofs-3.1.7-r3.ebuild, -autofs-3.1.7-r4.ebuild, -autofs-4.0.0.ebuild, + -autofs-4.1.3.ebuild, -autofs-4.1.3-r1.ebuild, -autofs-4.1.3-r2.ebuild, + -autofs-4.1.3-r3.ebuild, -autofs-4.1.3-r4.ebuild, -autofs-4.1.3-r8.ebuild, + -autofs-5.0.3.ebuild, -autofs-5.0.3-r1.ebuild, -autofs-5.0.3-r2.ebuild, + -autofs-5.0.3-r4.ebuild, -autofs-5.0.3-r5.ebuild: + remove obsolete versions + +*autofs-5.0.4-r4 (11 Jun 2009) + + 11 Jun 2009; Stefaan De Roeck <stefaan@gentoo.org> + +autofs-5.0.4-r4.ebuild: + Revision bump - include latest upstream patches + + 08 Jun 2009; Jeroen Roovers <jer@gentoo.org> autofs-5.0.3-r6.ebuild: + Stable for HPPA (bug #257097). + + 01 Jun 2009; nixnut <nixnut@gentoo.org> autofs-5.0.3-r6.ebuild: + ppc stable #257097 + +*autofs-5.0.4-r3 (27 Apr 2009) + + 27 Apr 2009; Stefaan De Roeck <stefaan@gentoo.org> + +files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch, + +autofs-5.0.4-r3.ebuild: + Update patch set, probably fixing bugs #253806 and #255369 + + 08 Apr 2009; Raúl Porcel <armin76@gentoo.org> autofs-5.0.3-r6.ebuild: + arm/ia64/sparc stable wrt #257097 + + 15 Mar 2009; Brent Baude <ranger@gentoo.org> autofs-5.0.3-r6.ebuild: + Marking autofs-5.0.3-r6 ppc64 for bug 257097 + + 01 Feb 2009; Markus Meier <maekke@gentoo.org> autofs-5.0.3-r6.ebuild: + amd64/x86 stable, bug #257097 + + 01 Feb 2009; Tobias Klausmann <klausman@gentoo.org> + autofs-5.0.3-r6.ebuild: + Stable on alpha, bug #257097 + +*autofs-5.0.4-r2 (31 Jan 2009) + + 31 Jan 2009; Stefaan De Roeck <stefaan@gentoo.org> + -autofs-5.0.4-r1.ebuild, +autofs-5.0.4-r2.ebuild: + Update upstream patch set + +*autofs-5.0.4-r1 (20 Jan 2009) + + 20 Jan 2009; Stefaan De Roeck <stefaan@gentoo.org> + +autofs-5.0.4-r1.ebuild: + Introducing new patches from upstream, in an attempt to fix bugs #253806 + and #255369 + +*autofs-5.0.4 (04 Jan 2009) + + 04 Jan 2009; Stefaan De Roeck <stefaan@gentoo.org> + +files/autofs-5.0.4-user-ldflags-and-as-needed.patch, + +autofs-5.0.4.ebuild: + Version bump to 5.0.4 + fix bugs #247969 and #253412 concerning LDFLAGS + and --as-needed + + 29 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> Manifest: + Bug #236051, I had a download failure during digesting, with a zero-byte + file ending up in the Manifest wrongly. + +*autofs-5.0.3-r6 (27 Aug 2008) + + 27 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> + +autofs-5.0.3-r6.ebuild: + Bump to include more patches from upstream, fixes LDAP functionality in + large deployments. + + 12 May 2008; <solar@gentoo.org> autofs-5.0.3-r5.ebuild: + - Keyworded ~arm per request. Builds native but fails at cross-compiles. + + 05 May 2008; Stefaan De Roeck <stefaan@gentoo.org> autofs-5.0.3-r5.ebuild: + Patch patches in temporary directory (fixes bug #220315) + +*autofs-5.0.3-r5 (03 May 2008) + + 03 May 2008; Stefaan De Roeck <stefaan@gentoo.org> + +files/autofs-5.0.3-heimdal.patch, autofs-5.0.3-r4.ebuild, + +autofs-5.0.3-r5.ebuild: + Support also heimdal's krb5 implementation (fixes bug #210762) + some QA + +*autofs-5.0.3-r4 (28 Apr 2008) + + 28 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org> + +files/autofs-5.0.3-map-patch-fix.patch, -autofs-5.0.3-r3.ebuild, + +autofs-5.0.3-r4.ebuild: + Fix error introduced by autofs-5.0.3-map-type-in-map-name.patch (patch + taken from redhat rawhide autofs-5.0.3-11), also fix bug #219607 + +*autofs-5.0.3-r3 (28 Apr 2008) + + 28 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org> + +autofs-5.0.3-r3.ebuild: + Revision bump to include the most recent patches + to fix bugs #157968 and + #154797 + +*autofs-5.0.3-r2 (18 Feb 2008) + + 18 Feb 2008; Stefaan De Roeck <stefaan@gentoo.org> + +autofs-5.0.3-r2.ebuild: + Update patch list + +*autofs-4.1.3-r9 (05 Feb 2008) + + 05 Feb 2008; Stefaan De Roeck <stefaan@gentoo.org> +files/autofs.rc14, + +autofs-4.1.3-r9.ebuild: + Fix bug #91104 + + 05 Feb 2008; Stefaan De Roeck <stefaan@gentoo.org> +files/autofs5.rc1, + -files/autofs.rc14, metadata.xml, autofs-5.0.3.ebuild, + autofs-5.0.3-r1.ebuild: + Rename file in the tree, specify name in metadata + +*autofs-5.0.3-r1 (01 Feb 2008) + + 01 Feb 2008; Stefaan De Roeck <stefaan@gentoo.org> + +autofs-5.0.3-r1.ebuild: + Add use flag for sasl, force dependency on krb5 when using sasl (bug #208393) + +*autofs-5.0.3 (31 Jan 2008) + + 31 Jan 2008; Stefaan De Roeck <stefaan@gentoo.org> +files/autofs.rc14, + metadata.xml, +autofs-5.0.3.ebuild: + Big version bump to 5.0.3, probably fixes many open bugs + +*autofs-4.1.3-r8 (24 Jan 2008) + + 24 Jan 2008; Stefaan De Roeck <stefaan@gentoo.org> +files/autofs.rc13, + +autofs-4.1.3-r8.ebuild: + Fix bug #110887, + avoid segfault on amd64 + + 06 May 2007; Marius Mauch <genone@gentoo.org> autofs-3.1.7-r4.ebuild, + autofs-3.1.7-r5.ebuild, autofs-3.1.7-r6.ebuild, autofs-4.0.0.ebuild, + autofs-4.1.3.ebuild, autofs-4.1.3-r1.ebuild, autofs-4.1.3-r2.ebuild, + autofs-4.1.3-r3.ebuild, autofs-4.1.3-r4.ebuild, autofs-4.1.3-r7.ebuild: + Replacing einfo with elog + + 29 Apr 2007; Torsten Veller <tove@gentoo.org> autofs-4.1.3-r7.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) + + 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: + Transition to Manifest2. + + 25 Nov 2006; Guy Martin <gmsoft@gentoo.org> autofs-4.1.3-r7.ebuild: + Stable on hppa. + + 15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: + Remove rphillips from metadata.xml as he's retired. + + 02 Jun 2006; Robin H. Johnson <robbat2@gentoo.org> autofs-4.1.3-r7.ebuild: + Bug #135023, fix a parallel make bug. + +*autofs-4.1.3-r7 (30 May 2006) + + 30 May 2006; Alec Warner <antarus@gentoo.org> -autofs-4.1.3-r6.ebuild, + +autofs-4.1.3-r7.ebuild: + revbump for sort fix + + 30 May 2006; Alec Warner <antarus@gentoo.org> files/auto.net: + s/+/-/ for bug #120403, completely my fault :( + +*autofs-4.1.3-r6 (28 May 2006) + + 28 May 2006; Alec Warner <antarus@gentoo.org> + -files/autofs-4.1.3-fix-sort-opts.patch, files/auto.net, + -autofs-4.1.3-r5.ebuild, +autofs-4.1.3-r6.ebuild: + Refix bug #120403 with permission from robbat2 + +*autofs-4.1.3-r5 (20 May 2006) + + 20 May 2006; Mark Loeser <halcy0n@gentoo.org> + +files/autofs-4.1.3-fix-sort-opts.patch, +autofs-4.1.3-r5.ebuild: + Add patch to to fix sort options; bug #120403 + + 19 Feb 2006; Joshua Kinard <kumba@gentoo.org> autofs-4.1.3-r4.ebuild: + Added ~mips to KEYWORDS. + + 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) + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest new file mode 100644 index 0000000..4227b8f --- /dev/null +++ b/net-fs/autofs/Manifest @@ -0,0 +1,13 @@ +AUX autofs-5.0.3-heimdal.patch 1380 RMD160 ed40e452a7648aec1b25e1002c99929be97b8bf9 SHA1 3f7d05c14e52a9a8160a43a38a7b736bb81bb68b SHA256 ca62546abf6b6ae2ed95f53d439d25770f20e70651fdaf5a0edf9d69920b108a +AUX autofs-5.0.5-fix-building-without-ldap.patch 1047 RMD160 c0e01afebea8dbc6e6672db4ac442a2620de5284 SHA1 e197ddccc2da488a7a3a65696ad7f1e4c4912bcf SHA256 039a77646a753d29572d2c63b54c2ac0f49b34ce73fc70297144d670cc6e802e +AUX autofs-5.0.5-fix-building-without-sasl.patch 469 RMD160 63727a0f759f57291fb05b534ddc797f597706db SHA1 4f37776eece0cc620d7e21cf8a901c29b2a292e0 SHA256 eba6fd9e03506833401096a744303b843960cd7e40bab2582daa29cd9c80efa0 +AUX autofs-5.0.5-fix-install-deadlink.patch 544 RMD160 1fc3e01015a0b18e90a41754654ca6b7b1f3f30c SHA1 6170d1f7cd2ba88063967154b92d2ef67d760160 SHA256 48393e00ddb51c5b0588ea45711abb16bf256c487c584062bc3de59b30bae053 +AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch 4400 RMD160 441f8c5488267036da65f69234f11fd82015f809 SHA1 94016e5fde7286e54f8ca0c465dc3f1fe3bbd3ba SHA256 ab5cbc585fb3f6f753d08345beffbb4a188d8f957fad3ee9c81487baca6e69ec +AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch 3851 RMD160 df4fec7045a4dea512745f91fbbb3c7d00d2cf9f SHA1 b9e175dffcb65cb83fc34a15dce3c91f279278f3 SHA256 f69b3fcc717e96826fa6f6b2766423bc6d12cee06b739b0f10b99ffa3e4589ad +AUX autofs5.initd 1554 RMD160 48cd3e6e49c01e3f3c0de44a4c3b7fedb1bdc189 SHA1 0f45d41c85875b73eb79e8ce567bb341721ad51c SHA256 6a382bfbce3efe9648f4a30458c471cb71cff18b5e4f768c86e1bc31f745b834 +DIST autofs-5.0.5-patches-3.tar.lzma 77343 RMD160 fc60a2605b65f9926dfd334c86c96ff617e845e4 SHA1 62d528a70b828c26496cd1de003fa15097114464 SHA256 161a397230cf767e1f15c50aeeac7974e407935f81939de29ff9029ae88f96a6 +DIST autofs-5.0.5.tar.bz2 301327 RMD160 4d105cce439544193b4abcb0ca4763f8c1d3cf54 SHA1 7f8a320cc126cb233be23749669735320fe6933c SHA256 68c73e01bc3c14c7d3613a861bbde4ab601c13f3127fcb837d49e435e5986002 +EBUILD autofs-5.0.5-r1.ebuild 3252 RMD160 6fb207c5e655f543b3daab48601378ede4f7260e SHA1 94ee894c40191137c45ac8a20b6dc67c04908e8a SHA256 d750e7844af863730af65315b7ca8242becb921bfffebcc6b3e911e962cc9a48 +MISC ChangeLog 15470 RMD160 e7c75c591cd6d2a05212ce1c507c6ff23005bf50 SHA1 85721b0d8363e63a06a949b8b61e9d8fb4d4f084 SHA256 307d0dd35036b620305cbc928ae29a58ca34636cf33f7ea0d1a9891b805c6262 +MISC README 128 RMD160 966105e1822e79079dc682e025cb688f510ea28f SHA1 611f808b3bba78ee248e91900f908023be2949b7 SHA256 3cc60b77affd158840ce9b2523abe105bd3df0eb05db34ce46d781670cc3cd1a +MISC metadata.xml 629 RMD160 e54d3bf18dc419c0e900d81ed9aca1432e555d65 SHA1 64893b5cd342d35c9278df1b63fa106629b5ccf4 SHA256 2f9dffb787ccf5f094c9f839c60f32cc78f12546b56da94fec2c1fbb23e07e2b diff --git a/net-fs/autofs/README b/net-fs/autofs/README new file mode 100644 index 0000000..0daffe9 --- /dev/null +++ b/net-fs/autofs/README @@ -0,0 +1,4 @@ +This readme is unfinished ... (work in progress) + +Mention nfs-utils in elog for NFS mounts, bug 163210 reported by Kai Krakow. + diff --git a/net-fs/autofs/autofs-5.0.5-r1.ebuild b/net-fs/autofs/autofs-5.0.5-r1.ebuild new file mode 100644 index 0000000..e4fc276 --- /dev/null +++ b/net-fs/autofs/autofs-5.0.5-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +inherit eutils multilib autotools linux-info + +DESCRIPTION="Kernel based automounter" +HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" +PATCH_VER="3" +SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2 + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="hesiod ldap sasl" + +# USE="sasl" adds SASL support to the LDAP module which will not be build. If +# SASL support should be available, please add "ldap" to the USE flags. +REQUIRED_USE="sasl? ( ldap )" + +# currently, sasl code assumes the presence of kerberosV +RDEPEND="hesiod? ( net-dns/hesiod ) + ldap? ( >=net-nds/openldap-2.0 + sasl? ( dev-libs/cyrus-sasl + dev-libs/libxml2 + virtual/krb5 ) )" +DEPEND="${RDEPEND} + || ( app-arch/xz-utils app-arch/lzma-utils )" + +src_prepare() { + # Upstream's patchset + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + + # Fix for bug #210762 + # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203 + epatch "${FILESDIR}"/${PN}-5.0.3-heimdal.patch + + # Accumulated fixes for bugs + # #154797: Respect CC and CFLAGS + # #253412: Respect LDFLAGS + # #247969: Link order for --as-needed + epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded-v1.patch + + # do not include <nfs/nfs.h>, rather <linux/nfs.h>, + # as the former is a lame header for the latter (bug #157968) + sed 's@nfs/nfs.h@linux/nfs.h@' -i include/rpc_subs.h || die + + # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5591 + epatch "${FILESDIR}"/${P}-fix-building-without-sasl.patch + + # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371 + epatch "${FILESDIR}"/${P}-fix-install-deadlink.patch + + # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039 + # Disable LDAP specific code if USE="-ldap", let's see what upstream says... + epatch "${FILESDIR}"/${P}-fix-building-without-ldap.patch + + eautoreconf +} + +src_configure() { + # work around bug #355975 (mount modifies timestamp of /etc/mtab) + # with >=sys-apps/util-linux-2.19, + addpredict "/etc/mtab" + + # --with-confdir is for bug #361481 + econf \ + --with-confdir=/etc/conf.d \ + $(use_with ldap openldap) \ + $(use_with sasl) \ + $(use_with hesiod) \ + --enable-ignore-busy +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL + + # kernel patches + docinto patches + dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch + + newinitd "${FILESDIR}"/autofs5.initd autofs +} + +pkg_postinst() { + if kernel_is -lt 2 6 30; then + elog "This version of ${PN} requires a kernel with autofs4 supporting" + elog "protocol version 5.00. Patches for kernels older than 2.6.30 have" + elog "been installed into" + elog "${EROOT}usr/share/doc/${P}/patches." + elog "For further instructions how to patch the kernel, please refer to" + elog "${EROOT}usr/share/doc/${P}/INSTALL." + elog + fi + elog "If you plan on using autofs for automounting remote NFS mounts," + elog "please check that both portmap (or rpcbind) and rpc.statd/lockd" + elog "are running." +} diff --git a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch new file mode 100644 index 0000000..707364d --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch @@ -0,0 +1,35 @@ +--- autofs-5.0.3.orig/modules/cyrus-sasl.c 2008-04-28 16:17:03.000000000 +0200 ++++ autofs-5.0.3/modules/cyrus-sasl.c 2008-04-28 16:41:58.000000000 +0200 +@@ -66,6 +66,15 @@ + #endif + #endif + ++/** ++ * The type of a principal is different for MIT Krb5 and Heimdal. ++ * These macros are provided by Heimdal, and introduced here for MIT. ++ */ ++#ifndef krb5_realm_length ++#define krb5_realm_length(r) ((r).length) ++#define krb5_realm_data(r) ((r).data) ++#endif ++ + /* + * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME + * environment variable so that the library knows where to find it. +@@ -452,11 +461,11 @@ + + /* setup a principal for the ticket granting service */ + ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, ++ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), + strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, ++ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), + 0); + if (ret) { + error(logopt, + diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch new file mode 100644 index 0000000..d90ef94 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch @@ -0,0 +1,58 @@ +--- lib/defaults.c.orig ++++ lib/defaults.c +@@ -19,7 +19,9 @@ + + #include "list.h" + #include "defaults.h" ++#ifdef HAVE_LDAP + #include "lookup_ldap.h" ++#endif + #include "log.h" + #include "automount.h" + +@@ -197,6 +199,7 @@ static int parse_line(char *line, char * + return 1; + } + ++#ifdef HAVE_LDAP + void defaults_free_uris(struct list_head *list) + { + struct list_head *next; +@@ -252,9 +255,11 @@ static unsigned int add_uris(char *value + + return 1; + } ++#endif + + struct list_head *defaults_get_uris(void) + { ++#ifdef HAVE_LDAP + FILE *f; + char buf[MAX_LINE_LEN]; + char *res; +@@ -288,6 +292,9 @@ struct list_head *defaults_get_uris(void + + fclose(f); + return list; ++#else ++ return NULL; ++#endif + } + + /* +@@ -450,6 +457,7 @@ unsigned int defaults_get_ldap_network_t + return res; + } + ++#ifdef HAVE_LDAP + struct ldap_schema *defaults_get_default_schema(void) + { + struct ldap_schema *schema; +@@ -645,6 +653,7 @@ struct ldap_schema *defaults_get_schema( + + return schema; + } ++#endif + + unsigned int defaults_get_mount_nfs_default_proto(void) + { diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch new file mode 100644 index 0000000..ae93e2e --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch @@ -0,0 +1,16 @@ +--- modules/lookup_ldap.c.old 2010-05-28 13:47:33.888723271 +0200 ++++ modules/lookup_ldap.c 2010-05-28 13:58:32.048972838 +0200 +@@ -141,9 +141,13 @@ + { + int rv; + ++#ifdef WITH_SASL + if (ctxt->auth_required == LDAP_AUTH_USESIMPLE) + rv = ldap_simple_bind_s(ldap, ctxt->user, ctxt->secret); + else if (ctxt->version == 2) ++#else ++ if (ctxt->version == 2) ++#endif + rv = ldap_simple_bind_s(ldap, ctxt->base, NULL); + else + rv = ldap_simple_bind_s(ldap, NULL, NULL); diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch b/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch new file mode 100644 index 0000000..8ab10fc --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch @@ -0,0 +1,12 @@ +--- modules/Makefile.old 2010-06-19 20:43:45.373371321 +0200 ++++ modules/Makefile 2010-06-19 20:45:26.062417092 +0200 +@@ -63,7 +63,9 @@ install: all + -rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so + ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so + ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so ++ifeq ($(SASL), 1) + ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so ++endif + ln -fs mount_nfs.so $(INSTALLROOT)$(autofslibdir)/mount_nfs4.so + ifeq ($(EXT2FS), 1) + ifeq ($(EXT3FS), 1) diff --git a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch new file mode 100644 index 0000000..f49b4aa --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch @@ -0,0 +1,166 @@ +=== modified file 'Makefile.conf.in' +--- Makefile.conf.in 2011-04-02 14:53:02 +0000 ++++ Makefile.conf.in 2011-04-02 14:53:26 +0000 +@@ -95,3 +95,5 @@ + # Location for init.d files + initdir = @initdir@ + ++# Use the compiler determined by configure ++CC := @CC@ + +=== modified file 'Makefile.rules' +--- Makefile.rules 2011-04-02 14:53:02 +0000 ++++ Makefile.rules 2011-04-02 14:54:11 +0000 +@@ -16,44 +16,30 @@ + AUTOFS_LIB = ../lib/autofs.a + + # Compilers, linkers and flags +-# The STRIP defined here *must not* remove any dynamic-loading symbols +- + ifdef DMALLOCLIB + DEBUG=1 + endif + + ifdef DEBUG + CFLAGS ?= -g -Wall -DDEBUG +-LDFLAGS = -g +-STRIP = : + else +-ifdef DONTSTRIP + CFLAGS ?= -O2 -g +-LDFLAGS = -g +-STRIP = : +-else +-CFLAGS ?= -O2 -Wall +-LDFLAGS = -s +-STRIP = strip --strip-debug +-endif +-endif ++endif ++AUTOFS_LDFLAGS = -g + +-CC = gcc +-CXX = g++ + CXXFLAGS = $(CFLAGS) + LD = ld + SOLDFLAGS = -shared + + CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 +-LDFLAGS += -lpthread + + ifdef TIRPCLIB + CFLAGS += -I/usr/include/tirpc +-LDFLAGS += $(TIRPCLIB) ++AUTOFS_LDFLAGS += $(TIRPCLIB) + endif + + ifdef DMALLOCLIB +-LDFLAGS += $(DMALLOCLIB) ++AUTOFS_LDFLAGS += $(DMALLOCLIB) + endif + + # Standard rules +@@ -67,5 +53,4 @@ + $(CC) $(CFLAGS) -S $< + + .c.so: +- $(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) +- $(STRIP) $*.so ++ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) + +=== modified file 'configure.in' +--- configure.in 2011-04-02 14:53:02 +0000 ++++ configure.in 2011-04-02 14:53:26 +0000 +@@ -174,7 +174,7 @@ + : Search for Hesiod in normal directory path + else + : Search for Hesiod in specific directory +- LDFLAGS="$LDFLAGS -L${withval}/lib" ++ LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib" + LIBHESIOD="-L${withval}/lib" + HESIOD_FLAGS="-I${withval}/include" + fi + +=== modified file 'daemon/Makefile' +--- daemon/Makefile 2011-04-02 14:53:02 +0000 ++++ daemon/Makefile 2011-04-02 14:53:26 +0000 +@@ -2,8 +2,8 @@ + # Makefile for autofs + # + ++include ../Makefile.rules + -include ../Makefile.conf +-include ../Makefile.rules + + SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \ + lookup.c state.c flag.c +@@ -20,7 +20,7 @@ + CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" + CFLAGS += -DVERSION_STRING=\"$(version)\" + LDFLAGS += -rdynamic +-LIBS = -ldl ++LIBS = -ldl -lpthread + + ifeq ($(LDAP), 1) + CFLAGS += $(XML_FLAGS) +@@ -30,8 +30,7 @@ + all: automount + + automount: $(OBJS) $(AUTOFS_LIB) +- $(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) +- $(STRIP) automount ++ $(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) + + clean: + rm -f *.o *.s *~ automount + +=== modified file 'lib/Makefile' +--- lib/Makefile 2011-04-02 14:53:02 +0000 ++++ lib/Makefile 2011-04-02 14:53:26 +0000 +@@ -41,14 +41,12 @@ + + mount_clnt.o: mount_clnt.c + $(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c +- $(STRIP) mount_clnt.o + + mount_xdr.c: mount.h + $(RPCGEN) -c -o mount_xdr.c mount.x + + mount_xdr.o: mount_xdr.c + $(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c +- $(STRIP) mount_xdr.o + + master_tok.c: master_tok.l + $(LEX) -o$@ -Pmaster_ $? + +=== modified file 'modules/Makefile' +--- modules/Makefile 2011-04-02 14:53:02 +0000 ++++ modules/Makefile 2011-04-02 14:55:06 +0000 +@@ -85,9 +85,8 @@ + # Ad hoc compilation rules for modules which need auxilliary libraries + # + lookup_hesiod.so: lookup_hesiod.c +- $(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ ++ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ + lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV) +- $(STRIP) lookup_hesiod.so + + cyrus-sasl.o: cyrus-sasl.c + $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< +@@ -96,13 +95,10 @@ + $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< + + lookup_ldap.so: lookup_ldap.c dclist.o $(SASL_OBJ) +- $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ ++ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ + lookup_ldap.c dclist.o $(SASL_OBJ) \ + $(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) +- $(STRIP) lookup_ldap.so + + mount_nfs.so: mount_nfs.c replicated.o +- $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ ++ $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ + mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) +- $(STRIP) mount_nfs.so +- + diff --git a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch new file mode 100644 index 0000000..029dcc5 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch @@ -0,0 +1,144 @@ +--- configure.in.old 2010-05-29 17:17:06.242996467 +0200 ++++ configure.in 2010-05-29 17:19:23.453749422 +0200 +@@ -173,7 +173,7 @@ AC_ARG_WITH(hesiod, + : Search for Hesiod in normal directory path + else + : Search for Hesiod in specific directory +- LDFLAGS="$LDFLAGS -L${withval}/lib" ++ LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib" + LIBHESIOD="-L${withval}/lib" + HESIOD_FLAGS="-I${withval}/include" + fi +--- Makefile.conf.in.old 2010-05-27 16:25:30.136149753 +0200 ++++ Makefile.conf.in 2010-05-27 16:27:29.736148646 +0200 +@@ -90,3 +90,5 @@ + # Location for init.d files + initdir = @initdir@ + ++# Use the compiler determined by configure ++CC := @CC@ +--- Makefile.rules.old 2010-05-27 16:25:26.722150726 +0200 ++++ Makefile.rules 2010-05-27 16:35:52.030400349 +0200 +@@ -16,8 +16,6 @@ + AUTOFS_LIB = ../lib/autofs.a + + # Compilers, linkers and flags +-# The STRIP defined here *must not* remove any dynamic-loading symbols +- + ifdef DMALLOCLIB + DEBUG=1 + endif +@@ -24,36 +24,24 @@ + + ifdef DEBUG + CFLAGS ?= -g -Wall -DDEBUG +-LDFLAGS = -g +-STRIP = : + else +-ifdef DONTSTRIP + CFLAGS ?= -O2 -g +-LDFLAGS = -g +-STRIP = : +-else +-CFLAGS ?= -O2 -Wall +-LDFLAGS = -s +-STRIP = strip --strip-debug +-endif + endif ++AUTOFS_LDFLAGS = -g + +-CC = gcc +-CXX = g++ + CXXFLAGS = $(CFLAGS) + LD = ld + SOLDFLAGS = -shared + + CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 +-LDFLAGS += -lpthread + + ifdef TIRPCLIB + CFLAGS += -I/usr/include/tirpc +-LDFLAGS += $(TIRPCLIB) ++AUTOFS_LDFLAGS += $(TIRPCLIB) + endif + + ifdef DMALLOCLIB +-LDFLAGS += $(DMALLOCLIB) ++AUTOFS_LDFLAGS += $(DMALLOCLIB) + endif + + # Standard rules +@@ -56,4 +54,3 @@ + + .c.so: + $(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) +- $(STRIP) $*.so +--- daemon/Makefile.old 2010-05-27 16:37:18.755178257 +0200 ++++ daemon/Makefile 2010-05-27 16:39:24.433440867 +0200 +@@ -2,8 +2,8 @@ + # Makefile for autofs + # + +--include ../Makefile.conf + include ../Makefile.rules ++-include ../Makefile.conf + + SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \ + lookup.c state.c flag.c +@@ -20,7 +20,7 @@ + CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" + CFLAGS += -DVERSION_STRING=\"$(version)\" + LDFLAGS += -rdynamic +-LIBS = -ldl ++LIBS = -ldl -lpthread + + ifeq ($(LDAP), 1) + ifeq ($(SASL), 1) +@@ -30,8 +30,7 @@ + all: automount + + automount: $(OBJS) $(AUTOFS_LIB) +- $(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) +- $(STRIP) automount ++ $(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS) + + clean: + rm -f *.o *.s *~ automount +--- lib/Makefile.old 2010-05-27 17:42:14.424151727 +0200 ++++ lib/Makefile 2010-05-27 17:42:43.629174396 +0200 +@@ -41,14 +41,12 @@ + + mount_clnt.o: mount_clnt.c + $(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c +- $(STRIP) mount_clnt.o + + mount_xdr.c: mount.h + $(RPCGEN) -c -o mount_xdr.c mount.x + + mount_xdr.o: mount_xdr.c + $(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c +- $(STRIP) mount_xdr.o + + master_tok.c: master_tok.l + $(LEX) -o$@ -Pmaster_ $? +--- modules/Makefile.old 2010-05-27 17:42:18.726149315 +0200 ++++ modules/Makefile 2010-05-27 17:43:01.581400805 +0200 +@@ -87,7 +87,6 @@ + lookup_hesiod.so: lookup_hesiod.c + $(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ + lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV) +- $(STRIP) lookup_hesiod.so + + cyrus-sasl.o: cyrus-sasl.c + $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< +@@ -96,10 +95,7 @@ + $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ + lookup_ldap.c dclist.o $(SASL_OBJ) \ + $(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) +- $(STRIP) lookup_ldap.so + + mount_nfs.so: mount_nfs.c replicated.o + $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ + mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) +- $(STRIP) mount_nfs.so +- diff --git a/net-fs/autofs/files/autofs5.initd b/net-fs/autofs/files/autofs5.initd new file mode 100644 index 0000000..fe30c36 --- /dev/null +++ b/net-fs/autofs/files/autofs5.initd @@ -0,0 +1,68 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +DAEMON=/usr/sbin/automount +PIDFILE=/var/run/autofs.pid +DEVICE=autofs + +depend() { + need localmount + use ypbind nfs slapd portmap net +} + +opts="start stop restart status reload" + +start() { + ebegin "Starting automounter" + + # Ensure autofs support is loaded + grep -q autofs /proc/filesystems || modprobe -q autofs4 + if [ $? -ne 0 ]; then + eend 1 "No autofs support available in kernel" + return 1 + fi + + # Check misc device + if [ -n "${USE_MISC_DEVICE}" -a "${USE_MISC_DEVICE}" = "yes" ]; then + sleep 1 + if [ -e "/proc/misc" ]; then + MINOR=$(awk "/${DEVICE}/ {print \$1}" /proc/misc) + [ -n "${MINOR}" -a ! -c "/dev/${DEVICE}" ] && \ + mknod -m 0600 "/dev/${DEVICE}" c 10 ${MINOR} + if [ $? -ne 0 ]; then + eend 1 "Could not create '/dev/${DEVICE}'" + return 1 + fi + fi + [ -x /sbin/restorecon -a -c "/dev/${DEVICE}" ] && \ + /sbin/restorecon "/dev/${DEVICE}" + if [ $? -ne 0 ]; then + eend 1 "Failed to execute '/sbin/restorecon \"/dev/${DEVICE}\"'" + return 1 + fi + else + [ -c "/dev/${DEVICE}" ] && rm -rf "/dev/${DEVICE}" + fi + + start-stop-daemon --start --exec ${DAEMON} -- -p ${PIDFILE} ${OPTIONS} + + eend $? +} + +stop() { + ebegin "Stopping automounter" + start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} + eend $? +} + +reload() { + ebegin "Reloading automounter" + if [ ! -r "${PIDFILE}" ]; then + eend 1 "automount not running" + else + kill -HUP $(cat "${PIDFILE}") 2> /dev/null + eend $? + fi +} diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml new file mode 100644 index 0000000..3b1e12b --- /dev/null +++ b/net-fs/autofs/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>net-fs</herd> +<maintainer> + <email>stefaan@gentoo.org</email> + <name>Stefaan De Roeck</name> +</maintainer> +<maintainer> + <email>pva@gentoo.org</email> + <name>Peter Volkov</name> +</maintainer> +<maintainer> + <email>gentoobugsie.20.dsurawicz@spamgourmet.com</email> + <name>Dustin Polke</name> +</maintainer> +<use> + <flag name="hesiod">Install hesiod module</flag> + <flag name="ldap">Install LDAP module</flag> + <flag name="sasl">Enable SASL support in the LDAP module</flag> +</use> +</pkgmetadata> |