gentoo resync : 16.04.2022

4 files changed, 8 insertions, 5 deletions

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index f96a0e186304..e41bcd81ae32 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -21,8 +21,8 @@ EBUILD openssl-1.1.1k-r1.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8c
 EBUILD openssl-1.1.1l-r1.ebuild 8467 BLAKE2B 5416eaf449db4d7e785cf8ba2b83a829a9b57237c9d561900029ede389205a3905411b9b19d170f801d781fdb7ff3f8e562c0b037a87ad1cb48830cdac8091f5 SHA512 826f4e77f5388fa0b3cdd754c5d39c049987f4c7c038fa416da1611e084c866339ae95ccae722fb2058689953c60ed56562247feb11baaaf869516eea5a56b00
 EBUILD openssl-1.1.1l.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8ce7be60a85bcc8f1de2c74b1421dd33fd22c00451f6c55aad404616b82f2c971aab751de1d243cb4dc6cde23615e18e SHA512 2f594b4df0c9a408a8208f98b9bbdb0ffc63f3d3e84c3c242b307b2d4cd1eb5b34ec8b30735c2c4bb0f9c0842fe6264dd71722adca04caed79e4c32ee25c005c
 EBUILD openssl-1.1.1m.ebuild 9036 BLAKE2B 998fbd22a08de53c635cb928dc236827e0982e5758f51d179d92a087771f46fbff227624868bb0a682d0df2daec093d7c64bfb3812a6c5035f529030bbec7e8e SHA512 d976a3e28a9914a6ca0cba3d6a852c787f80d51b381bcb400ab88bcbc9d6e956c60dbb439781cfbffe47d1227301aa4ceb7729718f49a239f784dcc239815f93
-EBUILD openssl-1.1.1n.ebuild 9240 BLAKE2B 272e5a33356c2dab0d681998d52843bc817ec3d717a05c0645f6948a48758a5f3f93bf14164068da3c40a001727d52c309ecc3e2534354e27b244a7be2f58198 SHA512 9b9882975b1082b8a141206d9178a969b3301eeffee30415a1d9417f74e63310fe819bdec191e9d22d41d9c8036ade9eb1d0eb0c52428be65d9bca968811ebf6
+EBUILD openssl-1.1.1n.ebuild 9289 BLAKE2B 50fe702a2a3872ac9c54c68dc5ebeb7eedef4324f3e0fefb077a13072e4cd6d4279c5ef25512b48bb35b5af2e1c93408da2cfc09cdeb93f238551281abeb3266 SHA512 7eb28d1c27b89c9051e221b8f7dea53517c2307d5656874d4a12fc0df7e359d005963348102faf779893cddeb217d51fe10ba2e1609eb3e99097c0bf30cab057
 EBUILD openssl-3.0.0.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
 EBUILD openssl-3.0.1.ebuild 8464 BLAKE2B 8e024cdae9836cb5135089482d22617b0a90b9617bc5b4f9ab79669c9b28a8c623218de11a452e2525ba29456a7ba9be7ac16724eb0dbcafd2d653b26fd77e4a SHA512 28e4e5be320a1a0c2ea726ec0872d6d42c79f3b5eea9ef23a2501e24e1ca6ff27226ad7720a7717e61642399a4a0d5d98ef406d8b8856ef98934ea7c3015d1a5
-EBUILD openssl-3.0.2.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
-MISC metadata.xml 1486 BLAKE2B ddf79f8ea66471d1aa2809dce9b3b87973c38a1367566ec77222dfd22062963535241314bd4fd56387f2d133825e43627f363edee9329c14565717511b5cb870 SHA512 92f53ca3d3867ab8cfc4093ac92a9d9885eee8c10ac43f80c4dfb87911fc253557118064ecf1b1fae48c50e1273ef3821c9db84f00760dd0af8d5104a49595f0
+EBUILD openssl-3.0.2.ebuild 8461 BLAKE2B da0438ee498a7c718678596c00517bbbd15af8350d7d9fe5c0ca7cf5b0009019022a6aac19ee9ddc77b46089262778098633a2360d52b1d7aec1865da0394844 SHA512 18ca4c6e0944fbe12afa68b21475d947a7145b874c6a7a336e564b18f3688e45af2941ce1008e800eb053f1a7133b748bb6d99ccdee8f0dbf3c839ce1c4aa417
+MISC metadata.xml 1585 BLAKE2B 104cd90ff54c6789edddb7f433252731754cb600ea663c6da66b28ee988541b9fa5f8b3086684841946ca8c4928c8768a1ed11d39419a26c039da840912a66ae SHA512 13cf734d5d1685135e0f1c488af0e4a2f1295eac33c45d65b1dbdd1b04100b1ca5f3d5d1c9938f4100f8df548ba739c9ade56c72176de92cb7f9c2cc2da818cc
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index e0b7df73655d..7aeb3cfc9e34 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -15,6 +15,7 @@
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
  <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
+ <flag name="weak-ssl-ciphers">Build support for SSL/TLS ciphers that are considered "weak"</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
diff --git a/dev-libs/openssl/openssl-1.1.1n.ebuild b/dev-libs/openssl/openssl-1.1.1n.ebuild
index af9f45ed046c..5a7d16cfa51b 100644
--- a/dev-libs/openssl/openssl-1.1.1n.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1n.ebuild
@@ -17,7 +17,7 @@ LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig"
+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 )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
@@ -193,6 +193,7 @@ multilib_src_configure() {
 		$(use_ssl sctp) \
 		$(use_ssl tls-compression zlib) \
 		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl weak-ssl-ciphers) \
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
diff --git a/dev-libs/openssl/openssl-3.0.2.ebuild b/dev-libs/openssl/openssl-3.0.2.ebuild
index a42efd8d9f4e..2ef0aaed3200 100644
--- a/dev-libs/openssl/openssl-3.0.2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.2.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0/3" # .so version of libssl/libcrypto
 
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig"
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -180,6 +180,7 @@ multilib_src_configure() {
 		$(use_ssl rfc3779)
 		$(use_ssl sctp)
 		$(use_ssl tls-compression zlib)
+		$(use_ssl weak-ssl-ciphers)
 		--prefix="${EPREFIX}"/usr
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
 		--libdir=$(get_libdir)