Punt old packages vuln to GLSA 200902-02 #271772 by Robert Buchholz.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 6 insertions, 414 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index a70282567ce6..ea21501346e0 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.290 2009/05/29 21:33:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.291 2009/05/29 23:32:49 vapier Exp $
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/openssl-0.9.8b-parallel-build.patch, -openssl-0.9.8h-r1.ebuild,
+  -files/openssl-0.9.8h-pkcs12.patch, -openssl-0.9.8i.ebuild:
+  Punt old packages vuln to GLSA 200902-02 #271772 by Robert Buchholz.
 
 *openssl-0.9.8k-r1 (29 May 2009)
 
diff --git a/dev-libs/openssl/files/openssl-0.9.8b-parallel-build.patch b/dev-libs/openssl/files/openssl-0.9.8b-parallel-build.patch
deleted file mode 100644
index 64cc8ef1493b..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.8b-parallel-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- openssl-0.9.8b/Makefile.org
-+++ openssl-0.9.8b/Makefile.org
-@@ -229,15 +229,15 @@
- 
- build_crypto:
- 	@dir=crypto; target=all; $(BUILD_ONE_CMD)
--build_ssl:
-+build_ssl: build_crypto
- 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
--build_engines:
-+build_engines: build_crypto
- 	@dir=engines; target=all; $(BUILD_ONE_CMD)
--build_apps:
-+build_apps: build_libs
- 	@dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests:
-+build_tests: build_libs
- 	@dir=test; target=all; $(BUILD_ONE_CMD)
--build_tools:
-+build_tools: build_libs
- 	@dir=tools; target=all; $(BUILD_ONE_CMD)
- 
- all_testapps: build_libs build_testapps
diff --git a/dev-libs/openssl/files/openssl-0.9.8h-pkcs12.patch b/dev-libs/openssl/files/openssl-0.9.8h-pkcs12.patch
deleted file mode 100644
index bec63f1da33a..000000000000
--- a/dev-libs/openssl/files/openssl-0.9.8h-pkcs12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-fix from upstream
-
-http://bugs.gentoo.org/224843
-
-Index: crypto/x509/x509_att.c
-===================================================================
-RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/x509/x509_att.c,v
-retrieving revision 1.8.2.2
-retrieving revision 1.8.2.3
-diff -u -p -r1.8.2.2 -r1.8.2.3
---- crypto/x509/x509_att.c	2 Apr 2008 11:11:51 -0000	1.8.2.2
-+++ crypto/x509/x509_att.c	30 May 2008 10:57:13 -0000	1.8.2.3
-@@ -303,7 +303,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIB
- 	}
- 	if(!(attr->value.set = sk_ASN1_TYPE_new_null())) goto err;
- 	if(!(ttmp = ASN1_TYPE_new())) goto err;
--	if (len == -1)
-+	if ((len == -1) && !(attrtype & MBSTRING_FLAG))
- 		{
- 		if (!ASN1_TYPE_set1(ttmp, attrtype, data))
- 			goto err;
diff --git a/dev-libs/openssl/openssl-0.9.8h-r1.ebuild b/dev-libs/openssl/openssl-0.9.8h-r1.ebuild
deleted file mode 100644
index 53c536e618bd..000000000000
--- a/dev-libs/openssl/openssl-0.9.8h-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8h-r1.ebuild,v 1.8 2008/10/09 05:36:54 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="-* alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bindist gmp kerberos sse2 test zlib"
-
-RDEPEND="gmp? ( dev-libs/gmp )
-	zlib? ( sys-libs/zlib )
-	kerberos? ( app-crypt/mit-krb5 )"
-DEPEND="${RDEPEND}
-	sys-apps/diffutils
-	>=dev-lang/perl-5
-	test? ( sys-devel/bc )"
-PDEPEND="app-misc/ca-certificates"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8b-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8-toolchain.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8-makedepend.patch #149583
-	epatch "${FILESDIR}"/${PN}-0.9.8e-make.patch #146316
-	#epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8g-sslv3-no-tlsext.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
-	epatch "${FILESDIR}"/${PN}-0.9.8h-pkcs12.patch #224843
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
-	chmod a+rx gentoo.config
-
-	# Don't build manpages if we don't want them
-	has noman FEATURES \
-		&& sed -i '/^install:/s:install_docs::' Makefile.org \
-		|| sed -i '/^MANDIR=/s:=.*:=/usr/share/man:' Makefile.org
-
-	# Try to derice users and work around broken ass toolchains
-	if [[ $(gcc-major-version) == "3" ]] ; then
-		filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops
-		[[ $(tc-arch) == "ppc64" ]] && replace-flags -O? -O
-	fi
-	[[ $(tc-arch) == ppc* ]] && append-flags -fno-strict-aliasing
-	append-flags -Wa,--noexecstack
-
-	# using a library directory other than lib requires some magic
-	sed -i \
-		-e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \
-		-e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \
-		Makefile.org engines/Makefile \
-		|| die "sed failed"
-	./config --test-sanity || die "I AM NOT SANE"
-}
-
-src_compile() {
-	unset APPS #197996
-
-	tc-export CC AR RANLIB
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     5,214,703 25/05/2010    http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		$(use_ssl !bindist idea) \
-		enable-mdc2 \
-		$(use_ssl !bindist rc5) \
-		enable-tlsext \
-		$(use_ssl gmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl zlib) \
-		$(use_ssl zlib zlib-dynamic) \
-		--prefix=/usr \
-		--openssldir=/etc/ssl \
-		shared threads \
-		|| die "Configure failed"
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-		-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
-		Makefile || die
-
-	# depend is needed to use $confopts
-	# rehash is needed to prep the certs/ dir
-	emake -j1 depend || die "depend failed"
-	emake all rehash || die "make all failed"
-}
-
-src_test() {
-	# make sure sandbox doesnt die on *BSD
-	addpredict /dev/crypto
-
-	emake -j1 test || die "make test failed"
-}
-
-src_install() {
-	emake -j1 INSTALL_PREFIX="${D}" install || die
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml doc/*
-
-	# create the certs directory
-	dodir /etc/ssl/certs
-	cp -RP certs/* "${D}"/etc/ssl/certs/ || die "failed to install certs"
-	rm -r "${D}"/etc/ssl/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${D}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	diropts -m0700
-	keepdir /etc/ssl/private
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7}
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7}
-
-	if [[ ${CHOST} == i686* ]] ; then
-		ewarn "Due to the way openssl is architected, you cannot"
-		ewarn "switch between optimized versions without breaking"
-		ewarn "ABI.  The default i686 0.9.8 ABI was an unoptimized"
-		ewarn "version with horrible performance.  This version uses"
-		ewarn "the optimized ABI.  If you experience segfaults when"
-		ewarn "using ssl apps (like openssh), just re-emerge the"
-		ewarn "offending package."
-	fi
-}
diff --git a/dev-libs/openssl/openssl-0.9.8i.ebuild b/dev-libs/openssl/openssl-0.9.8i.ebuild
deleted file mode 100644
index 816aa01505a7..000000000000
--- a/dev-libs/openssl/openssl-0.9.8i.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8i.ebuild,v 1.1 2008/10/02 04:35:40 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bindist gmp kerberos sse2 test zlib"
-
-RDEPEND="gmp? ( dev-libs/gmp )
-	zlib? ( sys-libs/zlib )
-	kerberos? ( app-crypt/mit-krb5 )"
-DEPEND="${RDEPEND}
-	sys-apps/diffutils
-	>=dev-lang/perl-5
-	test? ( sys-devel/bc )"
-PDEPEND="app-misc/ca-certificates"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8b-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8-toolchain.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8-makedepend.patch #149583
-	epatch "${FILESDIR}"/${PN}-0.9.8e-make.patch #146316
-	#epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8g-sslv3-no-tlsext.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
-	chmod a+rx gentoo.config
-
-	# Don't build manpages if we don't want them
-	has noman FEATURES \
-		&& sed -i '/^install:/s:install_docs::' Makefile.org \
-		|| sed -i '/^MANDIR=/s:=.*:=/usr/share/man:' Makefile.org
-
-	# Try to derice users and work around broken ass toolchains
-	if [[ $(gcc-major-version) == "3" ]] ; then
-		filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops
-		[[ $(tc-arch) == "ppc64" ]] && replace-flags -O? -O
-	fi
-	[[ $(tc-arch) == ppc* ]] && append-flags -fno-strict-aliasing
-	append-flags -Wa,--noexecstack
-
-	# using a library directory other than lib requires some magic
-	sed -i \
-		-e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \
-		-e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \
-		Makefile.org engines/Makefile \
-		|| die "sed failed"
-	./config --test-sanity || die "I AM NOT SANE"
-}
-
-src_compile() {
-	unset APPS #197996
-
-	tc-export CC AR RANLIB
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     5,214,703 25/05/2010    http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		$(use_ssl !bindist idea) \
-		enable-mdc2 \
-		$(use_ssl !bindist rc5) \
-		enable-tlsext \
-		$(use_ssl gmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl zlib) \
-		$(use_ssl zlib zlib-dynamic) \
-		--prefix=/usr \
-		--openssldir=/etc/ssl \
-		shared threads \
-		|| die "Configure failed"
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-		-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
-		Makefile || die
-
-	# depend is needed to use $confopts
-	# rehash is needed to prep the certs/ dir
-	emake -j1 depend || die "depend failed"
-	emake all rehash || die "make all failed"
-}
-
-src_test() {
-	# make sure sandbox doesnt die on *BSD
-	addpredict /dev/crypto
-
-	emake -j1 test || die "make test failed"
-}
-
-src_install() {
-	emake -j1 INSTALL_PREFIX="${D}" install || die
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
-	dohtml doc/*
-
-	# create the certs directory
-	dodir /etc/ssl/certs
-	cp -RP certs/* "${D}"/etc/ssl/certs/ || die "failed to install certs"
-	rm -r "${D}"/etc/ssl/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${D}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	diropts -m0700
-	keepdir /etc/ssl/private
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7}
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7}
-
-	if [[ ${CHOST} == i686* ]] ; then
-		ewarn "Due to the way openssl is architected, you cannot"
-		ewarn "switch between optimized versions without breaking"
-		ewarn "ABI.  The default i686 0.9.8 ABI was an unoptimized"
-		ewarn "version with horrible performance.  This version uses"
-		ewarn "the optimized ABI.  If you experience segfaults when"
-		ewarn "using ssl apps (like openssh), just re-emerge the"
-		ewarn "offending package."
-	fi
-}