security cleanup, bug #140514.

(Portage version: 2.1.1_rc1-r1)
 (Signed Manifest commit)

3 files changed, 8 insertions, 249 deletions

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 204ec1fc95b6..ea5aeeadf122 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -53,15 +53,10 @@ AUX saslauthd2.rc6 527 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 SHA1 eeea
 MD5 5d79108b7b67bd3af315e3142023fef5 files/saslauthd2.rc6 527
 RMD160 d7862bf389349b6cf9248f8dc7ed69fb0a7f5ca8 files/saslauthd2.rc6 527
 SHA256 55e59c02dcfeab84b777b9a4f1d1bb79645aab43538e1ba593c61dcb82a9e1f7 files/saslauthd2.rc6 527
-DIST cyrus-sasl-2.1.20.tar.gz 1775163 RMD160 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c SHA256 f0b97118e3e014a185c17777672a93300ca561cf5f2beeac2d4aa6abec09534d
 DIST cyrus-sasl-2.1.21-ntlm_impl-spnego.patch.gz 7465 RMD160 acf1d479c4559acdda66ab66da999ffc2f68d029 SHA1 46cc3664004bb33bf9a5642e47e401e43555fb46 SHA256 b02b97bbc3968248c4f04d3d67a9aac4baa4aa4f8388eefec548475784a2d968
 DIST cyrus-sasl-2.1.21.tar.gz 1584931 RMD160 93e0e1868453c5781602b5cce23e746b8823a26b SHA1 6449f730c963d29d43600a95373a6e2db52d6d66 SHA256 fa37bcc8b855597aa1e6b72915b38985991b4abd4e7bc116c3e88fd4e86fb0fb
 DIST cyrus-sasl-2.1.22-ntlm_impl-spnego.patch.gz 7466 RMD160 70e498d2ca27289bd729563793dcdabe650ffac4 SHA1 2f944004dbd828ca9bbd53bc7619d79c8b8714ab SHA256 a696dddc27d46ab1950b546fcf49efc1a03a8380ecc4537d085d8daacb88ccf0
 DIST cyrus-sasl-2.1.22.tar.gz 1609278 RMD160 086e20d01588cb86decad001244b72a37223354c SHA1 d23454ab12054714ab97d229c86cb934ce63fbb1 SHA256 c69e3853f35b14ee2c3f6e876e42d880927258ff4678aa052e5f0853db209962
-EBUILD cyrus-sasl-2.1.20.ebuild 7352 RMD160 f413208cc4849a826a4d6a62868918c2a83c13b7 SHA1 1ee100ed13d5985bc58309988e582d5c254b8eee SHA256 3c9b3b3d83c0d590b8841fe66dcef8e5b7ae2cbab119a1b8c1445f754b721973
-MD5 97de45d37a62d1c1e7e52740007637b7 cyrus-sasl-2.1.20.ebuild 7352
-RMD160 f413208cc4849a826a4d6a62868918c2a83c13b7 cyrus-sasl-2.1.20.ebuild 7352
-SHA256 3c9b3b3d83c0d590b8841fe66dcef8e5b7ae2cbab119a1b8c1445f754b721973 cyrus-sasl-2.1.20.ebuild 7352
 EBUILD cyrus-sasl-2.1.21-r2.ebuild 9281 RMD160 68d8ae4ac6a3358a4a74a50b811e07547e9fceae SHA1 8718af5779a0f9733df424fb4b795af1b85290cd SHA256 cc5caec0f547c03b8b5143a43c1d4288f4ee60b1c45d1a71dce2872700c94252
 MD5 b06ccf8a3b8cb647e91f14babcd0a61d cyrus-sasl-2.1.21-r2.ebuild 9281
 RMD160 68d8ae4ac6a3358a4a74a50b811e07547e9fceae cyrus-sasl-2.1.21-r2.ebuild 9281
@@ -74,17 +69,14 @@ EBUILD cyrus-sasl-2.1.22.ebuild 9527 RMD160 8cd73372b71d26628336d1ebac2b4d552782
 MD5 4fd0780f9ca4f2fbc136acbc9b4cd4e7 cyrus-sasl-2.1.22.ebuild 9527
 RMD160 8cd73372b71d26628336d1ebac2b4d55278222dc cyrus-sasl-2.1.22.ebuild 9527
 SHA256 34fbb78f84e1c14ebf38e31003c456ca256e50baa0b90bd9cd141d33a6c465da cyrus-sasl-2.1.22.ebuild 9527
-MISC ChangeLog 27236 RMD160 6896fc87bb2ad210bd755ca3369c840625825cf3 SHA1 8eb9f0550d762d1231d83c20f0090a02beeaacb1 SHA256 08e8222aa5464a1846baabd25df2a5ea7eb949fe1266eaf7bdf58566150ff9aa
-MD5 67a3a18e370b1c89dd0d1d49f50f05f8 ChangeLog 27236
-RMD160 6896fc87bb2ad210bd755ca3369c840625825cf3 ChangeLog 27236
-SHA256 08e8222aa5464a1846baabd25df2a5ea7eb949fe1266eaf7bdf58566150ff9aa ChangeLog 27236
+MISC ChangeLog 27350 RMD160 db6362f1016d044d2a7bba3262cb212e4470f517 SHA1 1341189af3c7bc6a94a3c1b0a2aabaf0cef9029e SHA256 c685b736666896c1b6eaef074fbb808a31b48e50ba1859d8f81bfd6018da36d1
+MD5 6acf67344b68488205685cd03cb30ac6 ChangeLog 27350
+RMD160 db6362f1016d044d2a7bba3262cb212e4470f517 ChangeLog 27350
+SHA256 c685b736666896c1b6eaef074fbb808a31b48e50ba1859d8f81bfd6018da36d1 ChangeLog 27350
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 395f130dc8a34f1b77ab6c371980825e files/digest-cyrus-sasl-2.1.20 256
-RMD160 8851e2882852ed4389d1f1e6d2bfe01c973c84fc files/digest-cyrus-sasl-2.1.20 256
-SHA256 5e117803c82ca33b50a8c87db9a761e762662fe0c75ac28ed93855fc88901f72 files/digest-cyrus-sasl-2.1.20 256
 MD5 f834cac9cb71cbdb5f80b22f6f79d1d3 files/digest-cyrus-sasl-2.1.21-r2 560
 RMD160 dfa902833d1cefe847969ccef5b54be841b96bc5 files/digest-cyrus-sasl-2.1.21-r2 560
 SHA256 b32d41e1a514f5363d5747eedf3f52e1a01e44ec21faf8f885fa752ffb2193a4 files/digest-cyrus-sasl-2.1.21-r2 560
@@ -95,9 +87,9 @@ MD5 867cdff3326eba0a057e9f78e16f9de1 files/digest-cyrus-sasl-2.1.22 560
 RMD160 70eac19a0f9ef23cfefcd6061eb588cab116b3d1 files/digest-cyrus-sasl-2.1.22 560
 SHA256 69ae66e16518d7fa10bfda885a7994bdedea8a317b51cf7e27bb6d823f332cbb files/digest-cyrus-sasl-2.1.22 560
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/xQa2ZWR0Jhg/EsRAtwGAJ97Un9PBEHkV/elaF9/syqLUlGgNACdEfC4
-x5OymNcThy0ZBZZ7pig3fgQ=
-=Pj+/
+iD8DBQFFBYh/5FrxP71izLARAlPjAKDKW0GemHJ7KAVBCTsfikBDFu9KJwCeKYgq
+n6ryzYLuySB0KFktMlzZK2M=
+=3R/2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
deleted file mode 100644
index 555720c8947b..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.16 2005/10/02 11:38:04 matsuu Exp $
-
-inherit eutils gnuconfig flag-o-matic java-pkg
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 sh ppc64"
-IUSE="berkdb gdbm ldap mysql postgres kerberos static ssl java pam authdaemond"
-
-RDEPEND="virtual/libc
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	kerberos? ( virtual/krb5 )
-	authdaemond? (
-		|| (
-			>=net-mail/courier-imap-3.0.7
-			>=mail-mta/courier-0.46
-		)
-	)
-	java? ( virtual/jdk )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	sys-devel/libtool"
-
-pkg_setup() {
-	if use gdbm && use berkdb; then
-		echo
-		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
-		ewarn "Will default to GNU DB as your SASLdb database backend."
-		ewarn "If you want to build with Berkeley DB support; hit Control-C now."
-		ewarn "Change your USE flag -gdbm and emerge again."
-		echo
-		has_version ">=sys-apps/portage-2.0.50" && (
-		einfo "It would be best practice to add the set of USE flags that you use for this"
-		einfo "package to the file: /etc/portage/package.use. Example:"
-		einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`"
-		einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend."
-		)
-		echo
-		ewarn "Waiting 10 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 10
-	fi
-
-	echo
-	einfo "This version include a "-r" option for saslauthd to instruct it to reassemble"
-	einfo "realm and username into a username of "user@realm" form."
-	echo
-	einfo "If you are still using postfix->sasl->saslauthd->pam->mysql for"
-	einfo "authentication, please edit /etc/conf.d/saslauthd to read:"
-	einfo "SASLAUTHD_OPTS=\"\${SASLAUTH_MECH} -a pam -r\""
-	einfo "Don't forget to restart the service: \`/etc/init.d/saslauthd restart\`."
-	echo
-	einfo "Pause 10 seconds before continuing."
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-
-	# Fix default port name for rimap auth mechanism.
-	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
-		-i saslauthd/auth_rimap.c || die "sed failed"
-
-	# DB4 detection and versioned symbols.
-	# Fixed upstream.
-	# epatch "${FILESDIR}/cyrus-sasl-2.1.18-db4.patch"
-
-	# Add configdir support.
-	epatch "${FILESDIR}/${P}-configdir.patch"
-
-	# Fix include path for newer PostgreSQL versions.
-	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
-
-	# Add setuid/setgid check for SASL_PATH
-	# Fixed upstream.
-	# epatch "${FILESDIR}/${P}-sasl-path-fix.patch"
-
-	# Fix for gcc-4.0
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-
-	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache
-	ebegin "Recreating configure"
-	aclocal -I cmulocal -I config && autoheader && autoconf || \
-		die "recreate configure failed"
-	eend $?
-
-}
-
-src_compile() {
-	local myconf="--enable-login --enable-ntlm --disable-krb4 --disable-otp"
-	myconf="${myconf} `use_enable static`"
-	myconf="${myconf} `use_with ssl openssl`"
-	myconf="${myconf} `use_with pam`"
-	myconf="${myconf} `use_with ldap`"
-	myconf="${myconf} `use_enable kerberos gssapi`"
-	myconf="${myconf} `use_with mysql` `use_enable mysql`"
-	myconf="${myconf} `use_with postgres pgsql` `use_enable postgres`"
-	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
-	# bug #56523. add authdaemond support.
-	myconf="${myconf} `use_with authdaemond`"
-
-	# fix for bug #59634. langthang 20040810.
-	if ! use ssl; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# default to GDBM if both 'gdbm' and 'berkdb' present.
-	if use gdbm; then
-		einfo "build with GNU DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "build with Berkeley DB as database backend for your SASLdb."
-		myconf="${myconf} --with-dblib=berkeley"
-	else
-		einfo "build without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Detect mips systems properly.
-	gnuconfig_update
-
-	econf \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/lib/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		${myconf} || die "econf failed"
-
-	# Parallel build doesn't work.
-	# Parallel build doesn't like distcc?
-	if has distcc $FEATURES || has ccache $FEATURES; then
-		einfo "You have \"distcc\" enabled"
-		einfo "build with MAKEOPTS=-j1"
-		emake -j1 || die "compile problem"
-	else
-		einfo "build with MAKEOPTS=$MAKEOPTS"
-		emake || die "compile problem"
-	fi
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Bug #58768. Add testsaslauthd.
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "failed to make"
-}
-
-src_install () {
-	#einstall
-	make DESTDIR=${D} install || die "failed to install."
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Bug #60769. Default location for java classes breaks OpenOffice.
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		#hackish, don't wanna dig though makefile
-		rm -rf ${D}/usr/lib/java
-		docinto java
-		dodoc ${S}/java/README ${FILESDIR}/java.README.gentoo ${S}/java/doc/*
-		mkdir ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to create ${D}/usr/share/doc/${PF}/java/Test/"
-		cp ${S}/java/Test/*.java ${D}/usr/share/doc/${PF}/java/Test/ \
-			|| die "failed to copy java files to ${D}/usr/share/doc/${PF}/java/Test/"
-	fi
-
-	# Generate an empty sasldb2 with correct permissions.
-	LD_OLD="${LD_LIBRARY_PATH}"
-	export LD_LIBRARY_PATH="${D}/usr/lib" SASL_PATH="${D}/usr/lib/sasl2"
-	echo "p" | "${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -p login
-	"${D}/usr/sbin/saslpasswd2" -f "${D}/etc/sasl2/sasldb2" -d login
-	export LD_LIBRARY_PATH="${LD_OLD}"
-	chown root:mail "${D}/etc/sasl2/sasldb2"
-	chmod 0640 "${D}/etc/sasl2/sasldb2"
-
-	docinto ""
-	dodoc AUTHORS COPYING ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto examples
-	dodoc sample/{*.[ch],Makefile}
-
-	docinto saslauthd
-	dodoc saslauthd/{AUTHORS,COPYING,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/saslauthd.pam" saslauthd
-	fi
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/pwcheck.rc6" pwcheck || \
-		die "failed to \"newexe\" pwdcheck to /etc/init.d"
-	newexe "${FILESDIR}/saslauthd2.rc6" saslauthd || \
-		die "failed to \"newexe\" saslauthd to /etc/init.d"
-	insinto /etc/conf.d
-	newins "${FILESDIR}/saslauthd-${PV}.conf" saslauthd || \
-		die "failed to install /etc/conf/saslauthd."
-	exeinto ${ROOT}/usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || \
-		die "failed to install testsaslauthd."
-}
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20
deleted file mode 100644
index d7812557f204..000000000000
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz 1775163
-RMD160 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c cyrus-sasl-2.1.20.tar.gz 1775163
-SHA256 f0b97118e3e014a185c17777672a93300ca561cf5f2beeac2d4aa6abec09534d cyrus-sasl-2.1.20.tar.gz 1775163