Add USE=tls-heartbeat for controlling the heartbeat extension.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 26 insertions, 20 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 4c51095ef8aa..83cd0c9257db 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.492 2013/10/13 11:18:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.493 2013/10/14 23:06:56 vapier Exp $
+
+  14 Oct 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  openssl-1.0.1e-r1.ebuild:
+  Add USE=tls-heartbeat for controlling the heartbeat extension.
 
   13 Oct 2013; Agostino Sarubbo <ago@gentoo.org> openssl-0.9.8y.ebuild,
   openssl-1.0.1e-r1.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 83cdf0acbcec..f9c4050e74f9 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gentoo.config-0.9.8 4246 SHA256 a38f4a9af890303d764b04eab64dd618b60599762d3ab3286b667c1ee38d2b75 SHA512 04ca7a9cb42762060216cf2696003d1087b1504e7f79278b0509b6a03da0bba0a13cdbe9fd713754379e09dc6bf0e7354fc1bcbaf8a7d75f4a400fe6c8868ab7 WHIRLPOOL 3d5524dda714eec5236b7d15e36c0633d75c750ba5555df2c5da59781cd6d0005f5810dad001758635def1894f27f83fde45e80f51c5467603c54a2b1389e22a
 AUX gentoo.config-1.0.0 4748 SHA256 67ae024ebb87a8236a358a081f2d9b038eef2d0f432705d05063274e7af28b4e SHA512 c68b7eb3d07a3b619f6c3e5f508e594efe2991aef91d8904019f967c20a7e9e9604d8fce1271b5bc247856411e81a800eed7710da46645b9d5d9e5cb184ab99b WHIRLPOOL a849c1ea7d7d0dfeac675636e801dd050c66866f6327e6619f233ede0fc0e59f5f2f554f7812a0c33bd40d76a7ba85ca3aab0a00f964e971de97f5af11a527bc
@@ -50,24 +50,24 @@ EBUILD openssl-1.0.1b.ebuild 7306 SHA256 4a829742d4d55cfd92151171c22cb163efc7937
 EBUILD openssl-1.0.1c.ebuild 7295 SHA256 da1088596931cd88539039a0015a5183eb185aa443609044c76592dff37bacca SHA512 94a7a7297bd0a3152984167cc65da970fa1cb9a6c1fafdd9fe9b546cc5c00b0ede0b8059fa28f4a46c83afff7ffe15a9f23afb49e8b35e38228c3ffaa07fe37c WHIRLPOOL f4fb2d2bc6866db955cb6b3c168ed9c8d82458197e1183fc72b0a96192f37af674b3b77bb463c4ea7ed4540e1c81311f906bb765ad607264c218f9a31596c20e
 EBUILD openssl-1.0.1d-r1.ebuild 7434 SHA256 26fb761323ea41e4ee192ce86dd9903487f944dabd496127c41acbc7c897710c SHA512 06d5da0341b8a009c1117b9ad1868b38b46ed80c857654580543819ab1506e56be0d135baf284afbd520c22793e4ee637414df2f7b9f3f43507732010f8f8703 WHIRLPOOL b7d153979c4076ec228e3f922abda7cc4ad4bb35d9631b33718ec998ad5afd08ae749710885033687dc54337deae777cc0a5afa2cfa4880c9201d169e686adc1
 EBUILD openssl-1.0.1d.ebuild 7245 SHA256 7d8ce014bc036419385d2081d3fa7ec650f60a06adbfa4121edebd71266393e5 SHA512 9449a3265ce876b62ae1c0a44ad031d4db3ebaa805a3bb65abb55562a865519cab6c7808f3668b08f9c02abf59dad3307169e0cd648779910f7ed81ecc7e8553 WHIRLPOOL ec43e086e774d114d4caeb85e13a496070436cae8332db5a47f24a001f7fe0374afb2e74fbac3ab0dd264e6ab12ecbca1ed2d1faacb285959224657926c06b81
-EBUILD openssl-1.0.1e-r1.ebuild 7801 SHA256 889f9f43e2bbe660109dfaa3d50eab8d625bae5624827873185f0546caa3a11a SHA512 ebf66299a275393af8857042cd1e7e1e699b5ef686eff9906c1683a6054298412f5c74e7d3fb4153860ec9f4aaf79ca79a465d33c7c5af7d5cdd90f6c509b20c WHIRLPOOL 68026413396247bb157f051f3bd7e5ae8fe62da48db4e2c58142cc1f803d6205d646aeb3f1ba864b6c9202072b371501174b4df0b40e21c31860c82a35b9bb01
+EBUILD openssl-1.0.1e-r1.ebuild 7859 SHA256 afe03bc307ba4391798c4022812117ef6ee2a7128eb05c6fd125868c9ce90f5b SHA512 ad0c3019a93442e8e9f16f214a026a6bf171dfc810595902b88470c98a7867fb18adb781210529fc744bc11a0f4674100bbaa129311159b7f64138e62d4e556f WHIRLPOOL 3cc5c402f942206832c7932c3b425503c85a1db30269be43dd05c32eba1b33eec872f0f58b2cb99c35d5a9f67e39c2cb6fb8cb1ad8c6c954273fa24bfd950070
 EBUILD openssl-1.0.1e.ebuild 7381 SHA256 a9553f47c918bf1ad707391e8de7ce27dd4c0ca82c0f9995db74e208d7ed9127 SHA512 0a68cff5641931682bd1b23ad02ee74b235eac2f0020206f223d0b0de5e86bb12ab4d684fee6692e85dbd050693aeb42095e89c3653a94e406c8e3a518262bc5 WHIRLPOOL 7eea97e122a721c76ae1b9d0ed523e332d5f100808856f2e2dd0bf4733069b4123dd79b8cafe4c905d88769aa61dbb0eb3b089d5b6c9ce0a81e614e5718d473c
-MISC ChangeLog 74147 SHA256 5e9fdd404cc02d5e73ad62f36e429694cd2133046b52c9f805e88a0a61a82b7b SHA512 ded1d751427c2a3a3587289fd84b5750f04b8bfa97b4e13a28065dceef59456daadea45100394b2280c40cceffb558562db780547c755e67b2c4c7c381b80520 WHIRLPOOL 1f9dfdf810ee974959f406654a6e2b63add947bd042e2c3056e1bab296e764c2dcf7f2b1c8e281caf9b53e8d4fcf209c4574ac215cad27d4b09d4150f76588e2
-MISC metadata.xml 455 SHA256 fd017d6cdb1c9f11ab839c8aae14acf1035556b52aae35b6d2628cc4eb5ba57a SHA512 c7f54d9305e637f66afafb0b8e10497bba30ddad597e3ffd24eace9bbe4c8af96ffcbf44c37cb39e4d59f93c3abfe9f3ed9d491bde6b76a5eb5f1311916ddf1c WHIRLPOOL 4bbf598eb90781ef18c92e8eca3a6f9fca9c1c60b4b5a2d3f6306acea16ddd6a4f3166511d73b17df73dfbdeeb6e2c16e5527c8a3e980e420cb93efee2a78743
+MISC ChangeLog 74308 SHA256 7b07d867e0a85410cd69de00b816d711686894785fd662d63f3329d655bdf9c2 SHA512 adc3ad2a2c9488235058f4504c2111f7e2e05014485a3cfbb2ebab5fa790ace997da793f83e85ea566a677d9a38955921960faa488c59f5c6083acd4f9fc051a WHIRLPOOL cf1ab4a1a56751a693ba0ea9136d87bb4c6963aa405556cb8a520d05023c0a3470735065d247074a84781f9cf9c5f543801460655e2638635e42e40b2c846b2f
+MISC metadata.xml 537 SHA256 dfb61bab6de1d7e943f92be14ed54fb9275d568a11d6ba29e395f23f547603ee SHA512 0417c438c7f9586c7bbe7694707fec94f2ecf6fb59e36bc87d707fab0b24346a6c9fac5e58c69302e767cd8a7e50a508cdb2430b2cdf8fcc88921286e09756e1 WHIRLPOOL 0f21bab1258c7ee675c27cb7d78a90985437dc8d001a232661657549cebd9f2f26802686435bdd3a1346c5a0ff14bfffa740d6ded2288dc211ad0183f5b3f686
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSWoCYAAoJELp701BxlEWfJfUQALeyWAYdwgPXY3JqwaiYYWCw
-Cwvqjdfx2RxOPSAtWh8Y0IR2DevphR8TaFN4GOWRyUSyqOtJei1+ozPFgVJ7FMlP
-1qo3Pu0foG/UUjtWtRC+TFAP77yuRdnSx6lKDPJLTY+FDYcBHEEC5n9QtYPY9y8b
-sP1HvG4fQmz8clfgaFZrlX1yxnr/W61+CkwvimvSaQz7LmvgY1DCNe4rOKxXqPtm
-Wu/9d/7AWGrIBLz5hQyEC66zrdD5SWV+GCPeG9igdnQd68nnTe/NuBPVSUWD+Asg
-YLjPGi/dvUyLGyBK+9tiB1UdQcveuTj/Rds8ANgs0wBRtYlgvfl4OizHP70Mnnpv
-xEizcQH1UppQKbVwhasEHBge/4LmS3AnAF4o1lrnno3UoTurknBsFmnKPadpXiz+
-bwOe/+w/5DBZ6X4pdBjlFJvb/4QyrZPsE8Llf07MLZbaUD02lrU3rgiC+mnaJNIY
-mWeFvX9wzI2+NTTEgx6GUgdIWt33770Qtrf2Z1l4amefwTLfZhDg99eoTG7msbXa
-HbIBui6TTe1n+efBWSNzreaFmgTPz25/z/PyOUbm/9oP4mNd9mjJFrbCSRKX8QHX
-i11VYpe3Q7dmKompX1g+KD8FrsNb6ULve8sIZzJgIIKUXWzbHWr48BDR83ihE2RY
-fDpNcqkYnkoQu8XKrqTm
-=l46F
+iQIcBAEBCAAGBQJSXHkWAAoJELEHsLL7fEFWr+IP/3Gphp6QfhXCaDWsuFQY2tqP
+kh4CZBTdMhyo0Y84gg1YebZfj0kCuwbxv/4+0sDueauvvstcDJuh92sGoAs4YBXd
+ETR/PqUySXp5EO/qOeoFYoRYwA7PSjoT3U81iAwSgzC2FkhhFihRtnlsJ3lkbTRA
+itNyeIFXo4z7e6p7fp7JytJuTfOr3LzL9vmGZUqD/qhzxSjObPmwhW7TyhwDO7fa
+OkbjsCC8ZGVgurxqeQ7CUTiEmz6MA2a0lRW3LNrspvaOxRr/iB41uBRpvX+ZsXwO
+F0IVwSfRqKlXqrolbqx14NPeEcKbSv7RAjdIdYh/2qTwEaVG8UrF1ixw8II3CMAX
+dKFY3VOx/TSWi4Qhej+LuoMh6YXccWLTOSe4FXyi9pVanzRg32PRFewXFXHsMVq5
+1ZQhlUKcy5qlfV/0lwDeKMq5E1x0B54JC8QgcuPt1dToFcNwfncxA55ozuD+RI/G
+bDVT6pJFDmOF09gHCJ/htDZsFSfK1LTyxPlJgZ7O/HxnkcrzeuBUpcv9cDdVg7zF
+n0XY9+P83CPDNiiiz8+mwfn5CtG7hvMXrLMl6KYfnHepShNIyO/T8mCpTkwWzyWP
+QSlNNt8V6gwge3+83hdZQtg7tY8adwv87BL8AFwnVIz90vcO6gtKR7cBG6PSKRw3
+ByuyyrmfAftZ2yvAsVdt
+=znfY
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index e6141a703efa..84ddb514f86c 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -5,6 +5,7 @@
 <use>
  <flag name='bindist'>Disable EC/RC5 algorithms (as they seem to be patented)</flag>
  <flag name='rfc3779'>Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
+ <flag name='tls-heartbeat'>Enable the Heartbeat Extension in TLS and DTLS</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
diff --git a/dev-libs/openssl/openssl-1.0.1e-r1.ebuild b/dev-libs/openssl/openssl-1.0.1e-r1.ebuild
index 1b14dd2ac703..8d2a289aa45d 100644
--- a/dev-libs/openssl/openssl-1.0.1e-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1e-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1e-r1.ebuild,v 1.13 2013/10/13 11:18:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1e-r1.ebuild,v 1.14 2013/10/14 23:06:56 vapier Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
+IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
 # our libssl.a depends on libz.a/etc... at runtime.
@@ -134,6 +134,7 @@ src_configure() {
 		$(use_ssl gmp gmp -lgmp) \
 		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
 		$(use_ssl rfc3779) \
+		$(use_ssl tls-heartbeat heartbeats) \
 		$(use_ssl zlib) \
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \