From 0922e7f160098c343e6e41a5e167a69b9e035db6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 May 2023 05:33:06 +0100 Subject: gentoo auto-resync : 06:05:2023 - 05:33:06 --- dev-perl/Net-SSLeay/Manifest | 2 + dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild | 66 +++++++++++ .../files/Net-SSLeay-1.92-libressl.patch | 129 +++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild create mode 100644 dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch (limited to 'dev-perl/Net-SSLeay') diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest index e0f164cea4b5..ba342f15641b 100644 --- a/dev-perl/Net-SSLeay/Manifest +++ b/dev-perl/Net-SSLeay/Manifest @@ -1,7 +1,9 @@ AUX Net-SSLeay-1.88-fix-libdir.patch 946 BLAKE2B 8f3522ccc62c5b09942d61dbe73fb87bec5c5fb15e460b5a00b4a0108f6c50299304acc7e37a268a46d75af86cbdfdfab80cdf2ebecf5836f676503869727cb5 SHA512 76ff12ce42631393dcf95008b3a4a5064f2f0cc54dd44b1002fe02fccdc4b8a47871f77b28ce43346f140058c23bd9d6be08261d6a4cecffc45ced5416aa4cb3 AUX Net-SSLeay-1.88-fix-network-tests.patch 600 BLAKE2B aac7cfbf6770d56df1af455bb37b4cfa81879a880b35a315a90df9012b1fcbc545205b206777e6929454d31f881f2581d9dbd9f6b22cd849846bc0b9f3c6484b SHA512 7fd3078e55b4c829224289e7e1cc0628e2fb162dccf151b559022d5367ac06593a460779b28d9cae015dba6614d9e273399fa6b81144aefaf47d710f63b6c046 +AUX Net-SSLeay-1.92-libressl.patch 5010 BLAKE2B 792d7cc29d285faf286cf91d550a64cac7cf95216f78bc494ab6af946c7b18fcd41bf1ce788acae29e95695f75cca5a2088452b1c5c7eb4d67d263369f5349a6 SHA512 d7ab9dd929a2664ec9eaa4b01cacd2a653a93be5fd7ee3d80fdcb2bc13f067481d2cd1565b07798e14e76c7d342bc6253dfdcb9f7345ba3b790bdf79a1c01e46 DIST Net-SSLeay-1.90.tar.gz 534246 BLAKE2B 2510fa886db8b7c5f185aa1145ae1b50b7c4101a9bd80e17c8c1d77718765f288c9180464d831775c35aa94b5a6f6c8f717ecaeb4974f7280829b63f10567f22 SHA512 8a5f251b5ef1d8c2d619d984594a7a22ddeed2e5e726fe683a45f299d7878f4ca8ffab00480ebf5ef7a94ae1fcf6be05dfdaa68b8bfe2ad68443150765adb891 DIST Net-SSLeay-1.92.tar.gz 555930 BLAKE2B 04d97860817b013a9680e0ef29b0004ddb98da2db859761a45612c4d25b6edd16bf92645293d1108d83352bce18665721c6df05455426b32a95a42b464119a3d SHA512 e9d9161ebeb7be90f4c7a0ea98f1034892ce6d33aa72872683177b19daa1f4c5819f85ea9a052a076ec8d7c21705f6c344aef64680bc881bf3218d38e8b7b173 EBUILD Net-SSLeay-1.900.0.ebuild 1463 BLAKE2B eaa31e733dc8d19370f77d608e84fa9cfc7e2746793e01ec48c1aadb75a5c1c8e2b6c2f80be118b1b877c2c555196d3ad584251a29deac729299a9ff1c0f8687 SHA512 c3a0c8db551f138be800afc8396f263d3601f13a5737d0595cc9df869cd06da68c18b7c8b32dd274b20d654157ddbe3c0abd4675e5ec0c962327232d9df5800e +EBUILD Net-SSLeay-1.920.0-r1.ebuild 1508 BLAKE2B 6e2cdb8e57c6a6b86ecd40cb2198c0ef27472514f4a51726f0aa15b8af735a6f4b3872455d7e90bc369ab15dbc3c069a72276812fe08eb3b9fbc04e50a112ad0 SHA512 bcbc36d7bd498feee0780b56d1dbcdeabafc4d6fa485bcffb3f040957160a67097422a9ac89d3c368c6c4679d9b44a4b3a05ba99fafde470cae6d2403798d60d EBUILD Net-SSLeay-1.920.0.ebuild 1451 BLAKE2B dccf24e4d33788cd07eef07c5185e60a4a677408b8663f98ecdec8985344959a99f718860f1c093e8fab3a2dcea4ea4a113db527e4c14ff61f981aa0253eb3c6 SHA512 e3c5883626beb80158a3d6c6ca269a9f809836ed0d2d3822c2752f483c397d3b7a15d192d4cea42f61c064dd517f7150cdc2a47244dbd5e7e1bc78cfbbd2edb5 MISC metadata.xml 459 BLAKE2B c3621c53dd1e2593f2855530c57671797678132180f2b3e7983f1ee62eebc0da4655ca78def94ceb2543e0f34cad1261afffad60ee86f879094be1c43d7b6e55 SHA512 2dcfa628355849c903774c7bf983e3b8b98810bce37effc7eece1c3b92c54941641f0da5024fe42220b824adb4141bf1555894adbc80d03f9396b739e6c360ba 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 new file mode 100644 index 000000000000..d20588d10330 --- /dev/null +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild @@ -0,0 +1,66 @@ +# 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 ~ia64 ~loong ~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" +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 +) + +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.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch new file mode 100644 index 000000000000..380fd152ea78 --- /dev/null +++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch @@ -0,0 +1,129 @@ +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 + +From 4a886e06c1cac80e7fb3f8d52146a27ce557ba8c Mon Sep 17 00:00:00 2001 +From: Alexander Bluhm +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 +--- + Changes | 5 +++++ + SSLeay.xs | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +From 88c3bbc45399c8ef2c8879aada8bfa91d8bc6c10 Mon Sep 17 00:00:00 2001 +From: Alexander Bluhm +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 +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(-) + +diff --git a/SSLeay.xs b/SSLeay.xs +index b0667e2..58f1716 100644 +--- 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) +@@ -7197,7 +7218,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 +7711,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 +7720,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); -- cgit v1.2.3