diff options
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/openssl/Manifest | 11 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8m-binutils.patch | 24 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.8m.ebuild | 177 |
4 files changed, 215 insertions, 5 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 35d7085a5f46..4af67919a54d 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.319 2010/02/15 06:39:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.320 2010/03/05 21:43:33 vapier Exp $ + +*openssl-0.9.8m (05 Mar 2010) + + 05 Mar 2010; Mike Frysinger <vapier@gentoo.org> +openssl-0.9.8m.ebuild, + +files/openssl-0.9.8m-binutils.patch: + Version bump #306925 by Hanno Boeck. 15 Feb 2010; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8l-r2.ebuild: Fix up man page munging #304663 by William Throwe. diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 1da34dafa823..771cedb7b578 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -19,16 +19,19 @@ AUX openssl-0.9.8l-CVE-2009-1387.patch 1561 RMD160 58d4df1b1e246c4bbb4db44e60eac AUX openssl-0.9.8l-CVE-2009-2409.patch 2224 RMD160 3283173440e957d2a1fa9c65e6a6dc3b656b4b84 SHA1 399c77a4c25b3016509f85cf78760356e204013e SHA256 1e95948c5f44bcdd3f734db7f403e5ad6b3674794deecbbbba661fee3d06961f 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 +AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876 DIST openssl-0.9.8l.tar.gz 4179422 RMD160 9de81ec2583edcba729e62d50fd22c0a98a52903 SHA1 d3fb6ec89532ab40646b65af179bb1770f7ca28f SHA256 ecd054e9eed2e9c1620ba15257e6fc4d882c9a4aea663d23b769e2138de8c91a +DIST openssl-0.9.8m.tar.gz 3767604 RMD160 0296af151993008526b4f2b3a6810e20c4ad3759 SHA1 2511c709a47f34d5fa6cd1a1c9cb1699bdffa912 SHA256 36037160281cf4977d964e403d2bc0680fbca0a7ff9f65e33136d75fae12cb5b DIST openssl-1.0.0-beta5.tar.gz 4006467 RMD160 b6e351973a6d41d5f1834ec3b0fdfd7d4973f3a1 SHA1 a16377c02625f803a5dcfaa9c11aeadcfd3703b6 SHA256 499adac5ab67741215ca9ccc1b54b8a1eaa2c90da8971b9babdf7e12ae12155f EBUILD openssl-0.9.8l-r2.ebuild 6196 RMD160 e99f82df485bd234e207f9730eaf08a8dbd64e83 SHA1 54160505698cf4812cef7b57314ccf4e289b245b SHA256 750fa447190f467bd56f88e5469e12878bc3962a864f245b2c5c92d655ee215c +EBUILD openssl-0.9.8m.ebuild 5684 RMD160 ae856919cfa4b293874801895c792e84d84636aa SHA1 022ec7899966bb5a615d8b817e0cd64cb54ecc43 SHA256 d1b53b15f17dc9036e6f9686a22f39bfdc352030af2c3bcf658764284373c437 EBUILD openssl-1.0.0_beta5.ebuild 5359 RMD160 129700062b0705fa579944ed4933aed2594a00d2 SHA1 e5020560e9cc0881497882f134c8759ae2938fef SHA256 f2490f939a3b0fde8ecce27bade76be1e86e92546b222fac84b6833fe967d9fd -MISC ChangeLog 47801 RMD160 bb8ad8ee3f984f0e9ed73a0b7f438ccd228620ce SHA1 e2442d774a55034071271b67822d42f7eba6b948 SHA256 96ca22dcbe921af10e96827621e51518dd69d2a1cf28e945fc98e8430ce78655 +MISC ChangeLog 47986 RMD160 95fed72cbe5ab8f117e39032608738cd527e0faa SHA1 bb738ed2d608f92bd63735349167743f74b64bdf SHA256 1ff6b24568883593c70b6a021ee8df6de30e6972678740bd56261a3bbe62f36f MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iF4EAREIAAYFAkt47T4ACgkQTwhj9JtAlp4SeAD/SiGRGwFA2qPWJ6/OfWOTFrD2 -66528QIcgp6vvoQTCiIBAKX3zI1W1EEx/MauAxaGG1N+Wio0o3FYO+wkAo2UAFuC -=jlQP +iF4EAREIAAYFAkuRewsACgkQTwhj9JtAlp73jQD/cgM4x9Xkri84QdBuEc+p6ppy +ew+gCJHFEhlY2m8pWewA/23N0uEFKyzbEfL94TNVTuYSVN2I/LyHIddTcJCN6J2l +=UyB+ -----END PGP SIGNATURE----- diff --git a/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch b/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch new file mode 100644 index 000000000000..9fa79b9a65fb --- /dev/null +++ b/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/289130 + +Ripped from Fedora + +--- openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl.binutils 2009-11-12 15:17:29.000000000 +0100 ++++ openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl 2009-11-12 17:24:18.000000000 +0100 +@@ -150,7 +150,7 @@ ___ + sub BODY_20_39 { + my ($i,$a,$b,$c,$d,$e,$f)=@_; + my $j=$i+1; +-my $K=($i<40)?0x6ed9eba1:0xca62c1d6; ++my $K=($i<40)?0x6ed9eba1:-0x359d3e2a; + $code.=<<___ if ($i<79); + lea $K($xi,$e),$f + mov `4*($j%16)`(%rsp),$xi +@@ -187,7 +187,7 @@ sub BODY_40_59 { + my ($i,$a,$b,$c,$d,$e,$f)=@_; + my $j=$i+1; + $code.=<<___; +- lea 0x8f1bbcdc($xi,$e),$f ++ lea -0x70e44324($xi,$e),$f + mov `4*($j%16)`(%rsp),$xi + mov $b,$t0 + mov $b,$t1 diff --git a/dev-libs/openssl/openssl-0.9.8m.ebuild b/dev-libs/openssl/openssl-0.9.8m.ebuild new file mode 100644 index 000000000000..f5a027e7c1e2 --- /dev/null +++ b/dev-libs/openssl/openssl-0.9.8m.ebuild @@ -0,0 +1,177 @@ +# 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.8m.ebuild,v 1.1 2010/03/05 21:43:33 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 ~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.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.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 + + # 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 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 + # 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##*/} + # fix up references to renamed man pages + sed -i '/^[.]SH "SEE ALSO"/,/^[.][^I]/s:\([^(, I]*([15])\):ssl-\1:g' ${d}/${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} +} |