Add patch to fix a bug slipped by upstream but caught by testsuite; thanks to Brant Gurganus in bug #345767 for reporting and providing a link to the upstream patch.

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

4 files changed, 219 insertions, 6 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 16c036c9943c..106bad5f105d 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.365 2010/11/16 18:13:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.366 2010/11/17 12:12:57 flameeyes Exp $
+
+*openssl-1.0.0b-r1 (17 Nov 2010)
+
+  17 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +openssl-1.0.0b-r1.ebuild, +files/openssl-1.0.0b-rev19998.patch:
+  Add patch to fix a bug slipped by upstream but caught by testsuite; thanks to
+  Brant Gurganus in bug #345767 for reporting and providing a link to the
+  upstream patch.
 
 *openssl-0.9.8p (16 Nov 2010)
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d7aacd6fc994..2c4a39a35365 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX alphacpuid.s 1641 RMD160 d17ba2ec61e0a380e74f554ba58b9cf9c31805c8 SHA1 5fab001dbd6af763a809eff5f68e5e2430059b46 SHA256 f754956f7de5ffa07762ac4b574b29a5de016c181382c233d17ac8009b770be9
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
@@ -13,6 +13,7 @@ AUX openssl-1.0.0a-alpha-mont.patch 2635 RMD160 6559e94693f62cf3c65c4318936566d8
 AUX openssl-1.0.0a-alphacpuid.patch 342 RMD160 98c6ad7e6b643c4adb13dc566a54faa3d0235807 SHA1 0f093ab2015727fe675d971a4ff2a3cdea633590 SHA256 6f9bf3284204c363295e735a8b23752274e5de90229ece8df2595f6651aa6fa1
 AUX openssl-1.0.0a-fix-double-free.patch 252 RMD160 4cf11701c503eb28ce2cea834523b9ec3e38bd4a SHA1 4006be947a41f77c471504d4770dbf8b36b315b8 SHA256 a179daada4021897dc2759e9555b22f5dcb511c1d011bbab8106b35fd2332b96
 AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
+AUX openssl-1.0.0b-rev19998.patch 662 RMD160 9f778f8c90e4d49bf2c8664dac4189a5517c4b4b SHA1 7d244be4e87b1387b0d182bd0d1ed9f6c204bedc SHA256 b0b8cb9b2e312eb305b5de1446416aa5a7a40944aa168aa199cc880ac4ca2730
 DIST openssl-0.9.8o.tar.gz 3772542 RMD160 c2e455a17bce59c8a54522ffaa26c3a5cb26b510 SHA1 80c73afc7dca790cd26936cb392a4dfd14d4e4d7 SHA256 befada1ac3819b1d317df8197b5e82ec768b39d250fcbef81e2b1cb7f165d448
 DIST openssl-0.9.8p.tar.gz 3772501 RMD160 13ec0427100f3d31940fe3725ca7c73163dc9fdd SHA1 4ba43f4110432d7518c4f5d7be79077705ae7f16 SHA256 b2645e2a2af221fa230b5ef6aa2b9388a875801b74cbddbb16be557f80f45242
 DIST openssl-1.0.0a.tar.gz 4015794 RMD160 f46ea1d0875ef523662e652f22faf0f0f261f354 SHA1 b837a9f75a51f456bd533690cf04d3d5714812dc SHA256 18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63
@@ -22,13 +23,14 @@ EBUILD openssl-0.9.8o-r2.ebuild 4332 RMD160 ae5366edaed12cd42859dd8a2e1cf5ce8df4
 EBUILD openssl-0.9.8o.ebuild 5355 RMD160 944bcef12c47a34a29f9d41c071e084daec2e715 SHA1 8984a9f092d75365e9506999edab77a042dbd1d9 SHA256 aafeacde45a423a2ef7a43fff95dcc22776371ca9a5dd475ebf8fdf992d96786
 EBUILD openssl-0.9.8p.ebuild 4267 RMD160 3bea936e621f20f0ecf26ab1e91b49a379464e09 SHA1 1831c7c95840068c0e0f0d5ea37d76d93b62e110 SHA256 565c2d5778fb53d62f98d637349f1e083e27bcba724ebd85a2dd38ffaad85854
 EBUILD openssl-1.0.0a-r3.ebuild 6085 RMD160 5eba02ab11c7cb71aa6d217cc18e4a670ce4d228 SHA1 e8c3c7c333dd52544bea6319356e18eb4a35d6df SHA256 d07612e9146dca0bd15d6773c06587ff92f494072d25cd8420cbb05da5554c0c
+EBUILD openssl-1.0.0b-r1.ebuild 5940 RMD160 6ef5ff8854cb28cfa61a29864bf43a6b78d171a8 SHA1 57343f967884eface2a84d58e41bb5e9ef811b42 SHA256 4b58a3c67af8cfeb0248a8ea2f7d2433908fde2fb64a777d70a433da41a40b69
 EBUILD openssl-1.0.0b.ebuild 5856 RMD160 2219e93857c26e6b5080f2f2e00eb1b1ff5720d4 SHA1 fb3e06053e066602ba5bc1b2bebda0430bada469 SHA256 1557a7e7b54fc946f06805b9616bf1a682390ce4723e929bd77323d910500dfc
-MISC ChangeLog 54958 RMD160 796ae81c85159183b5a95bfd7a8115de4badb889 SHA1 6db30a9fc4896f2b6e0c89315090098454165b43 SHA256 bc81ff865d970c023a6ab7e4d6e44b059b083081445a03cfcfe53dea3784da5b
+MISC ChangeLog 55291 RMD160 1841d79b6e3d80c81ff890d99c826b2bca936f5f SHA1 f7f0efd9bd4cb44879248cb8ee5dd1710299c19e SHA256 19c2c770bd199fca2ec7b55e1b5e66d5030bb4a42a6c991c7fb4388a725c1323
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkziyY8ACgkQTwhj9JtAlp5vjQD7BUGiHenO2854Cjaeito8FFam
-SUJFj+6pREa6AipI7XsBALGVlFH0BgF5mk5Huqjyv4kBRY1AKfvJsp0MCs+9pc4F
-=ganx
+iEYEARECAAYFAkzjxpcACgkQAiZjviIA2XitKQCgshvVcwXT2lqXaKTfXjYbwWyK
+wPAAoO2toP/07c7Oak2AvTfrsuIEp6+S
+=lOfm
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-1.0.0b-rev19998.patch b/dev-libs/openssl/files/openssl-1.0.0b-rev19998.patch
new file mode 100644
index 000000000000..d986ae512f58
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.0b-rev19998.patch
@@ -0,0 +1,16 @@
+Index: openssl/ssl/t1_lib.c
+RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
+rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
+--- t1_lib.c	2010/11/16 13:26:24	1.64.2.15
++++ t1_lib.c	2010/11/16 22:41:07	1.64.2.16
+@@ -779,8 +779,8 @@
+ 				{
+ 				if(s->session->tlsext_ecpointformatlist)
+ 					{
+-					*al = TLS1_AD_DECODE_ERROR;
+-					return 0;
++					OPENSSL_free(s->session->tlsext_ecpointformatlist);
++					s->session->tlsext_ecpointformatlist = NULL;
+ 					}
+ 				s->session->tlsext_ecpointformatlist_length = 0;
+ 				if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
diff --git a/dev-libs/openssl/openssl-1.0.0b-r1.ebuild b/dev-libs/openssl/openssl-1.0.0b-r1.ebuild
new file mode 100644
index 000000000000..ae38d016c0a2
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.0b-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0b-r1.ebuild,v 1.1 2010/11/17 12:12:57 flameeyes Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+REV="1.7"
+DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist gmp kerberos rfc3779 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 ${P}.tar.gz
+	cp "${DISTDIR}"/${PN}-c_rehash.sh.${REV} "${WORKDIR}"/c_rehash || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
+	epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+	epatch "${FILESDIR}"/${PN}-1.0.0b-rev19998.patch # test failure on 1.0.0b-r0
+	epatch_user #332661
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		Makefile{,.org} \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die "cp cross-compile failed"
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags -Wa,--noexecstack
+
+	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+	./config --test-sanity || die "I AM NOT SANE"
+}
+
+src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+
+	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 07/01/2012    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 gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl zlib) \
+		--prefix=/usr \
+		--openssldir=/etc/ssl \
+		--libdir=$(get_libdir) \
+		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
+}
+
+src_compile() {
+	# 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() {
+	emake -j1 test || die "make test failed"
+}
+
+src_install() {
+	emake -j1 INSTALL_PREFIX="${D}" install || die
+	dobin "${WORKDIR}"/c_rehash || die #333117
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+	dohtml -r 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}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${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 :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir /etc/ssl/private
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${ROOT}etc/ssl/certs/' to rebuild hashes #333069"
+	c_rehash "${ROOT}etc/ssl/certs" >/dev/null
+	eend $?
+
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}