From bffebb258b126dce08119205b237b345742ce545 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 3 Jun 2010 02:28:34 +0000 Subject: Version bump. --- dev-libs/openssl/ChangeLog | 7 +- dev-libs/openssl/Manifest | 30 ++---- dev-libs/openssl/openssl-1.0.0a.ebuild | 173 +++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 22 deletions(-) create mode 100644 dev-libs/openssl/openssl-1.0.0a.ebuild (limited to 'dev-libs') diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 84bac8da1d66..a72d990f2b88 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.330 2010/04/11 20:05:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.331 2010/06/03 02:28:34 vapier Exp $ + +*openssl-1.0.0a (03 Jun 2010) + + 03 Jun 2010; Mike Frysinger +openssl-1.0.0a.ebuild: + Version bump. 11 Apr 2010; Mike Frysinger openssl-0.9.8n.ebuild, openssl-1.0.0.ebuild: diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 04dda0f2e9ff..8597cb593a2d 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -3,38 +3,26 @@ 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 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 -AUX openssl-0.9.8g-sslv3-no-tlsext.patch 918 RMD160 707c3c1b583b414d65799c0dbf189e32e7d4e62c SHA1 4f1c5f79f85445ed8e70d3437236687d70bf5dfd SHA256 4d33738a3eb5520e37cc0531207b47d032fc812779cf2b33f43465aac9e746d5 AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805 AUX openssl-0.9.8j-parallel-build.patch 715 RMD160 c20d37606fa0e32e1381a166d5a28b8a40d7db8c SHA1 9386fdfd52975c841b9d40cebb18d859b258f2ab SHA256 92a3e00a358cecc3cc79ce0dd99f6f7af4776e05d99a9b948d0c18a683fbc5b2 -AUX openssl-0.9.8k-toolchain.patch 726 RMD160 d925596e8761867a0326b8bf30c556be2fd7e000 SHA1 23a539a1c06a3e3a4c5ac321e7708773c955e043 SHA256 98902cc49e2639e8e4948e7bc36e9068b9e292b3ddd0f66b9f6abc56e3fe43b3 -AUX openssl-0.9.8l-CVE-2009-1377.patch 1630 RMD160 d97d1f0f27c5331c7ad8eb47bc231cbf2bbebf7b SHA1 b6e6785d740ad89d20e9fae113529e3082bea81b SHA256 399dfff19f183f0dc94497f3e48cef0a20dbb0e6c6583baf9e25479b985af1f0 -AUX openssl-0.9.8l-CVE-2009-1378.patch 894 RMD160 a7df4efdb0b1127e8fcf15d647dcddd6f5365e84 SHA1 4179a7ef9725b2540c29768c2d80e79b6e26b271 SHA256 e8e9273e30cadb9076ec8f2694d4d3a2d71289a0b33d37960b9d28c2c055459b -AUX openssl-0.9.8l-CVE-2009-1379.patch 662 RMD160 15b352d935eb1489cadeebb8e09c8bcb301fc8c1 SHA1 358cacdf2442dfb882db5c945daa333329009dd1 SHA256 19fdbc9551cee3985a6f326c5b28d0ba6f2e52ef44c7b023bb313644937c5e7d -AUX openssl-0.9.8l-CVE-2009-1387.patch 1561 RMD160 58d4df1b1e246c4bbb4db44e60eac51a286ccb4d SHA1 938ea6ec1af911f67075cba3b1675e8b07baa75f SHA256 5fd8dd453022aa6ea245877d795dd03761334a8960dfa0e13f1cfbdd88680438 -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 -AUX openssl-0.9.8m-cfb.patch 716 RMD160 fa56649ead8d7243f4be01d2e081f092b0664ead SHA1 bbd603510de2de075219ff2fe25484e330a2fb19 SHA256 bf71b7d0624651e48c91ba05990bf8cd70b3dad7153217a7cfb69b514e1f30ab -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-0.9.8n.tar.gz 3770041 RMD160 8eb5e877c2bab203e8eb108e42d60580a478f718 SHA1 595f5ebf592568515964f0adc62239e7012ef08b SHA256 b01abc28376b866515df58f1b004da8453166291783d4e7477cda89b000c1f01 +DIST openssl-0.9.8o.tar.gz 3772542 RMD160 c2e455a17bce59c8a54522ffaa26c3a5cb26b510 SHA1 80c73afc7dca790cd26936cb392a4dfd14d4e4d7 SHA256 befada1ac3819b1d317df8197b5e82ec768b39d250fcbef81e2b1cb7f165d448 DIST openssl-1.0.0.tar.gz 4010166 RMD160 e9d8f52540a1ddae565e5d2bea966b819d7de818 SHA1 3f800ea9fa3da1c0f576d689be7dca3d55a4cb62 SHA256 1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca -EBUILD openssl-0.9.8l-r2.ebuild 6196 RMD160 e99f82df485bd234e207f9730eaf08a8dbd64e83 SHA1 54160505698cf4812cef7b57314ccf4e289b245b SHA256 750fa447190f467bd56f88e5469e12878bc3962a864f245b2c5c92d655ee215c -EBUILD openssl-0.9.8m-r1.ebuild 5739 RMD160 f313671216e1aa68926b2da989f92f97f19826a4 SHA1 1be6423a387d169a4f4fdcbc10bd7cd5cdb4e14a SHA256 16e01254c9078e06b84c64f9ae7fb93d81e4e19b8bb46d0379d764e6d81b20c6 +DIST openssl-1.0.0a.tar.gz 4015794 RMD160 f46ea1d0875ef523662e652f22faf0f0f261f354 SHA1 b837a9f75a51f456bd533690cf04d3d5714812dc SHA256 18a9bd1fc02b8ef90dded34fafaa9089baaafef278a19fc4e89c2ab0dcf70f63 EBUILD openssl-0.9.8n.ebuild 5408 RMD160 b88cb4eac096be1d6ada2c4d88cce90f249045f1 SHA1 09f79cbbd20e8b41d3136653f3f7a44bb900bb72 SHA256 99c1989f8468020ce62ae9d0a2f37dc5039cfbda7f47841eab3fa394597cb326 +EBUILD openssl-0.9.8o.ebuild 5367 RMD160 0506f51d1c81998e8f87f82bcbb19702466797e2 SHA1 1edc1c8651410863e5efe09fa40265f532c3d17b SHA256 847c525fb9fb2c201aac086ae96685a348233411cd2177637e774582b6193ba5 EBUILD openssl-1.0.0.ebuild 5337 RMD160 1a6ed954059ee75be6062bbd66a13ea1c5f42acd SHA1 77268de251c5e217df66747f35e26930d5448db4 SHA256 823bf15841acd6a0b78f4246b07fc4b125744c132342dab7bcf8effef19de72e -MISC ChangeLog 49288 RMD160 ddde4a76b55f9d5d944107c36020f98ec48c76e4 SHA1 034567c79fd04689920346db4c5703613ad384fb SHA256 83ec1fe087faf666f8d26955e5bff892962f05efaf5c3ad1248187b13085442e +EBUILD openssl-1.0.0a.ebuild 5338 RMD160 bf6cd88ec6aaf9fd1b35f4de91becfb785435407 SHA1 5328607774d32c71a4e23c314dc21604b35a94c7 SHA256 f1f4343676cb004d03f2dba63b5c53ed2b7b147a60891d309be5c8811e090545 +MISC ChangeLog 49532 RMD160 a2b1484e3b6c01e6c3178b8a1f61c87d864ecc68 SHA1 8368db9b6769d97cb36fc7a41007c31f193e7fea SHA256 68144b6ce36c4be1cffc706bbd6c7a29e540f55e29e1529dabd56f5d953dbf19 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkvCK3gACgkQTwhj9JtAlp7XRgEAgEo3aht8h29AIITzWIp8twuZ -qHQgDIiD+Yx7yaiTFC0BAKytQsu2mKLpZhmY2YIkoI3goHq9TS+/Kpnk8aUxb93Y -=x/qN +iF4EAREIAAYFAkwHE1sACgkQTwhj9JtAlp6bzwEAj4qhiIX+ir/BB1n4URqVcymc +38GvYgcNr78B3i+/q8IBAMPpNyzWkXaWwlG1HWQwR6sMVLeC9HKw2K56d5rbVZxr +=Ctvs -----END PGP SIGNATURE----- diff --git a/dev-libs/openssl/openssl-1.0.0a.ebuild b/dev-libs/openssl/openssl-1.0.0a.ebuild new file mode 100644 index 000000000000..f543c6f32d10 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0a.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.0a.ebuild,v 1.1 2010/06/03 02:28:34 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="" +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 ${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 + + # 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 + ./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 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 + + # 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} +} -- cgit v1.2.3-65-gdbad