summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-12-02 22:25:53 +0000
committerMike Frysinger <vapier@gentoo.org>2010-12-02 22:25:53 +0000
commit4341567a9007096d43e2dc7eb60340fb13966e19 (patch)
tree58c7ddda12e61b9f74982d503c74a9be95952c18 /dev-libs/openssl
parentFixes for upstreams changes (diff)
downloadhistorical-4341567a9007096d43e2dc7eb60340fb13966e19.tar.gz
historical-4341567a9007096d43e2dc7eb60340fb13966e19.tar.bz2
historical-4341567a9007096d43e2dc7eb60340fb13966e19.zip
Version bump.
Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog7
-rw-r--r--dev-libs/openssl/Manifest10
-rw-r--r--dev-libs/openssl/openssl-0.9.8q.ebuild139
3 files changed, 151 insertions, 5 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 6ed10e8059ff..15c4c6181301 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
# 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.373 2010/12/02 21:33:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.374 2010/12/02 22:25:53 vapier Exp $
+
+*openssl-0.9.8q (02 Dec 2010)
+
+ 02 Dec 2010; Mike Frysinger <vapier@gentoo.org> +openssl-0.9.8q.ebuild:
+ Version bump.
*openssl-1.0.0c (02 Dec 2010)
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 11aebd9da9a2..8f74ece81767 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -11,18 +11,20 @@ AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c
AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
AUX openssl-1.0.0b-rev19998.patch 662 RMD160 9f778f8c90e4d49bf2c8664dac4189a5517c4b4b SHA1 7d244be4e87b1387b0d182bd0d1ed9f6c204bedc SHA256 b0b8cb9b2e312eb305b5de1446416aa5a7a40944aa168aa199cc880ac4ca2730
DIST openssl-0.9.8p.tar.gz 3772501 RMD160 13ec0427100f3d31940fe3725ca7c73163dc9fdd SHA1 4ba43f4110432d7518c4f5d7be79077705ae7f16 SHA256 b2645e2a2af221fa230b5ef6aa2b9388a875801b74cbddbb16be557f80f45242
+DIST openssl-0.9.8q.tar.gz 3773961 RMD160 2a6583fc059f83232b16d0dad8855fc8086f2450 SHA1 12b6859698ca299fa0cba594686c25d5c01e410d SHA256 d522b3e8a2b48e83ba1e142d7205eaca01358a137bb58e8d64583574e697ffd7
DIST openssl-1.0.0b.tar.gz 4019360 RMD160 4c661c812315c25b3ab8f0f92d52430529f890d1 SHA1 cccb125b29f2fa209edb114258d22aeca4e871a2 SHA256 4e7b4e2fb33ee2d97c5e143561ab495dbbfc08f0a863e617a0c7adca19017331
DIST openssl-1.0.0c.tar.gz 4023056 RMD160 3053569d12c55fca80d718044d277bc44358d384 SHA1 5a2d74fa7fe90c80915332404b9700044ef676a1 SHA256 f731b36de3edaa361179ae6f449668b248a360e34e31e92902d976e9b9d604eb
DIST openssl-c_rehash.sh.1.7 4167 RMD160 c87f12c5421593d160f0cc650921c2e3412869ab SHA1 54493c80be245f2da9b7d303e49d613d376d9609 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0
EBUILD openssl-0.9.8p.ebuild 4257 RMD160 26c5c516f1d3d46f19a7c03f868ef36ee58e5f5d SHA1 1e6e18425f675e1ee3ce15fd937ab50fbaf3f3dc SHA256 4594177bf27620a851ba1d2a414c99f92497fa9a95e1b4ae19474b8d3a7e5d33
+EBUILD openssl-0.9.8q.ebuild 4267 RMD160 bef52c24be16813487773703cf7102b2cb8a0a27 SHA1 b236fa2c94280cf3712f9ba2a39d4353da4a7ddb SHA256 e7f97434fa8a9b684319b373072191c34d1eeba277d0cead97d31c740681aa01
EBUILD openssl-1.0.0b-r1.ebuild 5925 RMD160 b00fadbe69afaddfc72dd6a0902b08060a343bd3 SHA1 f12caff36492b973dc1b577469b03fb12f4bb9a4 SHA256 ce760479df95aaff6b119528831188f3ba2e11fa3140681482ba14c9aed0746b
EBUILD openssl-1.0.0c.ebuild 5856 RMD160 02f993ec10723be953e1c4846328a91152918f89 SHA1 22fcfc950ee5e14668ee576b6e0b428dd01d4559 SHA256 1580978a8492335e138a636e27824da1e58a08bf8351acc0ba48def9717dcb86
-MISC ChangeLog 56193 RMD160 fa8c900e236a50afdd5676ca04bbd2a0a98283ce SHA1 2e9aa593ab888ccd6feffaf5a804999d7ad3e754 SHA256 3cb6f97306a8af7ca9729224146b38208b58ff7bb128228425961d3baed331fb
+MISC ChangeLog 56315 RMD160 adf9484a39074e2a000ee814ecaf3d4f1d6cb26a SHA1 3364fadb991572c7f29dcf7ec1f13879291f159c SHA256 321ebb41417c416bc673ff0824b0348a11ae798130e299f3f86419e018035c7b
MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iF4EAREIAAYFAkz4D5wACgkQTwhj9JtAlp5gRAEArINggcR5Nhy+e8OQGPuY4wMI
-3Og8L4o9DtOMZcIJ7awA/iFg6gOdA68wKraXtScS8dLmimgj/YDuLOfstUK7AwV8
-=axna
+iF4EAREIAAYFAkz4G9IACgkQTwhj9JtAlp7HwwD9FD4Jl0k2McgIFbxO33EWiuMZ
+40NLV6dtUTUtWmiwW3sA/io+dkL5gKMY2YsDN47PaQwuwEOl72we8jpH4leI9jdc
+=H0ag
-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8q.ebuild b/dev-libs/openssl/openssl-0.9.8q.ebuild
new file mode 100644
index 000000000000..13ebef8af93d
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.8q.ebuild
@@ -0,0 +1,139 @@
+# 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-0.9.8q.ebuild,v 1.1 2010/12/02 22:25:53 vapier Exp $
+
+# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
+
+EAPI="1"
+
+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.9.8"
+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 )
+ !=dev-libs/openssl-0.9.8*:0"
+DEPEND="${RDEPEND}
+ sys-apps/diffutils
+ >=dev-lang/perl-5
+ test? ( sys-devel/bc )"
+
+pkg_setup() {
+ # avoid collisions with openssl-1 (preserve lib)
+ if ! has_version dev-libs/openssl:${SLOT} ; then
+ ewarn "Removing lib{crypto,ssl}.so.0.9.8 to avoid collision with openssl-1"
+ rm -f "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
+ epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
+ epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
+ epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130
+
+ # 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-0.9.8 gentoo.config || die "cp cross-compile failed"
+ chmod a+rx gentoo.config
+
+ append-flags -fno-strict-aliasing
+ append-flags -Wa,--noexecstack
+
+ 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
+ unset SCRIPTS #312551
+
+ 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 \
+ 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 "/^LIBDIR=/s:=.*:=$(get_libdir):" \
+ -e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
+ -e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
+ Makefile || die
+
+ # depend is needed to use $confopts
+ emake -j1 depend || die "depend failed"
+ emake -j1 build_libs || die "make build_libs failed"
+}
+
+src_test() {
+ emake -j1 test || die "make test failed"
+}
+
+src_install() {
+ dolib.so lib{crypto,ssl}.so.0.9.8 || die
+}