diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-fs/autofs | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-fs/autofs')
25 files changed, 1853 insertions, 0 deletions
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest new file mode 100644 index 000000000000..84ddb5e6494b --- /dev/null +++ b/net-fs/autofs/Manifest @@ -0,0 +1,7 @@ +DIST autofs-5.0.10.tar.xz 258480 SHA256 98150c09639112a125a6d0ddc6aa1920ae4e6c41736e65d8a004c3171fcca70b SHA512 899d3b7040d1162312f9d595df0fd6c40489e4aefb7086893b51993446da78f10707d7e8caf8440ff24000d54794faca869aaf8564e5622caf8bb046af6fcf3b WHIRLPOOL 32c964a58f5125dfbfe589345e1fdf3da357fdadead790e3adbc840f0fc1b7093a0191224ac8d07ac792184914f6630ba08d572ffdcca0423e2a41bb2892ceaf +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 +DIST autofs-5.0.8.tar.bz2 328559 SHA256 2e0e42c654b7762b1235ec0131317224c57fdc6757ec00c820b2aa86338c9f7d SHA512 72b01b4a45e70b651ab6f4cd63039bc3d7f389a21fde354a4ba1e0e172b5480abd9b12134b8a9c74284712c2d4ff0d46ad2b47ca1692b510b0d1be5d56bf3335 WHIRLPOOL 4d9cd57819930070d6741d174f61d7c99d00ff6af364e1f9ced3f4dc8eacdf3af4c1d843127e2d8d4e57238389542976379d8c009562fa51e3fdecf7f3db29d0 +DIST autofs-5.0.9.tar.xz 256680 SHA256 81ab99ee1656a10ecaffe7933c26e8fc720f0b639ed47ab52adc66cdd868fd5c SHA512 36ecc38fa5108766069d5bbfcc22b186481d2e8aaa1b101406b389787280ae5e87ee21aab697f7ed0c9c9705278e8cd8b0143aee5fc2affd1becd85535dd9d73 WHIRLPOOL 915486d725e0a3b0d939b28dfd030d79c4fd71b7ff12c3f09bbbe558f00a8560141b9483263a5a04e84cc84eb0f92c90b1bb18df747aa5746046470b0f18bc00 +DIST autofs-5.1.0.tar.xz 288288 SHA256 f4b343797e6df03627a9fd41bda6fd85acb84aa3fdd15694eec03ec90a52bc27 SHA512 a455df8d93bc29aa87c3f928edea5bb3f91ab9c7bd7bbca8eb1370fdcc4c32b3a30d7f2c0d79800f65ac08716634f118c81ede7e816ef567048e4361aafac476 WHIRLPOOL ed265b1a9e697c08e802f0a17c0de482e5f1f292aecf8ab42cd7cf7177a605b0337ff6ab81b72950fc38687d31c47f9c01ff68cd0a8f10952a59b69a590e19ca +DIST autofs-5.1.1.tar.xz 290300 SHA256 e08ff0ef9ff365d87b6c33dca136d20e4e07675197a324f2816894cb437021c3 SHA512 37c0f10ee06bbfc76059ff9ae54d9b462f1c2bc39e8779e96dd5bfc2b07055606c0710f1c3de95e6f099edd2c5bb5a6f8a341be989d7554bf80011bfbe90c905 WHIRLPOOL 063e7bcabb3e93a17e8e7da75e6b42af59769e794e3b31240762a4617cc2ac626b4b4985a38455bdca56753fb897fed1a3173c633f1f9a594e79f891dc41f523 diff --git a/net-fs/autofs/autofs-5.0.10.ebuild b/net-fs/autofs/autofs-5.0.10.ebuild new file mode 100644 index 000000000000..ea11c95900c6 --- /dev/null +++ b/net-fs/autofs/autofs-5.0.10.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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.xz + ${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[threads] ) + 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() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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-5.0.7-r4.ebuild b/net-fs/autofs/autofs-5.0.7-r4.ebuild new file mode 100644 index 000000000000..b4e18b00eba0 --- /dev/null +++ b/net-fs/autofs/autofs-5.0.7-r4.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +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[threads] ) + 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.7-respect-user-flags-and-fix-asneeded-r3.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 + "${FILESDIR}"/${PN}-5.0.7-libtirpc-link.patch #464120 + "${FILESDIR}"/${PN}-5.0.7-parallel-make.patch + ) + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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 + --with-systemd + systemddir="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + 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-5.0.7-r5.ebuild b/net-fs/autofs/autofs-5.0.7-r5.ebuild new file mode 100644 index 000000000000..db45af8b27ae --- /dev/null +++ b/net-fs/autofs/autofs-5.0.7-r5.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +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[threads] ) + 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.7-respect-user-flags-and-fix-asneeded-r3.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 + "${FILESDIR}"/${PN}-5.0.7-libtirpc-link.patch #464120 + "${FILESDIR}"/${PN}-5.0.7-parallel-make.patch + "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258 + ) + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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 + --with-systemd + systemddir="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + 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-5.0.8-r1.ebuild b/net-fs/autofs/autofs-5.0.8-r1.ebuild new file mode 100644 index 000000000000..d10115b590b3 --- /dev/null +++ b/net-fs/autofs/autofs-5.0.8-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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[threads] ) + 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() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + epatch "${FILESDIR}"/${P}-ldap-wo-sasl.patch + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd + systemddir="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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-5.0.8-r2.ebuild b/net-fs/autofs/autofs-5.0.8-r2.ebuild new file mode 100644 index 000000000000..c4503e7d73d2 --- /dev/null +++ b/net-fs/autofs/autofs-5.0.8-r2.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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[threads] ) + 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=( + "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258 +) + +src_prepare() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + epatch "${FILESDIR}"/${P}-ldap-wo-sasl.patch + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd + systemddir="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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-5.0.9-r1.ebuild b/net-fs/autofs/autofs-5.0.9-r1.ebuild new file mode 100644 index 000000000000..674d2069012b --- /dev/null +++ b/net-fs/autofs/autofs-5.0.9-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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.xz + ${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[threads] ) + 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=( + "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258 +) + +src_prepare() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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-5.0.9.ebuild b/net-fs/autofs/autofs-5.0.9.ebuild new file mode 100644 index 000000000000..673f4bd06f82 --- /dev/null +++ b/net-fs/autofs/autofs-5.0.9.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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.xz + ${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[threads] ) + 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() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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-5.1.0-r1.ebuild b/net-fs/autofs/autofs-5.1.0-r1.ebuild new file mode 100644 index 000000000000..5295885cc946 --- /dev/null +++ b/net-fs/autofs/autofs-5.1.0-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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.xz + ${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[threads] ) + 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=( + "${FILESDIR}/${P}-fix-missing-stdarg.patch" + "${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258 +) + +src_prepare() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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-5.1.0.ebuild b/net-fs/autofs/autofs-5.1.0.ebuild new file mode 100644 index 000000000000..df24123bb886 --- /dev/null +++ b/net-fs/autofs/autofs-5.1.0.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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.xz + ${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[threads] ) + 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=( + "${FILESDIR}/${P}-fix-missing-stdarg.patch" +) + +src_prepare() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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-5.1.1.ebuild b/net-fs/autofs/autofs-5.1.1.ebuild new file mode 100644 index 000000000000..ea11c95900c6 --- /dev/null +++ b/net-fs/autofs/autofs-5.1.1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true +AUTOTOOLS_IN_SOURCE_BUILD=true + +inherit autotools-utils linux-info multilib systemd toolchain-funcs + +PATCH_VER= +[[ -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.xz + ${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[threads] ) + 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() { + # Upstream's patchset + if [[ -n ${PATCH_VER} ]]; then + EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}"/patches + fi + + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + autotools-utils_src_prepare +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + 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-force-shutdown + --enable-ignore-busy + --with-systemd="$(systemd_get_unitdir)" #bug #479492 + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile DONTSTRIP=1 +} + +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.3-heimdal.patch b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch new file mode 100644 index 000000000000..707364df2f97 --- /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-install-deadlink.patch b/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch new file mode 100644 index 000000000000..8ab10fcf7471 --- /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.6-revert-ldap.patch b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch new file mode 100644 index 000000000000..49901ddfc69b --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch @@ -0,0 +1,18 @@ +--- modules/lookup_ldap.c ++++ modules/lookup_ldap.c +@@ -1488,6 +1488,7 @@ int lookup_init(const char *mapfmt, int + } + } + ++#ifdef WITH_SASL + /* + * First, check to see if a preferred authentication method was + * specified by the user. parse_ldap_config will return error +@@ -1500,7 +1501,6 @@ int lookup_init(const char *mapfmt, int + return 1; + } + +-#ifdef WITH_SASL + /* Init the sasl callbacks */ + if (!autofs_sasl_client_init(LOGOPT_NONE)) { + error(LOGOPT_ANY, "failed to init sasl client"); diff --git a/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch b/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch new file mode 100644 index 000000000000..366b1eaaba3b --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch @@ -0,0 +1,45 @@ +--- ./modules/lookup_ldap.c ++++ ./modules/lookup_ldap.c +@@ -591,10 +591,12 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context + { + LDAP *ldap; + ++#ifdef HAVE_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); + } ++#endif + + ldap = init_ldap_connection(logopt, uri, ctxt); + if (ldap) { +@@ -1372,10 +1374,12 @@ static void free_context(struct lookup_context *ctxt) + defaults_free_searchdns(ctxt->sdns); + if (ctxt->dclist) + free_dclist(ctxt->dclist); ++#ifdef HAVE_SASL + if (ctxt->extern_cert) + free(ctxt->extern_cert); + if (ctxt->extern_key) + free(ctxt->extern_key); ++#endif + free(ctxt); + + return; + modules/lookup_ldap.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index dbec753..ce1e2e5 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -28,7 +28,9 @@ + #include <arpa/nameser.h> + #include <resolv.h> + #include <lber.h> ++#ifdef HAVE_SASL + #include <libxml/tree.h> ++#endif + + #define MODULE_LOOKUP + #include "automount.h" diff --git a/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch b/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch new file mode 100644 index 000000000000..92143f1d3066 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.7-libtirpc-link.patch @@ -0,0 +1,10 @@ +diff --git a/modules/Makefile b/modules/Makefile +index 4ecbd6a..6a17540 100644 +--- a/modules/Makefile ++++ b/modules/Makefile +@@ -114,4 +114,4 @@ lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ) + + mount_nfs.so: mount_nfs.c replicated.o + $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ +- mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) ++ mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) $(TIRPCLIB) diff --git a/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch b/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch new file mode 100644 index 000000000000..f510f8fa2015 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.7-parallel-make.patch @@ -0,0 +1,48 @@ +From ed85b855e1bcdb814b3dca7f6c768b86e6353fe7 Mon Sep 17 00:00:00 2001 +From: "Lan Yixun (dlan)" <dennis.yxun@gmail.com> +Date: Thu, 25 Jul 2013 10:04:23 +0800 +Subject: [PATCH] fix occasional build error when enable parallel compiling + +the problem here we pass "-jX" ( X> 1) to "make", and "rpc_subs.c" +occasionally fail to compile due to it can't find "mount.h", +the root cause it that "mount.h" haven't generated by that time, +add this patch should fix this problem. +to make rpc_subs.o explicitly depend on "mount.h". + +--- +error message: + +x86_64-pc-linux-gnu-gcc -O2 -pipe -march=core2 -D_REENTRANT +-D_FILE_OFFSET_BITS=64 -I/usr/include/tirp c -D_REENTRANT +-D_FILE_OFFSET_BITS=64 -I/usr/include/tirpc -I../include -fPIC +-D_GNU_SOURCE -DAUTOFS_MA P_DIR=\"/etc/autofs\" +-DAUTOFS_CONF_DIR=\"/etc/conf.d\" -c rpc_subs.c +rpc_subs.c:46:19: fatal error: mount.h: No such file or directory + #include "mount.h" + ^ +compilation terminated. +make[1]: *** [rpc_subs.o] Error 1 +make[1]: *** Waiting for unfinished +jobs.... + +Signed-off-by: Lan Yixun (dlan) <dennis.yxun@gmail.com> +--- + lib/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/Makefile b/lib/Makefile +index 5418009..314779b 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -70,6 +70,8 @@ nss_tok.o: nss_tok.c nss_parse.tab.h + + nss_parse.tab.o: nss_parse.tab.c nss_parse.tab.h + ++rpc_subs.o: mount.h ++ + install: all + + clean: +-- +1.8.3.2 + diff --git a/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch b/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch new file mode 100644 index 000000000000..c12d4bbe2b17 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch @@ -0,0 +1,144 @@ +--- a/Makefile.conf.in ++++ b/Makefile.conf.in +@@ -100,3 +100,6 @@ initdir = @initdir@ + + # Location of systemd unit files + systemddir = @systemddir@ ++ ++# Use the compiler determined by configure ++CC := @CC@ +--- a/Makefile.rules ++++ b/Makefile.rules +@@ -16,44 +16,30 @@ INSTALLROOT = $(DESTDIR) + 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 ++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 + + ifdef SASL +@@ -71,5 +57,4 @@ endif + $(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) +--- a/configure.in ++++ b/configure.in +@@ -183,7 +183,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 +--- a/daemon/Makefile ++++ b/daemon/Makefile +@@ -20,7 +20,7 @@ CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfi + 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 @@ endif + 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 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -41,14 +41,12 @@ mount_clnt.c: mount.h + + 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_ $? +--- a/modules/Makefile ++++ b/modules/Makefile +@@ -87,9 +87,8 @@ endif + # 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 $< +@@ -98,13 +97,10 @@ cyrus-sasl-extern.o: cyrus-sasl-extern.c + $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< + + lookup_ldap.so: lookup_ldap.c dclist.o base64.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 base64.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.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 <arpa/nameser.h> + #include <resolv.h> + #include <lber.h> +-#ifdef HAVE_SASL +-#include <libxml/tree.h> +-#endif + + #define MODULE_LOOKUP + #include "automount.h" +@@ -38,6 +35,10 @@ + #include "lookup_ldap.h" + #include "base64.h" + ++#ifdef WITH_SASL ++#include <libxml/tree.h> ++#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/files/autofs-5.0.7-sloppy-mount.patch b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch new file mode 100644 index 000000000000..86e02bce5558 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch @@ -0,0 +1,99 @@ +From: Ian Kent <ikent@redhat.com> + +Historically autofs added an option to mounts, called the sloppy +option, meant to allow mount(8) to ignore invalid mount options. +This was done so that mount map entries for sites that needed to +use different mount options for some machines would still work. +It was needed for nfs mounts in particular. + +Recent changes to mount(8) cause the sloppy option to be passed on +for all mounts when it is given. + +Previously mount(8) only passed on the option to nfs mounts so now, +for other than nfs mounts, the mount will fail if the file system +doesn't understand the sloppy option. + +Since the option was not passed on to other than nfs mounts before +it seems sensible for autofs to not add it for other than nfs mounts +now. + +Signed-off-by: Ian Kent <ikent@redhat.com> +--- + modules/mount_bind.c | 9 ++++----- + modules/mount_changer.c | 6 +++--- + modules/mount_ext2.c | 6 +++--- + modules/mount_generic.c | 4 ++-- + 4 files changed, 12 insertions(+), 13 deletions(-) + +--- a/modules/mount_bind.c ++++ b/modules/mount_bind.c +@@ -158,13 +158,12 @@ int mount_mount(struct autofs_point *ap, + if (!status) + existed = 0; + +- debug(ap->logopt, +- MODPREFIX +- "calling mount --bind " SLOPPY " -o %s %s %s", ++ debug(ap->logopt, MODPREFIX ++ "calling mount --bind -o %s %s %s", + options, what, fullpath); + +- err = spawn_bind_mount(ap->logopt, +- SLOPPYOPT "-o", options, what, fullpath, NULL); ++ err = spawn_bind_mount(ap->logopt, "-o", ++ options, what, fullpath, NULL); + + if (err) { + if (ap->type != LKP_INDIRECT) +--- a/modules/mount_changer.c ++++ b/modules/mount_changer.c +@@ -103,12 +103,12 @@ int mount_mount(struct autofs_point *ap, + } + + if (options && options[0]) { +- debug(ap->logopt, +- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", ++ debug(ap->logopt, MODPREFIX ++ "calling mount -t %s -o %s %s %s", + fstype, options, what, fullpath); + + err = spawn_mount(ap->logopt, "-t", fstype, +- SLOPPYOPT "-o", options, what, fullpath, NULL); ++ "-o", options, what, fullpath, NULL); + } else { + debug(ap->logopt, + MODPREFIX "calling mount -t %s %s %s", +--- a/modules/mount_ext2.c ++++ b/modules/mount_ext2.c +@@ -116,11 +116,11 @@ int mount_mount(struct autofs_point *ap, + } + + if (options) { +- debug(ap->logopt, +- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", ++ debug(ap->logopt, MODPREFIX ++ "calling mount -t %s -o %s %s %s", + fstype, options, what, fullpath); + err = spawn_mount(ap->logopt, "-t", fstype, +- SLOPPYOPT "-o", options, what, fullpath, NULL); ++ "-o", options, what, fullpath, NULL); + } else { + debug(ap->logopt, + MODPREFIX "calling mount -t %s %s %s", +--- a/modules/mount_generic.c ++++ b/modules/mount_generic.c +@@ -97,11 +97,11 @@ int mount_mount(struct autofs_point *ap, + + if (options && options[0]) { + debug(ap->logopt, +- MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s", ++ MODPREFIX "calling mount -t %s -o %s %s %s", + fstype, options, loc, fullpath); + + err = spawn_mount(ap->logopt, "-t", fstype, +- SLOPPYOPT "-o", options, loc, fullpath, NULL); ++ "-o", options, loc, fullpath, NULL); + } else { + debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s", + fstype, loc, fullpath); + diff --git a/net-fs/autofs/files/autofs-5.0.8-ldap-wo-sasl.patch b/net-fs/autofs/files/autofs-5.0.8-ldap-wo-sasl.patch new file mode 100644 index 000000000000..a64ed7e8157f --- /dev/null +++ b/net-fs/autofs/files/autofs-5.0.8-ldap-wo-sasl.patch @@ -0,0 +1,27 @@ +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index 2ab1e8c..04b1da7 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -846,20 +846,20 @@ int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **valu + return 0; + } + +-#ifdef WITH_SASL + /* + * For plain text, login and digest-md5 authentication types, we need + * user and password credentials. + */ + int authtype_requires_creds(const char *authtype) + { ++#ifdef WITH_SASL + if (!strncmp(authtype, "PLAIN", strlen("PLAIN")) || + !strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")) || + !strncmp(authtype, "LOGIN", strlen("LOGIN"))) + return 1; ++#endif + return 0; + } +-#endif + + /* + * Returns: diff --git a/net-fs/autofs/files/autofs-5.1.0-fix-missing-stdarg.patch b/net-fs/autofs/files/autofs-5.1.0-fix-missing-stdarg.patch new file mode 100644 index 000000000000..411a6d088dcc --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.0-fix-missing-stdarg.patch @@ -0,0 +1,43 @@ +From b9653c08896fcb08c441177e5918458f09111351 Mon Sep 17 00:00:00 2001 +From: "Yixun Lan (dlan)" <dennis.yxun@gmail.com> +Date: Sat, 14 Jun 2014 23:16:36 +0800 +Subject: [PATCH] fix undefined va_{start,end} error + +https://bugs.gentoo.org/show_bug.cgi?id=513196 + +--- + +x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -rdynamic -pie -o automount auto +mount.o indirect.o direct.o spawn.o module.o mount.o lookup.o state.o flag.o ../ +lib/autofs.a -lpthread -lnsl -ldl +../lib/autofs.a(defaults.o): In function `message': +/var/tmp/portage/net-fs/autofs-5.1.0/work/autofs-5.1.0/lib/defaults.c:179: undef +ined reference to `va_start' +/var/tmp/portage/net-fs/autofs-5.1.0/work/autofs-5.1.0/lib/defaults.c:186: undefined reference to `va_end' +collect2: error: ld returned 1 exit status +Makefile:33: recipe for target 'automount' failed +make[1]: *** [automount] Error 1 +make[1]: Leaving directory '/var/tmp/portage/net-fs/autofs-5.1.0/work/autofs-5.1.0/daemon' +Makefile:14: recipe for target 'daemon' failed +make: *** [daemon] Error 2 + +Signed-off-by: Yixun Lan (dlan) <dennis.yxun@gmail.com> +--- + lib/defaults.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/defaults.c b/lib/defaults.c +index 2b03ea2..5728e67 100644 +--- a/lib/defaults.c ++++ b/lib/defaults.c +@@ -16,6 +16,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdarg.h> + #include <ctype.h> + #include <string.h> + #include <sys/utsname.h> +-- +1.8.5.2 + diff --git a/net-fs/autofs/files/autofs5-auto.master b/net-fs/autofs/files/autofs5-auto.master new file mode 100644 index 000000000000..8656474647ed --- /dev/null +++ b/net-fs/autofs/files/autofs5-auto.master @@ -0,0 +1,24 @@ +# $Id$ +# Sample auto.master file +# This is an automounter map and it has the following format +# key [ -mount-options-separated-by-comma ] location +# For details of the format look at autofs(5). +# +#/misc /etc/autofs/auto.misc +#/net /etc/autofs/auto.net +# +# NOTE: mounts done from a hosts map will be mounted with the +# "nosuid" and "nodev" options unless the "suid" and "dev" +# options are explicitly given. +# +#/net -hosts +# +# Include central master map if it can be found using +# nsswitch sources. +# +# Note that if there are entries for /net or /misc (as +# above) in the included master map any keys that are the +# same will not be seen as the first read key seen takes +# precedence. +# +#+auto.master diff --git a/net-fs/autofs/files/autofs5.initd b/net-fs/autofs/files/autofs5.initd new file mode 100644 index 000000000000..8152f46c082e --- /dev/null +++ b/net-fs/autofs/files/autofs5.initd @@ -0,0 +1,70 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +DAEMON=/usr/sbin/automount +PIDFILE=/var/run/autofs.pid +DEVICE=autofs + +depend() { + need localmount + use ypbind nfs slapd portmap net +} + +extra_started_commands="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) + if [ -n "${MINOR}" -a ! -c "/dev/${DEVICE}" ]; then + mknod -m 0600 "/dev/${DEVICE}" c 10 ${MINOR} + if [ $? -ne 0 ]; then + eend 1 "Could not create '/dev/${DEVICE}'" + return 1 + fi + fi + fi + if [ -x /sbin/restorecon -a -c "/dev/${DEVICE}" ]; then + /sbin/restorecon "/dev/${DEVICE}" + if [ $? -ne 0 ]; then + eend 1 "Failed to execute '/sbin/restorecon \"/dev/${DEVICE}\"'" + return 1 + fi + 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 -s 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 000000000000..c212ce4e2fe6 --- /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>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <use> + <flag name="dmalloc">Enable debugging with the dmalloc library</flag> + <flag name="hesiod">Install hesiod module</flag> + <flag name="ldap">Install LDAP module</flag> + <flag name="libtirpc">Use TiRPC library instead of SunRPC</flag> + <flag name="mount-locking"> + Enable locking to prevent corruption of /etc/mtab in the presence of + concurrent auto-mounting. If enabled, recursive auto-mounting (eg. using + autofs to bind or loop mount a filesystem which is itself auto-mounted) + is not possible. + </flag> + <flag name="sasl">Enable SASL support in the LDAP module</flag> + </use> +</pkgmetadata> |