Fix bug #110887, + avoid segfault on amd64

(Portage version: 2.1.4)

4 files changed, 413 insertions, 2 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 8685c95a90e3..9ce3c0d49e47 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/autofs
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.63 2007/05/06 10:07:34 genone Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.64 2008/01/24 10:09:19 stefaan Exp $
+
+*autofs-4.1.3-r8 (24 Jan 2008)
+
+  24 Jan 2008; Stefaan De Roeck <stefaan@gentoo.org> +files/autofs.rc13,
+  +autofs-4.1.3-r8.ebuild:
+  Fix bug #110887, + avoid segfault on amd64
 
   06 May 2007; Marius Mauch <genone@gentoo.org> autofs-3.1.7-r4.ebuild,
   autofs-3.1.7-r5.ebuild, autofs-3.1.7-r6.ebuild, autofs-4.0.0.ebuild,
diff --git a/net-fs/autofs/autofs-4.1.3-r8.ebuild b/net-fs/autofs/autofs-4.1.3-r8.ebuild
new file mode 100644
index 000000000000..84c5c3956227
--- /dev/null
+++ b/net-fs/autofs/autofs-4.1.3-r8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 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-r8.ebuild,v 1.1 2008/01/24 10:09:19 stefaan 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="virtual/libc
+		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 dependancies"
+}
+
+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"
+	# 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.rc13 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/files/autofs.rc13 b/net-fs/autofs/files/autofs.rc13
new file mode 100644
index 000000000000..6d2a0d71f314
--- /dev/null
+++ b/net-fs/autofs/files/autofs.rc13
@@ -0,0 +1,289 @@
+#!/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.rc13,v 1.1 2008/01/24 10:09:19 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/files/digest-autofs-4.1.3-r8 b/net-fs/autofs/files/digest-autofs-4.1.3-r8
new file mode 100644
index 000000000000..c5a58779c3e8
--- /dev/null
+++ b/net-fs/autofs/files/digest-autofs-4.1.3-r8
@@ -0,0 +1,24 @@
+MD5 9efa8126decb509011646d4a4ed0779f autofs-4.1.3-bad_chdir.patch 6343
+RMD160 a406cdaa048c7b44cf93bb05df35bf2f790c6cfb autofs-4.1.3-bad_chdir.patch 6343
+SHA256 ba89a372971daa3d689366f7708ec24034c294e485a88d921fb2eac573f95b0f autofs-4.1.3-bad_chdir.patch 6343
+MD5 5d2cb735d77cd397d3de600bf3e321e6 autofs-4.1.3-miscfixes.patch.gz 3058
+RMD160 ad3d831ac3dd60eba633f976bf0cd38c4f05c6a6 autofs-4.1.3-miscfixes.patch.gz 3058
+SHA256 630f9ee90d23b02ffaa5fe379c4f1bca7db61b8f24f9cd5a2764a0c99a7eddfc autofs-4.1.3-miscfixes.patch.gz 3058
+MD5 f2e7950dab204719162be84b63857abc autofs-4.1.3-mtab_lock.patch 551
+RMD160 f34aeb1e29d8ddc06259c51fcc1bccd48e2b7efc autofs-4.1.3-mtab_lock.patch 551
+SHA256 13494713f698c29281bc5d27a7b4b2dbb7692b6d18f770fada71ab3b28c33fca autofs-4.1.3-mtab_lock.patch 551
+MD5 e404ec690f3ef118ade6f0e605228258 autofs-4.1.3-non_block_ping.patch 7934
+RMD160 6df2da01f032d8d33ef56db62964b68e14b16ca8 autofs-4.1.3-non_block_ping.patch 7934
+SHA256 882a8ddb30b30232bed1afe9b891721ebbaec54c7122e625df3382e6099e8460 autofs-4.1.3-non_block_ping.patch 7934
+MD5 bc536e7fe6e3c79f9b66a4254bf0ad43 autofs-4.1.3-replicated_server_select.patch 962
+RMD160 52f13fed9e443e0810d3e29408b06e797344e8c1 autofs-4.1.3-replicated_server_select.patch 962
+SHA256 95e2f7d1ca19c67b8116a8d5f382a7bb116255fbd507dc6689faea7da9a67dad autofs-4.1.3-replicated_server_select.patch 962
+MD5 14681387a1fc5229c2c73f593334071b autofs-4.1.3-sock-leak-fix.patch 1236
+RMD160 09ca250b5711d04336f61fb7a227d99ae2b4d053 autofs-4.1.3-sock-leak-fix.patch 1236
+SHA256 6aaa548688e7d48eb735dfa9acb1c097b82f8ef68a3ca30aab70a92b9b36453b autofs-4.1.3-sock-leak-fix.patch 1236
+MD5 d408ddcd5dafca8d2907b788f93b225c autofs-4.1.3-strict.patch 1626
+RMD160 8527db5b40eb7d0bf7fcc6f47a5be5beb22905d3 autofs-4.1.3-strict.patch 1626
+SHA256 518a7930cb6bad18f045dfc493ce39816e6fbce0f80c444dd75a33d722a8caff autofs-4.1.3-strict.patch 1626
+MD5 f43a09e94c4bd512ec58ac06e9d42c60 autofs-4.1.3.tar.bz2 125234
+RMD160 7df2839fce00222609bd7977a9d6275276e232b4 autofs-4.1.3.tar.bz2 125234
+SHA256 9257a603815ee8c8d0f2935ff3c254b23f8007eee5fa8c9bf2e3661fdc171035 autofs-4.1.3.tar.bz2 125234