commit:     9ffdcaba89a94dc933e722339fe9471ad16af62a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 20:13:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 20:15:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffdcaba

dev-libs/openssl: drop 1.1.1s back to ~arch; fix verify-sig dependency

- Drop 1.1.1s back to ~arch (wasn't supposed to be stabled yet)
- Update dependency on sec-keys/openpgp-keys-openssl for refreshed keys

Bug: https://github.com/openssl/openssl/issues/19566
Bug: https://github.com/openssl/openssl/issues/19567
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/openssl/openssl-1.1.1s.ebuild | 4 ++--
 dev-libs/openssl/openssl-3.0.7.ebuild  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild 
b/dev-libs/openssl/openssl-1.1.1s.ebuild
index 5539a1b32d86..1314b4d0326b 100644
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1s.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-       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"
+       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"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test 
tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
@@ -32,7 +32,7 @@ BDEPEND="
                sys-devel/bc
                kernel_linux? ( sys-process/procps )
        )
-       verify-sig? ( sec-keys/openpgp-keys-openssl )"
+       verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 )"
 PDEPEND="app-misc/ca-certificates"
 
 # force upgrade to prevent broken login, bug #696950

diff --git a/dev-libs/openssl/openssl-3.0.7.ebuild 
b/dev-libs/openssl/openssl-3.0.7.ebuild
index 518b44da5f56..8bde8401c1ce 100644
--- a/dev-libs/openssl/openssl-3.0.7.ebuild
+++ b/dev-libs/openssl/openssl-3.0.7.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
                sys-devel/bc
                sys-process/procps
        )
-       verify-sig? ( sec-keys/openpgp-keys-openssl )"
+       verify-sig? ( >=sec-keys/openpgp-keys-openssl-20221101 )"
 
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"

Reply via email to