From 53c8e6508546e0e642b9c2fcc5273d50479c8dd7 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 8 Jan 2015 17:28:55 +0000 Subject: [PATCH] Security bump (bug #536042). Removed old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- dev-libs/openssl/ChangeLog | 13 +- dev-libs/openssl/Manifest | 38 +++-- dev-libs/openssl/openssl-0.9.8z_p4.ebuild | 159 ++++++++++++++++++ ...sl-1.0.0o.ebuild => openssl-1.0.0p.ebuild} | 4 +- ...sl-1.0.1i.ebuild => openssl-1.0.1k.ebuild} | 6 +- 5 files changed, 195 insertions(+), 25 deletions(-) create mode 100644 dev-libs/openssl/openssl-0.9.8z_p4.ebuild rename dev-libs/openssl/{openssl-1.0.0o.ebuild => openssl-1.0.0p.ebuild} (98%) rename dev-libs/openssl/{openssl-1.0.1i.ebuild => openssl-1.0.1k.ebuild} (97%) diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index c924ec208c04..c7228936f116 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-libs/openssl -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.612 2014/10/22 23:46:29 vapier Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.613 2015/01/08 17:28:53 polynomial-c Exp $ + +*openssl-1.0.1k (08 Jan 2015) +*openssl-1.0.0p (08 Jan 2015) +*openssl-0.9.8z_p4 (08 Jan 2015) + + 08 Jan 2015; Lars Wendler + +openssl-0.9.8z_p4.ebuild, -openssl-1.0.0o.ebuild, +openssl-1.0.0p.ebuild, + -openssl-1.0.1i.ebuild, +openssl-1.0.1k.ebuild: + Security bump (bug #536042). Removed old. 22 Oct 2014; Mike Frysinger openssl-1.0.1j.ebuild: Mark arm64/m68k/s390/sh stable. diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index b15732cf53fc..e8360fb5f780 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -22,34 +22,36 @@ AUX openssl-1.0.2_beta2-ipv6.patch 18212 SHA256 92cd8a8713e26e569307a427d9357204 DIST openssl-0.9.8za.tar.gz 3787508 SHA256 cdcb98d0fbc026ca798b17919334310271d3a593554ffd6a59659b9222fd4e48 SHA512 3e16cd427bb7da4c740fa56dbee3d3e77d59bc255a474be07521354ef1db507fbd3befd35e30eaabf1c84458602bfe0ec887167604a22ae832acdcb113edb753 WHIRLPOOL 6a8f9fead39dfeb0c4e702e8395dcb6554fac03c351d31693e08a613fba3be638dcd52c5feb583b68c7729efe5adc1f5bef8deae47590183b747462fe3873c3d DIST openssl-0.9.8zb.tar.gz 3727934 SHA256 950e2298237de1697168debd42860bf41ead618e0c03dc9a3a56e23258e435be SHA512 b563a7d9c7ae602aefb3ba8e5cd54d0460c805b7a4ef0b1b369907d6447f5b1977ebb1e261d37254a487d74d56f40bf825e2a279c6ae56ffcc9b7fd785dc7dbd WHIRLPOOL 60aeeb8171222d358c26361494c2d06f3cc6d66a385f3fcd58005e1220c3819add0e952cd4add16457191d8317b11efcdb7f6ae4696880d21a77c95df2c56a6a DIST openssl-0.9.8zc.tar.gz 3735406 SHA256 461cc694f29e72f59c22e7ea61bf44671a5fc2f8b3fc2eeac89714b7be915881 SHA512 e4a68857b509bbaa5c66bf43491541e309e37f136816a1380664488420805edc74dc7f94c6318e34e077b29d53d060f971ba69b9efcfa0da9605934b2be45ef4 WHIRLPOOL 5fef377db08b93dc67cda509beb7c366af10cca3dfab3ce9e9f89798169984691ddec784a02bc839e190ddc08641d337f3adf6b0ced3ed796a5ed4f247805e90 -DIST openssl-1.0.0o.tar.gz 4003271 SHA256 3b6f5aa4faa5190f29647cce6899b146f5968503c4188980c437ca6f11d8c8fd SHA512 7deb813128dd9202277a07793f31ef36a91851b115002e51c0db93d7c6571a2a4e74a3945bd309a6f7d4cac79f80db9739624cad5465dbf59b3131e0c6cbc50e WHIRLPOOL bce2a153588c07e69fae2341ead37c8bcad32ed072eb4ac812ba8969bdec23253153196ce3466ff21ea2c1c0e7939bb3a3c09068a464d8489654e44aa14af4fc -DIST openssl-1.0.1i.tar.gz 4422117 SHA256 3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 SHA512 6cbcdcec8568236e8f20f0461f93df8a193a0ad88102ff548443e6ec87e2a7f649e314beee1e6bafda693934b4fb142244b61d14bf736828dda09e277b941d93 WHIRLPOOL 4baefe8a203243d08c2ca4dc9e1019a539135604a8ddfb09b9a7f2711108ad6ebd45eef1cfa09331f19fe57defbe7e1390f9ac2de086437a484c5819cabb5a4a +DIST openssl-0.9.8zd.tar.gz 3737538 SHA256 59266dcfb0be0fbe6181edead044ac3edaf83bc58991f264dcf532b01d531ee3 SHA512 97c1dd58d57ebe76aa4d5aa4a31ad62660401c4dd5283276148a95de78a6f7c9547c14559cc3be2563af15b7b69eba35418496de6b39fa030fe055596758fb41 WHIRLPOOL 48bfda1d8f2c7919a95e59fa5a470ad4e19e82018818c7a1d84f86922ba626d01479777a6675113fa7038183dae089245ca0134a6fcc7303265ad4d4e0efc36b +DIST openssl-1.0.0p.tar.gz 4008663 SHA256 b745d11f19531620a2e7402167d54845d253f2da3e523c2d0950595aef104fc8 SHA512 0f9fc847160b4139f778cf64eaf7ad3220710f86dab9812cdade04638f236e069059b05caff47880b40db7bba8fedb3d7e944abff081f78f164c78fbab048953 WHIRLPOOL 6d0cadef7f4f9657cf55f12d76139a82ae9b854d4cbfa0c749708d09e6022a1299e0368c2713a0120b32e15c879be63557ee515747abcfcac71773cd34add067 DIST openssl-1.0.1j.tar.gz 4432964 SHA256 1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 SHA512 a786bb99b68d88c1de79d3c5372767f091ebeefb5abc1d4883253fd3ab5a86af53389f5ff36fdd8faa27c5fb78be8bbff406392c373358697da80d250eadebb8 WHIRLPOOL 467aa3b02d04837e3281670401985e492d15b561c03b97246e3c8e61b0d3b1927332e3a226de4ed5bd02265a04fb31ce84c3501f4af9685633d00a9b43c56978 +DIST openssl-1.0.1k.tar.gz 4434910 SHA256 8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c SHA512 8b000fbd1bf919d9913a314f99aedd48a69f6caa4ccf43237889e73e08cbe0d82bfc27e9c7c4cade09fc459f91d6c4a831a9b3fc8bca0344fb864eadd7d1e8e8 WHIRLPOOL 5236a966d610c971e473cfc30e5412a72eef116fd259ada9c50da08bcd4ca967f80bb19babf530b4e5b9f1f24e9275e00391eb2e12a26d4544f593e2b4ba20b8 DIST openssl-1.0.2-beta3.tar.gz 5149260 SHA256 264d2d5114d3da3c0e1712312ad0c77bd41757f1cc12f543250063d1e57259e6 SHA512 d18ce87429d0addba11a02d121affd16ec63237a97474167ae1ed914dbc5d284b090d72443b0bfed1e0ad165a37655dd96d3be87053b792a871515e819ccfa72 WHIRLPOOL 26bbce30122106cb5f36d426fb1f50c0bca952caf6d7224e17a6252a5731e3b4ec9da1a96553f152631e7b0243332d3c0f7c8bc2e512b64f3a126955d4355a53 DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1 EBUILD openssl-0.9.8z_p1-r2.ebuild 4538 SHA256 f66c582eae2dd464bd42393c675d1452a7693681af7d479d346cd5e896fca697 SHA512 fd93cb629f8853964922547a8e8ff04f840eeedeacdd266e8bb75b96d12853c83a325ee45058a3f07265c1ac143f2be73616677465e1eeea95bde57d62093223 WHIRLPOOL b3b42ae1ef384ef220a5503d302674608578bd015b7041f33b782aa3cb79d69e35d51fb4f1b38d499187864fae755cf09fe7b71e81ebf86829e72f8f7e45f86c EBUILD openssl-0.9.8z_p2.ebuild 4981 SHA256 2e5abcc57ef84f093dfea05047746af19b364a885c72febf2d82e9b7fedac6e3 SHA512 fcf9fe7e968c89e74c905a5d21b75cbee92157cde55cfd7b345c37a26cf0c4e632c4883276bcc7fe6053e9c1eedb08d462034f8742f32964920a24ae498137f5 WHIRLPOOL 1d4e415755a4f6cb5f531c0e043b5aa3ffccc6f3b0e42e29708335dbcbee8f79076cb6602e190cefa649e2a1213fd8735935711fedfd29deee2c5f70985c4d97 EBUILD openssl-0.9.8z_p3.ebuild 4989 SHA256 c9aa34c65343bbcfb7036186dff3a88015075afc5b4fe6c1c5cc2d103b76db64 SHA512 98699bb16870c53790b670f71e74dac94d2aeb4bc766e217872b2d79e007c52d7e25bcc86ea2f63fe3761a7a3a70d81bf288597fbc07e2b6c5b04d34bfec1a1e WHIRLPOOL 92c304ecf1f27edece67b4711429a94263bb82cc53c6e22425ade7e6f35129a1f80994892435deccbc7ea95cfe20a705b46362f5db950d123c1f3ab42c8a69bd -EBUILD openssl-1.0.0o.ebuild 7053 SHA256 2486b010d3ab50bb196f7c5732f0e5ce65c27259ba009fa7374484f8620deb26 SHA512 ca2440979654170b27c370289c191b580afc08b4040556e5c836c71112cd6e785a23004847bdd07e70ecc32b67ea93383588ae7c149f9fd8bb84dbdaed4a6ed8 WHIRLPOOL 55f5f723c88e8153b325200b98efd96962137074184733d263ebf8da74e0ced5dd9a8afea22ddf4e30045fa666040824af9b0f048d13a8c5fff4126b3aa6904c -EBUILD openssl-1.0.1i.ebuild 8750 SHA256 7a8e19bed95667172404c85f19aab3749a52b0b9868b48ff81b51dc379fffecf SHA512 dc01c83afb5267a9aaae2eed45ae9f6d09498fe83b0e5257f0cb5eaaa8ae7fc062fd1909a5080df5b2f0d3ba1a25e31ed1ec3ed2c21a44404b202b52ed1689c8 WHIRLPOOL f845572114a4e6d4247c62c4e3422da59b2fd3bfa1aa7cd0973dfcc0c4f532b4c4168b11738704b424c430214ed78fa3ad89801cbd76f0c417dcc08bb709ef0f +EBUILD openssl-0.9.8z_p4.ebuild 4999 SHA256 384ace3c49fcad7c9ddc66dbac5fb7c514b057f801e911ab6b74e9bd104a85f4 SHA512 a346b8d566dff523d340633cd8f29697d9438a1e20e88efb1bd2d99e6bc3161c199870076661968fe9c97cfa82f7580f3d3c3c33b181776daef9fa03966c8dfc WHIRLPOOL a0f06b46e7a7cc0d3bd0b74fc980900c62f0bb3a89603a45ef411347d57531a7e138c3a5768f0d9ec7f254d2e207363a90a380a5497ea67730c122602d1abad7 +EBUILD openssl-1.0.0p.ebuild 7053 SHA256 9b9256cacd42ec7f7c454c985b759c3dc38cfa677c30626aff2952788532fd69 SHA512 58657ce4aa34f7efc7f6a97f50ae3e282c6a61cdfc87372eebc570e766fa2979752692e4cdff521fef66f0eaa13364b1424559793cba07e3e29eb3387cf7faca WHIRLPOOL 27cf19bd2a79c0742f3ec9592a1b1b14fef15695c4bba15e46399dc55ee869feacc1f611a5ecbccccfa5b66067caf2b60d40ce6d02af8750cb8fda4752574080 EBUILD openssl-1.0.1j.ebuild 8753 SHA256 d8d6837da8e3e74531d752a181836087d214de18ce57ca985317badb1e4a8b97 SHA512 02a154b3aeb6ec4e51f872ae811c83ed27c0caac2ca25450f1ec54b4ce82367042e09600ddfc9e4fd4bcd439e24c8a5a0d787f74ba0d148e0d6fe44e0d6eb6d2 WHIRLPOOL b36cdf732b11cb9d36b4a328d67d000a99c3ab50a9372937e988734e705787ec2f68c195dfed1047df8b746abf6de6ea0a8961401c309af141531847a3e9eb9c +EBUILD openssl-1.0.1k.ebuild 8771 SHA256 01e63bfb774252da09a8422e01f9cb16f40387026ebf824ee70f21d26bf6721f SHA512 01c7723985a5027a1a9497220c5dd766354bf2a89f38ee52376cc7d9f5af73b0231dbe07c9a3c282da883d29ef0194bf3c9bd81e7dd84a2a99e8b3c7f0a2b90b WHIRLPOOL 42a85b63bc39303037018d33a596e1c3d08bb8bb231da8e5c6b0a80fd5a4421a827014f54546b4a53330e50afeb6a4c70f3612f951c5d2668523a8fcb9b419a8 EBUILD openssl-1.0.2_beta3.ebuild 8651 SHA256 f0a4eece15dd48460b0a3e7fcb2bdadd087d049ec0f5ff67194e4ce78dffa540 SHA512 a6c915f4c03d638470c8edb8f57a09b01d9709feb09c65a8fc4562088f28f94898946dcbbe800b4ecd8a523a100ac7e90a7003163c9159ef1c188711f7f36ce0 WHIRLPOOL 3624424fe3435d492035964b8c7bce134bce13b27cd3e508673aefe31477b42231cd3957e6bf0236ca2352a39e236db5939b4ece2709eecbafb2881117637b73 -MISC ChangeLog 93583 SHA256 cc246230538a9498a1eee1a3930896ca1fba94d2e02d03da01167d8e55f7d8eb SHA512 9ee64c6a2c588b3c3c09d53b232c66570dc474b308d5c904e19ccdcd526bc48ab2bc119273e96fed0df5199ba6f8fb3b182d04901562ee5309194982b7d55a6e WHIRLPOOL 76a03ba6c5b939523996531fd1d21df930af3927540df951fbd701e42da43f8a58ddfe946cf2885122cfecbed0009dc0198cd5cc30c7ef905953951d54d3759c +MISC ChangeLog 93909 SHA256 0de08f9a942ee7049ec5216cf057be89036185ba6d051ceedcde289ad8163499 SHA512 a5c7cf4491779d059432c34e1bc7f60ac79139601efc2e5a17ee6b081cad765db7c69626a60816db0451271535bd2280a7ea25260e69905e2b5d0d1f9911e6e8 WHIRLPOOL dbfaca2a4c7f6c7357968c1267b28911557655a72126a7bac9649c825fc6a1924db84a20e6dda9b557d8a0930427853d9e311824dd0588e396dbba31b7a274c8 MISC metadata.xml 562 SHA256 5c61e2a07ffdb4ba157e0add7f84ff74458c890092d5e6980fd936dfdb457c34 SHA512 f83769af7ffd223923b72a62db27cbc80ca31925b95b720845b6bedd2a9b52837f70f9da93ee43e272ceb3c8424a8c9f35a31ebd5274bc04c91cd63ace1af844 WHIRLPOOL d98f2af2cf3e13c09ad526a2fe06fe8ef02e1db20fd4e3843f1793a97c9ae6a2897308c84038a9a37d6d68fadc7af6d913b980f4f079dac36ea3860a33aca8c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUSEHXAAoJEPGu1DbS6WIA5GEP/A+jQ4qEQXfnXwanKt2LZPSs -jIqIi1aqpT+so9PJ2Nuu0LIUB8P6cYZTD5y6f1zQN6beNEJH3dCbLuVREsMihYOc -/9ZihIA9/q2gAPvXMFgxkQIVVeafTuh2tkL/yDdbMlKYU7uD2cF7SFSflj9vRjjA -qdgNjC8CoFYW+f+ucDZREF5Y5TyFKSgrhKvVS2OTZD7p5lMW3mfHCAHKOhCd/BUf -35hyfWRv6W3JlMSGUWOAEkAwrLggW+9Pqj1dJG3hHdfrGhcFbu/KREmqP3u+5RNv -YH0uPYQ72yR97qG/GZY3JACruf7AbfHkrZqConcnxIlqh8Io0A4uweUkdDY02Ksy -itVb/ADk1EXyTr3U//AN7+ITf5jR7DgFq8qCOaT4ZbJDeE7kn+XLojD2V/795Wz1 -h+ta5UAivUDLytXAivxgUdTmolOYplVY2Qz/jGuX1jJjEVBi9xuxr2T1QMlyBXrW -aVoHmopoRBQYUFTmmtld1LO6x5iDBAvnfIqhyApht7+/JCzO1BVhlU8keCrGR5f0 -wob3EUfDuhwppmrJ37azf1r6QrlR2u+CJeJn0yVJhuRpGhi176ZgNHZVPpmPykIi -cVjkJ37nZt12pyFiX2dc07xT0KU22j9asob3RsXgMjhCxC1xpBtM43t2qagR/MG/ -XSw3JLL6C1zL+BIPwKof -=/DsV +iQIcBAEBCAAGBQJUrr5XAAoJEPiazRVxLXTF7BoP/iWM12QhgmtoUOBWV9o9Y2d6 +aQUOYQeW4nSYnoqPlD5bp+4rN5e2Vmq6P/LhsEXQKlER8oL8YU8DP0rtzHvqe3uA +hoNxMC3NBIUiW2uK211l0zbKAeqGEiASI/yCmn8oRFSqxODErZzEUa2yiW8Rpj1O +renFGf3urABTmr4nnTYESjuSEksvMmJFuMhaIVz3tn+dBz7Np0Z74xzWiechEqGr +GajfM+q+L7tlWdlo/77TXz55nicizZ6W4kWwtqL6yXOyAmWdnUmxvGiEQQQUOfx7 +lTGbkqesOzOFQwXYzp45JiY5XDe3tPeFV0+xNMgHCZhB4dmowDrfvhjEyNFVn1MJ +ByJokZRYVwDgM5qwqttUXj9kYn4Xmu42664rwh8U/q0Mn3jCgC9QFe5WlLJFqoNA +YFjGUXfzxf580NRTvbbuWqyMLaqVFK+g/MY9VqxAFjPiMuxtSh39DEbuA3UBpkQV +77yq57NLZFYfNzSbukSEaBjM9MccDR+pROW5lWraXDLVjtuU2wSKquqJoWiVDlIF +nmueDfKIvkWCzIl/Bx2M0N4gpfjY7Dg1CHdjex4abmwiB3s5IDw9Tw3zRal6/CXv +Mt1277LEp3w9FYD9vPxQiSrKzt/rR8Lyk0j57do/XKIOu+xHkZl7KT3GeLfpkI5s +KzSBt631IcYhPlGM/sIC +=Jojp -----END PGP SIGNATURE----- diff --git a/dev-libs/openssl/openssl-0.9.8z_p4.ebuild b/dev-libs/openssl/openssl-0.9.8z_p4.ebuild new file mode 100644 index 000000000000..652e713aebdc --- /dev/null +++ b/dev-libs/openssl/openssl-0.9.8z_p4.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p4.ebuild,v 1.1 2015/01/08 17:28:53 polynomial-c Exp $ + +# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal + +PLEVEL=$(echo "${PV##*_p}" | tr '[1-9]' '[a-i]') +MY_PV=${PV/_p*/${PLEVEL}} +MY_P=${PN}-${MY_PV} +S="${WORKDIR}/${MY_P}" +DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="mirror://openssl/source/${MY_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-5.1.3-r1[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) + !=dev-libs/openssl-0.9.8*:0" +DEPEND="${RDEPEND} + sys-apps/diffutils + >=dev-lang/perl-5 + test? ( sys-devel/bc )" + +# Do not install any docs +DOCS=() + +src_prepare() { + 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 + # update the enginedir path. + # punt broken config we don't care about as it fails sanity check. + sed -i \ + -e '/^"debug-ben-debug-64"/d' \ + -e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \ + Configure || die + + # since we're forcing $(CC) as makedep anyway, just fix + # the conditional as always-on + # helps clang (#417795), and versioned gcc (#499818) + sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die + + # quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (#417795 again) + [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments + + # 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-bodo/d' Configure # 0.9.8za shipped broken + ./config --test-sanity || die "I AM NOT SANE" + + multilib_copy_sources +} + +multilib_src_configure() { + 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: Expired 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) \ + enable-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 +} + +multilib_src_compile() { + # depend is needed to use $confopts + emake -j1 depend + emake -j1 build_libs +} + +multilib_src_test() { + emake -j1 test +} + +multilib_src_install() { + dolib.so lib{crypto,ssl}.so.0.9.8 +} diff --git a/dev-libs/openssl/openssl-1.0.0o.ebuild b/dev-libs/openssl/openssl-1.0.0p.ebuild similarity index 98% rename from dev-libs/openssl/openssl-1.0.0o.ebuild rename to dev-libs/openssl/openssl-1.0.0p.ebuild index 3e476e36faa5..1b05d96e0aba 100644 --- a/dev-libs/openssl/openssl-1.0.0o.ebuild +++ b/dev-libs/openssl/openssl-1.0.0p.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0o.ebuild,v 1.1 2014/10/15 16:27:02 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0p.ebuild,v 1.1 2015/01/08 17:28:53 polynomial-c Exp $ EAPI="4" diff --git a/dev-libs/openssl/openssl-1.0.1i.ebuild b/dev-libs/openssl/openssl-1.0.1k.ebuild similarity index 97% rename from dev-libs/openssl/openssl-1.0.1i.ebuild rename to dev-libs/openssl/openssl-1.0.1k.ebuild index afc632622bd1..90f5d45519b1 100644 --- a/dev-libs/openssl/openssl-1.0.1i.ebuild +++ b/dev-libs/openssl/openssl-1.0.1k.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1i.ebuild,v 1.12 2014/09/19 10:34:21 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1k.ebuild,v 1.1 2015/01/08 17:28:53 polynomial-c Exp $ EAPI="4" @@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz LICENSE="openssl" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib" # The blocks are temporary just to make sure people upgrade to a -- 2.26.2