summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/openssl/ChangeLog7
-rw-r--r--dev-libs/openssl/openssl-1.0.1h-r1.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 2c620b0303f9..77d4907414d9 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
# 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.542 2014/06/05 18:14:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.543 2014/06/05 18:16:45 chainsaw Exp $
+
+ 05 Jun 2014; Tony Vroon <chainsaw@gentoo.org> openssl-1.0.1h-r1.ebuild:
+ Stabilising 1.0.1H on AMD64 based on infra field testing by Jorge Manuel B.
+ S. Vicetto and additional testing by Kristian Fiskerstrand. For security bug
+ #512506; expedited due to operational needs.
*openssl-1.0.1h-r2 (05 Jun 2014)
*openssl-1.0.1h-r1 (05 Jun 2014)
diff --git a/dev-libs/openssl/openssl-1.0.1h-r1.ebuild b/dev-libs/openssl/openssl-1.0.1h-r1.ebuild
index 51bfad7fcdbf..b726f568c2da 100644
--- a/dev-libs/openssl/openssl-1.0.1h-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1h-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r1.ebuild,v 1.1 2014/06/05 18:14:56 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r1.ebuild,v 1.2 2014/06/05 18:16:45 chainsaw 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"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,