Version bump.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 189 insertions, 5 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index ea592a8e9cad..7ff356feef45 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.302 2012/02/21 20:23:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.303 2012/02/29 16:25:35 flameeyes Exp $
+
+*sudo-1.8.4_p2 (29 Feb 2012)
+
+  29 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> +sudo-1.8.4_p2.ebuild:
+  Version bump.
 
 *sudo-1.8.4_p1 (21 Feb 2012)
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 36e6dec48c02..a83cf389b436 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -11,6 +11,7 @@ DIST sudo-1.8.2.tar.gz 1465051 RMD160 daebd7f67fff6429c3cb85260e9b11f0c3e28e3c S
 DIST sudo-1.8.3p1.tar.gz 1536465 RMD160 7809cbde339220d7dc10ae8da504d5c4e219b55c SHA1 2a7ad912aa8a31706796e5bff8813e4fc7505333 SHA256 1a22635bc5a0a84df273a893c624d45f628c78668317c5bc442dac11db55bb82
 DIST sudo-1.8.3p2.tar.gz 1536943 RMD160 5a6b8574d2245cc89d2ac982eae9cb6ca2414033 SHA1 37d70b133f809116ce631229fa0e727d9f5125ad SHA256 7edcf02ef4dc4f26f524726e8faaa90d7939772c186409ab150d2934e3a9ba31
 DIST sudo-1.8.4p1.tar.gz 1607355 RMD160 3f83dd07e9a563f8249ee08a37f3ca09d2718983 SHA1 5d5fe07cc44ea648c2ea6dc3129a5c13604c83ed SHA256 48214b55b40fd1fa9501e69f82fc8754911943ca2652d955e66e2b992d39d027
+DIST sudo-1.8.4p2.tar.gz 1608580 RMD160 62c52bf05ac4a236e7cdf56c15cc271928635d85 SHA1 949c39a0191584ded1044a0f729d54a8dc7b3e72 SHA256 b1310b8548db5ea92f3063011c0fe6e843a1f95f548a4aeae54bcc2fdfea88a9
 EBUILD sudo-1.7.4_p5.ebuild 7199 RMD160 c3d60aa16569fd4538d1d9da14d3360ab7efa071 SHA1 4d6538f1fd59bc4a0dc1a2cb8c9d376817ad3a01 SHA256 1b367137a5c65081749db1abd23b1ab32555f12935c6185f22fda90cf956d7b8
 EBUILD sudo-1.8.1_p2.ebuild 5052 RMD160 e48597e49b3ac5f8e0f1f220f4274cc7e18569bc SHA1 c431a81c23beded264fb0591860135d6c4635316 SHA256 55a73de80034c85a4f20392e45dd28e23fd5f22ec032333997fe5138aa3fa599
 EBUILD sudo-1.8.2-r1.ebuild 5199 RMD160 4640b960d26a1a62fc2423bdaf8c96f518bf739e SHA1 29a3463b6c5b094d14f82518d1fb497655ec16a1 SHA256 16e4eb9cfff5d5dc55c0aac343fba80000ac87c9d6ddad725340a4f3b6efe38e
@@ -18,12 +19,13 @@ EBUILD sudo-1.8.3_p1-r2.ebuild 4879 RMD160 983f9f7099de9a6dc720988841460c4f09710
 EBUILD sudo-1.8.3_p1.ebuild 5109 RMD160 b958efc43a95bf1a5a1cb4f196df22317d0d1b4b SHA1 c069b14b38274cf53a711de3e422d4f58f31a917 SHA256 b79fb3d8a91f29d5a1472be1892e4510cd658c5cd0c5b31364bb9658244176fc
 EBUILD sudo-1.8.3_p2.ebuild 4902 RMD160 529c3add3ba73e861bfed43e36092e01e5b805bd SHA1 a212f9d26c6c11d642f1d67f831cc62ee6a07662 SHA256 3e9b2b4ed154a828ca5814dbf5bd0bf7bb85af8cfa6e7f766954a5de610d2532
 EBUILD sudo-1.8.4_p1.ebuild 4865 RMD160 b344a4fd80caa9986efe52c6f4ba7229e5363f33 SHA1 499ee1941442d97f51c39ce5a3762b456b33fd78 SHA256 5a0ec71de79f0a4a1fa6fe984691e46b5a2e55f1a021a02dd9096dd8bb6ef56b
-MISC ChangeLog 44024 RMD160 1faf91672d60af0dd9cbbe81797a532b97e813c7 SHA1 760e1fa45feede349487e857f715a3e164dfd4d2 SHA256 fa0d3311a1e25850683fe7d8617f507112e72acf77fdabcdd3c94c82c69c0d93
+EBUILD sudo-1.8.4_p2.ebuild 4865 RMD160 1eac12234da0914cf4e04f448f3cae8f92263443 SHA1 ec3d7243739ba592579abc64a983248943169a24 SHA256 baa2673fd738a4966c6dff486b2fdbcf767cadb1a48cd3d9d4d859f7222b03ee
+MISC ChangeLog 44150 RMD160 b3f02a8636664f29da592351d85622b79016c135 SHA1 7fd3c43bacb3a3809e0c7bb768d1a16269b244c0 SHA256 6b1ddaab29d7406b2799c52a398c30b829b1418676b65e3ab484766aacb1f6f6
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9D/Q0ACgkQAiZjviIA2XgrEACg6KmohWMFOvwJgxK9FB67tbfl
-dOIAn19lJwjHD0nFJIFvFT9IOUznZ6lt
-=Hs1/
+iEYEARECAAYFAk9OUS8ACgkQAiZjviIA2Xjo+wCgxgT9+7PEJv70ZtOK4WINh2FE
+bTcAn3RGd4eyRMkKrhNmSmAyREFPBOD4
+=kwGE
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.8.4_p2.ebuild b/app-admin/sudo/sudo-1.8.4_p2.ebuild
new file mode 100644
index 000000000000..f267532da392
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.4_p2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.4_p2.ebuild,v 1.1 2012/02/29 16:25:35 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+*_beta*|*_rc*) uri_prefix=beta/ ;;
+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="ldap nls pam offensive selinux skey"
+
+DEPEND="pam? ( virtual/pam )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-sudo )
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	virtual/mta"
+DEPEND="${DEPEND}
+	sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	elibtoolize
+}
+
+set_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 ..."
+
+	# first extract the default ROOTPATH from build env
+	ROOTPATH=$(unset ROOTPATH; . /etc/profile.env; echo "${ROOTPATH}")
+	if [[ -z ${ROOTPATH} ]] ; then
+		ewarn "	Failed to find ROOTPATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		ROOTPATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${ROOTPATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		ROOTPATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local ROOTPATH
+	set_rootpath
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	econf \
+		--enable-zlib=system \
+		--with-secure-path="${ROOTPATH}" \
+		--with-editor=/usr/libexec/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) \
+		$(use_enable nls) \
+		$(use_with pam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		--without-opie \
+		--without-linux-audit \
+		--with-timedir=/var/db/sudo \
+		--with-plugindir=/usr/$(get_libdir)/sudo \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if use ldap ; then
+		dodoc README.LDAP doc/schema.OpenLDAP
+		dosbin plugins/sudoers/sudoers2ldif
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# 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
+
+	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 grep -qs '^[[: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."
+}