Revision bump with zlib linked in at build-time rather than dlopened. See bug #271415.

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

3 files changed, 191 insertions, 5 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index f59056166715..a70282567ce6 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.289 2009/04/09 20:20:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.290 2009/05/29 21:33:52 flameeyes Exp $
+
+*openssl-0.9.8k-r1 (29 May 2009)
+
+  29 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +openssl-0.9.8k-r1.ebuild:
+  Revision bump with zlib linked in at build-time rather than dlopened. See
+  bug #271415.
 
   09 Apr 2009; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8k.ebuild:
   Make sure we dont accidently create /etc/sandbox.d with 0700 perms #265376
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 059a4227b933..0e7e79a7ddb9 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -24,13 +24,14 @@ DIST openssl-0.9.8k.tar.gz 3852259 RMD160 496df7a5d33457b0d8e3b930a8e5cf06892318
 EBUILD openssl-0.9.8h-r1.ebuild 6174 RMD160 7e21270ab2d6d5f749ee09823f35a8bc516e73d8 SHA1 a88647a7bd84b0d4f3ee3c71b637072504904132 SHA256 f6c272040cdddacb0e2f1ca0d73ae0b94b53831b8d3c98e294c4c30cb925b235
 EBUILD openssl-0.9.8i.ebuild 6127 RMD160 791c036f860f91ea655c57dc01b36ae7ec4338fc SHA1 83efa8185a5ecf7e19e511fde0d8854bb7a045a3 SHA256 f88f05a1f4f1fb853d24d4f59f09cf4768a284c7615ab11144e27ed2cc0bb5e0
 EBUILD openssl-0.9.8j.ebuild 6315 RMD160 d66fe9982208cebd9027c69f1268270bbafe7ee6 SHA1 5bde4b5cb3201a33cb0c89c135ed52bd1d767194 SHA256 57a178169069f1da27ce28972ca18126d35b3692672b087531878d5b7a81232f
+EBUILD openssl-0.9.8k-r1.ebuild 5974 RMD160 48e17fdc79257067440d3f263f4df14ac5e57159 SHA1 5660f4f4436de01061739e4721d06542d9d95412 SHA256 124c5b0aff342484e0224c0a733e182df14101d8b07e310fef14e275cd96d286
 EBUILD openssl-0.9.8k.ebuild 5989 RMD160 6da50840cc10f982176156bfca8320d560aa8895 SHA1 a2509663bec3775fe81b2810301f46dbe503c464 SHA256 44958921f9043e8892a5f225aee5d10e6d5b920e222f8b448b24e4d29c13c9cd
-MISC ChangeLog 43142 RMD160 6344b5ab15b4879a4dd1a23433d52d71cc744cef SHA1 117db13623be08b971206316eef6cc9ed07673a8 SHA256 ffbff80a667d6e46dfd997c86f6d54c60f40a75eeb3114f29d4e79e344cfd029
+MISC ChangeLog 43356 RMD160 67ec1afd794991b5a6ea1b8143ed7e6097b82a08 SHA1 c0910d9b32102cc6da334a3305971de4f6e10b61 SHA256 77e50cf2cf5a3158e4b1d0d04a04d915ec956b5a70a793da4b286856e977e97e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoH6QgACgkQn/5bYzqsSmFPewCffKdcBk2cpMQjEdGWNg6QMQOI
-hoIAnj80NWZPAgDaljoHlFqPGszL2N+D
-=iRc1
+iEYEARECAAYFAkogVMcACgkQAiZjviIA2XjLogCgvvwMyCx/yZFRh6OOKXDx2mbu
+B9cAniuGqcweRr6szJJ7cWA/iY99XIGL
+=ctJt
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8k-r1.ebuild b/dev-libs/openssl/openssl-0.9.8k-r1.ebuild
new file mode 100644
index 000000000000..04124c1b13ee
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8k-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8k-r1.ebuild,v 1.1 2009/05/29 21:33:52 flameeyes 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 ~x86 ~sparc-fbsd ~x86-fbsd"
+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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch
+	#Forward port of the -b patch. Parallel make fails though.
+	epatch "${FILESDIR}"/${PN}-0.9.8j-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
+	epatch "${FILESDIR}"/${PN}-0.9.8k-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
+	epatch "${FILESDIR}"/${PN}-0.9.8g-sslv3-no-tlsext.patch
+	#epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
+	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
+
+	# 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"
+	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+	sed -i '/^"debug-steve/d' Configure # 0.9.8k shipped broken
+	./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) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl zlib) \
+		--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 -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 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}
+		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}
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7}
+}