Bump, bug 254183 and CVE-2008-5077, bug 251346. Parallel build fails horribly, forcing -j1. Since we don't install fips, sedded that part out of the root makefile to get around a build failure.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 225 insertions, 13 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index f4e8ca7827a8..a9ace6017e8c 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/openssl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.275 2008/10/03 10:02:24 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.276 2009/01/08 11:46:12 loki_val Exp $
+
+*openssl-0.9.8j (08 Jan 2009)
+
+  08 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/openssl-0.9.8j-parallel-build.patch, +openssl-0.9.8j.ebuild:
+  Bump, bug 254183 and CVE-2008-5077, bug 251346. Parallel build fails
+  horribly, forcing -j1. Since we don't install fips, sedded that part out
+  of the root makefile to get around a build failure.
 
   03 Oct 2008; Raúl Porcel <armin76@gentoo.org> openssl-0.9.8h-r1.ebuild:
   alpha/ia64/x86 stable wrt #239301
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 0ae6fc7daa9b..940fd11cee28 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gentoo.config-0.9.8 3157 RMD160 794fbfe1b01dff11a2722148e62274f38a242ef5 SHA1 fe9ee8b36dab783201a75d853f15dba6758787b6 SHA256 d34e75afa3e3661d29f8a7b0af8e7e47d39c7ba5db3b0e9cc48d6e41c58e94ed
 AUX openssl-0.9.7-alpha-default-gcc.patch 533 RMD160 ea2d91421aa4d3f463034b40c2c81c195a71c0dd SHA1 f5ee85db45ab80b66225a222c7655b74760b94fe SHA256 814ae7c09359414e7dcd96008c82d868fba0565de2d1b3e6a4275f8cdbeefb5c
 AUX openssl-0.9.7e-gentoo.patch 460 RMD160 60969fd05a15fe00d0d1c27b9098acfde28ba65e SHA1 73ff3c336dfdbeed903ac7b82486674ab4ec66a2 SHA256 ddb8d47429f3aadf3f5142293a2c38cbb9eb3927edfd1b497771337c48a11641
@@ -23,23 +20,19 @@ AUX openssl-0.9.8g-CVE-2008-1672.patch 836 RMD160 16faf7fc779ad4565cf110dafac113
 AUX openssl-0.9.8g-sslv3-no-tlsext.patch 848 RMD160 37bad7b70fd0bdae91fffe337dcbe820b371a163 SHA1 32043ee7841bd95bc647efa8fd7ecb5dcc2fa223 SHA256 d61299ab9b5f96f37979d60ea8e65430c59ef3242627de50be8e2fc87c8753be
 AUX openssl-0.9.8h-ldflags.patch 992 RMD160 3350aaa026419281ac8178cdd59db5d19fa7f4c0 SHA1 0da211ea01216c5a61d32d33be40090ca4e54c71 SHA256 a664f2291e97ce4cf043a63349bcb0c2c89c0d288b7edea0ccfa323b21a9268a
 AUX openssl-0.9.8h-pkcs12.patch 732 RMD160 8afbc53985088fbed3d7608deba95d85716df967 SHA1 9ee10f75616d6e556fa419db491cef9866940cd6 SHA256 6de724cbe0ea6adf72401eb93e47e56a00e193687f46a810702180cbf61e43a6
+AUX openssl-0.9.8j-parallel-build.patch 812 RMD160 f6b6d64d23a6fb3ef8d8d21bc67e22867d248763 SHA1 35e05b75ff4367858d471aee692c541536623027 SHA256 9684c3008e1b3bc378f89e3700d9ca4436696c9ecedc8bb865253cd15ce85619
 DIST openssl-0.9.8e.tar.gz 3341665 RMD160 c1a498606dc0fc7219376b950fab6b53687466db SHA1 b429872d2a287714ab37e42296e6a5fbe23d32ff SHA256 414e8428b95fbc51707965fda31390497d058290356426bfe084b49464a60340
 DIST openssl-0.9.8f.tar.gz 3357445 RMD160 ad0d9d8b238dbede1aa6b76256d11038bd281e05 SHA1 e8716370093b112763ace0c66c06a0d6049e413b SHA256 be5afd386f5d7acff019acaf46cdaad89a8b42cc9cee85d1adb2774627f32b42
 DIST openssl-0.9.8g.tar.gz 3354792 RMD160 f080a32da9becdc8b98c38744d62c6fd8664f603 SHA1 4e9c5ced466715d18fd924de79bde5c15da80fa1 SHA256 0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0
 DIST openssl-0.9.8h.tar.gz 3439981 RMD160 676337da20c3fc3fc4001a79c6d28589cba719cd SHA1 ced4f2da24a202e01ea22bef30ebc8aee274de86 SHA256 224e1ca3aeeda8acc72e5c48b34843904b9d585aaadb4d5a15524c25f6c6a1ce
 DIST openssl-0.9.8i.tar.gz 3459643 RMD160 596d767345d7c74b39c48f9b725c2c9d2641d7e4 SHA1 b2e029cfb68bf32eae997d60317a40945db5a65f SHA256 e8fc5fcfb715ffe925b2982aa9ca287832a93495d7fff03f17f6449f0732718c
+DIST openssl-0.9.8j.tar.gz 3738359 RMD160 d60417e0fd943fbffc6dae8391a21dcf5d97e967 SHA1 f70f7127a26e951e8a0d854c0c9e6b4c24df78e4 SHA256 7131242042dbd631fbd83436f42aea1775e7c32f587fa4ada5a01df4c3ae8e8b
 EBUILD openssl-0.9.8e-r3.ebuild 5832 RMD160 ca8af0f3e4a375e49c217858798a7f88e3bc7cfb SHA1 215342689ba7e709e803973b89aaa290abbf8605 SHA256 5f816d62ebf69d57e5d048071d3e8a3bbd1135fdf21068ccd7a595c6f98a4b01
 EBUILD openssl-0.9.8e-r4.ebuild 6557 RMD160 ad9946a39fd4beb295b35a4b10bfc06fc0c77099 SHA1 e62202b0ec42ce354413fbf486870bdf6df95867 SHA256 c6a8090276ba069dc50cb21fe07437166f0cd1d456e8d9fd20e82bc732ec3559
 EBUILD openssl-0.9.8f.ebuild 6215 RMD160 7af3dc8ed2b30206ff44e8d80af0c585cc7cea51 SHA1 12dc43a8baf204c3ac724344652c95ce0f8f4bed SHA256 4ffbdf05b8ea00618d3868a8a265220ff25bb5b1d8d58b150b3b6a5868e03fca
 EBUILD openssl-0.9.8g-r2.ebuild 6189 RMD160 f4ce4514b7e6636d23d9897742527c000203a382 SHA1 4bab53bfcff3037f7e5452cd3da2a4c325cda393 SHA256 d390551e94446b906f4d065b6708efc17069f8ef6a2d011257b92e0cdaf1e4bf
 EBUILD openssl-0.9.8h-r1.ebuild 6174 RMD160 7e21270ab2d6d5f749ee09823f35a8bc516e73d8 SHA1 a88647a7bd84b0d4f3ee3c71b637072504904132 SHA256 f6c272040cdddacb0e2f1ca0d73ae0b94b53831b8d3c98e294c4c30cb925b235
 EBUILD openssl-0.9.8i.ebuild 6127 RMD160 791c036f860f91ea655c57dc01b36ae7ec4338fc SHA1 83efa8185a5ecf7e19e511fde0d8854bb7a045a3 SHA256 f88f05a1f4f1fb853d24d4f59f09cf4768a284c7615ab11144e27ed2cc0bb5e0
-MISC ChangeLog 41073 RMD160 65ce31d129e2862cb84f26a1ec5192ccc2c09e6f SHA1 443966f6dce554baa3a79b5e57ac5a80dcdb5e11 SHA256 29ffc9eea007068fc4825e242348cd1088848b4d66430f6d90c7f91e79633231
+EBUILD openssl-0.9.8j.ebuild 6290 RMD160 57fa97169571b3af226bfbb4163dab5e708a07c0 SHA1 7ed835e4f6b2dd9d6837288fd8f4b7562b585df5 SHA256 1ecc6c5768374f028361b71f85a8f2b17bdef805b1405b6ee2069cfeb8ee8ef8
+MISC ChangeLog 41429 RMD160 4b4ba71aecaa3761f8cb247eac62c9fd4031bc56 SHA1 b33a3b8cf2043f4be02d0baa9f51f8b09d15034c SHA256 0490870167d889ccc3235a5c8bbbcb634147881c522b2e4c01301e5ef45578c9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklUUpAACgkQn/5bYzqsSmHFJgCgo0v4sEfyYL3cwDVe3a2hItVU
-1mMAoKllDyGAPPx0q6UxKf9oYIe4k8xY
-=xcQ3
------END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-0.9.8j-parallel-build.patch b/dev-libs/openssl/files/openssl-0.9.8j-parallel-build.patch
new file mode 100644
index 000000000000..eace0f491b60
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.8j-parallel-build.patch
@@ -0,0 +1,24 @@
+diff -uNr openssl-0.9.8j.ORIG/Makefile.org openssl-0.9.8j/Makefile.org
+--- openssl-0.9.8j.ORIG/Makefile.org	2009-01-07 18:06:31.000000000 +0000
++++ openssl-0.9.8j/Makefile.org	2009-01-07 18:08:38.000000000 +0000
+@@ -333,15 +333,15 @@
+ 		dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_fips:
+ 	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(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/openssl-0.9.8j.ebuild b/dev-libs/openssl/openssl-0.9.8j.ebuild
new file mode 100644
index 000000000000..18c65702161f
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8j.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8j.ebuild,v 1.1 2009/01/08 11:46:12 loki_val 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
+	#Forward port of the -b patch. Parallel make fails though.
+	epatch "${FILESDIR}"/${PN}-0.9.8j-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
+	sed -i -e '/DIRS/ s/ fips / /g' Makefile{,.org} \
+		|| die "Removing fips from openssl failed."
+
+	# 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 -j1 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
+}