Version bump; remove old.

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

4 files changed, 14 insertions, 203 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 9d88af74236a..0ee924238893 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.269 2011/04/16 12:00:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.270 2011/05/18 01:29:24 flameeyes Exp $
+
+*sudo-1.8.1_p2 (18 May 2011)
+
+  18 May 2011; Diego E. Pettenò <flameeyes@gentoo.org> -sudo-1.7.6_p1.ebuild,
+  -sudo-1.8.1_p1.ebuild, +sudo-1.8.1_p2.ebuild:
+  Version bump; remove old.
 
 *sudo-1.8.1_p1 (16 Apr 2011)
 *sudo-1.7.6_p1 (16 Apr 2011)
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 454c5630272b..ac5c0c491069 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.4p4.tar.gz 963663 RMD160 3b5eb69b4317c72def0e811c58a24df8c9c1c892 SHA1 c873f509f80d5722989a912a42a61ad27b71453f SHA256 38de3c3e08346b2b8dcb3cf7ed0813300d1a1d5696d0f338ea8a4ef232aacf97
 DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d SHA1 bb9c9ff6ce6d4c70bdc546316442e7021ca754c2 SHA256 72e8e3545f314d342f178b0fee4b483e26d70ef132b081699be035da0f0acbba
-DIST sudo-1.7.6p1.tar.gz 1124115 RMD160 9a7fcf993e6081044d3c9063e3c82add3cfa16e8 SHA1 b87c4fa295a3670a07b8dce5d6f4627deb0faf17 SHA256 538d5c6372952eaff86dc499e40eb1a87fd60047fa645790e8faa1b51a7cbe07
-DIST sudo-1.8.1p1.tar.gz 1239231 RMD160 5042fd2935bccb67e04c9a97e3a09eb90625a7b0 SHA1 000c156a82216f08db743928a70c0b1990b4b32e SHA256 c6bd76bda54aab022b758e0f321f008403cdaf73621a7f316c22c44e28133e13
+DIST sudo-1.8.1p2.tar.gz 1238804 RMD160 165029d462e737c885b1d32accb9b2b19411a0fb SHA1 b743b3d7bdb06de68ea24eedfe13530e8fbcae09 SHA256 281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb
 EBUILD sudo-1.7.4_p4.ebuild 7209 RMD160 66eab6cd5ccf87e87913bcd52bde8791e316fe82 SHA1 4bfedb8f6a7354f50422cb8b4baaf266699b5b7c SHA256 0ffac351399a497f94ffd4f674dc2fea9e9e6aed80936aea27bc8ff998ca73bb
 EBUILD sudo-1.7.4_p5.ebuild 7208 RMD160 3e8714403edb762e6e31c084001a82fb7160fbf7 SHA1 7a5fa03c5c68ef5ad43dab98ddeb53d43b4cea9a SHA256 5dcdf6cf6e8a73dae5cdd92d2b447dfb9c7e959eab14fc76ca31a3e0f82d3d26
-EBUILD sudo-1.7.6_p1.ebuild 5322 RMD160 005aeb33ab3bfb64b6c2c57f3bf621e564525648 SHA1 a90d441e9eacf37536f26476bb7ac118579c6f29 SHA256 34a02001b158f9cbe6a3d11826c99449e125d48a720fec9e5832e88366f35a02
-EBUILD sudo-1.8.1_p1.ebuild 5034 RMD160 627226ad1e759185b86439b74d8befc86d30bbd4 SHA1 cdfdfdfd812c0d20c57acd13a41fcbd006322a1a SHA256 ca334e646322773c4550d9a810afe1c78c43d24ef232d96e548e3f800b6401f1
-MISC ChangeLog 39581 RMD160 fcebd1a43d04bb046ee48bdcddc3abc5b33c98fa SHA1 b80b621a82a97441847a5e96c3bc2f11ffac5918 SHA256 35d9ae1b0179719556576fd861e743e72b426caebad9ad0682b6565e2de71179
+EBUILD sudo-1.8.1_p2.ebuild 5034 RMD160 aedafcaf3354ab3ab233cceee21c15f6dfa56c87 SHA1 6d0a97895bdbba1bd302773ee0894f25ea299ee3 SHA256 f979b64098d34a7c3e40a65e487eaa796e700017516dba1f555642388bb60849
+MISC ChangeLog 39767 RMD160 c4cc16a75b34b3404767a3d714723e2a79f1887d SHA1 9f484f03950b3299c00008cd19b19e55b7288289 SHA256 f72db0315300dc0684ca9e80c192cd1e62fbd71c23796827434378a152ad9655
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2phNMACgkQAiZjviIA2XhdBgCg5l1BW4FvCHbSm9TU2PJzha9D
-YTcAn0sllPGzTeoojOYYuWoVK07cbAej
-=WskF
+iEYEARECAAYFAk3TIO0ACgkQAiZjviIA2XhFSgCg2sOLHbpFjOHwmbOTZwjxmtXj
+QCUAn03E6Dlpcc7cn6iMgWxqbF9jPlsq
+=C2qp
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.7.6_p1.ebuild b/app-admin/sudo/sudo-1.7.6_p1.ebuild
deleted file mode 100644
index 94e94e7ab5ab..000000000000
--- a/app-admin/sudo/sudo-1.7.6_p1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.6_p1.ebuild,v 1.1 2011/04/16 12:00:38 flameeyes Exp $
-
-EAPI=4
-
-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}
-
-REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
-
-src_prepare() {
-	# compatability fix.
-	epatch "${FILESDIR}"/${PN}-skeychallengeargs.diff
-
-	# prevent binaries from being stripped.
-	sed -i 's/\($(INSTALL).*\) -s \(.*[(sudo|visudo)]\)/\1 \2/g' Makefile.in
-}
-
-src_configure() {
-	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/*'
-		rmpath ROOTPATH '*/gnat-gcc-bin/*'
-		rmpath ROOTPATH '*/gnat-gcc/*'
-
-	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}
-}
-
-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."
-}
diff --git a/app-admin/sudo/sudo-1.8.1_p1.ebuild b/app-admin/sudo/sudo-1.8.1_p2.ebuild
index c9661c116213..61486beabea7 100644
--- a/app-admin/sudo/sudo-1.8.1_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.1_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_p1.ebuild,v 1.1 2011/04/16 12:00:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_p2.ebuild,v 1.1 2011/05/18 01:29:24 flameeyes Exp $
 
 EAPI=4