Add testing version #269482 by Daniel Black.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 188 insertions, 7 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 68b7a99aca50..ac41bf63f449 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.314 2010/01/11 02:20:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.315 2010/01/11 03:33:31 vapier Exp $
+
+*openssl-1.0.0_beta4 (11 Jan 2010)
+
+  11 Jan 2010; Mike Frysinger <vapier@gentoo.org>
+  +openssl-1.0.0_beta4.ebuild:
+  Add testing version #269482 by Daniel Black.
 
   11 Jan 2010; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8l-r2.ebuild:
   Drop gcc-3 flag munging, add -fno-strict-aliasing for everyone, and use
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index f2fd14030898..8cb9432b95f5 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX openssl-0.9.7e-gentoo.patch 460 RMD160 60969fd05a15fe00d0d1c27b9098acfde28ba65e SHA1 73ff3c336dfdbeed903ac7b82486674ab4ec66a2 SHA256 ddb8d47429f3aadf3f5142293a2c38cbb9eb3927edfd1b497771337c48a11641
 AUX openssl-0.9.8-make-engines-dir.patch 440 RMD160 0e7d4fd52c9deaf46809fa2b3c62c9096ad08197 SHA1 d4757620437fabb5ec506ce3a74b802fd530f647 SHA256 af1b1f68c8fe77283abf05068ff0c08d28d94e35754c8eee7c76b3006825026a
-AUX openssl-0.9.8-makedepend.patch 666 RMD160 1ab11b3fb8d24c6d30afb90cf0d7bd878f946389 SHA1 5e2d269f2d91c7f9d4bfb9d619439eba88971182 SHA256 8a2574fc12e6e039aee06be8b36d41dacf4e994474fa18b00aeb3bea343a6081
+AUX openssl-0.9.8-makedepend.patch 376 RMD160 a9bb25e8f525e1d5fd93070b825385a7ba9bd3f0 SHA1 b494d1e15979f78d77d360a39dcfb0304a38e988 SHA256 858d822e7a05ae176ed6d28f0fdfd61f3503b6b2f65a44a191b4de95b5e41a6b
 AUX openssl-0.9.8b-doc-updates.patch 9104 RMD160 c250a9117439449f7f7849f8f414725e1acaac47 SHA1 c328e7c06b5501205faef93c55f8b7ed8cc7dd53 SHA256 77ba2167f4f69a3be040d3214214c3529b55d9404e87bc7cb3135861f43bfb3f
 AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f2e993949b SHA1 d07542663f934d5dc2f8f8b8985bde9b033aafdb SHA256 8a79f022a17a7fadb4eb708538b41a7a034e21ad84162beb1f7fa7cff5eb487e
 AUX openssl-0.9.8e-make.patch 845 RMD160 3bfd6e65000bcf1ac96cb691bc3d519696c73ddd SHA1 80cfdb37c78414e39368546ee95e02533158e56b SHA256 025aea3eb61b26476b4e0bdac40ff39b9fdd3ca79dc6a9dd7e2fff1a9f986299
@@ -20,13 +20,15 @@ AUX openssl-0.9.8l-CVE-2009-2409.patch 2224 RMD160 3283173440e957d2a1fa9c65e6a6d
 AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
 AUX openssl-0.9.8l-dtls-compat.patch 6141 RMD160 87d25f9b1e3ebbee2b3f168510e160bfeba5e2b3 SHA1 fe20d1d695df7fc3a87a264819305c7f40adc3d9 SHA256 440217a7b34dbc5eafc063bf6a3d9208dca1a8e673dcf0345759e898f0940ace
 DIST openssl-0.9.8l.tar.gz 4179422 RMD160 9de81ec2583edcba729e62d50fd22c0a98a52903 SHA1 d3fb6ec89532ab40646b65af179bb1770f7ca28f SHA256 ecd054e9eed2e9c1620ba15257e6fc4d882c9a4aea663d23b769e2138de8c91a
-EBUILD openssl-0.9.8l-r2.ebuild 6084 RMD160 54ce2ddd89e18460b0897c4a8224c0cbb87e5d73 SHA1 0e96ed56e7093a2dbb7fbeb5abb0ac489eaf86f1 SHA256 40c7dd6c2d90e4b94a04a646433970eca5562d9db35b2a3943da028bdd47c81d
-MISC ChangeLog 47024 RMD160 b7d0996c1e4a51de9ed0439440aad6a1b20480d9 SHA1 d128ee91dbde8b4cc599c61ab3fa2efb8fd4bc2b SHA256 fefc37f362d8874162a4691bd0ae52b652f9f584b27f3736545fd5a986e08506
+DIST openssl-1.0.0-beta4.tar.gz 4000628 RMD160 ea6f9b9fe5edaead775e0d3ba9f476cedd1a76ea SHA1 f590232651b9033365e0aa9a2279cdef6519884c SHA256 f28992036ef8e1166d1165951e6b4ce5ab3ee10ca7c3bc57b2e9e563a1a254ca
+EBUILD openssl-0.9.8l-r2.ebuild 6132 RMD160 050094429a7cb431db7406c7e5d895a1dbceb4c7 SHA1 32c6b822d121358c9303be2ff0e718437436a4d4 SHA256 c4f1776de6c773cc34a80e8dd524d27c02748d41380506c4d0c876d1269ac867
+EBUILD openssl-1.0.0_beta4.ebuild 5426 RMD160 9859be4a1e9bcc736a50e03b5fb23a4bd777ee5a SHA1 c39a219e7c67b0f402bf7192d34c7b938124ba85 SHA256 83f34be2a752be622aacb96096d889452f6cd4c8eca585b94e4bacc860521e95
+MISC ChangeLog 47189 RMD160 b5df6848b24794d0e9cc3a22cc83230f95e514bd SHA1 8bc67b51d2268a909ad5d6131579ef2972970175 SHA256 d63e679f1132a5320eea44a83637c6d0c8ea32942521b0dea4452602fafde117
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktKix0ACgkQTwhj9JtAlp7gXwD+MJuBtEpq9TaBKYsZimrJUpnL
-bihhIXh0E8ANJ0Uw7wYA/1pNG+lyu89t2m0Y9rZ+veqQ6x3bK/TjJF9/FrEz72HR
-=rNzB
+iF4EAREIAAYFAktKnCEACgkQTwhj9JtAlp4TMQD/Wm3LA3mAaYcVC9Bem2Zmf40I
+OFyeO4dhZr1Qbi/ssqYA/1lcA3zXpRRDqGkukbhuuOW1NcjRcJV0Lsvz1p8DxmJT
+=FJrW
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-1.0.0_beta4.ebuild b/dev-libs/openssl/openssl-1.0.0_beta4.ebuild
new file mode 100644
index 000000000000..574eed678453
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.0_beta4.ebuild
@@ -0,0 +1,173 @@
+# 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.0_beta4.ebuild,v 1.1 2010/01/11 03:33:31 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P=${P/_/-}
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS=""
+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"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
+	#epatch "${FILESDIR}"/${PN}-0.9.8j-parallel-build.patch
+	#epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch
+	#epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
+	#epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
+	epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
+	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
+
+	append-flags -fno-strict-aliasing
+	append-flags -Wa,--noexecstack
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+	sed -i '/^MAKEDEPPROG/s:=.*:=$(CC):' Makefile.org
+
+	# a few spots are missing $LIBDIR
+	sed -i 's:/lib/:/$(LIBDIR)/:g' engines/{,ccgost/}Makefile || die
+	sed -i 's:/lib;:/$(LIBDIR);:g' Makefile.org || die
+
+	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+	./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 gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(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
+
+	# 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
+	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() {
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7,8}
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7,8}
+}