summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2014-01-21 00:01:22 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2014-01-21 00:01:22 +0000
commit83b034c00b90dbd0109b02c1974c1c784f006b0d (patch)
tree26c0f8796f735aaf06acdc391fb718e6db4a6488 /dev-libs/openssl
parentbump (diff)
downloadgentoo-2-83b034c00b90dbd0109b02c1974c1c784f006b0d.tar.gz
gentoo-2-83b034c00b90dbd0109b02c1974c1c784f006b0d.tar.bz2
gentoo-2-83b034c00b90dbd0109b02c1974c1c784f006b0d.zip
x86 stable wrt security bug #497838
(Portage version: 2.2.7/cvs/Linux i686, signed Manifest commit with key 30427902)
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog5
-rw-r--r--dev-libs/openssl/openssl-1.0.1f.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 03b77470233e..d3d736c48e5e 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
# 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.508 2014/01/20 15:59:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.509 2014/01/21 00:01:22 phajdan.jr Exp $
+
+ 21 Jan 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> openssl-1.0.1f.ebuild:
+ x86 stable wrt security bug #497838
20 Jan 2014; Agostino Sarubbo <ago@gentoo.org> openssl-1.0.1f.ebuild:
Stable for ppc, wrt bug #497838
diff --git a/dev-libs/openssl/openssl-1.0.1f.ebuild b/dev-libs/openssl/openssl-1.0.1f.ebuild
index fe0a3b96b684..845d21d22fc6 100644
--- a/dev-libs/openssl/openssl-1.0.1f.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1f.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.1f.ebuild,v 1.9 2014/01/20 15:59:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1f.ebuild,v 1.10 2014/01/21 00:01:22 phajdan.jr 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,