gentoo auto-resync : 24:08:2022 - 14:48:06

4 files changed, 40 insertions, 6 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 0f558bdd9760..31f6d755969e 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index baf961b21630..3b54cc1b562a 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,8 +1,8 @@
+AUX nzbget-21.1-openssl-3.patch 943 BLAKE2B 7a66602312169f985f869e0d5cc4b64fd735ed276be3ae3d745715cf4c7d098947c0ea786412594f2240eef20be58332d0481e6221bb3fda723c2aebf67c1430 SHA512 5d5f47088560d7835cf8f8d2fd39aae2d591a12b5d6f9182f433eb72857343b532125a33b4206048343afe159660689f403201fe8f2e2ad1b732f3f8539677d3
 AUX nzbget.confd 337 BLAKE2B 4986f3c00019f8f2d0c3d71f9d623186823748722dc4c8aea82ef39b57cebc079247ce5aaa14f1fd844a3c94931f53c1af7ce015e2b4ba68973367c6b708e0e3 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56
 AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3b96c55bcdb115cc99d12e0569f59cc546f9655460230e5f29a82c4d749a654e2019e7c06651c165a SHA512 df4965d25a221c033586da85596584a712bc5c5d9c2e0950850f96fa872f29a04571649e7add504d9fe8be3639654e5653a766a6accf4dea344ca771088b432a
 AUX nzbget.service 466 BLAKE2B 928ff8fd5f48b9190324ccaa98f1215aa35e30eb9959278fe2b9d77f175ee97a28e0efe3ac034ceb2da023c9d7737aa3f803861489284578412559e257700003 SHA512 5a59562580596bc5524086dcb2b2550b242a5f62750fd42a5b2e9ecb786b40107a21fcab7496d0cd396434da7ed3ee5d1046059d94f5f2bcb76ad496862d19e1
-DIST nzbget-21.0.tar.gz 1988902 BLAKE2B ee9204a978502562348dc4945e19b084d8d17f566099cfe7e95dac154ffac6d772084c9c070fba0d585cd2229d0a5760b3298ef29eba52d7c75edbc9fe43e310 SHA512 bbee5073a2788a17d78009b7ae0c41473aa4d8424301e7e62b2544dc8993e1e3b6e1026dd9f71af5627293d2113d8637a4a6138eee0a328554df298117dd6bb3
 DIST nzbget-21.1.tar.gz 1988916 BLAKE2B 74298c5c7f3986831f36832a8ffe596543196b5b46500925de478bf11cab8e66fb36dee9458533a4194d82123765b29e37914463d72fd206e218b4875861001a SHA512 d8dc1ad324f675c5505e623049a14c022475267aa03dcd5d8fd6cf9ed3b776cc2776077b61d035e252937ea4b6bf8f90bd33e715cfd842d2e012615df3ffeafb
-EBUILD nzbget-21.0-r2.ebuild 2445 BLAKE2B 996992ae3f64a147a9fe704757e510bce821c13d03491aa79b7ec102ce3ff7b5f19136bb9bfd03090158edeb920587ae7509e9f00c3f881914e0ccca073db454 SHA512 9e1938fb947ff3fd4e28915d60338392c1d372f26f10956a6ea5f45cee933f0f0cce8ab37823915b8d4d9c505a8e005f8199dd7426de447106e097126d1568bb
 EBUILD nzbget-21.1-r1.ebuild 2445 BLAKE2B 3caa46ddd86a962d8627826e98bc8c2444598392c08e2f883ce7b1bdc3bf3054464bbb3eba1ba057ed807244a5f805a9ce0bd607ebf454b23cdbe91c9d5d5fac SHA512 1e983dd0db364d347a8745ce8d37f14f944cb62be57a4452a4df211c85d5c8bce0e14f16861cf5429d2de75b108dcbbf5f34118376bf69b77b2b25293fad4685
+EBUILD nzbget-21.1-r2.ebuild 2577 BLAKE2B de6e7bb2817c5f63c485813091ea7bb4a80a666362f6baba21117c46e37c2bb3e2f9b358a141c280354b53d9fb08d9038f62ae735fc5f919b2da31ffa1dc7848 SHA512 7dbdf6423a91780e524847fdc6df195b0175494af6080ee20fb617bfea3e5bad8cdaef7eef1e1074d1ad5f04b417f690b75d36131b369f3531743f7cb36f5f9e
 MISC metadata.xml 631 BLAKE2B 0cbd5cb1f68087c6b42e15627a9309738b96e2fc788cd3ef97374d45d5c2ea4f445897ea1ce78258e6210c9d6820d060466868b430b70a574957d05f2c074105 SHA512 6649273fa2d5cec355b18763e34f8b0d5a3d2f1feea20cdee057c72584562291ef6ea8e2b8154d32c0c80e921ed040ba77971c42c6c6d5edccd5cc3df6b6a8e5
diff --git a/net-nntp/nzbget/files/nzbget-21.1-openssl-3.patch b/net-nntp/nzbget/files/nzbget-21.1-openssl-3.patch
new file mode 100644
index 000000000000..d1d89e9260c0
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget-21.1-openssl-3.patch
@@ -0,0 +1,28 @@
+From f76e8555504e3af4cf8dd4a8c8e374b3ca025099 Mon Sep 17 00:00:00 2001
+From: Simon Chopin <simon.chopin@canonical.com>
+Date: Tue, 7 Dec 2021 13:23:21 +0100
+Subject: [PATCH] daemon:connect: don't use FIPS_mode_set with OpenSSL 3
+
+This function has been removed in OpenSSL 3, replaced by
+EVP_default_properties_enable_fips. See
+https://www.openssl.org/docs/man3.0/man7/migration_guide.html
+---
+ daemon/connect/TlsSocket.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/daemon/connect/TlsSocket.cpp b/daemon/connect/TlsSocket.cpp
+index 544bf6850..831da0dc0 100644
+--- a/daemon/connect/TlsSocket.cpp
++++ b/daemon/connect/TlsSocket.cpp
+@@ -189,7 +189,11 @@ void TlsSocket::Final()
+ 
+ #ifdef HAVE_OPENSSL
+ #ifndef LIBRESSL_VERSION_NUMBER
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+ 	FIPS_mode_set(0);
++#else
++	EVP_default_properties_enable_fips(NULL, 0);
++#endif
+ #endif
+ #ifdef NEED_CRYPTO_LOCKING
+ 	CRYPTO_set_locking_callback(nullptr);
diff --git a/net-nntp/nzbget/nzbget-21.0-r2.ebuild b/net-nntp/nzbget/nzbget-21.1-r2.ebuild
index fa2ce4072770..a7d5afecaf9a 100644
--- a/net-nntp/nzbget/nzbget-21.0-r2.ebuild
+++ b/net-nntp/nzbget/nzbget-21.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd
 
@@ -11,10 +11,11 @@ MY_P=${PN}-${PV/_pre/-testing-r}
 DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
 HOMEPAGE="https://nzbget.net/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug gnutls ncurses +parcheck ssl test zlib"
 RESTRICT="!test? ( test )"
 
@@ -43,9 +44,14 @@ BDEPEND="
 	)
 	virtual/pkgconfig
 "
+
 DOCS=( ChangeLog README nzbget.conf )
 
-S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
+PATCHES=(
+	# https://bugs.gentoo.org/805896
+	# https://github.com/nzbget/nzbget/pull/793
+	"${FILESDIR}/${P}-openssl-3.patch"
+)
 
 src_prepare() {
 	default