# ChangeLog for net-fs/autofs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.129 2011/09/21 15:49:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.130 2011/10/05 14:27:26 pva Exp $
+
+*autofs-5.0.6-r3 (05 Oct 2011)
+*autofs-4.1.4-r1 (05 Oct 2011)
+
+ 05 Oct 2011; Peter Volkov <pva@gentoo.org> +autofs-4.1.4-r1.ebuild,
+ files/autofs5.initd, files/autofs-4.1.4-init.patch, +autofs-5.0.6-r3.ebuild:
+ Don't use deprecated opts, bug 385639 thank Martin von Gagern for report and
+ Dustin Polke for fix.
21 Sep 2011; Peter Volkov <pva@gentoo.org> autofs-5.0.5-r4.ebuild,
autofs-5.0.6-r2.ebuild:
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f5d82a1073471eed654c99ff1fc3c064f3 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414
AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
AUX auto.net 1134 RMD160 6396a1d4faac5e9a2bf0f83d53fa7e3c578840f9 SHA1 7a6c88657d22630f688ca80cc5ca782a93eb33f0 SHA256 5ff54fb5e8588b7e7503fca90cad179acec1dbe85a4b81f9c2320151f6b34602
AUX autofs-4.1.4-clean-up-maps.patch 1779 RMD160 eeeb76e4aefddbf0a389a6ebd037de3974cad3f0 SHA1 7494a2f630abc348510c0ef417de33c90d900287 SHA256 e7e782016fd1af945107805eac243c0d6355b13366932c7d25447013c5a2c445
AUX autofs-4.1.4-fix-install-ldap-samples-and-maps.patch 2645 RMD160 d2c1794dbb291e716e0712bc3d556cb195d8b8ba SHA1 219d6758f090cbb756380b5067aa9ad916fe2092 SHA256 188e73bcee6e2a10e1b5957a59a48ba1df7af534535e84359aaffb6f3e5986e7
AUX autofs-4.1.4-fix-man-pages.patch 1397 RMD160 5fb831758d8a4daaae347a46e888102f258f2993 SHA1 697c4404aa48b3d2266f118473fb11aa04257bcc SHA256 2ad7f542990b74ac0113afacfaf703b45d925477d098c013c14717ca7a5a540d
-AUX autofs-4.1.4-init.patch 336 RMD160 3abc496d3e2f9b7267f4a645775fa63e9c24e694 SHA1 a3022d60a11257b8072299e7b7036ea37ae8af11 SHA256 886825df108b48ca8eb86a92b627e1c61d4509a5b2c2a8404953b35c0e8207d4
+AUX autofs-4.1.4-init.patch 444 RMD160 cb6ec18d3639908b3ef009913e1c43ef4933f491 SHA1 ab2006e356267bfa90d97b3c911b5c96d4a9b636 SHA256 11da86e096b84c26e90bbfdc8ed4d7f6a0ddf89eb2606517a219578358da1794
AUX autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch 4223 RMD160 2e782926682b81408a2098b80ce7a19783eaa80d SHA1 65d85218dcded570e375214766d8b6f5df4c61d5 SHA256 6151293e89dfce612d3a05393293b4167b42dff74c8e75be480e4648455357e0
AUX autofs-5.0.3-heimdal.patch 1380 RMD160 ed40e452a7648aec1b25e1002c99929be97b8bf9 SHA1 3f7d05c14e52a9a8160a43a38a7b736bb81bb68b SHA256 ca62546abf6b6ae2ed95f53d439d25770f20e70651fdaf5a0edf9d69920b108a
AUX autofs-5.0.3-map-patch-fix.patch 2543 RMD160 3be39a53ddc5125b9ca09f636f3099c02b15de20 SHA1 4d0613ba4c9f51b1bdfdc2f854f02b0acc2681fa SHA256 7a905f5784b9ecddb757cc998033827b58c2c3f4ea514fd746d1d99d8f0f1d5b
AUX autofs.rc13 7876 RMD160 feb761b16f10e90ca55fc25a75b1ada9e79a83e2 SHA1 dadfdea84cf741ede50f5131433f88b09dd05f40 SHA256 d477a63305db5d0cc78e9f538cea745f733ae46305f71986c8a5abce1d2f0c56
AUX autofs.rc14 7881 RMD160 f801010b880dca90ea76926880af928889b2fe38 SHA1 3d1cb7d1bd9b34035932452ea47dcd291ff7b0b4 SHA256 6d233d75882e93f2139b706df58eb4172dbac1ffe55dd1b4792492db97ab457d
AUX autofs5-auto.master 756 RMD160 ef587371fbaab6fb119128acfe17e66b37bcb434 SHA1 543c21a7e54bcf00e35c1a8c981a908ea3403a9e SHA256 8651b42b338ffdb8be24ed88893ca90f95d0221f2684274957de154fd89df5cb
-AUX autofs5.initd 1673 RMD160 b2b796c353dead2595e820bf28fa7767a0a8a142 SHA1 03ae74b330b5aca9544cd770f0091f2c19749559 SHA256 68c17d54ad22ea68eeff6fef5a5b0a9ebcb40a03878306984b95567159f3aaeb
+AUX autofs5.initd 1665 RMD160 c3bb7a4996312bb8f9900a860d25a2efc873c402 SHA1 11accb9171dd1282fede2c61eaacb45f9ef3e777 SHA256 50cf0d305f1605a7511b9033d9e7a710d0e18e16bf37924c0b6d5a2a4d0910a9
AUX autofs5.rc1 920 RMD160 9adb413578fba86eeabefb2c25b4bf6e27bd8efe SHA1 44db5523bc7d07c949e71bf0fda6499b0c6578d1 SHA256 94c956da80446f391df3a8f89794754c0e42ea9d1fca47f2abe57eecadbc3ffa
DIST autofs-4.1.3-bad_chdir.patch 6343 RMD160 a406cdaa048c7b44cf93bb05df35bf2f790c6cfb SHA1 4e186624b0faaef1a15632d42615463427142dcb SHA256 ba89a372971daa3d689366f7708ec24034c294e485a88d921fb2eac573f95b0f
DIST autofs-4.1.3-miscfixes.patch.gz 3058 RMD160 ad3d831ac3dd60eba633f976bf0cd38c4f05c6a6 SHA1 29603180ca0ddb185ae4d8540e9c99f97659fd63 SHA256 630f9ee90d23b02ffaa5fe379c4f1bca7db61b8f24f9cd5a2764a0c99a7eddfc
DIST autofs-5.0.6.tar.bz2 311857 RMD160 1bbd94f887df4a90f379d98795fd009ef08840c3 SHA1 8c323e4327e98cbbcefc40883763e30814df9b44 SHA256 125b439a311939f247936ad697bc53b11a8e694aaff8ddf44a9fd7fa850e692c
EBUILD autofs-4.1.3-r7.ebuild 2992 RMD160 7fc94cc967a7756eb9efb3da4a422fbb647c4d2c SHA1 056a5a4710b7275fb47a495985b51a64312412c4 SHA256 e8c538577a1a04659a0ff990b543efdb2dbb61d8b6bbb1cd2c7c1b159a842710
EBUILD autofs-4.1.3-r9.ebuild 3101 RMD160 29c754ba5407258028cc372ee0d88193224f2ff9 SHA1 4fd3ec05fc46d05148c7ef32f97ee402bf2cb23f SHA256 a895a29abf8ee920cfa87764a30052f2d014d3003fc0421d430d0c2300e233bd
+EBUILD autofs-4.1.4-r1.ebuild 2729 RMD160 de7c8074b7bb7aa40b9846be2262aeb31eae1fc2 SHA1 ca794b4e852395958963abe035ef31177879ae48 SHA256 eceb20f621b6740ab31a7dd1d49af9cc03ff64d8f95f0728f775f5eef5b0b025
EBUILD autofs-4.1.4.ebuild 2723 RMD160 1c23e657b66b03dfe9bbdbe0d5f283a659d3e1b2 SHA1 dcafdbe093529dfc186b698aeac8d0e34e948a75 SHA256 f7f6b28fce5d44a43cfc056acbb84824022f96a20a41b6c1ea6421d69086cef1
EBUILD autofs-5.0.3-r6.ebuild 4266 RMD160 f1fedf489dceea7366f0d334d499fcc1db57d824 SHA1 b8dc48046353e6ea3e4bdd7c228d0ed565077634 SHA256 7db072e58681b59a7e04970134ea8c5d37ffc1388e7e64a27280a013886d335a
EBUILD autofs-5.0.4-r5.ebuild 4984 RMD160 05b95859cc4e26b1f2fed6ae2d390cb3c4adeaed SHA1 4c7956fea61a9017a85aa6d4312ddb4cc2c2f5dd SHA256 77058cde2964a60ec8aaaa953b6ee655cede9d036bdc0db4dbc0860f27b44ccc
EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
EBUILD autofs-5.0.6-r1.ebuild 3702 RMD160 589d540d027f97a674a4723db36d997118d17172 SHA1 bf120380ceb21c7d6a72c8e09b50c64c0ceb8d89 SHA256 f2f8f94c1f6c1e75bd7acfdfc83d1a5ba1bce3368c0fa230989edb466a652107
EBUILD autofs-5.0.6-r2.ebuild 3826 RMD160 79a773c7af48ff4bc18097c35f7453352e0860b2 SHA1 f23e8f39bb80d92e7530e1b5b9b38ddd58317e10 SHA256 9ed7b30e3fa651e7dc57971de42a046e6c5f29b36c90f311989894ad0a2ab5ab
+EBUILD autofs-5.0.6-r3.ebuild 3828 RMD160 0f0b1802b4fdef9f0cf10692b1e30c1244e2a97e SHA1 6ec266ea1d758915e47cc7df01003572525b8ef7 SHA256 45c9b8c077f99c9b8f54242351cc9e0aa73a6f827ccb587ac6cc62fcee7e34f5
EBUILD autofs-5.0.6.ebuild 3485 RMD160 7c7accf22b56f49a3fa89fd0356a12ef17f39399 SHA1 24ebb4e411afb5721b1acd634ab2e516aae237f0 SHA256 faa6b414e896e49b3b8bac1507f3a43baa0399cd84b29c4ad517ac3ff59ba1e0
-MISC ChangeLog 21445 RMD160 0b3b798cfd4fba10403a4fd2b4a387056cce4466 SHA1 8f6652e99f6e000026c5a209b5d33de2dc636f32 SHA256 275d356d112593d7d5c10e788cd3b9a3beeb72ea74a5e1f2a257e9a2d2b0e386
+MISC ChangeLog 21761 RMD160 9cc799032333847e47809217036c33d93a5ed934 SHA1 9bab4dcf2cd2cbd3321af881d496a18e03d8ffbf SHA256 ec33b78e6affdf6be143fd5a9eef3070b61127ee2ac732793747ba8efd4683f5
MISC metadata.xml 530 RMD160 417c66e2ec6e8627d23373d76d8c187a4dced885 SHA1 7629fc63948229c175548cc8ca24774316fe41b1 SHA256 454c11f4af437af306f09746ed10abe0d565c2b9b4b232b3d892dca494e0d768
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk6MaPkACgkQGrk+8vGYmwcOgQEAs+nSxYetyLUSCZqoLhj/XW04
+Ny/Q3T6Wi3OnpaOpmT0BALMVa3qxnPL4ITTIU/HsNRS/Wd5QUCY8kPlk7Ftszpvs
+=Xj6K
+-----END PGP SIGNATURE-----
--- /dev/null
+# 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-r1.ebuild,v 1.1 2011/10/05 14:27:26 pva 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
+}
--- /dev/null
+# 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-r3.ebuild,v 1.1 2011/10/05 14:27:26 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."
+}
--- gentoo/net-fs/autofs/files/autofs.init.orig
+++ gentoo/net-fs/autofs/files/autofs.init
-@@ -11,8 +11,8 @@ DAEMON=/usr/sbin/automount
+@@ -11,11 +11,12 @@ DAEMON=/usr/sbin/automount
SYSCONFDIR=/etc/autofs
depend() {
+ use ypbind nfs slapd portmap net
}
- opts="start stop status stats reload restart"
+-opts="start stop status stats reload restart"
++extra_commands="stats"
++extra_started_commands="reload"
+
+ #
+ # Check for all maps that are to be loaded
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.2 2011/04/03 17:55:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.3 2011/10/05 14:27:26 pva Exp $
DAEMON=/usr/sbin/automount
PIDFILE=/var/run/autofs.pid
use ypbind nfs slapd portmap net
}
-opts="start stop restart status reload"
+extra_started_commands="reload"
start() {
ebegin "Starting automounter"
projects / gentoo.git / commitdiff