Fix default editor handling, bug 286017.

Package-Manager: portage-2.2_rc50/cvs/Linux i686

3 files changed, 231 insertions, 2 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 86390ae53725..f025145e261f 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.195 2009/10/09 17:48:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.196 2009/11/21 22:10:27 ulm Exp $
+
+*sudo-1.7.2_p1-r1 (21 Nov 2009)
+
+  21 Nov 2009; Ulrich Mueller <ulm@gentoo.org> +sudo-1.7.2_p1-r1.ebuild:
+  Fix default editor handling, bug 286017.
 
   09 Oct 2009; Raúl Porcel <armin76@gentoo.org> sudo-1.7.2_p1.ebuild:
   arm/ia64/m68k/s390/sh/sparc stable wrt #284089
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 391f4b111e4e..8f4add088d0e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX sudo-1.7.1-bug348.patch 449 RMD160 68d3066d595d3e8f7b15da4a52129d332f4da65a SHA1 50439aa618dc3b941111364275d06752ff8b42fd SHA256 c3f361764b41755331ae711b1647d09dec5324381176b9633f762f1c9381b563
 AUX sudo-1.7.2p1-securepath.patch 1719 RMD160 e8db558c04873de58c46cfbe0c1992a9f0832732 SHA1 0ea0d723258b8b8ca834115835f1d4c2caa6fad6 SHA256 1d7958aca43426213ab3685a012ce3667b7bc24b52a2fe7a1b8b0230db0f6141
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.1.tar.gz 755823 RMD160 e9c2e165ead15e5cab6a8d32facc0d38135d0ff9 SHA1 f76ad5ff5dac253c14dfedfdbddd99b4cf7f54a2 SHA256 e51c39eb4fca981b28b02c1cc58eef0b079258dce90cc87d5d91fcecedabe1db
 DIST sudo-1.7.2p1.tar.gz 771059 RMD160 5f345d6062f178700fd78c93c04ee47c03bbcc50 SHA1 2ef461d840110d2c9160db142336591775ede67a SHA256 34d11a1dd8bace0885f55b4c8bddda1da29993ff8d7174099e25bd80db1eaf7f
 EBUILD sudo-1.7.1-r1.ebuild 6557 RMD160 df55b25134eab5a9cb509eeaaaacb2f31b314899 SHA1 d1963d5484a8ec97581c4d21d9fcb8432818ec07 SHA256 07571099b8eb490fc52e1b07803cd91cafb47c557c42a3d142821ab3ff1ae9e9
+EBUILD sudo-1.7.2_p1-r1.ebuild 6385 RMD160 3a19f27f65bb01917d404b87678bd9b60952a7e5 SHA1 59b41c747e4c0a45c5873685ebc6598b9c7be7eb SHA256 b485842b65d414c64fe0dcc290490c48bf58f1f7bf8025535fccb1471b18399e
 EBUILD sudo-1.7.2_p1.ebuild 6513 RMD160 4973cb8bdb47e40693a48e7ce8e54610f0318a6b SHA1 e356dcbd1c0fea524dd8352001ea2b8ee8ba9471 SHA256 7d9c19e60ca675f26df6d92691db8f28d85e89285367ff7020e2f2e0d0db3183
-MISC ChangeLog 27182 RMD160 b24936575478171e98cd539b02b397a0f5db0f6e SHA1 e68d7336637899884f63f76a1f0e0d385a44cee7 SHA256 1293501ac5f855de5f9801e19bda38bdd6e18eb547890a512d053ddba005694e
+MISC ChangeLog 27328 RMD160 46cf741df2f0a917247893886efaa3bf5d8b7abe SHA1 ead67dbae31ee2f5791d25b4db21055016f0ee21 SHA256 2a43e4b882550b15db5cab9ec6e33ba0a6c94327f507fa85fc5d7ab3eb8ff2bb
 MISC metadata.xml 434 RMD160 a713e5ffdcc2216a46f5023ab77c6e3aeed0d183 SHA1 49a31df517e1ec39344ac83c13e9fca87379d261 SHA256 87e2d9f4535e80f4ba1f73366040bb23cfb4b1f3101c0e33df73aff2e77fc13f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAksIZe4ACgkQOeoy/oIi7uxjfACdHN9xETT94U6RKx8VAOiIP/sP
+Az0An3+kFlFRIc/2zcAFCLfCfvzh6bM4
+=vmFv
+-----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.7.2_p1-r1.ebuild b/app-admin/sudo/sudo-1.7.2_p1-r1.ebuild
new file mode 100644
index 000000000000..f4ec5898df72
--- /dev/null
+++ b/app-admin/sudo/sudo-1.7.2_p1-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.2_p1-r1.ebuild,v 1.1 2009/11/21 22:10:27 ulm Exp $
+
+inherit eutils pam confutils autotools
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+case "${P}" in
+	*_beta* | *_rc*)
+		uri_prefix=beta/
+		;;
+	*)
+		uri_prefix=""
+		;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam skey offensive ldap selinux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	app-editors/gentoo-editor
+	virtual/mta"
+RDEPEND="selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	${DEPEND}"
+DEPEND="${DEPEND} sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	confutils_use_conflict skey pam
+}
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+
+	# compatability fix.
+	epatch "${FILESDIR}"/${PN}-skeychallengeargs.diff
+
+	# additional variables to disallow, should user disable env_reset.
+
+	# NOTE: this is not a supported mode of operation, these variables
+	#       are added to the blacklist as a convenience to administrators
+	#       who fail to heed the warnings of allowing untrusted users
+	#       to access sudo.
+	#
+	#       there is *no possible way* to foresee all attack vectors in
+	#       all possible applications that could potentially be used via
+	#       sudo, these settings will just delay the inevitable.
+	#
+	#       that said, I will accept suggestions for variables that can
+	#       be misused in _common_ interpreters or libraries, such as
+	#       perl, bash, python, ruby, etc., in the hope of dissuading
+	#       a casual attacker.
+
+	# XXX: perl should be using suid_perl.
+	# XXX: users can remove/add more via env_delete and env_check.
+	# XXX: <?> = probably safe enough for most circumstances.
+
+	einfo "Blacklisting common variables (env_delete)..."
+		sudo_bad_var() {
+			local target='env.c' marker='\*initial_badenv_table\[\]'
+
+			ebegin "	$1"
+			sed -i 's#\(^.*'${marker}'.*$\)#\1\n\t"'${1}'",#' "${S}"/${target}
+			eend $?
+		}
+
+		sudo_bad_var 'PERLIO_DEBUG'   # perl, write debug to file.
+		sudo_bad_var 'FPATH'          # ksh, search path for functions.
+		sudo_bad_var 'NULLCMD'        # zsh, command on null-redir. <?>
+		sudo_bad_var 'READNULLCMD'    # zsh, command on null-redir. <?>
+		sudo_bad_var 'GLOBIGNORE'     # bash, glob paterns to ignore. <?>
+		sudo_bad_var 'PYTHONHOME'     # python, module search path.
+		sudo_bad_var 'PYTHONPATH'     # python, search path.
+		sudo_bad_var 'PYTHONINSPECT'  # python, allow inspection.
+		sudo_bad_var 'RUBYLIB'        # ruby, lib load path.
+		sudo_bad_var 'RUBYOPT'        # ruby, cl options.
+		sudo_bad_var 'ZDOTDIR'        # zsh, path to search for dotfiles.
+	einfo "...done."
+
+	# prevent binaries from being stripped.
+	sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in
+
+	epatch "${FILESDIR}"/${MY_P}-securepath.patch
+
+	eautoconf
+}
+
+src_compile() {
+	local line ROOTPATH
+
+	# FIXME: secure_path is a compile time setting. using ROOTPATH
+	# is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path..."
+
+		# why not use grep? variable might be expanded from other variables
+		# declared in that file. cannot just source the file, would override
+		# any variables already set.
+		eval `PS4= bash -x /etc/profile.env 2>&1 | \
+			while read line; do
+				case $line in
+					ROOTPATH=*) echo $line; break;;
+					*) continue;;
+				esac
+			done`  && einfo "	Found ROOTPATH..." || \
+				ewarn "	Failed to find ROOTPATH, please report this."
+
+		# remove duplicate path entries from $1
+		cleanpath() {
+			local i=1 x n IFS=:
+			local -a paths;	paths=($1)
+
+			for ((n=${#paths[*]}-1;i<=n;i++)); do
+				for ((x=0;x<i;x++)); do
+					test "${paths[i]}" == "${paths[x]}" && {
+						einfo "	Duplicate entry ${paths[i]} removed..." 1>&2
+						unset paths[i]; continue 2; }
+				done; # einfo "	Adding ${paths[i]}..." 1>&2
+			done; echo "${paths[*]}"
+		}
+
+		ROOTPATH=$(cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}})
+
+		# strip gcc path (bug #136027)
+		rmpath() {
+			declare e newpath oldpath=${!1} PATHvar=$1 thisp IFS=:
+			shift
+			for thisp in $oldpath; do
+				for e; do [[ $thisp == $e ]] && continue 2; done
+				newpath=$newpath:$thisp
+			done
+			eval $PATHvar='${newpath#:}'
+		}
+
+		rmpath ROOTPATH '*/gcc-bin/*'
+
+	einfo "...done."
+
+	# XXX: --disable-path-info closes an info leak, but may be confusing.
+	econf --with-secure-path="${ROOTPATH}" \
+		--with-editor=/usr/libexec/gentoo-editor \
+		--with-env-editor \
+		$(use_with offensive insults) \
+		$(use_with offensive all-insults) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) || die
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog HISTORY PORTING README TROUBLESHOOTING \
+		UPGRADE WHATSNEW sample.sudoers sample.syslog.conf
+
+	if use ldap; then
+		dodoc README.LDAP schema.OpenLDAP
+		dosbin sudoers2ldif
+
+		cat - > "${T}"/ldap.conf.sudo <<EOF
+# See ldap.conf(5) and README.LDAP for details\n"
+# This file should only be readable by root\n\n"
+# supported directives: host, port, ssl, ldap_version\n"
+# uri, binddn, bindpw, sudoers_base, sudoers_debug\n"
+# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
+EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+	fi
+
+	pamd_mimic system-auth sudo auth account password session
+
+	insinto /etc
+	doins "${S}"/sudoers
+	fperms 0440 /etc/sudoers
+}
+
+pkg_postinst() {
+	if use ldap; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if egrep -q '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+}