Version bump.

Package-Manager: portage-2.2_rc77/cvs/Linux x86_64

3 files changed, 254 insertions, 6 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 8f8f359fc580..d6b8a7544d51 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.243 2010/09/07 12:00:58 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.244 2010/09/07 18:00:37 flameeyes Exp $
+
+*sudo-1.7.4_p4 (07 Sep 2010)
+
+  07 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +sudo-1.7.4_p4.ebuild:
+  Version bump.
 
 *sudo-1.7.4_p3-r1 (07 Sep 2010)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 7fdbec8d51b3..8b71b837c1e3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX sudo-CVE-2010-2956.patch 2815 RMD160 6d48eb1dce125a129e56a208ee47bd502f0cd18a SHA1 ab3dbcc8de166bdf01aef0cf0bc53a6d86950c95 SHA256 4cc2c68d65a8ce95e3b248a426774a20896d36cbf21980137c77af1f0b674c4b
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.4p3.tar.gz 962697 RMD160 0583313d214fbc7946c1e36f100334e018c206b5 SHA1 e47de4d8cc22077085eb01eef38a65f74577d334 SHA256 1dd7ce66046c6479603db41c7cb9d878e1b4b1f23b90c9c7f2e5e808e3d0bbb5
+DIST sudo-1.7.4p4.tar.gz 963663 RMD160 3b5eb69b4317c72def0e811c58a24df8c9c1c892 SHA1 c873f509f80d5722989a912a42a61ad27b71453f SHA256 38de3c3e08346b2b8dcb3cf7ed0813300d1a1d5696d0f338ea8a4ef232aacf97
 EBUILD sudo-1.7.4_p3-r1.ebuild 7258 RMD160 f1173df1252fdc417c953ffc8aa766d9742522c7 SHA1 a6f26bbc69536fa894ae22c78e90d5cdda069d1a SHA256 31ebbd2c020b7243ed3cac30dbf84da0a2a8a11ecbdae2b3470bf92f08a4383a
-MISC ChangeLog 34311 RMD160 7cc2ebb33e6709ead133a2a908d56d9f99e378d9 SHA1 8bb2f9abbfccbf1baef841750105abfa42880c24 SHA256 884679020c9e91ac7517edbe11cd73d2a21571cb63ff37c3f43dc6c1a0e61d7a
+EBUILD sudo-1.7.4_p4.ebuild 7222 RMD160 dfb7858f9b9c766377a763bb40858921f04565e4 SHA1 e8a3764aab432a204363558d76201161f05e7f84 SHA256 1de22436df4a1b5eee3d6e11249b1d5543dfd7f810270beed3571e409a30d739
+MISC ChangeLog 34444 RMD160 5c2aed3dc61c0a360c61311c805f69ea31fb9b3d SHA1 2093d517387870c7072d9812998c7f251184601d SHA256 3cf4f9a0c5e7beba42c71bcd9f83d06ac1d8b5348ce1c8a82878d67e7e1fecaf
 MISC metadata.xml 434 RMD160 a713e5ffdcc2216a46f5023ab77c6e3aeed0d183 SHA1 49a31df517e1ec39344ac83c13e9fca87379d261 SHA256 87e2d9f4535e80f4ba1f73366040bb23cfb4b1f3101c0e33df73aff2e77fc13f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyGKYMACgkQ3Ca6Xy8+rvRAJwD9EIazM2uUhXIDIzA1vz49aspA
-/B8gNFMKHgPWNa6ZfxwA/iW34MUbAzZ1sdpgrNZGoS4f5JrJmZX0JfzNOWXbfgWK
-=9Abl
+iEYEARECAAYFAkyGfdMACgkQAiZjviIA2XjKJACgyTeIjM7YlnXhSr+aFkWX0zbR
+GuIAnRYSECQ/x8Psbk8hIr3vjlXNCYmq
+=kzzl
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.7.4_p4.ebuild b/app-admin/sudo/sudo-1.7.4_p4.ebuild
new file mode 100644
index 000000000000..b2744a764843
--- /dev/null
+++ b/app-admin/sudo/sudo-1.7.4_p4.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.4_p4.ebuild,v 1.1 2010/09/07 18:00:37 flameeyes Exp $
+
+inherit eutils pam
+
+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="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+	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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="pam skey offensive ldap selinux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	!pam? ( skey? ( >=sys-auth/skey-1.1.5-r1 ) )
+	app-editors/gentoo-editor
+	virtual/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() {
+	if use pam && use skey; then
+		ewarn "You cannot enable both S/KEY and PAM at the same time, PAM will"
+		ewarn "be used then."
+	fi
+}
+
+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
+}
+
+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."
+
+	if use pam; then
+		myconf="--with-pam --without-skey"
+	elif use skey; then
+		myconf="--without-pam --with-skey"
+	else
+		myconf="--without-pam --without-skey"
+	fi
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. — Diego
+	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 ldap ldap_conf_file /etc/ldap.conf.sudo) \
+		$(use_with ldap) \
+		--without-linux-audit \
+		--with-timedir=/var/db/sudo \
+		--docdir=/usr/share/doc/${PF} \
+		${myconf}
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	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 session
+
+	insinto /etc
+	doins "${S}"/sudoers
+	fperms 0440 /etc/sudoers
+
+	keepdir /var/db/sudo
+	fperms 0700 /var/db/sudo
+}
+
+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
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}