Version bump #382069.

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

3 files changed, 200 insertions, 6 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 7d0ab717d6fa..6ea5d700a386 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.400 2011/08/12 19:35:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.401 2011/09/07 04:11:26 vapier Exp $
+
+*openssl-1.0.0e (07 Sep 2011)
+
+  07 Sep 2011; Mike Frysinger <vapier@gentoo.org> +openssl-1.0.0e.ebuild:
+  Version bump #382069.
 
   12 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> openssl-1.0.0d.ebuild,
   +files/openssl-1.0.0d-alpha-fix-unalign.patch:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index cf899969491c..5e9c739baa67 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX gentoo.config-1.0.0 4699 RMD160 d0ec1c6aed0f0282d273532de68f53548dd78186 SHA1 faeca9aba6223d4ea71251beb83ba01081fab07a SHA256 7e7251bb0f97a8b28870b5fb28d54af9ee2997639d91cb90810333d4a9668407
@@ -14,15 +14,17 @@ AUX openssl-1.0.0d-fbsd-amd64.patch 417 RMD160 a75ca3b792caa64e32732598f97872153
 AUX openssl-1.0.0d-windres.patch 2586 RMD160 b4fe79439aac0aa0febb027b0ace52fbf5b0a349 SHA1 4dfdaee0d15a947b054cf35e44e7dcc0f0913357 SHA256 15103c5e22a78c1f34dc83adad90636ad510df6eb1661e0063a221d8c3fd8bae
 DIST openssl-0.9.8r.tar.gz 3773698 RMD160 9bc8024bf7af229c5024887d6f6a368cd8b93728 SHA1 a02411e5f4d463cac4a2a4a357a4a0b93bf65e72 SHA256 42b2368f786b05ed3be846838dce126b4e8e3dba8fb2e0ce83102df28c102fad
 DIST openssl-1.0.0d.tar.gz 4025484 RMD160 0c6cdf0659d88bf4dbc6d0394059a47a01fe6846 SHA1 32ca934f380a547061ddab7221b1a34e4e07e8d5 SHA256 92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db
+DIST openssl-1.0.0e.tar.gz 4040229 RMD160 f7b7c8146592bb0924f145b1e3382b5a1d9283e4 SHA1 235eb68e5a31b0f7a23bc05f52d7a39c596e2e69 SHA256 e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7
 DIST openssl-c_rehash.sh.1.7 4167 RMD160 c87f12c5421593d160f0cc650921c2e3412869ab SHA1 54493c80be245f2da9b7d303e49d613d376d9609 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0
 EBUILD openssl-0.9.8r.ebuild 4217 RMD160 78dfdc61cab7217adee5b3444d704cd12210b8cf SHA1 64db1d963327532b5e11d87619be5ed0ed6f9a63 SHA256 6dae15ddd4b6fa2262745747fcd623631024baba79ebf115fc6b94370835dbb0
 EBUILD openssl-1.0.0d.ebuild 6061 RMD160 d86d813d661ef0a7df0184ac169642dfe2b55323 SHA1 2bc7ad533647386d28534afa8fe4b924bc6fceda SHA256 46da641b70b10005086a39b16a7196b4636209530de15700e37e8c2e6378aaf2
-MISC ChangeLog 60030 RMD160 6051ff31b7205b7d796440ef7acff88a2eee2499 SHA1 e0a7d66c57782c154911f6cc58a2de2d229ea712 SHA256 427b488e9b1c245080b117b07aac15930f5155da6cdb1c783f2c359826bcc5a7
+EBUILD openssl-1.0.0e.ebuild 5945 RMD160 471f93b078c2e8d80b4dbf877e7c8bcf6361650f SHA1 5840c1dafc06d46c2c967f7d2f0443cb3181c918 SHA256 948c72ce7f7ff14e71f344028e9abf375760c70171aac2c36213de2e3bc8af04
+MISC ChangeLog 60160 RMD160 11508294222218aa5affc49618b3b8511a902494 SHA1 449622e7ffc8d9052b8066929230cebef17b2194 SHA256 02079287d845a651e1e4506eaa3cfe79cb342f64fb2237504b07a7322e56125d
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5FgU4ACgkQcaHudmEf86qG8wCggxTT5CGBrJHjXwUOOXf0K9Pz
-oN8AnjcLXpE8YnJD+HrPvx5gZ7JwNcVg
-=nkbY
+iF4EAREIAAYFAk5m7vkACgkQaC/OocHi7JYXYgEAhlSHqKC+RLdTPmsEXwJ/IlRq
+k3S1KTZULiEnsf0RykABAJwhA9rqsFRxRyoFyzdzp13AjqPBd6kTxtkiHdEq7zGU
+=cNSR
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-1.0.0e.ebuild b/dev-libs/openssl/openssl-1.0.0e.ebuild
new file mode 100644
index 000000000000..c2552107e02c
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.0e.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0e.ebuild,v 1.1 2011/09/07 04:11:26 vapier 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.8l-binutils.patch #289130
+	epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+	epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089
+	epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
+	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 $(test-flags-CC -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 RC
+
+	# 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
+}