1 |
commit: 9ffdcaba89a94dc933e722339fe9471ad16af62a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 1 20:13:47 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 1 20:15:14 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffdcaba |
7 |
|
8 |
dev-libs/openssl: drop 1.1.1s back to ~arch; fix verify-sig dependency |
9 |
|
10 |
- Drop 1.1.1s back to ~arch (wasn't supposed to be stabled yet) |
11 |
- Update dependency on sec-keys/openpgp-keys-openssl for refreshed keys |
12 |
|
13 |
Bug: https://github.com/openssl/openssl/issues/19566 |
14 |
Bug: https://github.com/openssl/openssl/issues/19567 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
dev-libs/openssl/openssl-1.1.1s.ebuild | 4 ++-- |
18 |
dev-libs/openssl/openssl-3.0.7.ebuild | 2 +- |
19 |
2 files changed, 3 insertions(+), 3 deletions(-) |
20 |
|
21 |
diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild b/dev-libs/openssl/openssl-1.1.1s.ebuild |
22 |
index 5539a1b32d86..1314b4d0326b 100644 |
23 |
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild |
24 |
+++ b/dev-libs/openssl/openssl-1.1.1s.ebuild |
25 |
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" |
26 |
LICENSE="openssl" |
27 |
SLOT="0/1.1" # .so version of libssl/libcrypto |
28 |
if [[ ${PV} != *_pre* ]] ; then |
29 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
30 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
31 |
fi |
32 |
IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers" |
33 |
RESTRICT="!test? ( test )" |
34 |
@@ -32,7 +32,7 @@ BDEPEND=" |
35 |
sys-devel/bc |
36 |
kernel_linux? ( sys-process/procps ) |
37 |
) |
38 |
- verify-sig? ( sec-keys/openpgp-keys-openssl )" |
39 |
+ verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 )" |
40 |
PDEPEND="app-misc/ca-certificates" |
41 |
|
42 |
# force upgrade to prevent broken login, bug #696950 |
43 |
|
44 |
diff --git a/dev-libs/openssl/openssl-3.0.7.ebuild b/dev-libs/openssl/openssl-3.0.7.ebuild |
45 |
index 518b44da5f56..8bde8401c1ce 100644 |
46 |
--- a/dev-libs/openssl/openssl-3.0.7.ebuild |
47 |
+++ b/dev-libs/openssl/openssl-3.0.7.ebuild |
48 |
@@ -40,7 +40,7 @@ BDEPEND=" |
49 |
sys-devel/bc |
50 |
sys-process/procps |
51 |
) |
52 |
- verify-sig? ( sec-keys/openpgp-keys-openssl )" |
53 |
+ verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 )" |
54 |
|
55 |
DEPEND="${COMMON_DEPEND}" |
56 |
RDEPEND="${COMMON_DEPEND}" |