From 4e8757d0a15742d7a21e4795b4fc21ecd1d0ab54 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 12 Jun 2013 22:19:29 +0000 Subject: Update, now with proxy maintenance. Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 --- net-fs/autofs/ChangeLog | 9 +- net-fs/autofs/Manifest | 18 ++-- net-fs/autofs/autofs-5.0.7-r2.ebuild | 129 ++++++++++++++++++++++++ net-fs/autofs/autofs-9999.ebuild | 98 ++++++++++++++++++ net-fs/autofs/files/autofs-5.0.7-sasl-def.patch | 43 ++++++++ net-fs/autofs/metadata.xml | 13 +++ 6 files changed, 297 insertions(+), 13 deletions(-) create mode 100644 net-fs/autofs/autofs-5.0.7-r2.ebuild create mode 100644 net-fs/autofs/autofs-9999.ebuild create mode 100644 net-fs/autofs/files/autofs-5.0.7-sasl-def.patch (limited to 'net-fs/autofs') diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index 31e8b6a4096b..7614ff8e6378 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-fs/autofs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.151 2013/05/06 08:45:14 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.152 2013/06/12 22:19:03 robbat2 Exp $ + +*autofs-9999 (12 Jun 2013) +*autofs-5.0.7-r2 (12 Jun 2013) + + 12 Jun 2013; Robin H. Johnson +autofs-5.0.7-r2.ebuild, + +autofs-9999.ebuild, +files/autofs-5.0.7-sasl-def.patch, metadata.xml: + Update, now with proxy maintenance. 06 May 2013; Justin Lecher autofs-5.0.7-r1.ebuild, +files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patc diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 47950f804c76..9818a55cd3a9 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX autofs-4.1.4-clean-up-maps.patch 1779 SHA256 e7e782016fd1af945107805eac243c0d6355b13366932c7d25447013c5a2c445 SHA512 479d6a6bf094980c73ca5f0b0bbc1321c666072d02848e7083f178b1bf93cd99ee0eea8817f9df29eddf159a792651330a2d2d4f7a35015edb535a0cb35d4938 WHIRLPOOL 0512674c720e91750e9fcba79c7dfb1d950074d8150eeacf433820018c79d52fb91221f385ad456e3c2da533d9e333a6b94f397d872cd2343b406e005a02e007 AUX autofs-4.1.4-fix-install-ldap-samples-and-maps.patch 2645 SHA256 188e73bcee6e2a10e1b5957a59a48ba1df7af534535e84359aaffb6f3e5986e7 SHA512 937251e1e386d7aa754e68b9e5586b3dbc8e8bf072f3faf49c5e828be6f0d69e20979afeafe514189d2d91d5f898c0e888ecb51264428fadfd1e47ff3af4dabb WHIRLPOOL 6f47561e22e1806ce180589d2840b785418c52ec9ab590ff4d9e2bd9439b01f13172bc66ca402f65ced29154faf535726263edd100ba3334a67cfaa5facfc889 AUX autofs-4.1.4-fix-man-pages.patch 1397 SHA256 2ad7f542990b74ac0113afacfaf703b45d925477d098c013c14717ca7a5a540d SHA512 3defc0714a04c8c6160357b6dac579f434dc3714cf23b2b61e065b32f06f59148b1c0a89dae616c425d4b237d617b4a8fb81b0327614488c69e31c7e07166894 WHIRLPOOL 5af92798e01af747eb7f8d5e6d74e42f7ca69199521cc3309093540f5af01b9b0e88bb4e7328d8f8f84da7878005495d85c309d6fa6137efdb801c080e8fd5dc @@ -18,6 +15,7 @@ AUX autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch 3895 SHA256 4f063e952 AUX autofs-5.0.6-revert-ldap.patch 512 SHA256 67e4f23d0c1ef771f861ec295a2780d9c09b37d26718c21e3f20d3b4936738e9 SHA512 e929bbe145c19ac5180094205a9095387e90126e8360ede99ab972cca864c40c1caf779503454784804e925e0efc0b4c459accb734f63482c758989bb17d7313 WHIRLPOOL 70c541931415e7d35955196c683bef2bf08c16b920f7398a679eaa8abeda5364cd3f0afec674e02e126447ca5c29d8c2934eb33d3f09aeb48fa0ae7a798cc56f AUX autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch 1151 SHA256 e2ea51d649d9c40ccea45828570e7b9b43cb598a703990d59933e79ab38669f1 SHA512 d92b0fcafdf6bb5df1b1d79f628bd049e07a51318e7b487f350816b1ff54d73c24b0fb44d8558b068bf27f128cf9edbc611a5e67e5d33f96b91c47bede1ebbfd WHIRLPOOL 3bfe2633f81069ca0d491f591b87368a9251eecf7af53ad888a5b2bf86a8754473575f1dd1e081ba91ed03823c13c2fd94aaf2ace5e0f060f3ba90e9f123af56 AUX autofs-5.0.7-mount-sloppy.patch 600 SHA256 244642785032d7b5c5114e714de0251584b67b24f5e9641f66d7c62183ebfcd2 SHA512 98ca3efe58cbc4247f9cf2e00edba19a2a227898f118511ca009ad6d7c67b06b2e4526e84cf94e8135031f72015df2e540a910dd259a0e28b49cc77e56c39f50 WHIRLPOOL 151d032f0d0a404faa1059e30ee4fc00b43dfc7e778faae6d00e4c379eb869f14cfb08aa2afd0d3befbadde67f7f285ff10289ec968061216674e833eccdc461 +AUX autofs-5.0.7-sasl-def.patch 1114 SHA256 bcaa9a826d7a936d1510f4ddb914a314bf37eeab9edc24dcf9b73cdbc6cfa79a SHA512 a6b1b75079f4651ef9886d8315c8fb6894c5800eb6a4f614fdcb205365e805ba6e4f95146ed95b283e361339eb5b0b723956b3344e50856223ae79aec7c6ca09 WHIRLPOOL fcea83e33989315a87a983972d7c6cc155346c7d901f63e9aa8a18f300cc5b109fa247b617acc9f97aa20100e4d4e95b901f24fd9ac3af6ef8530dee2b1e2b11 AUX autofs.rc12 7807 SHA256 dc08949c2d47614be7fcea8be9988de52715b8072753ee3df77a87c19962975c SHA512 1f5c747df09f4bbc38a31a803f817a14dd0721cf9e90517aa49cb4a0f5456d87e1d15d1a8b41ca3ac521b376bf4ce10c5105740c95f34f8b8d40c93abe605e3c WHIRLPOOL 0a840162d53c0eab3074fb1160450852d4e58e816e56d06c4293278f022fafb9627ca08efd3cc25172fe303505aeef3438d8d731570c341bf9411cdcf19ac2b1 AUX autofs.rc13 7876 SHA256 d477a63305db5d0cc78e9f538cea745f733ae46305f71986c8a5abce1d2f0c56 SHA512 5130415323a93dc962d2360090dbe537b79e1276978f9f7005271aef888f39fe62cb85ae289477707b03b3734c98d3e5ab84c3652c02e96b57c93c58d9a15a96 WHIRLPOOL c490c308216dc094e24f3348e0720cfd35e97cfa80e93b69f31a1b202e8ef53baf68490dc93b9ea01c80c51780051ccd0535b43cca203bb3fce4041f5a70499c AUX autofs5-auto.master 756 SHA256 8651b42b338ffdb8be24ed88893ca90f95d0221f2684274957de154fd89df5cb SHA512 3c6e6dab6beb595f4bfa3af7be3c1f5343a80ea81bc9fb26e073e96ea1b75bf2fd304c4e54dad9ec1c233e01c62310bbdbc7f97a2370e82bc31138855819d3b2 WHIRLPOOL 2c5a885f76d6e2adfc6c3b5a739c7bf820ba48adfca28cd7a2a50b81ec150011b93f283b8bb5058a427bfd5c701b1da8cbd31fc9a15b121d310d3048dacfba72 @@ -89,6 +87,7 @@ DIST autofs-5.0.6-patches-1.tar.lzma 25424 SHA256 7d92dd29b733a0e567d8a3a793a955 DIST autofs-5.0.6.tar.bz2 311857 SHA256 125b439a311939f247936ad697bc53b11a8e694aaff8ddf44a9fd7fa850e692c SHA512 cedfa6b6a6c81390a9302732ddfd880870e53f4995c8d87f9150669aa05b65c645763cf3bbda2ecd46a1dae1c3a80fe0601c0b4bb8dbb370c2af1392671e6355 WHIRLPOOL 61b0d36235805eee61b8cf445bc16d72c91ce9fa0d3bb0dfac94a54bb51a47548a16003d2888a92ef6afa449d4b81d9ddd086a69b63579c04088139286a1a410 DIST autofs-5.0.7-patches-1.tar.lzma 12677 SHA256 6ebc07007592d7af9934454e0e72a7b2ba837d1481d7e7ee209d58089a0728cf SHA512 5cb3ed3825d03eea0024165ee34320f1803bcf3caefea3574b6d5fe9f71b1fbc0669aacf65558fd8ad0dc785c62ad8797a07cfef771d7603c21ff63f30bbdedd WHIRLPOOL bf4dfcface1519409bf68cf5a6568ca247d17132c9404f21309c17d1bd55b6a412934d9ecfa69b498bcc3d8cd31db011727035d5172546add65d9baedb42c745 DIST autofs-5.0.7-patches-2.tar.lzma 31340 SHA256 e7ea55e270e2dad0dbe371f772ef77bf75d09c74a8a869089b261ab466201d45 SHA512 af8d0faa4f5533e3bfa690d96289cb99fa1065ac5b57505865ad3f68c9214b02821d8271a5778a034d3a1b0570df38dc1c59f3de4fa216859b97bf8717aba7b0 WHIRLPOOL aeaebc3e937f8c465a48e6901e48d112ddf77c9bcf9a91ed3ba55690a58acee323f1765a5b6142ebcd0bd8c4e54e2cd41c6153008c718fddba78f0702191bd79 +DIST autofs-5.0.7-patches-3.tar.lzma 37967 SHA256 16de3486573a94d476f70f2c422656d6fddd79b3581ce05faeb5dd55748ba1cb SHA512 8cbb683a82d2cdc5e3c97921ba3a5bc5af5ab9fb45e4802de021a6161eaeaebb192790a351d281d48b68ed0f8ea6e3a0c0514a4f4a1c546191d8acca9e856ca7 WHIRLPOOL a42f6d609ee4160dfb2d84d94516667f41b8dbe9bf6bdef923f424f82ec00f6115f211dc2985170c45be53bdc45ea47026cc3750c61c7e14aa02ce3384bb9908 DIST autofs-5.0.7.tar.bz2 319117 SHA256 08c4304d8076dc80c14df559bc5fd821b67ef3457b245f61068bd053d8f94ccc SHA512 672c53e0a5477097779088d8654edaad4cb01ab68ade2ee175d963c7d4895d1bdeeeabc87057ecca2f4f3a0f08014298dae40e5e8e862c20c0b1477d72431f84 WHIRLPOOL 220cbd618ee4f34c82eaad823312284cc787aa28a0a8b9638a4b495cf38a3a6f9da194e74722febe04ee2b5ac4e1e9eccccde1f562d0d554f1e8a5ff4b5faec8 EBUILD autofs-4.1.4-r1.ebuild 2725 SHA256 8f495f2a77cd7ef699880ecee789ed3a2dd63696afa7c1c7a6757e882727ae44 SHA512 4b104cc7787772a3b5a0845e10846968c72829ebaafe076ff77cda19b7e33198fc05c0c7b7ce7dee9c96a0daa01a2f1512ffa98eb97377e104525e6ecf0ab806 WHIRLPOOL 2528de6ed0d209834042866dc7188cc6fa5d7bc15f374e739d15a3bafeb7eb43328aa9f468a50d8c3187193ad16c3f03feac72c4f31789a651af6035e5d477b8 EBUILD autofs-5.0.4-r5.ebuild 4931 SHA256 95e8c8f9c4ca3a08dae7b84317ed67082f65ee7e756dcde5503548ae4b5d1865 SHA512 40e92da0228a2a0127fb0eb703f65049fbc9bce5f3bd0ffe551a938ee1faac55461521d027c603db5d63d6df54d0e21dd2bf22e8776ee48fb03a0fed0c75c1b0 WHIRLPOOL b00a27695efe434ccb0099c49634cc130ca72b79e7d71c6e6989e5ff5c3862e9936e4c65877519185311407a17beea0a36df9182f6947e272198830ed3e79a4e @@ -96,13 +95,8 @@ EBUILD autofs-5.0.6-r3.ebuild 3823 SHA256 2ff9fc2d64056626d13334b2c89e9c0fcc5d29 EBUILD autofs-5.0.6-r4.ebuild 3894 SHA256 e28b1ac232cf470e339906ac879aee000fa1d1b138754f1e612f7ffd53b4e909 SHA512 8ac0c01b33c2627c43a6e659ceea517eba1ec8c4f2d53b3441a847dc320d78c21213ea34eff02b1a1655904a1e215c9ed7c097a4d9823d76cb20508a59038970 WHIRLPOOL 55592ed5e51fd91c6ff53e6600d32e7d729d895eb70a0571ece7311a5fa9b1a04022bd4a2d26c7b89b5c7fe1b8d807e073288828ce27947bfdd891a89445db23 EBUILD autofs-5.0.6-r5.ebuild 3621 SHA256 674564d087a7bd0199adf8eae6403a3f64df04a2b0540aab476ffde83f5d980c SHA512 2a45b83372916c2a27cce6a93a6914b5cf1d60f414ab368bb6c552b8fdecb7079274ac5e5caae7e5445bd162e373344761cfe2e548e525aa31e8793eacee9463 WHIRLPOOL 9071ebc6617754c2bca2bc4207efabf02b411a39dda86df45c819420d1fcfce2c12cace8097d0cd8bcc872dc87759ca79dc78d044bebbff70029854abb903ae8 EBUILD autofs-5.0.7-r1.ebuild 3386 SHA256 d840a5db8dc4499989c1b585909d0f570ca1cef52e6e1ad7f76ae9a142bb9ea1 SHA512 b6c2d70af4a1435b2ace3f9bd13efa261d06f4fdb3e36663b5d976c25fd2442e639a095b2976492673bb7a38bbdb38af4bfb03c9a0e04cc30bfccab8ba987ee0 WHIRLPOOL 3e4cd336b40d68f9ba7bdaaf687ca871199b597a1103287e6ab7bf41fd28859d049c2f8464dbd9e0ee4c1bc7ece863f9feb8fb0d44a83a2d5f9d4ed403fb4696 +EBUILD autofs-5.0.7-r2.ebuild 3676 SHA256 610055e4f57707e86e59d8bdf3d7317f33e037e89a593b9cfe574560ab73e9ac SHA512 8c555bd6a3351353736628a2f645478c398748b81340087929237a4483078eb750c952dfe83202c9fce73519af4a363b76d0a37550de3b53e98c0eb3d4b2912d WHIRLPOOL 46947079452158094fdee89f30835fe017cd9af3a8ef6f5368bd913c282080dfaf9c89a63ec0119cdd49a0102f73b297f04584dcca03fa918208a5e4f542f6bd EBUILD autofs-5.0.7.ebuild 3709 SHA256 5c1988d743b9ac6805a3af576d4799940b326a80869033b70946b77e732917b9 SHA512 971376c69990158d8e4c7c9e258f54f60a931cc76e380dd4ef9fd868ec49f6843b1be32ef483fbd24cc6175a8af47f3d38be08feb8f0169d6ddb554bf221a32c WHIRLPOOL 153a9746f65ccdb9437122be405e79b4ef863eca483e928d73bfaf4434ebfb813f07211ad7ac0d4dcf0832129d1bb41344248ddbfe56b1da0d085bdb408c8319 -MISC ChangeLog 25396 SHA256 5b9e0a24c10f82971faf201e040756935aaa2705e5783309399cd279fce99411 SHA512 292acf959b9779cce2c7484223df1fb33d7c80ec585a6fd3c8ec5d30e50ebce08e4280c1b841b4d2cb6c5ee30cba5fa8491460837c7d7f9c72609951f4e9f1a1 WHIRLPOOL 21e62eedac6a91e75e74e98bef43f956eed293fb02c41703b51c0f07927b789a83fa85a67519f503b059069aeb5bca770791138b21ed79217e1113aa4a7115b8 -MISC metadata.xml 754 SHA256 41d061c91ada31fdfad8335da8ffcdda872248fc06f2db1a3d1e69ccc720cd84 SHA512 5943490bd05ea234a219f2d7e373ccf0cbff531425fdb94a08c5c1036c62e9b467e368a5d2e56f721dd03c0e9b5cc592dd320a39faf72287757d2f2f9dfc659b WHIRLPOOL 7a4ee984f5301f78d3168daeb3f218017cef94cbb23493f77855003b4097d5b38e1b6d5b0b3d5fd19819192f52775b657e6d5367d9553b95628a51631206708e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREKAAYFAlGHbZgACgkQgAnW8HDreRaVuQCgoPxpKzMLeT3jgXNXsha7+p+H -v2cAn1qpNxX3B4seJ7kG/oGrdOM1c4OZ -=iEMY ------END PGP SIGNATURE----- +EBUILD autofs-9999.ebuild 2647 SHA256 35a1e7d21c7c672bee4fbe0ed43278fcac3f6af5d95a932de73c919eff94c047 SHA512 9f66187c00e531d500a1a93dbda147524b7ca864896f6c027a6cff4f83dc204f982a20a395f9391f0feb6cf0a7fa45944f6811fc229d3f550285730b8a8ac581 WHIRLPOOL d3caa04d74de2ff4d844f7678e36e74639f7431e402b827d763dae9cf490e90c7192ac527f7f591304a2258f769b36459f0754ed5620fbd4aef364987db9a6a3 +MISC ChangeLog 25648 SHA256 0046dab1471871dd390988d0944f4bd38baa66acb917b98d689f65a52c152933 SHA512 4f8b38fb5b3fbeec7fc12bae0b49c2e3706a5051c6a669e9c986c0e3d3ea5185e7427566f0c625fbd871688e356fdc776d9370908934ee0ccbde7cdd995a3130 WHIRLPOOL ff7c5fb484fcea45f899d88b5ff090182173d75a2579d8ebaae3b59101dc03fd1541d41325da332d1be3c71d80eddebdf52c1b6b8b953b0c6f493a7986e0c197 +MISC metadata.xml 1263 SHA256 0fc143d55dda5e9758892015bf6e12dea811908e4f57e507941e04fd9dcd036a SHA512 1272a7dc12f7cadb44fb31a6dbeaf874bf769e0514aba505af080c7257eb51dbb241844199e01baea2a7a8c0fba12e836467bf2cf17deebf6e5148ba2357d7ae WHIRLPOOL 5095cb91faca70879a8240c3f0c6e06cbb041dd00a7f3799d5353e5991a008a7f81d6239860b1b12cad22a701f98e64d5338ce17ab7b179c8674535e10deba36 diff --git a/net-fs/autofs/autofs-5.0.7-r2.ebuild b/net-fs/autofs/autofs-5.0.7-r2.ebuild new file mode 100644 index 000000000000..ff851f56708d --- /dev/null +++ b/net-fs/autofs/autofs-5.0.7-r2.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r2.ebuild,v 1.1 2013/06/12 22:19:03 robbat2 Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils linux-info multilib + +PATCH_VER=3 +[[ -n ${PATCH_VER} ]] && \ + PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma" + +DESCRIPTION="Kernel based automounter" +HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" +SRC_URI=" + mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2 + ${PATCHSET_URI}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="-dmalloc hesiod ldap libtirpc mount-locking 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=">=sys-apps/util-linux-2.20 + dmalloc? ( dev-libs/dmalloc ) + hesiod? ( net-dns/hesiod ) + ldap? ( >=net-nds/openldap-2.0 + sasl? ( + dev-libs/cyrus-sasl + dev-libs/libxml2 + virtual/krb5 + ) + ) + libtirpc? ( net-libs/libtirpc )" + +DEPEND="${RDEPEND} + sys-devel/flex + virtual/yacc" + +CONFIG_CHECK="~AUTOFS4_FS" + +PATCHES=( + # Fix for bug #210762 + # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203 + "${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 + "${FILESDIR}"/${PN}-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch + + # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371 + "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch + + "${FILESDIR}"/${P}-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch #361899, #468606 + "${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch #381315 + "${FILESDIR}"/${PN}-5.0.7-sasl-def.patch #469324 + ) + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + epatch_user + autotools-utils_src_prepare +} + +src_configure() { + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + # for systemd support (not enabled yet): + # --with-systemd + # --disable-move-mount: requires kernel >=2.6.39 + local myeconfargs=( + --with-confdir=/etc/conf.d + --with-mapdir=/etc/autofs + $(use_with dmalloc) + $(use_with ldap openldap) + $(use_with libtirpc) + $(use_with sasl) + $(use_with hesiod) + $(use_enable mount-locking) + --disable-ext-env + --enable-sloppy-mount # bug #453778 + --enable-forced-shutdown + --enable-ignore-busy + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + if kernel_is -lt 2 6 30; then + # kernel patches + docinto patches + dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch + fi + newinitd "${FILESDIR}"/autofs5.initd autofs + insinto etc/autofs + newins "${FILESDIR}"/autofs5-auto.master auto.master +} + +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/autofs-9999.ebuild b/net-fs/autofs/autofs-9999.ebuild new file mode 100644 index 000000000000..ba12e40fa450 --- /dev/null +++ b/net-fs/autofs/autofs-9999.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-9999.ebuild,v 1.1 2013/06/12 22:19:03 robbat2 Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=1 + +EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git" +inherit autotools-utils linux-info multilib git-2 + +DESCRIPTION="Kernel based automounter" +HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="-dmalloc hesiod ldap libtirpc mount-locking 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=">=sys-apps/util-linux-2.20 + hesiod? ( net-dns/hesiod ) + ldap? ( >=net-nds/openldap-2.0 + sasl? ( + dev-libs/cyrus-sasl + dev-libs/libxml2 + virtual/krb5 + ) + ) + libtirpc? ( net-libs/libtirpc )" + +DEPEND="${RDEPEND} + sys-devel/flex + virtual/yacc" + +CONFIG_CHECK="~AUTOFS4_FS" + +src_prepare() { + epatch_user + autotools-utils_src_prepare +} + +src_configure() { + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + # for systemd support (not enabled yet): + # --with-systemd + # --disable-move-mount: requires kernel >=2.6.39 + local myeconfargs=( + --with-confdir=/etc/conf.d + --with-mapdir=/etc/autofs + $(use_with dmalloc) + $(use_with ldap openldap) + $(use_with libtirpc) + $(use_with sasl) + $(use_with hesiod) + $(use_enable mount-locking) + --disable-ext-env + --disable-mount-locking + --enable-sloppy-mount + --enable-forced-shutdown + --enable-ignore-busy + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + if kernel_is -lt 2 6 30; then + # kernel patches + docinto patches + dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch + fi + newinitd "${FILESDIR}"/autofs5.initd autofs + insinto etc/autofs + newins "${FILESDIR}"/autofs5-auto.master auto.master +} + +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.7-sasl-def.patch b/net-fs/autofs/files/autofs-5.0.7-sasl-def.patch new file mode 100644 index 000000000000..a12d3798bdf0 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.7-sasl-def.patch @@ -0,0 +1,43 @@ +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index ce1e2e5..35a2106 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -28,9 +28,6 @@ + #include + #include + #include +-#ifdef HAVE_SASL +-#include +-#endif + + #define MODULE_LOOKUP + #include "automount.h" +@@ -38,6 +35,10 @@ + #include "lookup_ldap.h" + #include "base64.h" + ++#ifdef WITH_SASL ++#include ++#endif ++ + #define MAPFMT_DEFAULT "sun" + + #define MODPREFIX "lookup(ldap): " +@@ -587,7 +588,7 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context + { + LDAP *ldap; + +-#ifdef HAVE_SASL ++#ifdef WITH_SASL + if (ctxt->extern_cert && ctxt->extern_key) { + set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert); + set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key); +@@ -1389,7 +1390,7 @@ static void free_context(struct lookup_context *ctxt) + defaults_free_searchdns(ctxt->sdns); + if (ctxt->dclist) + free_dclist(ctxt->dclist); +-#ifdef HAVE_SASL ++#ifdef WITH_SASL + if (ctxt->extern_cert) + free(ctxt->extern_cert); + if (ctxt->extern_key) diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml index 2ab5d1660cdf..04898f1ed475 100644 --- a/net-fs/autofs/metadata.xml +++ b/net-fs/autofs/metadata.xml @@ -6,10 +6,23 @@ DuPol@gmx.de Dustin Polke + maintainer, assign bugs + + + dennis.yxun@gmail.com + Dennis (dlan) Lan + maintainer, assign bugs + + + robbat2@gentoo.org + Robin Johnson + proxy maintainer, CC on bugs + Enable debugging with the dmalloc library Install hesiod module Install LDAP module + Use libtirpc lib support Enable locking to prevent corruption of /etc/mtab in the presence of concurrent auto-mounting. If enabled, recursive auto-mounting (eg. using -- cgit v1.2.3-65-gdbad