From 78b65beabcec3573e69db4fba6c5de85310cf228 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 9 Dec 2004 08:25:48 +0000 Subject: Added some of the debian patches that fix up LDAP and Hesiod in 4.1.3. --- net-fs/autofs/ChangeLog | 8 ++- net-fs/autofs/Manifest | 21 +++----- net-fs/autofs/autofs-4.1.3-r2.ebuild | 84 ++++++++++++++++++++++++++++++ net-fs/autofs/files/auto.master | 4 +- net-fs/autofs/files/auto.net | 4 +- net-fs/autofs/files/autofs.rc9 | 16 ++++-- net-fs/autofs/files/digest-autofs-4.1.3-r2 | 9 ++++ 7 files changed, 122 insertions(+), 24 deletions(-) create mode 100644 net-fs/autofs/autofs-4.1.3-r2.ebuild create mode 100644 net-fs/autofs/files/digest-autofs-4.1.3-r2 (limited to 'net-fs') diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index 7057fe3d508d..2a68fb8ff38b 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/autofs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.33 2004/12/09 07:25:12 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.34 2004/12/09 08:25:48 robbat2 Exp $ + +*autofs-4.1.3-r2 (09 Dec 2004) + + 09 Dec 2004; Robin H. Johnson files/auto.master, + files/auto.net, files/autofs.rc9, +autofs-4.1.3-r2.ebuild: + Added some of the debian patches that fix up LDAP and Hesiod in 4.1.3. *autofs-4.1.3-r1 (08 Dec 2004) diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 2e269f45f114..103873e06015 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,26 +1,25 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 7fdd1290a43fb22705e55d4fc5e1198e autofs-4.1.3-r2.ebuild 2929 MD5 f67d1e63c8588166e494744c81b250d5 autofs-4.0.0.ebuild 1929 MD5 8ada6ad17d139fa85e4089066d3cbdfb autofs-4.1.3.ebuild 1930 MD5 1c01a893e20ffda0d2e05c5de202c6cf autofs-3.1.7-r6.ebuild 1784 MD5 9e0182d703eeb21b039d7d299cea75af autofs-3.1.7-r3.ebuild 1286 MD5 93f5658bc82138cfe25f2cd798c1b40a autofs-4.1.3-r1.ebuild 2864 MD5 3f9ef36aecb11a51f251a752482d7863 autofs-3.1.7-r5.ebuild 1750 -MD5 ca95edfb458d279932a97ddcdea9035a ChangeLog 5052 +MD5 802139b13ae5e21a33dfc66e88789820 ChangeLog 5234 MD5 1d3c436cc14252035bf2d97228cd3f58 metadata.xml 224 MD5 5e5b4c1e32387a90b3f21ccf55d13386 autofs-3.1.7-r4.ebuild 1736 MD5 a132f5883b92e2b509fa66e429f913ab files/autofs.confd 186 MD5 3e9a4415d9928180bd9d1a7a09d4d2e7 files/ldap_config.patch 785 -MD5 15262c86aa4bd226b8b27540abeb85fc files/auto.master 266 -MD5 26870815f4800fab87f6fa86fa1515ab files/auto.net 1123 +MD5 b670d85d339aae4fc86bb782567aee10 files/auto.master 267 +MD5 23da22655a924fad86f4477900519c7a files/auto.net 1132 MD5 39ac8cc927dab754a7694abdb1a2cdc5 files/open_max.diff 408 MD5 7fa23f910baa8aa00609bd74a60c8e34 files/autofs1.confd 137 MD5 2f74c237baee9004a019d3365ab04c0d files/digest-autofs-4.1.3-r1 586 +MD5 f311a86fdf3a03702afac9cf4fd74528 files/digest-autofs-4.1.3-r2 660 MD5 1b6efbe0072911c5c960a27e09a9d024 files/autofs.rc6 3717 MD5 4cc7219397b1bdb60da3f150bd7d9230 files/autofs.rc7 3624 MD5 a6a4e5d34c61cce698c4fc381ca75b9b files/autofs.rc8 5178 -MD5 dd22a616c2631680b8e6041358b498a5 files/autofs.rc9 5465 +MD5 532c631bf9279bfde61f1880720c87a0 files/autofs.rc9 5590 MD5 7b562ed7d75738124cadc9de83d4a335 files/digest-autofs-4.0.0 66 MD5 ba9378bfaf4e17d13789ac9a056ddb3b files/digest-autofs-4.1.3 65 MD5 552ad0cdacd4354b83dba94670ec0e99 files/autofs.confd9 799 @@ -33,11 +32,3 @@ MD5 ee656860c0682821d144556f674ca481 files/digest-autofs-3.1.7-r6 64 MD5 41de856a77a074078968ff244b863f88 files/automount.diff 322 MD5 77884391a3fbf365a88f5d2230b548d9 files/nisyp.patch 419 MD5 a872a3743192bbca4f78ecec7f74df03 files/ldap.diff 367 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) -Comment: Robbat2 @ Orbis-Terrarum Networks - -iD8DBQFBt/37PpIsIjIzwiwRAnMrAKDOxvGF2LPTHW5G7laoA9Yqnmrs0gCbBDJo -txXQ897BzVPIRgXefC+sbks= -=o9ts ------END PGP SIGNATURE----- diff --git a/net-fs/autofs/autofs-4.1.3-r2.ebuild b/net-fs/autofs/autofs-4.1.3-r2.ebuild new file mode 100644 index 000000000000..18d684f9de8c --- /dev/null +++ b/net-fs/autofs/autofs-4.1.3-r2.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/12/09 08:25:48 robbat2 Exp $ + +inherit eutils + +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}-signal-race-fix.patch + ${SRC_URI_BASE}/${P}-sock-leak-fix.patch + ${SRC_URI_BASE}/${P}-replicated_server_select.patch + mirror://gentoo/${P}-miscfixes.patch.gz" +DEPEND="virtual/libc + ldap? ( >=net-nds/openldap-2.0 )" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ia64 ~ppc64" + +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}-signal-race-fix.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 + + cd ${S} + autoconf || die "Autoconf failed" + + cd ${S}/daemon + sed -i 's/LIBS \= \-ldl/LIBS \= \-ldl \-lnsl \$\{LIBLDAP\}/' Makefile || die "LIBLDAP change failed" +} + +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/lib/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 + + dodir /etc/autofs /etc/init.d /etc/conf.d + 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! + + exeinto /etc/init.d ; newexe ${FILESDIR}/autofs.rc9 autofs + insinto /etc/conf.d ; newins ${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/lib/autofs ; doexe autofs-ldap-auto-master + fi +} + +pkg_postinst() { + einfo "Note: If you plan on using autofs for automounting" + einfo "remote NFS mounts without having the NFS daemon running" + einfo "please add portmap to your default run-level." + echo "" + einfo "Also the normal autofs status has been renamed stats" + einfo "as there is already a predefined Gentoo status" +} diff --git a/net-fs/autofs/files/auto.master b/net-fs/autofs/files/auto.master index 346bef542d8a..fdabf5d873fa 100644 --- a/net-fs/autofs/files/auto.master +++ b/net-fs/autofs/files/auto.master @@ -1,9 +1,9 @@ -# $Id: auto.master,v 1.2 2004/12/09 07:25:12 robbat2 Exp $ +# $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 +#/misc /etc/autofs/auto.misc #/home /etc/autofs/auto.home diff --git a/net-fs/autofs/files/auto.net b/net-fs/autofs/files/auto.net index 11bcc30e6bb8..aad4647ac5d3 100644 --- a/net-fs/autofs/files/auto.net +++ b/net-fs/autofs/files/auto.net @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: auto.net,v 1.1 2004/12/09 07:25:12 robbat2 Exp $ +# $Id: auto.net,v 1.2 2004/12/09 08:25:48 robbat2 Exp $ # This file must be executable to work! chmod 755! @@ -22,7 +22,7 @@ opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict" # Newer distributions get this right SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key" -$SHOWMOUNT | sort +0 | \ +$SHOWMOUNT | LC_ALL=C sort +0 | \ awk -v key="$key" -v opts="$opts" -- ' BEGIN { ORS=""; first=1 } { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } diff --git a/net-fs/autofs/files/autofs.rc9 b/net-fs/autofs/files/autofs.rc9 index ea0235fc1c51..78cd45f2d678 100644 --- a/net-fs/autofs/files/autofs.rc9 +++ b/net-fs/autofs/files/autofs.rc9 @@ -1,7 +1,7 @@ #!/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.rc9,v 1.1 2004/12/09 07:25:12 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc9,v 1.2 2004/12/09 08:25:48 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 @@ -139,9 +139,17 @@ function getmounts() start() { ebegin "Starting automounter" # ensure autofs support is loaded - grep -q autofs /proc/filesystems || modprobe -q autofs - [ $? -ne 0 ] && eend 1 "No autofs support available" - # now start working + grep -q autofs /proc/filesystems || modprobe -q autofs autofs4 + if [ $? -ne 0 ]; then + eend 1 "No autofs support available" + exit 1 + fi + # Check that maps exist + if [ -z "$(getmounts)" ]; then + eend 1 "No automount maps defined" + exit 1 + fi + # Now go getmounts | while read cmd timeout time mnt rest do #FIXME: this works but it really sucks diff --git a/net-fs/autofs/files/digest-autofs-4.1.3-r2 b/net-fs/autofs/files/digest-autofs-4.1.3-r2 new file mode 100644 index 000000000000..e109b9913ec5 --- /dev/null +++ b/net-fs/autofs/files/digest-autofs-4.1.3-r2 @@ -0,0 +1,9 @@ +MD5 f43a09e94c4bd512ec58ac06e9d42c60 autofs-4.1.3.tar.bz2 125234 +MD5 d408ddcd5dafca8d2907b788f93b225c autofs-4.1.3-strict.patch 1626 +MD5 f2e7950dab204719162be84b63857abc autofs-4.1.3-mtab_lock.patch 551 +MD5 9efa8126decb509011646d4a4ed0779f autofs-4.1.3-bad_chdir.patch 6343 +MD5 e404ec690f3ef118ade6f0e605228258 autofs-4.1.3-non_block_ping.patch 7934 +MD5 3cd31c9522651686f4b5ace5cf63c430 autofs-4.1.3-signal-race-fix.patch 635 +MD5 14681387a1fc5229c2c73f593334071b autofs-4.1.3-sock-leak-fix.patch 1236 +MD5 bc536e7fe6e3c79f9b66a4254bf0ad43 autofs-4.1.3-replicated_server_select.patch 962 +MD5 5d2cb735d77cd397d3de600bf3e321e6 autofs-4.1.3-miscfixes.patch.gz 3058 -- cgit v1.2.3-65-gdbad