gentoo resync : 29.12.2022

4 files changed, 38 insertions, 4 deletions

diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index 74d54a6d4262..4429b76ca3ad 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,7 +1,8 @@
 AUX sslsplit-0.5.4-install.patch 1131 BLAKE2B 1f81f8fbc8861e4ccfc0b2068d19e1a5dbb1485cf72d7aa0799e7addf7c73e4836b427afd510de8b6c98037e473e5699c33920fb7931c99ccc989fd0cb956bb3 SHA512 0219d175cf9f8a6a89f9a807bb5981a83c1e62c6738f5fafd93970045fa56dd0595761f3915cc223f60541b39a8bff9222233f176a5a608cdcf7a6774b69f56c
+AUX sslsplit-0.5.5-openssl3.patch 980 BLAKE2B e8cd6c99ffb0287a7a6be416bc7ba1aa6a4c0426f731c1e0559e195323775e146506cb7a3ffd5baece5ee8d324fd5ce881e64ae3dcdb438efc7c07c0041bd5a1 SHA512 eecb137c27db74185186285c7fc0e15b01d15362100fa26e16649678fcab51223028e5bbcd62674c882c41fa86b32f78730e303b69f15920a51e743a4b541a0a
 DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
 DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b SHA512 f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39
 EBUILD sslsplit-0.5.4.ebuild 1113 BLAKE2B f1dbf3553abdaa63f7f9e37f00a43939a91ae810b7faae363de80b7e817c3489403e2c157a55e412c23af602fecc1afe590aa3bbd2c6caca17a63996b637dd28 SHA512 27c5306499f1979b85253c20e8e86c46004aa6e5c61d46aeea64f552b82d2162fd73b836228c03d026eacf248415c35f22bf1098e83e9f7ce8170599bb312d30
-EBUILD sslsplit-0.5.5.ebuild 1080 BLAKE2B 9e0d713ca89fa7f51dd922b0b65a6509fa773b4a78057f2f02575d8fd7e195c1c8be1e77ee15b31f4818eb2f616ad785ad434bccc04c25e97b503b7984622cd5 SHA512 8f48fdfa5ae8ea31d872db559b22c101c850bc959ba97a5a66c73c0d1489ec72ed38359b408953ef1f460b5e9201dee36d9e05a0be5d79b935d7af8c73c88263
-EBUILD sslsplit-9999.ebuild 1080 BLAKE2B 9e0d713ca89fa7f51dd922b0b65a6509fa773b4a78057f2f02575d8fd7e195c1c8be1e77ee15b31f4818eb2f616ad785ad434bccc04c25e97b503b7984622cd5 SHA512 8f48fdfa5ae8ea31d872db559b22c101c850bc959ba97a5a66c73c0d1489ec72ed38359b408953ef1f460b5e9201dee36d9e05a0be5d79b935d7af8c73c88263
+EBUILD sslsplit-0.5.5.ebuild 1129 BLAKE2B e7a9647db8eabb19b9ba0c0005fcaaaf487fd380b23ffc09f4af0e58a52db6a59e08efd6e43fb78e4cd7574a71d5750d7aa3baaa2445022b0ea4688b179d0a7c SHA512 6a5a325bae647f959c8454cedc764ad8034bdc4590042af2c2b372c0792a822c41864315f4a39f99d152567e55d3f6cee0283c51970380d72ef93c2140d15ef9
+EBUILD sslsplit-9999.ebuild 1082 BLAKE2B 6fa6c0b6d6c2cd4d0e3201a809b36b63c0e3722d86ff954c05dd034a7861cafd2a178062d0318c3544073e74b45f9b7a94a80b6bee8b6fbca5e00a224131829d SHA512 9dc78dfd9c03a0ca60d2a3e0b73f8d9047e2e03be3c1f42f1dcb89f89e5b4c36827ee45fb0b0cf8c762a4563fe982ff52a9eb0cfcbe0cd228e830de71ff138d3
 MISC metadata.xml 904 BLAKE2B 06a5a152e3200df6b912c6a967c60a162f1517bd52360f6aee1f12eb16b5ef9cfe3f797659a7b300b543e863c16fdd8ab26231aa1c980b73800d897b9c855758 SHA512 86259c095d592c1a7a8f5d747fe339ffb4ebe8943bccfdb3cf2ee3932159f8dfb2d248bdaa2eee4edfffb49e48ce2817cdf03fca460ab69ddf0a497a79a9cbbe
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
new file mode 100644
index 000000000000..10807bee3899
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
@@ -0,0 +1,31 @@
+From: Soner Tari <sonertari@gmail.com>
+Date: Fri, 4 Feb 2022 19:46:58 +0300
+Subject: [PATCH] Fix build errors with OpenSSL 3.0.x, but not deprecation
+ warnings, issue #290
+
+This patch fixes errors only, so that build succeeds, but deprecation
+warnings remain. It seems we need considerable changes to replace those
+deprecated functions in the warnings.
+---
+
+Upstream-commit: e17de8454a65 ("Fix build errors with OpenSSL 3.0.x, but not deprecation warnings, issue #290")
+Upstream-issue: https://github.com/droe/sslsplit/issues/290
+
+diff --git a/pxyconn.c b/pxyconn.c
+index e69de20..09a8b80 100644
+--- a/pxyconn.c
++++ b/pxyconn.c
+@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shutdown(UNUSED struct bufferevent *bev,
+ }
+ #endif /* LIBEVENT_VERSION_NUMBER < 0x02010000 */
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#define ERR_GET_FUNC(x) 0
++#define ERR_func_error_string(x) ""
++#endif
+ 
+ /*
+  * Maximum size of data to buffer per connection direction before
+-- 
+2.35.1
+
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
index c6f530a49947..f156e951d876 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
@@ -23,7 +23,7 @@ else
 fi
 
 RDEPEND="
-	dev-libs/libevent[ssl,threads]
+	dev-libs/libevent:=[ssl,threads]
 	dev-libs/openssl:0=
 	net-libs/libnet:1.1
 	net-libs/libpcap
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-openssl3.patch" )
+
 src_prepare() {
 	default
 
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
index c6f530a49947..17ad8b68ff9c 100644
--- a/net-analyzer/sslsplit/sslsplit-9999.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -23,7 +23,7 @@ else
 fi
 
 RDEPEND="
-	dev-libs/libevent[ssl,threads]
+	dev-libs/libevent:=[ssl,threads]
 	dev-libs/openssl:0=
 	net-libs/libnet:1.1
 	net-libs/libpcap