gentoo auto-resync : 29:09:2023 - 23:38:29

6 files changed, 62 insertions, 105 deletions

diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.74.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.74.0.ebuild
deleted file mode 100644
index 87182db29029..000000000000
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.74.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=SULLR
-DIST_VERSION=2.074
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="idn"
-
-RDEPEND="
-	dev-perl/Mozilla-CA
-	>=dev-perl/Net-SSLeay-1.460.0
-	virtual/perl-Scalar-List-Utils
-	idn? (
-		|| (
-			>=dev-perl/URI-1.50
-			dev-perl/Net-LibIDN
-			dev-perl/Net-IDN-Encode
-		)
-	)"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-mydoc=("docs/debugging.txt")
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.78.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.78.0.ebuild
deleted file mode 100644
index bf4faa8c48e9..000000000000
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.78.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=SULLR
-DIST_VERSION=2.078
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="idn"
-
-RDEPEND="
-	dev-perl/Mozilla-CA
-	>=dev-perl/Net-SSLeay-1.460.0
-	virtual/perl-Scalar-List-Utils
-	idn? (
-		|| (
-			>=dev-perl/URI-1.50
-			dev-perl/Net-LibIDN
-			dev-perl/Net-IDN-Encode
-		)
-	)"
-BDEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-mydoc=("docs/debugging.txt")
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
deleted file mode 100644
index 7fda28972ddd..000000000000
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.81.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=SULLR
-DIST_VERSION=2.081
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="idn"
-
-RDEPEND="
-	dev-perl/Mozilla-CA
-	>=dev-perl/Net-SSLeay-1.460.0
-	virtual/perl-Scalar-List-Utils
-	idn? (
-		|| (
-			>=dev-perl/URI-1.50
-			dev-perl/Net-LibIDN
-			dev-perl/Net-IDN-Encode
-		)
-	)"
-BDEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-mydoc=("docs/debugging.txt")
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.83.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.83.0.ebuild
index 5ae41a5225c5..a173115b0a73 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.83.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.83.0.ebuild
@@ -30,4 +30,8 @@ BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}-openssl-compat.patch"
+)
+
 mydoc=("docs/debugging.txt")
diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest
index 7dd4e9280c22..2ee87d428efd 100644
--- a/dev-perl/IO-Socket-SSL/Manifest
+++ b/dev-perl/IO-Socket-SSL/Manifest
@@ -1,9 +1,4 @@
-DIST IO-Socket-SSL-2.074.tar.gz 252821 BLAKE2B 48801b1385d489a57de460b7a20552a9a66a2fb69fd0a2fc9555b45d004c472a1ed3797edaa59c7f71f1d26a7fbfec0dfd6f63b294665cd5b6e763f29d9ab1b3 SHA512 cafbf11a986b8fb5ce06bdf1e7a83741e2eef74d4bf054f0e0cd490959eddf54d32d3d4e786de52750dccc07139d8a1b5d5979080d0f1c1464e0004ccf98a6b0
-DIST IO-Socket-SSL-2.078.tar.gz 258997 BLAKE2B d343721810d032f0831a64318bf0b19315f835502362f11ee944d0dd4a9986fe51974ffd2007d8bfea88e0e3aea72d2b4c5c93671b5246c414dbe96e2f3a9381 SHA512 ff801b65c1eaed7570db767f1e3b071c374914230af0bd55cba5869afad14eff03f5bc02181200d742963f1fa7be6dbc21c9861e08b4d382a6a0e79e1e7dadc1
-DIST IO-Socket-SSL-2.081.tar.gz 261773 BLAKE2B 2de31aa1886bdf9f7f8525e2486d8d2d6cd631a03a39f1b8f647b0e89abfdf95ad753d27672ed8f9ee4aa9c19d175fa3922ed4693dc5526fa5ce87be29db301c SHA512 309d02983a8a6c1440c2161189fd4648533bafb784a3271fb0d8671681ed606aeaeb5f0650de5f26869e1fd84e9c8bd94674988bbefcd0f424c94a387a548534
+AUX 2.83.0-openssl-compat.patch 2143 BLAKE2B c4687fce76c11a4b5e9c3fa890279c46497d58b5d2d5167c31b81d2391b685f720043a48d869ae18b618526e7e01f408ea4868ce569debd15c9214d07ca40c4c SHA512 7057b6c413db2bcb57d8fba7f53b2a83b5012b07a26c8f8b7330b3a85fd0518f704d234bdd75a100beaaaeb08dff2375a9b052ed2846ace8c6cc9688c515f194
 DIST IO-Socket-SSL-2.083.tar.gz 259940 BLAKE2B be1b435b44d3209da1e3c02530556c9923e92a80cb7ef14b27550362f7cbc4bada2b5facf3177f26856dd458d894805ee84d06ffa50749b0bfa6e07818963f7b SHA512 a3fb70148eabc7b972c9b7a132b2a3f3ef23877606670c19ebffe40c82fc462431337ab498bca98b823b89ade8e2288d37fdb677ae154461de8f9f24e7568e4a
-EBUILD IO-Socket-SSL-2.74.0.ebuild 724 BLAKE2B 8b4ea7b4249dd7a291ebcc1c2bb8a763490676c0bbcf76fbd2f387318b94da49425f3211339c8e4e7bd452d902c7c3217caaa8c1249b3982209f6ced2b9e2fed SHA512 877934711ff36146d71f969e05a2f6138682bc72b8892132257d83468db8c6cf9d6e64fbd7c509f99f8bc541f89ce3591d79ad29a7163570e4ca7ca2dd281e93
-EBUILD IO-Socket-SSL-2.78.0.ebuild 734 BLAKE2B 5a2b70379db2cc47dfb60c1e3631c18684695ff5efedbfcedd890f54bdb50b255b418e1f9bb24326f5868f2527731ac6fbc5e0a57f02913979386840d5304073 SHA512 5b5ee215bbdf491b96ec993ef56941c74ced23847e23af201b6f06cc868007fccc3eb7bbd62cb661d66842d264f0f8a57ce232f2779499ea5be6912630f6190d
-EBUILD IO-Socket-SSL-2.81.0.ebuild 726 BLAKE2B ee9fea0939a1046de96ac29ffb34ceae54a1e4c66672dc5d2e2bdef086b9656b68677e6da2bbd6d5932782e665bb23a896b136a1999a28ac55f40792e1891333 SHA512 6b54fcffb7020f719c4c268f4c581237ad09f6f8d5a6ae8e03b5c7635b70724fd6053ca3d9bfd17f7960a7940eb025abec778368c76f594e2ed0ec611e66d547
-EBUILD IO-Socket-SSL-2.83.0.ebuild 739 BLAKE2B b3e2433c87395d5c4700d1e84c4054251e5453cd02cecdb3929afcb90cc28dfadd16dac5e7b1308fbd91126a4e185fcd6a5333828ae69dd8bc35a7a4cbf45604 SHA512 5e726c78bb9c7817722ce35f9c72ee0172c9bf8cd6b2a77aabb116fe50d74e6ed825102d9cb412fbcedf53788f06d73b6fcb3984e81107e847010c67d9e3fadc
+EBUILD IO-Socket-SSL-2.83.0.ebuild 794 BLAKE2B 0e94173a5e2c99be4bced1be8ee6e5f4ecda868fc236f5853f578d3b8dd1efcca9be88f68f80be4c65b0b7c36c88ab20cff6cce6b2067b513cf2503b6317c8a3 SHA512 264e71908347ce3fe499c6b5cf9773be811e6cd8c62ea12077f8df7f7be84cb1bf7c3888de41ae70d7932e75051dac0e903d43523c2515bb3363510eaab74029
 MISC metadata.xml 1059 BLAKE2B 03679a47cf71e8d647d24d9513314414dcaa63ab0bdf090d35537805a4f2cf0c76b85dcedbf9ba0b2f74a035d5deedb68543d1833f19e16f6fd63a1a1479ae6e SHA512 53b16ae1b73c9513401845babd1f653084c76251b1090b17c14d9b0eaf25cd515caddf67ff297700e98412ffd3db21affd4c6d2346e5866bcddcddeaac044f63
diff --git a/dev-perl/IO-Socket-SSL/files/2.83.0-openssl-compat.patch b/dev-perl/IO-Socket-SSL/files/2.83.0-openssl-compat.patch
new file mode 100644
index 000000000000..4653246125c8
--- /dev/null
+++ b/dev-perl/IO-Socket-SSL/files/2.83.0-openssl-compat.patch
@@ -0,0 +1,56 @@
+From a1ff93e99d504eb11cec1739ca57057731e3c2cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Thu, 28 Sep 2023 22:20:59 +0200
+Subject: [PATCH] Adapt to new OpenSSL version / ABI compatibility scheme
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://www.openssl.org/policies/releasestrat.html
+
+In short, as of 3.0.0, when the version is MAJOR.MINOR.PATCH,
+only changes in MAJOR indicate API/ABI incompatible changes.
+
+Fixes: https://github.com/noxxi/p5-io-socket-ssl/issues/137
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=909545
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ Makefile.PL | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 8a35591..f6b3195 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -64,16 +64,27 @@ if (my $compiled = eval {
+ 	$compiled) if $compiled < 0x00908000;
+ 
+     my $linked = Net::SSLeay::SSLeay();
+-    if (($compiled ^ $linked) >= 0x00001000) {
+-	die sprintf("API-different OpenSSL versions compiled in (0x%08x) vs linked (0x%08x)",
+-	    $compiled,$linked);
+-    }
+ 
+     # OpenSSL 1.1.1e introduced behavior changes breaking various code
+     # will likely be reverted  in 1.1.1f - enforce to not use this version
+     if ($linked == 0x1010105f) {
+ 	die "detected OpenSSL 1.1.1e - please use a different version\n";
+     }
++
++    # For old versions we need to be rather strict, however OpenSSL explicitly
++    # declares that from 3.0 on x.y versions are for all y ABI-compatible.
++    # https://www.openssl.org/policies/releasestrat.html
++    if ($linked <  0x30000000) {
++      if (($compiled ^ $linked) >= 0x00001000) {
++	  die sprintf("API-different OpenSSL versions compiled in (0x%08x) vs linked (0x%08x)",
++	      $compiled,$linked);
++      }
++    } else {
++      if (($compiled ^ $linked) >= 0x10000000) {
++	  die sprintf("API-different OpenSSL versions compiled in (0x%08x) vs linked (0x%08x)",
++	      $compiled,$linked);
++      }
++    }
+ }
+ 
+ # make sure that we have dualvar from the XS Version of Scalar::Util