[gentoo-commits] repo/proj/libressl:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/

["orbea" <orbea@riseup.net>]

commit:     2528691dc17c1a422945fad574ca8e491d1d59fc
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat Jan  4 16:00:36 2025 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sat Jan  4 16:00:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=2528691d

dev-perl/Net-SSLeay: drop 1.920.0-r1

Signed-off-by: orbea <orbea <AT> riseup.net>

 dev-perl/Net-SSLeay/Manifest                       |   1 -
 dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild   |  67 ---------
 .../files/Net-SSLeay-1.92-libressl-3.9.0.patch     |  44 ------
 .../files/Net-SSLeay-1.92-libressl.patch           | 158 ---------------------
 4 files changed, 270 deletions(-)

diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 5b509c1..48950ff 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,2 +1 @@
-DIST Net-SSLeay-1.92.tar.gz 555930 BLAKE2B 04d97860817b013a9680e0ef29b0004ddb98da2db859761a45612c4d25b6edd16bf92645293d1108d83352bce18665721c6df05455426b32a95a42b464119a3d SHA512 e9d9161ebeb7be90f4c7a0ea98f1034892ce6d33aa72872683177b19daa1f4c5819f85ea9a052a076ec8d7c21705f6c344aef64680bc881bf3218d38e8b7b173
 DIST Net-SSLeay-1.94.tar.gz 663948 BLAKE2B 97cef98bf3794ec992817e5ad91f8403ded95e29184512d9f23b5cbbd765912d2e7f8e835366b40aae9682dd13947cd79e2d9dcca2d10cd78e3c7869b1e197db SHA512 f1461667269f3da56ff7e1724b5511b95c34582250f8336e9f93d30f3b30d4a5360eb27622b9730bba11df75e00d717c7f0cea2120d20206723db136a8509375

diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild
deleted file mode 100644
index b0e43be..0000000
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=CHRISN
-DIST_VERSION=1.92
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Perl extension for using OpenSSL"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="minimal examples"
-
-RDEPEND="
-	dev-libs/openssl:=
-	virtual/perl-MIME-Base64
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-File-Spec
-	test? (
-		!minimal? (
-			dev-perl/Test-Exception
-			dev-perl/Test-Warn
-			dev-perl/Test-NoWarnings
-		)
-		virtual/perl-Test-Simple
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.88-fix-network-tests.patch"
-	"${FILESDIR}/${PN}-1.92-libressl.patch" #903001
-	"${FILESDIR}/${PN}-1.92-libressl-3.9.0.patch"
-)
-
-PERL_RM_FILES=(
-	# Hateful author tests
-	't/local/01_pod.t'
-	't/local/02_pod_coverage.t'
-	't/local/kwalitee.t'
-)
-
-src_configure() {
-	if use test && has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
-		export NETWORK_TESTS=yes
-	else
-		use test && einfo "Network tests will be skipped without DIST_TEST_OVERRIDE=~network"
-		export NETWORK_TESTS=no
-	fi
-	export LIBDIR=$(get_libdir)
-	export OPENSSL_PREFIX="${ESYSROOT}/usr"
-	perl-module_src_configure
-}
-
-src_compile() {
-	mymake=(
-		OPTIMIZE="${CFLAGS}"
-		OPENSSL_PREFIX="${ESYSROOT}"/usr
-	)
-	perl-module_src_compile
-}

diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.9.0.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.9.0.patch
deleted file mode 100644
index 4699989..0000000
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.9.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-#1 EVP_add_digest() was removed.
-#2, #3 X509_ALGOR has an accessor, don't reach into it, so it can be made opaque.
-
-Index: SSLeay.xs
---- a/SSLeay.xs.orig
-+++ b/SSLeay.xs
-@@ -6451,10 +6451,14 @@ int EVP_add_digest(EVP_MD *digest)
- 
- #else
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x3090000fL)
-+
- int EVP_add_digest(const EVP_MD *digest)
- 
- #endif
- 
-+#endif
-+
- #ifndef OPENSSL_NO_SHA
- 
- const EVP_MD *EVP_sha1()
-@@ -6944,7 +6948,9 @@ P_X509_get_signature_alg(x)
-         X509 * x
-     CODE:
- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
--        RETVAL = (X509_get0_tbs_sigalg(x)->algorithm);
-+        const ASN1_OBJECT * obj;
-+        X509_ALGOR_get0(&obj, NULL, NULL, X509_get0_tbs_sigalg(x));
-+        RETVAL = (ASN1_OBJECT *)obj;
- #else
-         RETVAL = (x->cert_info->signature->algorithm);
- #endif
-@@ -6959,8 +6965,10 @@ P_X509_get_pubkey_alg(x)
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L
-     {
- 	X509_ALGOR * algor;
-+        const ASN1_OBJECT * obj;
-         X509_PUBKEY_get0_param(0, 0, 0, &algor, X509_get_X509_PUBKEY(x));
--        RETVAL = (algor->algorithm);
-+        X509_ALGOR_get0(&obj, NULL, NULL, algor);
-+        RETVAL = ((ASN1_OBJECT *)obj);
-     }
- #else
-         RETVAL = (x->cert_info->key->algor->algorithm);

diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch
deleted file mode 100644
index f3e1b4a..0000000
--- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-https://bugs.gentoo.org/903001
-https://github.com/radiator-software/p5-net-ssleay/pull/360
-https://github.com/radiator-software/p5-net-ssleay/commit/4a886e06c1cac80e7fb3f8d52146a27ce557ba8c
-https://github.com/radiator-software/p5-net-ssleay/pull/362
-https://github.com/radiator-software/p5-net-ssleay/commit/88c3bbc45399c8ef2c8879aada8bfa91d8bc6c10
-https://github.com/radiator-software/p5-net-ssleay/pull/363
-https://github.com/radiator-software/p5-net-ssleay/commit/3dd2f101b8e15a59f66e22525b8d001d5ad6ce7d
-https://github.com/radiator-software/p5-net-ssleay/pull/434
-https://github.com/radiator-software/p5-net-ssleay/pull/435
-https://github.com/radiator-software/p5-net-ssleay/commit/fe9e49d220fa424c55fc436303b24f5bddae0b8d
-
-From 4a886e06c1cac80e7fb3f8d52146a27ce557ba8c Mon Sep 17 00:00:00 2001
-From: Alexander Bluhm <alexander.bluhm@gmx.net>
-Date: Wed, 19 Jan 2022 14:56:22 +0100
-Subject: [PATCH] Use X509_get0_tbs_sigalg() for LibreSSL. (#360)
-
-* Use X509_get0_tbs_sigalg() for LibreSSL.
-
-LibreSSL 3.5.0 has removed access to internal data structures.  Use
-X509_get0_tbs_sigalg() like in OpenSSL 1.1.
-
-* Start Changes for the next release.
-
-Co-authored-by: Heikki Vatiainen <hvn@radiatorsoftware.com>
----
- Changes   | 5 +++++
- SSLeay.xs | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-From 88c3bbc45399c8ef2c8879aada8bfa91d8bc6c10 Mon Sep 17 00:00:00 2001
-From: Alexander Bluhm <alexander.bluhm@gmx.net>
-Date: Wed, 19 Jan 2022 20:38:57 +0100
-Subject: [PATCH] Use OCSP_SINGLERESP_get0_id() for LibreSSL. (#362)
-
-LibreSSL 3.5.0 has removed access to internal ocsp data structures.
-Use OCSP_SINGLERESP_get0_id() like in OpenSSL 1.1.
----
- SSLeay.xs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-From 3dd2f101b8e15a59f66e22525b8d001d5ad6ce7d Mon Sep 17 00:00:00 2001
-From: Alexander Bluhm <alexander.bluhm@gmx.net>
-Date: Thu, 20 Jan 2022 19:15:27 +0100
-Subject: [PATCH] Implement RSA_get_key_parameters() for newer LibreSSL. (#363)
-
-LibreSSL 3.5.0 has removed access to internal rsa data structures.
-Use RSA_get0... functions to provide RSA_get_key_parameters().
----
- SSLeay.xs | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-From fe9e49d220fa424c55fc436303b24f5bddae0b8d Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Mon, 29 May 2023 10:16:33 -0700
-Subject: [PATCH] SSLeay.xs: Disable Policy Tree API for LibreSSL 3.8 and later
-
-This is taken from the OpenBSD ports tree.
-
-https://github.com/openbsd/ports/commit/f6567f938c9bd51bfd99f8426eba6a1590cc6384
----
- SSLeay.xs | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/SSLeay.xs
-+++ b/SSLeay.xs
-@@ -1914,7 +1914,7 @@ X509 * find_issuer(X509 *cert,X509_STORE *store, STACK_OF(X509) *chain) {
-     return issuer;
- }
-
--SV* bn2sv(BIGNUM* p_bn)
-+SV* bn2sv(const BIGNUM* p_bn)
- {
-     return p_bn != NULL
-         ? sv_2mortal(newSViv((IV) BN_dup(p_bn)))
-@@ -6283,8 +6283,28 @@ RSA_generate_key(bits,e,perl_cb=&PL_sv_undef,perl_data=&PL_sv_undef)
- void
- RSA_get_key_parameters(rsa)
- 	    RSA * rsa
-+PREINIT:
-+#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
-+    const BIGNUM *n, *e, *d;
-+    const BIGNUM *p, *q;
-+    const BIGNUM *dmp1, *dmq1, *iqmp;
-+#endif
- PPCODE:
- {
-+#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
-+    RSA_get0_key(rsa, &n, &e, &d);
-+    RSA_get0_factors(rsa, &p, &q);
-+    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
-+    /* Caution: returned list consists of SV pointers to BIGNUMs, which would need to be blessed as Crypt::OpenSSL::Bignum for further use */
-+    XPUSHs(bn2sv(n));
-+    XPUSHs(bn2sv(e));
-+    XPUSHs(bn2sv(d));
-+    XPUSHs(bn2sv(p));
-+    XPUSHs(bn2sv(q));
-+    XPUSHs(bn2sv(dmp1));
-+    XPUSHs(bn2sv(dmq1));
-+    XPUSHs(bn2sv(iqmp));
-+#else
-     /* Caution: returned list consists of SV pointers to BIGNUMs, which would need to be blessed as Crypt::OpenSSL::Bignum for further use */
-     XPUSHs(bn2sv(rsa->n));
-     XPUSHs(bn2sv(rsa->e));
-@@ -6294,9 +6314,10 @@ PPCODE:
-     XPUSHs(bn2sv(rsa->dmp1));
-     XPUSHs(bn2sv(rsa->dmq1));
-     XPUSHs(bn2sv(rsa->iqmp));
-+#endif
- }
-
--#endif
-+#endif /* OpenSSL < 1.1 or LibreSSL */
-
- void
- RSA_free(r)
-@@ -7010,6 +7031,7 @@ X509_VERIFY_PARAM_get0_peername(param)
-
- #endif /* OpenSSL 1.0.2-beta2, LibreSSL 2.7.0 */
-
-+#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x3080000fL) /* LibreSSL < 3.8.0 */
- void
- X509_policy_tree_free(tree)
-     X509_POLICY_TREE *tree
-@@ -7052,6 +7074,7 @@ const X509_POLICY_NODE *
- X509_policy_node_get0_parent(node)
-     const X509_POLICY_NODE *node
-
-+#endif /* !(LibreSSL >= 3.7.0) */
- #endif
-
- ASN1_OBJECT *
-@@ -7197,7 +7220,7 @@ ASN1_OBJECT *
- P_X509_get_signature_alg(x)
-         X509 * x
-     CODE:
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
-         RETVAL = (X509_get0_tbs_sigalg(x)->algorithm);
- #else
-         RETVAL = (x->cert_info->signature->algorithm);
-@@ -7690,7 +7713,7 @@ OCSP_response_results(rsp,...)
- 		if (!idsv) {
- 		    /* getall: create new SV with OCSP_CERTID */
- 		    unsigned char *pi,*pc;
--#if OPENSSL_VERSION_NUMBER >= 0x10100003L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100003L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
- 		    int len = i2d_OCSP_CERTID((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(sir),NULL);
- #else
- 		    int len = i2d_OCSP_CERTID(sir->certId,NULL);
-@@ -7699,7 +7722,7 @@ OCSP_response_results(rsp,...)
- 		    Newx(pc,len,unsigned char);
- 		    if (!pc) croak("out of memory");
- 		    pi = pc;
--#if OPENSSL_VERSION_NUMBER >= 0x10100003L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100003L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
- 		    i2d_OCSP_CERTID((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(sir),&pi);
- #else
- 		    i2d_OCSP_CERTID(sir->certId,&pi);