diff options
Diffstat (limited to 'net-fs')
24 files changed, 42 insertions, 2115 deletions
diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index 611eb9430aaa..92f07f8572c1 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,6 +1,22 @@ # 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.146 2013/03/17 15:55:37 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.147 2013/03/25 19:27:27 hwoarang Exp $ + +*autofs-5.0.7 (25 Mar 2013) + + 25 Mar 2013; Markos Chandras <hwoarang@gentoo.org> +autofs-5.0.7.ebuild, + -autofs-4.1.3-r7.ebuild, -autofs-4.1.3-r9.ebuild, -autofs-4.1.4.ebuild, + -autofs-5.0.3-r6.ebuild, -autofs-5.0.5-r3.ebuild, -autofs-5.0.5-r4.ebuild, + -autofs-5.0.5-r5.ebuild, -autofs-5.0.5.ebuild, -autofs-5.0.6-r1.ebuild, + -autofs-5.0.6-r2.ebuild, -autofs-5.0.6.ebuild, -files/auto.master, + -files/auto.misc, -files/auto.net, -files/autofs-4.1.3-signal-race-fix.patch, + -files/autofs-5.0.3-map-patch-fix.patch, + -files/autofs-5.0.5-fix-building-without-sasl.patch, + -files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch, + -files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch, + -files/autofs.confd9, -files/autofs.rc11, -files/autofs.rc14, metadata.xml: + Version bump. Bug #445010. Thanks to Dustin Polke + <gentoobugsie.20.dsurawicz@spamgourmet.com> 17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml: Add proxy-maintainers to metadata.xml diff --git a/net-fs/autofs/autofs-4.1.3-r7.ebuild b/net-fs/autofs/autofs-4.1.3-r7.ebuild deleted file mode 100644 index befcbd7fb408..000000000000 --- a/net-fs/autofs/autofs-4.1.3-r7.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r7.ebuild,v 1.8 2012/04/25 16:29:19 jlec Exp $ - -inherit eutils multilib - -IUSE="ldap" -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v4" -SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2 - ${SRC_URI_BASE}/${P}-strict.patch - ${SRC_URI_BASE}/${P}-mtab_lock.patch - ${SRC_URI_BASE}/${P}-bad_chdir.patch - ${SRC_URI_BASE}/${P}-non_block_ping.patch - ${SRC_URI_BASE}/${P}-sock-leak-fix.patch - ${SRC_URI_BASE}/${P}-replicated_server_select.patch - mirror://gentoo/${P}-miscfixes.patch.gz" -DEPEND="ldap? ( >=net-nds/openldap-2.0 )" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86" - -src_unpack() { - unpack ${P}.tar.bz2 - PATCH_LIST="${P}-strict.patch ${P}-mtab_lock.patch ${P}-bad_chdir.patch ${P}-non_block_ping.patch ${P}-sock-leak-fix.patch ${P}-replicated_server_select.patch ${P}-miscfixes.patch.gz" - for i in ${PATCH_LIST}; do - EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i} - done - - # Upstream version of this patch is incorrect - epatch "${FILESDIR}"/${P}-signal-race-fix.patch - - cd ${S} - autoconf || die "Autoconf failed" - - cd ${S}/daemon - sed -i 's/LIBS \= \-ldl/LIBS \= \-ldl \-lnsl \$\{LIBLDAP\}/' Makefile \ - || die "LIBLDAP change failed" - - cd ${S}/lib - sed -i '/^listmount.o:/s,$, mount.h,g' Makefile \ - || die "Failed to fix dependencies" -} - -src_compile() { - local myconf - use ldap || myconf="--without-openldap" - - econf ${myconf} || die - sed -i -e '/^\(CFLAGS\|CXXFLAGS\|LDFLAGS\)[[:space:]]*=/d' Makefile.rules || die "Failed to remove (C|CXX|LD)FLAGS" - emake || die "make failed" -} - -src_install() { - into /usr - dosbin daemon/automount - exeinto /usr/$(get_libdir)/autofs - doexe modules/*.so - - dodoc COPYING COPYRIGHT NEWS README* TODO CHANGELOG CREDITS - cd ${S}/samples - docinto samples ; dodoc auto.misc auto.master - cd ${S}/man - sed -i 's:\/etc\/:\/etc\/autofs\/:g' *.8 *.5 *.in || die "Failed to update path in manpages" - doman auto.master.5 autofs.5 autofs.8 automount.8 - - insinto /etc/autofs ; doins ${FILESDIR}/auto.master - insinto /etc/autofs ; doins ${FILESDIR}/auto.misc - exeinto /etc/autofs ; doexe ${FILESDIR}/auto.net # chmod 755 is important! - - newinitd ${FILESDIR}/autofs.rc11 autofs - newconfd ${FILESDIR}/autofs.confd9 autofs - if use ldap; then - cd ${S}/samples - docinto samples ; dodoc ldap* auto.master.ldap - insinto /etc/openldap/schema ; doins autofs.schema - exeinto /usr/$(get_libdir)/autofs ; doexe autofs-ldap-auto-master - fi -} - -pkg_postinst() { - elog "Note: If you plan on using autofs for automounting" - elog "remote NFS mounts without having the NFS daemon running" - elog "please add portmap to your default run-level." - elog - elog "Also the normal autofs status has been renamed stats" - elog "as there is already a predefined Gentoo status" -} diff --git a/net-fs/autofs/autofs-4.1.3-r9.ebuild b/net-fs/autofs/autofs-4.1.3-r9.ebuild deleted file mode 100644 index 7134f48b531e..000000000000 --- a/net-fs/autofs/autofs-4.1.3-r9.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.3-r9.ebuild,v 1.3 2012/04/25 16:29:19 jlec Exp $ - -inherit eutils multilib - -IUSE="ldap" -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v4" -SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2 - ${SRC_URI_BASE}/${P}-strict.patch - ${SRC_URI_BASE}/${P}-mtab_lock.patch - ${SRC_URI_BASE}/${P}-bad_chdir.patch - ${SRC_URI_BASE}/${P}-non_block_ping.patch - ${SRC_URI_BASE}/${P}-sock-leak-fix.patch - ${SRC_URI_BASE}/${P}-replicated_server_select.patch - mirror://gentoo/${P}-miscfixes.patch.gz" -DEPEND="ldap? ( >=net-nds/openldap-2.0 )" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -src_unpack() { - unpack ${P}.tar.bz2 - PATCH_LIST="${P}-strict.patch ${P}-mtab_lock.patch ${P}-bad_chdir.patch ${P}-non_block_ping.patch ${P}-sock-leak-fix.patch ${P}-replicated_server_select.patch ${P}-miscfixes.patch.gz" - for i in ${PATCH_LIST}; do - EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i} - done - - # Upstream version of this patch is incorrect - epatch "${FILESDIR}"/${P}-signal-race-fix.patch - - cd "${S}" - autoconf || die "Autoconf failed" - - cd "${S}"/daemon - sed -i 's/LIBS \= \-ldl/LIBS \= \-ldl \-lnsl \$\{LIBLDAP\}/' Makefile \ - || die "LIBLDAP change failed" - - cd "${S}"/lib - sed -i '/^listmount.o:/s,$, mount.h,g' Makefile \ - || die "Failed to fix dependencies" -} - -src_compile() { - local myconf - use ldap || myconf="--without-openldap" - - econf ${myconf} - sed -i -e '/^\(CFLAGS\|CXXFLAGS\|LDFLAGS\)[[:space:]]*=/d' Makefile.rules || die "Failed to remove (C|CXX|LD)FLAGS" - # fixes segfaults on startup on amd64 - use amd64 && CFLAGS="${CFLAGS} -DLDAP_DEPRECATED" - emake || die "make failed" -} - -src_install() { - into /usr - dosbin daemon/automount - exeinto /usr/$(get_libdir)/autofs - doexe modules/*.so - - dodoc COPYRIGHT NEWS README* TODO CHANGELOG CREDITS - cd "${S}"/samples - docinto samples ; dodoc auto.misc auto.master - cd "${S}"/man - sed -i 's:\/etc\/:\/etc\/autofs\/:g' *.8 *.5 *.in || die "Failed to update path in manpages" - doman auto.master.5 autofs.5 autofs.8 automount.8 - - insinto /etc/autofs ; doins "${FILESDIR}"/auto.master - insinto /etc/autofs ; doins "${FILESDIR}"/auto.misc - exeinto /etc/autofs ; doexe "${FILESDIR}"/auto.net # chmod 755 is important! - - newinitd "${FILESDIR}"/autofs.rc14 autofs - newconfd "${FILESDIR}"/autofs.confd9 autofs - if use ldap; then - cd "${S}"/samples - docinto samples ; dodoc ldap* auto.master.ldap - insinto /etc/openldap/schema ; doins autofs.schema - exeinto /usr/$(get_libdir)/autofs ; doexe autofs-ldap-auto-master - fi -} - -pkg_postinst() { - elog "Note: If you plan on using autofs for automounting" - elog "remote NFS mounts without having the NFS daemon running" - elog "please add portmap to your default run-level." - elog - elog "Also the normal autofs status has been renamed stats" - elog "as there is already a predefined Gentoo status" -} diff --git a/net-fs/autofs/autofs-4.1.4.ebuild b/net-fs/autofs/autofs-4.1.4.ebuild deleted file mode 100644 index 81d773c2f216..000000000000 --- a/net-fs/autofs/autofs-4.1.4.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-4.1.4.ebuild,v 1.8 2011/09/21 00:44:45 jer Exp $ - -EAPI="4" - -inherit eutils multilib autotools - -PATCH_VER="1" -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI="mirror://kernel/linux/daemons/${PN}/v4/${P}.tar.bz2 - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" -IUSE="hesiod ldap" - -DEPEND="hesiod? ( net-dns/hesiod ) - ldap? ( >=net-nds/openldap-2.0 )" -RDEPEND="${DEPEND}" - -UPSTREAM_FILESDIR="gentoo/${CATEGORY}/${PN}/files" - -src_prepare() { - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches - - # 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.patch - - # Reflect init script implementation - epatch "${FILESDIR}"/${P}-fix-man-pages.patch - - # Use Gentoo specific maps, init script and config file - for i in home master misc; do - if [ -e samples/auto.${i} ]; then - mv samples/auto.${i}{,.bak} || die "Failed to backup auto.${i}" - fi - ln -s "${S}/${UPSTREAM_FILESDIR}"/auto.${i} samples/auto.${i} || \ - die "Failed to symlink auto.${i}" - done - - # Clean-up maps and disable everything. - epatch "${FILESDIR}"/${P}-clean-up-maps.patch - - # Fix installation path of ldap samples and maps - epatch "${FILESDIR}"/${P}-fix-install-ldap-samples-and-maps.patch - - epatch "${FILESDIR}"/${P}-init.patch #Fix init script deps - - # 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 lib/rpc_subs.c || die - - eautoreconf -} - -src_configure() { - # work around bug #355975 (mount modifies timestamp of /etc/mtab) - # with >=sys-apps/util-linux-2.19, - addpredict "/etc/mtab" - - econf \ - $(use_with ldap openldap) \ - $(use_with hesiod) -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc README* CHANGELOG CREDITS COPYRIGHT - - newinitd ${UPSTREAM_FILESDIR}/${PN}.init ${PN} - newconfd ${UPSTREAM_FILESDIR}/${PN}.conf ${PN} -} - -pkg_postinst() { - 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." - elog - elog "Also the normal autofs status has been renamed stats" - elog "as there is already a predefined Gentoo status" - if use ldap; then - elog - elog "Sample files for ldap have been installed into" - elog "${PREFIX}/usr/share/share/doc/${P}/samples." - fi -} diff --git a/net-fs/autofs/autofs-5.0.3-r6.ebuild b/net-fs/autofs/autofs-5.0.3-r6.ebuild deleted file mode 100644 index 4744370f2ca2..000000000000 --- a/net-fs/autofs/autofs-5.0.3-r6.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r6.ebuild,v 1.10 2012/04/25 16:29:19 jlec Exp $ - -inherit eutils multilib autotools - -IUSE="ldap sasl" -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v5" -# This list is taken directly from http://kernel.org/pub/linux/daemons/autofs/v5/patch_order-5.0.3 -# Please do not modify the order -PATCH_LIST=" - ${P}-ldap-page-control-configure-fix.patch - ${P}-xfn-not-supported.patch - ${P}-basedn-with-spaces-fix-3.patch - ${P}-nfs4-tcp-only.patch - ${P}-correct-ldap-lib.patch - ${P}-dont-fail-on-empty-master-fix-2.patch - ${P}-expire-works-too-hard.patch - ${P}-unlink-mount-return-fix.patch - ${P}-update-linux-auto_fs4-h.patch - ${P}-expire-works-too-hard-update.patch - ${P}-expire-works-too-hard-update-2.patch - ${P}-handle-zero-length-nis-key.patch - ${PN}-5.0.2-init-cb-on-load.patch - ${P}-map-type-in-map-name.patch - ${P}-mount-thread-create-cond-handling.patch - ${P}-check-for-kernel-automount.patch - ${P}-nss-source-any.patch - ${P}-dont-abuse-ap-ghost-field.patch - ${P}-lookup-next-soucre-stale-entry.patch - ${P}-remove-redundant-dns-name-lookups.patch - ${P}-mount-thread-create-cond-handling-fix.patch - ${P}-allow-dir-create-on-nfs-root.patch - ${P}-check-direct-path-len.patch - ${P}-fix-get-user-info-check.patch - ${P}-fix-couple-of-memory-leaks.patch - ${P}-override-is-running-check.patch - ${P}-dont-use-proc-for-is-running-check.patch - ${P}-fix-included-browse-map-not-found.patch - ${P}-fix-multi-source-messages.patch - ${P}-clear-stale-on-map-read.patch - ${P}-fix-proximity-other-timeout.patch - ${P}-refactor-mount-request-vars.patch - ${P}-make-handle_mounts-startup-cond-distinct.patch - ${P}-submount-shutdown-recovery-12.patch - ${P}-dont-block-on-expire.patch - ${P}-add-umount_wait-parameter.patch - ${P}-fix-multi-mount-race.patch - ${P}-submount-shutdown-recovery-12-fix.patch - ${P}-fix-nfs4-colon-escape.patch - ${P}-check-replicated-list-after-probe.patch - ${P}-add-replicated-debug-logging.patch - ${P}-update-replicated-doco.patch - ${P}-use-dev-urandom.patch - ${P}-mtab-as-proc-mounts.patch - ${P}-fix-ifc-buff-size.patch - ${P}-fix-percent-hack.patch - ${P}-fix-ifc-buff-size-fix.patch - ${P}-mtab-as-proc-mounts-fix.patch" -SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2" -for i in ${PATCH_LIST} ; do - SRC_URI="${SRC_URI} ${SRC_URI_BASE}/${i}" -done ; -DEPEND="ldap? ( >=net-nds/openldap-2.0 ) - sasl? ( virtual/krb5 )" - # currently, sasl code assumes the presence of kerberosV -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86" - -src_unpack() { - unpack ${P}.tar.bz2 - for i in ${PATCH_LIST}; do - cp ${DISTDIR}/${i} ${T} - done - patch "${T}"/${P}-map-type-in-map-name.patch \ - < "${FILESDIR}"/${P}-map-patch-fix.patch || die "failed to patch" - for i in ${PATCH_LIST}; do - EPATCH_OPTS="-p1 -d ${S}" epatch ${T}/${i} - rm -f ${T}/${i} - done - - # fixes bug #210762 - epatch "${FILESDIR}"/${P}-heimdal.patch - - cd "${S}" - - # # use CC and CFLAGS from environment (bug #154797) - # write these values in Makefile.conf - (echo "# Use the compiler and cflags determined by configure"; - echo "CC := @CC@"; echo "CFLAGS := @CFLAGS@") >> Makefile.conf.in - # make sure Makefile.conf is parsed after Makefile.rules - sed -ni '/include Makefile.conf/{x; n; G}; p' Makefile - sed -i 's/^\(CC\|CXX\).*//' Makefile.rules - sed -i 's/^CFLAGS=-fPIE.*//' configure.in - - # do not include <nfs/nfs.h>, rather <linux/nfs.h>, - # as the former is a lame header for the latter (bug #157968) - sed -i 's@nfs/nfs.h@linux/nfs.h@' include/rpc_subs.h - - eautoreconf -} - -src_compile() { - CFLAGS="${CFLAGS}" \ - econf \ - $(use_with ldap openldap) \ - $(use_with sasl) \ - --enable-ignore-busy - - emake DONTSTRIP=1 || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - newinitd "${FILESDIR}"/autofs5.rc1 autofs -} - -pkg_postinst() { - elog "Note: If you plan on using autofs for automounting" - elog "remote NFS mounts without having the NFS daemon running" - elog "please add portmap to your default run-level." -} diff --git a/net-fs/autofs/autofs-5.0.5-r3.ebuild b/net-fs/autofs/autofs-5.0.5-r3.ebuild deleted file mode 100644 index 983bf1be3d42..000000000000 --- a/net-fs/autofs/autofs-5.0.5-r3.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5-r3.ebuild,v 1.1 2011/04/30 18:20:50 pva Exp $ - -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}" - -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 - - # https://bugs.gentoo.org/show_bug.cgi?id=361899 - epatch "${FILESDIR}"/${P}-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.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/autofs-5.0.5-r4.ebuild b/net-fs/autofs/autofs-5.0.5-r4.ebuild deleted file mode 100644 index 762eaca52f83..000000000000 --- a/net-fs/autofs/autofs-5.0.5-r4.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5-r4.ebuild,v 1.8 2011/09/21 15:49:56 pva Exp $ - -EAPI="4" -inherit eutils multilib autotools linux-info - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -PATCH_VER="4" -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} - sys-devel/flex - virtual/yacc" - -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 - - # https://bugs.gentoo.org/show_bug.cgi?id=361899 - epatch "${FILESDIR}"/${P}-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.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 - 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.5-r5.ebuild b/net-fs/autofs/autofs-5.0.5-r5.ebuild deleted file mode 100644 index 8da0c181b49a..000000000000 --- a/net-fs/autofs/autofs-5.0.5-r5.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5-r5.ebuild,v 1.1 2011/06/20 14:09:41 pva Exp $ - -EAPI="4" -inherit eutils multilib autotools linux-info - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -PATCH_VER="5" -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}" - -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/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 - - # https://bugs.gentoo.org/show_bug.cgi?id=361899 - epatch "${FILESDIR}"/${P}-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.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 - 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.5.ebuild b/net-fs/autofs/autofs-5.0.5.ebuild deleted file mode 100644 index c1a4e4beb4a9..000000000000 --- a/net-fs/autofs/autofs-5.0.5.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5.ebuild,v 1.1 2010/06/09 08:27:00 pva Exp $ - -EAPI="2" - -inherit eutils multilib autotools - -PATCH_VER="1" -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 - 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" - -# currently, sasl code assumes the presence of kerberosV -DEPEND="hesiod? ( net-dns/hesiod ) - ldap? ( - >=net-nds/openldap-2.0 - sasl? ( - dev-libs/cyrus-sasl - dev-libs/libxml2 - virtual/krb5 - ) - )" -RDEPEND="${DEPEND}" - -src_prepare() { - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches - - # fixes bug #210762 - 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.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 - - epatch "${FILESDIR}"/${P}-fix-building-without-sasl.patch - - eautoreconf -} - -src_configure() { - local myconf="" - - if use sasl && ! use ldap; then - ewarn "USE=\"sasl\" adds SASL support to the LDAP module" - ewarn "which will not be build. If SASL support should be" - ewarn "available, please add \"ldap\" to the USE flags." - myconf="--with-openldap=no --with-sasl=no" - epause 5 - else - myconf="$(use_with ldap openldap) $(use_with sasl)" - fi - - econf \ - ${myconf} \ - $(use_with hesiod) \ - --enable-ignore-busy -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" -# make DESTDIR="${D}" install_kernel || die "make install failed" -# make DESTDIR="${D}" install_samples || die "make install failed" - - dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL || die "dodoc failed" - - # kernel patches - docinto patches - dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch \ - || die "Installing patches failed" - - newinitd "${FILESDIR}"/autofs5.rc1 autofs || die -} - -pkg_postinst() { - elog "Note: You might need to patch your kernel to use this" - elog "version of ${PN}. Upstream kernel patches have been" - elog "installed into \"/usr/share/doc/${P}/patches\"." - elog "For further instructions, please refer to" - elog "\"/usr/share/doc/${P}/README\"." - elog "" - elog "Note: If you plan on using autofs for automounting" - elog "remote NFS mounts without having the NFS daemon running" - elog "please add portmap or rpcbind to your default run-level." -} diff --git a/net-fs/autofs/autofs-5.0.6-r1.ebuild b/net-fs/autofs/autofs-5.0.6-r1.ebuild deleted file mode 100644 index fe6b7c4b8120..000000000000 --- a/net-fs/autofs/autofs-5.0.6-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.6-r1.ebuild,v 1.3 2011/08/24 19:11:29 maekke Exp $ - -EAPI="4" -inherit eutils multilib autotools linux-info - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -PATCH_VER="" -[[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma" -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="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}" - -src_prepare() { - # Upstream's patchset - if [[ -n ${PATCH_VER} ]]; then - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches - fi - - # 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.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/5371 - epatch "${FILESDIR}"/${PN}-5.0.5-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}"/${PN}-5.0.5-fix-building-without-ldap.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=361899 - epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch - - # Fix for bug #373577 - # Upstream reference: http://article.gmane.org/gmane.linux.kernel.autofs/6187 - # Fix regression in IPv6 name lookup regression - epatch "${FILESDIR}"/${P}-ipv6_name_lookup_regression.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 - 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.6-r2.ebuild b/net-fs/autofs/autofs-5.0.6-r2.ebuild deleted file mode 100644 index 9a06e1534c65..000000000000 --- a/net-fs/autofs/autofs-5.0.6-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.6-r2.ebuild,v 1.6 2011/09/21 15:49:56 pva Exp $ - -EAPI="4" -inherit eutils multilib autotools linux-info - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -PATCH_VER="" -[[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma" -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="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} - sys-devel/flex - virtual/yacc" - -src_prepare() { - # Upstream's patchset - if [[ -n ${PATCH_VER} ]]; then - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches - fi - - # 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.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/5371 - epatch "${FILESDIR}"/${PN}-5.0.5-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}"/${PN}-5.0.5-fix-building-without-ldap.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=361899 - epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch - - # Fix for bug #373577 - # Upstream reference: http://article.gmane.org/gmane.linux.kernel.autofs/6187 - # Fix regression in IPv6 name lookup regression - epatch "${FILESDIR}"/${P}-ipv6_name_lookup_regression.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=381315 - epatch "${FILESDIR}"/${P}-revert-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 - 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.6.ebuild b/net-fs/autofs/autofs-5.0.7.ebuild index 78b71aa4d03c..261450bdd2ef 100644 --- a/net-fs/autofs/autofs-5.0.6.ebuild +++ b/net-fs/autofs/autofs-5.0.7.ebuild @@ -1,34 +1,37 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.6.ebuild,v 1.1 2011/06/28 14:06:07 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7.ebuild,v 1.1 2013/03/25 19:27:27 hwoarang Exp $ EAPI="4" inherit eutils multilib autotools linux-info DESCRIPTION="Kernel based automounter" HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -PATCH_VER="" +PATCH_VER="1" [[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma" + PATCHSET_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}-patches-${PATCH_VER}.tar.lzma" 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="hesiod ldap sasl" +IUSE="hesiod ldap 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="hesiod? ( net-dns/hesiod ) +RDEPEND=" + hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + sys-devel/flex + virtual/yacc" src_prepare() { # Upstream's patchset @@ -45,11 +48,7 @@ src_prepare() { # #154797: Respect CC and CFLAGS # #253412: Respect LDFLAGS # #247969: Link order for --as-needed - epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded.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 + epatch "${FILESDIR}"/${PN}-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch # Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371 epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch @@ -61,6 +60,8 @@ src_prepare() { # https://bugs.gentoo.org/show_bug.cgi?id=361899 epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch + # https://bugs.gentoo.org/show_bug.cgi?id=381315 + epatch "${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch eautoreconf } @@ -70,11 +71,17 @@ src_configure() { addpredict "/etc/mtab" # --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 econf \ --with-confdir=/etc/conf.d \ + --with-mapdir=/etc/autofs \ $(use_with ldap openldap) \ $(use_with sasl) \ $(use_with hesiod) \ + $(use_enable mount-locking) \ --enable-ignore-busy } diff --git a/net-fs/autofs/files/auto.master b/net-fs/autofs/files/auto.master deleted file mode 100644 index fdabf5d873fa..000000000000 --- a/net-fs/autofs/files/auto.master +++ /dev/null @@ -1,9 +0,0 @@ -# $Id: auto.master,v 1.3 2004/12/09 08:25:48 robbat2 Exp $ -# Sample auto.master file -# Format of this file: -# mountpoint map options -# For details of the format look at autofs(8). -#/net /etc/autofs/auto.net -#/misc /etc/autofs/auto.misc -#/home /etc/autofs/auto.home - diff --git a/net-fs/autofs/files/auto.misc b/net-fs/autofs/files/auto.misc deleted file mode 100644 index 254fa6bbe47b..000000000000 --- a/net-fs/autofs/files/auto.misc +++ /dev/null @@ -1,7 +0,0 @@ -# $Id: auto.misc,v 1.2 2002/10/27 05:21:15 bcowan Exp $ -# This is an automounter map and it has the following format -# key [ -mount-options-separated-by-comma ] location -# Details may be found in the autofs(5) manpage -#boot -fstype=ext2 :/dev/hda1 -#cd -fstype=iso9660,ro :/dev/cdrom -#floppy -fstype=auto :/dev/fd0 diff --git a/net-fs/autofs/files/auto.net b/net-fs/autofs/files/auto.net deleted file mode 100644 index 70e7f1164964..000000000000 --- a/net-fs/autofs/files/auto.net +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# $Id: auto.net,v 1.4 2006/05/30 15:00:50 antarus Exp $ - -# This file must be executable to work! chmod 755! - -# Look at what a host is exporting to determine what we can mount. -# This is very simple, but it appears to work surprisingly well - -key="$1" - -# add "nosymlink" here if you want to suppress symlinking local filesystems -# add "nonstrict" to make it OK for some filesystems to not mount -opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict" - -# Showmount comes in a number of names and varieties. "showmount" is -# typically an older version which accepts the '--no-headers' flag -# but ignores it. "kshowmount" is the newer version installed with knfsd, -# which both accepts and acts on the '--no-headers' flag. -#SHOWMOUNT="kshowmount --no-headers -e $key" -#SHOWMOUNT="showmount -e $key | tail -n +2" - -# Newer distributions get this right -SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key" - -$SHOWMOUNT | LC_ALL=C sort -k 1 | \ - awk -v key="$key" -v opts="$opts" -- ' - BEGIN { ORS=""; first=1 } - { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } - END { if (!first) print "\n"; else exit 1 } - ' diff --git a/net-fs/autofs/files/autofs-4.1.3-signal-race-fix.patch b/net-fs/autofs/files/autofs-4.1.3-signal-race-fix.patch deleted file mode 100644 index 217b9b130603..000000000000 --- a/net-fs/autofs/files/autofs-4.1.3-signal-race-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- autofs-4.1.3/daemon/automount.c.orig 2004-08-18 11:23:49.430470256 -0400 -+++ autofs-4.1.3/daemon/automount.c 2004-08-18 11:24:45.047015256 -0400 -@@ -848,10 +848,10 @@ static int st_prepare_shutdown(void) - alarm(0); - - /* Prevent any new mounts */ -- ap.state = ST_SHUTDOWN_PENDING; -- - sigprocmask(SIG_SETMASK, &lock_sigs, NULL); - -+ ap.state = ST_SHUTDOWN_PENDING; -+ - /* Unmount everything */ - exp = expire_proc(1); - diff --git a/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch b/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch deleted file mode 100644 index 4336c8dafd64..000000000000 --- a/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- autofs-5.0.3-map-type-in-map-name.patch.old 2008-04-28 17:47:07.000000000 +0200 -+++ autofs-5.0.3-map-type-in-map-name.patch 2008-04-01 05:57:45.000000000 +0200 -@@ -1,19 +1,6 @@ --diff --git a/CHANGELOG b/CHANGELOG --index af5a1b0..76f2477 100644 ----- a/CHANGELOG --+++ b/CHANGELOG --@@ -12,6 +12,7 @@ -- - update fix expire working harder than needed. -- - add missing check for zero length NIS key (Wengang Wang). -- - init SASL callbacks on every ldap lookup library load. --+- fix incorrect match of map type name when included in map name. -- -- 14/01/2008 autofs-5.0.3 -- ----------------------- --diff --git a/lib/master_tok.l b/lib/master_tok.l --index b379940..4bbe033 100644 ----- a/lib/master_tok.l --+++ b/lib/master_tok.l -+diff -up autofs-5.0.3/lib/master_tok.l.map-type-in-map-name autofs-5.0.3/lib/master_tok.l -+--- autofs-5.0.3/lib/master_tok.l.map-type-in-map-name 2008-04-01 11:14:00.000000000 +0800 -++++ autofs-5.0.3/lib/master_tok.l 2008-04-01 11:14:00.000000000 +0800 - @@ -77,6 +77,7 @@ int my_yyinput(char *, int); - char buff[1024]; - char *bptr; -@@ -22,7 +9,7 @@ - - %} - --@@ -190,13 +191,27 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo -+@@ -190,13 +191,27 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|-- - {OPTWS}\\\n{OPTWS} {} - - {MULTI} { -@@ -39,9 +26,10 @@ - + } - } - -- {MTYPE} { -+- {MTYPE} { - - strcpy(master_lval.strtype, master_text); - - return(MAPTYPE); -++ {MTYPE}/({DNSERVERSTR}|{DNATTRSTR}=)? { - + tlen = master_leng - 1; - + if (bptr != buff && isblank(master_text[tlen])) { - + strncat(buff, master_text, tlen); -@@ -54,7 +42,7 @@ - } - - {MULTISEP} { return(DDASH); } --@@ -226,7 +241,7 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo -+@@ -226,7 +241,7 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|-- - yyless(0); - } - -@@ -63,3 +51,15 @@ - BEGIN(DNSTR); - yyless(0); - } -+diff -up autofs-5.0.3/lib/master_parse.y.map-type-in-map-name autofs-5.0.3/lib/master_parse.y -+diff -up autofs-5.0.3/CHANGELOG.map-type-in-map-name autofs-5.0.3/CHANGELOG -+--- autofs-5.0.3/CHANGELOG.map-type-in-map-name 2008-04-01 11:14:00.000000000 +0800 -++++ autofs-5.0.3/CHANGELOG 2008-04-01 11:14:00.000000000 +0800 -+@@ -10,6 +10,7 @@ -+ - fix unlink of mount tree incorrectly causing autofs mount fail. -+ - add missing check for zero length NIS key (Wengang Wang). -+ - init SASL callbacks on every ldap lookup library load. -++- fix incorrect match of map type name when included in map name. -+ -+ 14/01/2008 autofs-5.0.3 -+ ----------------------- 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 deleted file mode 100644 index ae93e2e028b0..000000000000 --- a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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-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 deleted file mode 100644 index f49b4aa80305..000000000000 --- a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch +++ /dev/null @@ -1,166 +0,0 @@ -=== 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 deleted file mode 100644 index 029dcc58c166..000000000000 --- a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- 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/autofs.confd9 b/net-fs/autofs/files/autofs.confd9 deleted file mode 100644 index 51dcde44387e..000000000000 --- a/net-fs/autofs/files/autofs.confd9 +++ /dev/null @@ -1,29 +0,0 @@ -# Config file for /etc/init.d/autofs - -# e.g. localoptions='rsize=8192,wsize=8192' -localoptions='' - -# additional options for automount, ie. timeout -daemonoptions='--timeout 60' - -# NIS -nis_mapname='auto.master' - -# LDAP -# By default autofs-ldap-auto-master will check the old style structure defined -# here, and if that fails, it will check the new style structure before -# failing. If this generates too much traffic for you, just change to use the -# new style here. -ldap_mapname='auto.master' -# This is the classic style: -ldap_map_oc='nisMap' -ldap_entry_oc='nisObject' -ldap_map_key='nisMapName' -ldap_entry_key='cn' -ldap_value='nisMapEntry' -# This is the new style: -##ldap_map_oc='automountMap' -##ldap_entry_oc='automount' -##ldap_map_key='ou' -##ldap_entry_key='cn' -##ldap_value='automountInformation' diff --git a/net-fs/autofs/files/autofs.rc11 b/net-fs/autofs/files/autofs.rc11 deleted file mode 100644 index ad85f5bf0dad..000000000000 --- a/net-fs/autofs/files/autofs.rc11 +++ /dev/null @@ -1,279 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc11,v 1.1 2005/03/15 04:18:38 robbat2 Exp $ - -# rc file for automount using a Sun-style "master map". -# We first look for a local /etc/autofs/auto.master, then a YP -# map with that name - -DAEMON=/usr/sbin/automount - -depend() { - need localmount - use ypbind nfs slapd portmap net -} - -opts="start stop status stats reload restart" - -# this file is used to avoid the subshell-die problem -TMPSRC=/var/run/autofs.tmp - -# -# Check for all maps that are to be loaded -# -function getschemes() -{ - awk '/^automount:/{ $1="" ; gsub("\\[.*\\]","") ; print $0 }' /etc/nsswitch.conf -} - -function getfilemounts() -{ - if [ -f /etc/autofs/auto.master ] ; then - sed -e '/^#/d' -e '/^$/d' < /etc/autofs/auto.master - fi -} - -function getnismounts() -{ - /usr/bin/ypcat -k ${nis_mapname} 2> /dev/null | sed -e '/^#/d' -e '/^$/d' -} - -function getldapmounts() -{ - autofs_lam=/usr/lib/autofs/autofs-ldap-auto-master - if [ -f $autofs_lam -a -x $autofs_lam ]; then - ${autofs_lam} \ - -m ${ldap_map_oc} -e ${ldap_entry_oc} \ - -n ${ldap_map_key} -k ${ldap_entry_key} \ - -v ${ldap_value} 2> /dev/null - fi -} - -function getrawmounts() -{ - for scheme in `getschemes` ; do - case "$scheme" in - files) - getfilemounts - ;; - nis*) - getnismounts - ;; - ldap*) - getldapmounts - ;; - esac - done -} - - -# -# This function will build a list of automount commands to execute in -# order to activate all the mount points. It is used to figure out -# the difference of automount points in case of a reload -# -function getmounts() -{ - knownmaps=" " - # seperate storage variable to avoid clobbering the other $TMPSRC - TMPSRC_mounts="$TMPSRC.mounts" - getrawmounts >$TMPSRC_mounts - while read dir map options - do - # These checks screen out duplicates and skip over directories - # where the map is '-'. - if [ ! -z "$dir" -a ! -z "$map" \ - -a "x${map:0:1}" != "x-" \ - -a "`echo "$knownmaps" | grep -w $dir/`" = "" ]; then - # If the options include a -t or --timeout parameter, then - # pull those particular options out. - # echo DAEMONOPTIONS OPTIONS $daemonoptions $options - startupoptions="" - opt_timeout="" - opt_pidfile="" - opt_verbose="" - opt_debug="" - opt_ghost="" - - # use getopt to parse all of it - #getopteval="$(getopt -q -o -t:p:vdg --long timeout:,pid-file:,verbose,debug,ghost -- "$daemonoptions $options") " - getopt_input="$daemonoptions $options" - getopt_eval="$(getopt -q -o -t:vdg --long timeout:,verbose,debug,ghost -- $getopt_input) " - eval set -- "${getopt_eval}" - while [ -n "$1" ]; do - #-p|--pid-file) opt_pidfile="$2" ; shift 2 ;; - case $1 in - -t|--timeout) opt_timeout="$2" ; shift 2 ;; - -v|--verbose) opt_verbose="--verbose" ; shift ;; - -d|--debug) opt_debug="--debug" ; shift ;; - -g|--ghost) opt_ghost="--ghost" ; shift ;; - --) shift ; break ;; - *) shift ;; # just ignore other params for now - esac - done - # build the parameters - [ -n "${opt_timeout}" ] && startupoptions="${startupoptions} --timeout ${opt_timeout}" - #[ -n "${opt_pidfile}" ] && startupoptions="${startupoptions} --pid-file ${opt_pidfile}" - startupoptions="${startupoptions} ${opt_ghost} ${opt_verbose} ${opt_debug}" - - # Other option flags are intended for maps. - # unfortuntely this can't be integrated with the above getopt(1) - mapoptions="$(echo $daemonoptions $options | sed \ - -e '/-t/{s/--*t\(imeout\)*[[:space:]=]*\([0-9][0-9]*\)//g }' \ - -e '/-v/{s/--*v\(erbose\)*//g }' \ - -e '/-d/{s/--*d\(ebug\)*//g }' \ - -e '/-g/{s/--*g\(host\)*//g }' \ - -e 's/^[[:space:]]*//g' \ - -e 's/[[:space:]]*$//g')" - #-e '/-p/{s/--*p\(id-file\)*[[:space:]=]*\([^[:space:]]*\)//g }' \ - - # Break up the maptype and map, if the map type is specified - maptype="${map/:*}" - # Handle degenerate map specifiers - if [ "$maptype" = "$map" ] ; then - if [ -x "$map" ]; then - maptype="program" - elif [ -x "/etc/$map" ]; then - maptype="program" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ -f "$map" ]; then - maptype="file" - elif [ -f "/etc/$map" ]; then - maptype="file" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ "$map" = "hesiod" -o "$map" = "userhome" ] ; then - maptype="$map" - map= - elif [ "$map" = "multi" ] ; then - maptype="$map" - map= - else - maptype=yp - map="${map/*\/}" # same as "basename $map" - map="${map/#auto_/auto.}" # echo $map | sed -e 's/^auto_home/auto.home/' -e 's/^auto_mnt/auto.mnt/' - fi - fi - map="${map#*:}" - - #echo >>/tmp/debug - #date >>/tmp/debug - #echo STARTUPOPTIONS $startupoptions >> /tmp/debug - #echo DIR $dir >> /tmp/debug - #echo MAPTYPE $maptype >> /tmp/debug - #echo MAP $map >> /tmp/debug - #echo MAPOPTIONS $mapoptions >> /tmp/debug - #echo LOCALOPTIONS $localoptions >> /tmp/debug - #echo OPTIONS $options >>/tmp/debug - #echo GETOPT_INPUT $getopt_input >>/tmp/debug - - [ -z "${startupoptions}" ] && startupoptions=" " # to make life easier later - # protect startupoptions with _X_ to use it later - cmdline="$DAEMON ${startupoptions// /_X_} $dir $maptype $map ${mapoptions} ${localoptions}" - # leave out the " so that white space gets compressed - echo ${cmdline} - - # echo ------------------------ - fi - knownmaps=" $dir/ $knownmaps" - done <$TMPSRC_mounts - rm -f $TMPSRC_mounts -} - - -start() { - ebegin "Starting automounter" - # ensure autofs support is loaded - grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs - if [ $? -ne 0 ]; then - eend 1 "No autofs support available" - return 1 - fi - - getmounts >$TMPSRC - - # Check that maps exist - if [ ! -s $TMPSRC ]; then - eend 1 "No automount maps defined" - return 1 - fi - - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - bin="/usr/sbin/automount" - params="$(echo $startupopts $mnt $rest)" - - echo -n " $mnt" - #echo " $mnt ($params)" - - start-stop-daemon --start --pidfile $pidfile --quiet \ - --exec ${bin} -- ${params} - #ps ax | grep "[0-9]:[0-9][0-9] ${bin} ${params}" | ( - # read pid rest - # echo $pid > $pidfile - # echo "$mnt $rest" >> $pidfile - #) - if [ $? -ne 0 ]; then - eerror "Failure on $mnt" - else - echo "${params}" >> $pidfile - fi - done < $TMPSRC - # clean up - rm -f $TMPSRC - - echo - - eend $? -} - -stop() { - ebegin "Stopping automounter" - start-stop-daemon --stop --quiet --signal USR2 --exec /usr/sbin/automount - eend $? -} - -stats() { - echo "Configured Mount Points:" - echo "------------------------" - getmounts >$TMPSRC - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - params="$(echo $startupopts $mnt $rest)" - echo $cmd $params - done <$TMPSRC - rm -f $TMPSRC - echo "" - echo "Active Mount Points:" - echo "--------------------" - ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | ( - while read pid tt stat time command; do echo $command; done - ) -} - -reload() { - echo "Reloading automounter: checking for changes ... " - getmounts >$TMPSRC - for i in /var/run/autofs.*.pid - do - pid=`head -n 1 $i 2>/dev/null` - [ -z "$pid" ] && continue - command=`tail -n +2 $i` - if ! grep -q "^$command" $TMPSRC - then - echo "Stopping automounter: $command" - kill -USR2 $pid - fi - done - rm -f $TMPSRC - svc_start -} - -restart() { - svc_stop - svc_start -} diff --git a/net-fs/autofs/files/autofs.rc14 b/net-fs/autofs/files/autofs.rc14 deleted file mode 100644 index 37942c2710d2..000000000000 --- a/net-fs/autofs/files/autofs.rc14 +++ /dev/null @@ -1,289 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc14,v 1.3 2008/02/05 12:37:17 stefaan Exp $ - -# rc file for automount using a Sun-style "master map". -# We first look for a local /etc/autofs/auto.master, then a YP -# map with that name - -DAEMON=/usr/sbin/automount -SYSCONFDIR=/etc/autofs - -depend() { - need localmount - use ypbind nfs slapd portmap net -} - -opts="start stop status stats reload restart" - -# this file is used to avoid the subshell-die problem -TMPSRC=/var/run/autofs.tmp - -# -# Check for all maps that are to be loaded -# -function getschemes() { - schemes="$(awk '/^automount:/{ $1="" ; gsub("\\[.*\\]","") ; print $0 }' /etc/nsswitch.conf)" - # have a default entry - [ -z "$schemes" ] && echo 'files' || echo $schemes -} - -function getfilemounts() { - if [ -f /etc/autofs/auto.master ] ; then - sed -e '/^#/d' -e '/^$/d' < /etc/autofs/auto.master - fi -} - -function catnismap() { - [ -z "$1" ] && map="auto_master" || map="$1" - /usr/bin/ypcat -k ${map} 2> /dev/null | sed -e '/^#/d' -e '/^$/d' -} - -function getnismounts() { - YPMAP="$(catnismap auto.master)" - if [ -z "$YPMAP" ]; then - catnismap - else - catnismap auto.master - fi -} - -function getldapmounts() { - autofs_lam=/usr/lib/autofs/autofs-ldap-auto-master - if [ -f $autofs_lam -a -x $autofs_lam ]; then - ${autofs_lam} \ - -m ${ldap_map_oc} -e ${ldap_entry_oc} \ - -n ${ldap_map_key} -k ${ldap_entry_key} \ - -v ${ldap_value} 2> /dev/null - fi -} - -function getrawmounts() -{ - for scheme in `getschemes` ; do - case "$scheme" in - files) - getfilemounts - ;; - nis*) - getnismounts - ;; - ldap*) - getldapmounts - ;; - esac - done -} - - -# -# This function will build a list of automount commands to execute in -# order to activate all the mount points. It is used to figure out -# the difference of automount points in case of a reload -# -function getmounts() -{ - knownmaps=" " - # seperate storage variable to avoid clobbering the other $TMPSRC - TMPSRC_mounts="$TMPSRC.mounts" - getrawmounts >$TMPSRC_mounts - while read dir map options - do - # These checks screen out duplicates and skip over directories - # where the map is '-'. - if [ ! -z "$dir" -a ! -z "$map" \ - -a "x${map:0:1}" != "x-" \ - -a "`echo "$knownmaps" | grep -w $dir/`" = "" ]; then - # If the options include a -t or --timeout parameter, then - # pull those particular options out. - # echo DAEMONOPTIONS OPTIONS $daemonoptions $options - startupoptions="" - opt_timeout="" - opt_pidfile="" - opt_verbose="" - opt_debug="" - opt_ghost="" - - # use getopt to parse all of it - #getopteval="$(getopt -q -o -t:p:vdg --long timeout:,pid-file:,verbose,debug,ghost -- "$daemonoptions $options") " - getopt_input="$daemonoptions ${options/-/}" - getopt_eval="$(getopt -q -o -t:vdg --long timeout:,verbose,debug,ghost -- $getopt_input) " - eval set -- "${getopt_eval}" - while [ -n "$1" ]; do - #-p|--pid-file) opt_pidfile="$2" ; shift 2 ;; - case $1 in - -t|--timeout) opt_timeout="$2" ; shift 2 ;; - -v|--verbose) opt_verbose="--verbose" ; shift ;; - -d|--debug) opt_debug="--debug" ; shift ;; - -g|--ghost) opt_ghost="--ghost" ; shift ;; - --) shift ; break ;; - *) shift ;; # just ignore other params for now - esac - done - # build the parameters - [ -n "${opt_timeout}" ] && startupoptions="${startupoptions} --timeout ${opt_timeout}" - #[ -n "${opt_pidfile}" ] && startupoptions="${startupoptions} --pid-file ${opt_pidfile}" - startupoptions="${startupoptions} ${opt_ghost} ${opt_verbose} ${opt_debug}" - - # Other option flags are intended for maps. - # unfortuntely this can't be integrated with the above getopt(1) - mapoptions="$(echo $daemonoptions $options | sed \ - -e '/-t/{s/--*t\(imeout\)*[[:space:]=]*\([0-9][0-9]*\)//g }' \ - -e '/-v/{s/--*v\(erbose\)*//g }' \ - -e '/-d/{s/--*d\(ebug\)*//g }' \ - -e '/-g/{s/--*g\(host\)*//g }' \ - -e 's/^[[:space:]]*//g' \ - -e 's/[[:space:]]*$//g')" - #-e '/-p/{s/--*p\(id-file\)*[[:space:]=]*\([^[:space:]]*\)//g }' \ - - # Break up the maptype and map, if the map type is specified - maptype="${map/:*}" - # Handle degenerate map specifiers - if [ "$maptype" = "$map" ] ; then - if [ -x "$map" ]; then - maptype="program" - elif [ -x "/etc/$map" ]; then - maptype="program" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ -f "$map" ]; then - maptype="file" - elif [ -f "/etc/$map" ]; then - maptype="file" - map="/etc/$map" - map="${map//\/\//\/}" # strip doubles - elif [ "$map" = "hesiod" -o "$map" = "userhome" ] ; then - maptype="$map" - map= - elif [ "$map" = "multi" ] ; then - maptype="$map" - map= - else - maptype=yp - map="${map/*\/}" # same as "basename $map" - map="${map/#auto_/auto.}" # echo $map | sed -e 's/^auto_home/auto.home/' -e 's/^auto_mnt/auto.mnt/' - fi - fi - map="${map#*:}" - - #echo >>/tmp/debug - #date >>/tmp/debug - #echo STARTUPOPTIONS $startupoptions >> /tmp/debug - #echo DIR $dir >> /tmp/debug - #echo MAPTYPE $maptype >> /tmp/debug - #echo MAP $map >> /tmp/debug - #echo MAPOPTIONS $mapoptions >> /tmp/debug - #echo LOCALOPTIONS $localoptions >> /tmp/debug - #echo OPTIONS $options >>/tmp/debug - #echo GETOPT_INPUT $getopt_input >>/tmp/debug - - [ -z "${startupoptions}" ] && startupoptions=" " # to make life easier later - # protect startupoptions with _X_ to use it later - cmdline="$DAEMON ${startupoptions// /_X_} $dir $maptype $map ${mapoptions} ${localoptions}" - # leave out the " so that white space gets compressed - echo ${cmdline} - - # echo ------------------------ - fi - knownmaps=" $dir/ $knownmaps" - done <$TMPSRC_mounts - rm -f $TMPSRC_mounts -} - - -start() { - ebegin "Starting automounter" - # ensure autofs support is loaded - grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs - if [ $? -ne 0 ]; then - eend 1 "No autofs support available" - return 1 - fi - - getmounts >$TMPSRC - - # Check that maps exist - if [ ! -s $TMPSRC ]; then - eend 1 "No automount maps defined" - return 1 - fi - - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - bin="/usr/sbin/automount" - params="$(echo $startupopts $mnt $rest)" - - echo -n " $mnt" - #echo " $mnt ($params)" - - start-stop-daemon --start --pidfile $pidfile --quiet \ - --exec ${bin} -- ${params} - #ps ax | grep "[0-9]:[0-9][0-9] ${bin} ${params}" | ( - # read pid rest - # echo $pid > $pidfile - # echo "$mnt $rest" >> $pidfile - #) - # Omitted these five lines, see http://bugs.gentoo.org/110887 - #if [ $? -ne 0 ]; then - # eerror "Failure on $mnt" - #else - # echo "${params}" >> $pidfile - #fi - done < $TMPSRC - # clean up - rm -f $TMPSRC - - echo - - eend $? -} - -stop() { - ebegin "Stopping automounter" - start-stop-daemon --stop --quiet --signal USR2 --exec /usr/sbin/automount - eend $? -} - -stats() { - echo "Configured Mount Points:" - echo "------------------------" - getmounts >$TMPSRC - while read cmd startupopts mnt rest ; do - pidfile=/var/run/autofs${mnt//\//.}.pid - startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )" - params="$(echo $startupopts $mnt $rest)" - echo $cmd $params - done <$TMPSRC - rm -f $TMPSRC - echo "" - echo "Active Mount Points:" - echo "--------------------" - ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | ( - while read pid tt stat time command; do echo $command; done - ) -} - -reload() { - echo "Reloading automounter: checking for changes ... " - getmounts >$TMPSRC - for i in /var/run/autofs.*.pid - do - pid=`head -n 1 $i 2>/dev/null` - [ -z "$pid" ] && continue - command=`tail -n +2 $i` - if ! grep -q "^$command" $TMPSRC - then - echo "Stopping automounter: $command" - kill -USR2 $pid - fi - done - rm -f $TMPSRC - svc_start -} - -restart() { - svc_stop - svc_start -} diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml index 7c7f21c712ef..d1c0634ada12 100644 --- a/net-fs/autofs/metadata.xml +++ b/net-fs/autofs/metadata.xml @@ -10,6 +10,12 @@ <use> <flag name="hesiod">Install hesiod module</flag> <flag name="ldap">Install LDAP module</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> |