amd64 stable wrt bug #536042

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 17 insertions, 21 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index c7228936f116..35b697f97895 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.614 2015/01/08 20:20:40 zlogene Exp $
+
+  08 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> openssl-0.9.8z_p4.ebuild,
+  openssl-1.0.1k.ebuild:
+  amd64 stable wrt bug #536042
 
 *openssl-1.0.1k (08 Jan 2015)
 *openssl-1.0.0p (08 Jan 2015)
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index e8360fb5f780..3919aa67c4ec 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -31,27 +31,19 @@ DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d5
 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-0.9.8z_p4.ebuild 4999 SHA256 384ace3c49fcad7c9ddc66dbac5fb7c514b057f801e911ab6b74e9bd104a85f4 SHA512 a346b8d566dff523d340633cd8f29697d9438a1e20e88efb1bd2d99e6bc3161c199870076661968fe9c97cfa82f7580f3d3c3c33b181776daef9fa03966c8dfc WHIRLPOOL a0f06b46e7a7cc0d3bd0b74fc980900c62f0bb3a89603a45ef411347d57531a7e138c3a5768f0d9ec7f254d2e207363a90a380a5497ea67730c122602d1abad7
+EBUILD openssl-0.9.8z_p4.ebuild 4993 SHA256 331d66d214dfc81a496b8b323c675b0fe3e950427e5744228440c4a9ae6c5045 SHA512 f3035008bd9784b19bc647d9faaa7df97aecd715d81e64d14f20e2b62713bd2ee367ad52067a2dc2300573abd8b03bf040404eff98d49e6870a1e851e45fe22c WHIRLPOOL 952b271e0e5e588bdb7a52f88644c791a0bc42d979a2b3df36b73696e32c35943e470a4cefa72c0e4bdfb8e85845992f8692e1ae00719c85987b855aa7b423ed
 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.1k.ebuild 8765 SHA256 71637f7092bfd05dac9d4aa508301c16777103b3919ca9edb567758020a06f7c SHA512 1e07f21244282965e1cbc5137f277fb27f2a11b35b979148015e45c56565ff9b9ed38621900ce1e098e3616820e3ff3b534a10cbb27701f216e86f358e3976c0 WHIRLPOOL f57c1f246fe7cdd326dc09c84efc519b5016a3b090342ad10e9a5d12a9ba2e5954d58155fd3fae1ec75e3e0272190ab538c3e4d9a0d5af8381cef686029f773d
 EBUILD openssl-1.0.2_beta3.ebuild 8651 SHA256 f0a4eece15dd48460b0a3e7fcb2bdadd087d049ec0f5ff67194e4ce78dffa540 SHA512 a6c915f4c03d638470c8edb8f57a09b01d9709feb09c65a8fc4562088f28f94898946dcbbe800b4ecd8a523a100ac7e90a7003163c9159ef1c188711f7f36ce0 WHIRLPOOL 3624424fe3435d492035964b8c7bce134bce13b27cd3e508673aefe31477b42231cd3957e6bf0236ca2352a39e236db5939b4ece2709eecbafb2881117637b73
-MISC ChangeLog 93909 SHA256 0de08f9a942ee7049ec5216cf057be89036185ba6d051ceedcde289ad8163499 SHA512 a5c7cf4491779d059432c34e1bc7f60ac79139601efc2e5a17ee6b081cad765db7c69626a60816db0451271535bd2280a7ea25260e69905e2b5d0d1f9911e6e8 WHIRLPOOL dbfaca2a4c7f6c7357968c1267b28911557655a72126a7bac9649c825fc6a1924db84a20e6dda9b557d8a0930427853d9e311824dd0588e396dbba31b7a274c8
+MISC ChangeLog 94037 SHA256 481b89ed0245de4ec7cab6fe8c5fa16885669f369f906e4d16a8001342e8cd31 SHA512 360a63768d3d8dcc5df73a56f8dc713c5aa1f76b12a7cb399b58aa3c600efef26baa0051875d202b7df6ec0dde12220b0e9083f99e9c1eb3e52421e6771d18c1 WHIRLPOOL 85df1370028457fa1d86347149449083aecd06c015ace424fb2ef4a12c270812e653f12d89c47aa440a56bfdb7b582d55ba3d2cec6619b7e46db15bec9196525
 MISC metadata.xml 562 SHA256 5c61e2a07ffdb4ba157e0add7f84ff74458c890092d5e6980fd936dfdb457c34 SHA512 f83769af7ffd223923b72a62db27cbc80ca31925b95b720845b6bedd2a9b52837f70f9da93ee43e272ceb3c8424a8c9f35a31ebd5274bc04c91cd63ace1af844 WHIRLPOOL d98f2af2cf3e13c09ad526a2fe06fe8ef02e1db20fd4e3843f1793a97c9ae6a2897308c84038a9a37d6d68fadc7af6d913b980f4f079dac36ea3860a33aca8c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iJwEAQEIAAYFAlSu5joACgkQG9wOWsQutdY/LgP/YB54ui9Pwe7KaB4vvl028phx
+/tDXgzQ0QCIdU5gqvJaCMUerPrGEMDBut8rfccKEOdn7mv1KHmhkaqdQiK1GdPEZ
+X8U/vj1HGHTil8PTqk9jBJ+9v9SpGV3BtN/5vdPf1hTDWXkwJjer09H46CZf4dMi
+o4aGSjQBvZ9geXW7UVg=
+=PLB0
 -----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
index 652e713aebdc..0aa504f99bc6 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p4.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p4.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p4.ebuild,v 1.2 2015/01/08 20:20:40 zlogene Exp $
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
@@ -18,7 +18,7 @@ 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"
+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}] )
diff --git a/dev-libs/openssl/openssl-1.0.1k.ebuild b/dev-libs/openssl/openssl-1.0.1k.ebuild
index 90f5d45519b1..0f4c86af0d70 100644
--- a/dev-libs/openssl/openssl-1.0.1k.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1k.ebuild
@@ -1,6 +1,6 @@
 # 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.1k.ebuild,v 1.1 2015/01/08 17:28:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1k.ebuild,v 1.2 2015/01/08 20:20:40 zlogene 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