Version bump. Enable tlsext #196191 by Hanno Boeck. Fix double test running #196149 by Dustin Surawicz.

Package-Manager: portage-2.1.3.15

4 files changed, 212 insertions, 5 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 642f003f2e35..f545c7aca343 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.243 2007/10/16 16:51:23 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.244 2007/10/20 04:21:16 vapier Exp $
+
+*openssl-0.9.8g (20 Oct 2007)
+
+  20 Oct 2007; <vapier@gentoo.org> +openssl-0.9.8g.ebuild:
+  Version bump. Enable tlsext #196191 by Hanno Boeck. Fix double test running
+  #196149 by Dustin Surawicz.
 
   16 Oct 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   openssl-0.9.8f.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index ba0fda885f0c..8058fe44cc67 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -68,6 +68,7 @@ RMD160 ab3136992eb4028bff06bbc35322a1c2621485e8 files/openssl-0.9.8f-fix-version
 SHA256 73d9952fc7032099a03b3b7fa143229646ae6e52394b4facd043afbce65658f1 files/openssl-0.9.8f-fix-version.patch 445
 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
 EBUILD openssl-0.9.8e-r3.ebuild 5834 RMD160 61635cc5dcc3bad24f8a0034bd23bed23b1bd82b SHA1 9d5ff9a41e77e0dfd960d43abe0e37b01a0f7e00 SHA256 6be488a5e215a94656cbc5f9fb20edd04155a3525be1437ac9ae296bd9adaaf2
 MD5 1f10e5732a438786090c065079d8febf openssl-0.9.8e-r3.ebuild 5834
 RMD160 61635cc5dcc3bad24f8a0034bd23bed23b1bd82b openssl-0.9.8e-r3.ebuild 5834
@@ -80,10 +81,14 @@ EBUILD openssl-0.9.8f.ebuild 6215 RMD160 7af3dc8ed2b30206ff44e8d80af0c585cc7cea5
 MD5 ef83ebb885a3cb3ef504d4415849043c openssl-0.9.8f.ebuild 6215
 RMD160 7af3dc8ed2b30206ff44e8d80af0c585cc7cea51 openssl-0.9.8f.ebuild 6215
 SHA256 4ffbdf05b8ea00618d3868a8a265220ff25bb5b1d8d58b150b3b6a5868e03fca openssl-0.9.8f.ebuild 6215
-MISC ChangeLog 36613 RMD160 064379bcba5eb3e71caf030e306b7656932d6618 SHA1 ff94d075607981221e2a4c0f1151404ff2a7b22c SHA256 49c3383fe663b37570005507ec1fe87f226d83a7f4c1ee28fefa1a2cc718a3ca
-MD5 033a9cbe07344d5d48e10578deb33019 ChangeLog 36613
-RMD160 064379bcba5eb3e71caf030e306b7656932d6618 ChangeLog 36613
-SHA256 49c3383fe663b37570005507ec1fe87f226d83a7f4c1ee28fefa1a2cc718a3ca ChangeLog 36613
+EBUILD openssl-0.9.8g.ebuild 6182 RMD160 9a028f9a5d3ff509f753d0cc54f4edd73ea6358b SHA1 1dd8a113f46bb6af49a1901af11722fe80a51b84 SHA256 fa62475c3cadfeadcec5eb0ca0076313e34bfa8cdc5892f2c441cbf035ce5444
+MD5 4147f56fa4574962a9e8d15ed171f304 openssl-0.9.8g.ebuild 6182
+RMD160 9a028f9a5d3ff509f753d0cc54f4edd73ea6358b openssl-0.9.8g.ebuild 6182
+SHA256 fa62475c3cadfeadcec5eb0ca0076313e34bfa8cdc5892f2c441cbf035ce5444 openssl-0.9.8g.ebuild 6182
+MISC ChangeLog 36808 RMD160 073b1a836fb4f2fc33175b7aad26bd5955d9203c SHA1 2956b564d4f6f2a2983141fd18bf0c2efaee15dc SHA256 be97705d752f400c5f15df6259a9b07f635d4135a94c8f362170ed012fcf93bf
+MD5 90d0df1402eedb910e7bfd0bc729b81c ChangeLog 36808
+RMD160 073b1a836fb4f2fc33175b7aad26bd5955d9203c ChangeLog 36808
+SHA256 be97705d752f400c5f15df6259a9b07f635d4135a94c8f362170ed012fcf93bf ChangeLog 36808
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -97,3 +102,6 @@ SHA256 2805d899eece0f11f31ca624c548ed874c31daaddf922044a6586a3ad2aad00a files/di
 MD5 8c5c2183e7e6b1c75d6d6334cdb70582 files/digest-openssl-0.9.8f 247
 RMD160 a9a68b0a3c46ca757179c413c4b6eb3d4a03fcd5 files/digest-openssl-0.9.8f 247
 SHA256 2559b8838814e113808876b381dba1ee63d8602cd1fda92537c98a0894b10de5 files/digest-openssl-0.9.8f 247
+MD5 d2ac3e686735471cafa3d192a7dd20b4 files/digest-openssl-0.9.8g 247
+RMD160 1788ed282700095d7dc5c9c8084377d5b140a8a3 files/digest-openssl-0.9.8g 247
+SHA256 2fb08d78044a386d03ae9c2d4ac77fa38a7a1e8968fb917920775cfb05317f4d files/digest-openssl-0.9.8g 247
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.8g b/dev-libs/openssl/files/digest-openssl-0.9.8g
new file mode 100644
index 000000000000..620f243e4b10
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.8g
@@ -0,0 +1,3 @@
+MD5 acf70a16359bf3658bdfb74bda1c4419 openssl-0.9.8g.tar.gz 3354792
+RMD160 f080a32da9becdc8b98c38744d62c6fd8664f603 openssl-0.9.8g.tar.gz 3354792
+SHA256 0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0 openssl-0.9.8g.tar.gz 3354792
diff --git a/dev-libs/openssl/openssl-0.9.8g.ebuild b/dev-libs/openssl/openssl-0.9.8g.ebuild
new file mode 100644
index 000000000000..ac13fb55015a
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8g.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8g.ebuild,v 1.1 2007/10/20 04:21:16 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 emacs gmp kerberos sse2 test zlib"
+
+RDEPEND="gmp? ( dev-libs/gmp )
+	zlib? ( sys-libs/zlib )
+	kerberos? ( virtual/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
+
+	# 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() {
+	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"
+
+	# force until we get all the gentoo.config kinks worked out
+	if ! use test && ! tc-is-cross-compiler ; then
+		src_test
+	fi
+}
+
+src_test() {
+	# make sure sandbox doesnt die on *BSD
+	addpredict /dev/crypto
+
+	make test || die "make test failed"
+}
+
+src_install() {
+	emake -j1 INSTALL_PREFIX="${D}" install || die
+	dodoc CHANGES* FAQ NEWS README doc/*.txt
+	dohtml doc/*
+
+	if use emacs ; then
+		insinto /usr/share/emacs/site-lisp
+		doins doc/c-indentation.el
+	fi
+
+	# 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
+}