Version bump.

Package-Manager: portage-2.1.3.12

5 files changed, 232 insertions, 8 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index f0bd2698a4c9..1e9296a11f81 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.236 2007/10/11 05:47:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.237 2007/10/13 14:26:51 vapier Exp $
+
+*openssl-0.9.8f (13 Oct 2007)
+
+  13 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/openssl-0.9.8f-fix-version.patch, +openssl-0.9.8f.ebuild:
+  Version bump.
 
   11 Oct 2007; Mike Frysinger <vapier@gentoo.org>
   +files/openssl-0.9.8e-padlock-O0.patch, openssl-0.9.8e-r4.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 1a0228ce4867..de96add24db8 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -65,7 +65,12 @@ AUX openssl-0.9.8e-padlock-O0.patch 844 RMD160 e53dccc662c27a8a62fb45649f567f683
 MD5 ade0b39eb12517ae318cceaf48aa90f5 files/openssl-0.9.8e-padlock-O0.patch 844
 RMD160 e53dccc662c27a8a62fb45649f567f68394802f2 files/openssl-0.9.8e-padlock-O0.patch 844
 SHA256 f9ae47c6459d655707adb73333963a6dcd923c82d36cb34949bcc31e5aefc6d4 files/openssl-0.9.8e-padlock-O0.patch 844
+AUX openssl-0.9.8f-fix-version.patch 445 RMD160 ab3136992eb4028bff06bbc35322a1c2621485e8 SHA1 7a53632a9e13e00737930b22068d88b57879c925 SHA256 73d9952fc7032099a03b3b7fa143229646ae6e52394b4facd043afbce65658f1
+MD5 8413ec9ea17692a08f0986844e1b4ae0 files/openssl-0.9.8f-fix-version.patch 445
+RMD160 ab3136992eb4028bff06bbc35322a1c2621485e8 files/openssl-0.9.8f-fix-version.patch 445
+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
 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
@@ -74,10 +79,14 @@ EBUILD openssl-0.9.8e-r4.ebuild 6557 RMD160 ad9946a39fd4beb295b35a4b10bfc06fc0c7
 MD5 e4371cb19209f34de472baa6b9d42c4f openssl-0.9.8e-r4.ebuild 6557
 RMD160 ad9946a39fd4beb295b35a4b10bfc06fc0c77099 openssl-0.9.8e-r4.ebuild 6557
 SHA256 c6a8090276ba069dc50cb21fe07437166f0cd1d456e8d9fd20e82bc732ec3559 openssl-0.9.8e-r4.ebuild 6557
-MISC ChangeLog 35792 RMD160 670deab4af595f133a1d459c736e880ea10aa042 SHA1 7bea540a8ab1859edaf878be669c3da0ff473ef1 SHA256 aa2a34ee9b60c6f86b47fb77cc2a6374ec115ee1738c5b2abe2ebe3f1a63459a
-MD5 234dabf57160aeb9c289a212627ba097 ChangeLog 35792
-RMD160 670deab4af595f133a1d459c736e880ea10aa042 ChangeLog 35792
-SHA256 aa2a34ee9b60c6f86b47fb77cc2a6374ec115ee1738c5b2abe2ebe3f1a63459a ChangeLog 35792
+EBUILD openssl-0.9.8f.ebuild 6227 RMD160 cdd0409649d059398336ada8e181e979dc76b2e8 SHA1 2db4277eba57f886faf9dbd517b795d0b239a680 SHA256 31047f7c101f7b8f069720007d1ee7b0bad07f90ba19b9d7c0a94fb628fc1779
+MD5 b1cd7e5d8c33d398681a841706dffa0a openssl-0.9.8f.ebuild 6227
+RMD160 cdd0409649d059398336ada8e181e979dc76b2e8 openssl-0.9.8f.ebuild 6227
+SHA256 31047f7c101f7b8f069720007d1ee7b0bad07f90ba19b9d7c0a94fb628fc1779 openssl-0.9.8f.ebuild 6227
+MISC ChangeLog 35957 RMD160 72193526d8a77dcab9035d06bca6b3f4ffcc66d1 SHA1 908f8f6fd296c2e6f29b10aabf7d509ce9bb2639 SHA256 5eacd78bb3ea3e727afa3bbf69a30f3a80c988610af936fb2b8cb8b1e6a5f22b
+MD5 773326ead10dcc70a8d4d31bc4771194 ChangeLog 35957
+RMD160 72193526d8a77dcab9035d06bca6b3f4ffcc66d1 ChangeLog 35957
+SHA256 5eacd78bb3ea3e727afa3bbf69a30f3a80c988610af936fb2b8cb8b1e6a5f22b ChangeLog 35957
 MISC bindresport.o 1848 RMD160 1a62e51c343adfb9343af774dd18df0668f99147 SHA1 bc52ab3b819de17d7fba616770a4231b86c2a95c SHA256 11c183fcd6a67581444d4b1e07c8927eb00f7dd21a1a2e0bc0b32100165838be
 MD5 c4c2870cefd9746220ec6ea2bb5e0ab4 bindresport.o 1848
 RMD160 1a62e51c343adfb9343af774dd18df0668f99147 bindresport.o 1848
@@ -92,10 +101,13 @@ SHA256 2805d899eece0f11f31ca624c548ed874c31daaddf922044a6586a3ad2aad00a files/di
 MD5 b7beba1f496f9ed591d246ccb3986805 files/digest-openssl-0.9.8e-r4 247
 RMD160 70d9be870635c3015dcea57e013ad2017c44f878 files/digest-openssl-0.9.8e-r4 247
 SHA256 2805d899eece0f11f31ca624c548ed874c31daaddf922044a6586a3ad2aad00a files/digest-openssl-0.9.8e-r4 247
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHDbixp/wUKkr7RBoRApR5AJ4tiA6Aqwl9/L3EaLyLijymXWef9QCfSvxx
-Krt7uV+fzZ0AYv991kRetrE=
-=lPEq
+iD8DBQFHENWxp/wUKkr7RBoRAsYOAJ9K+bLgLJxORNf0ckUakIM/DIgqIQCg3JJz
+GsAhG4LybyuiDvHq6tInQjY=
+=tcnm
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.8f b/dev-libs/openssl/files/digest-openssl-0.9.8f
new file mode 100644
index 000000000000..16422426df07
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.8f
@@ -0,0 +1,3 @@
+MD5 114bf908eb1b293d11d3e6b18a09269f openssl-0.9.8f.tar.gz 3357445
+RMD160 ad0d9d8b238dbede1aa6b76256d11038bd281e05 openssl-0.9.8f.tar.gz 3357445
+SHA256 be5afd386f5d7acff019acaf46cdaad89a8b42cc9cee85d1adb2774627f32b42 openssl-0.9.8f.tar.gz 3357445
diff --git a/dev-libs/openssl/files/openssl-0.9.8f-fix-version.patch b/dev-libs/openssl/files/openssl-0.9.8f-fix-version.patch
new file mode 100644
index 000000000000..e5743144e9a2
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.8f-fix-version.patch
@@ -0,0 +1,13 @@
+OPENSSL_VERSION_NUMBER is obviously wrong in the release
+
+--- openssl-0.9.8f/crypto/opensslv.h
++++ openssl-0.9.8f/crypto/opensslv.h
+@@ -25,7 +25,7 @@
+  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
+  *  major minor fix final patch/beta)
+  */
+-#define OPENSSL_VERSION_NUMBER	0x00908070L
++#define OPENSSL_VERSION_NUMBER	0x0090806fL
+ #ifdef OPENSSL_FIPS
+ #define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8f-fips 11 Oct 2007"
+ #else
diff --git a/dev-libs/openssl/openssl-0.9.8f.ebuild b/dev-libs/openssl/openssl-0.9.8f.ebuild
new file mode 100644
index 000000000000..1b7e4d07871c
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8f.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.8f.ebuild,v 1.1 2007/10/13 14:26:51 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.8f-fix-version.patch
+	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 idea) \
+		$(use_ssl !bindist ec) \
+		enable-mdc2 \
+		$(use_ssl !bindist rc5) \
+		$(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 has test ${FEATURES} && ! 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
+}