From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 32160158041 for ; Mon, 11 Mar 2024 00:42:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81A612BC013; Mon, 11 Mar 2024 00:42:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6555EE29B7 for ; Mon, 11 Mar 2024 00:42:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8363D33BF28 for ; Mon, 11 Mar 2024 00:42:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8056B151A for ; Mon, 11 Mar 2024 00:42:38 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1710097171.56ba8e0934abe7b4086aabe6e49bd0f9223ba1b9.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-perl/Net-SSLeay/files/, dev-perl/Net-SSLeay/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-perl/Net-SSLeay/Manifest dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.9.0.patch dev-perl/Net-SSLeay/files/Net-SSLeay-1.94-libressl.patch X-VCS-Directories: dev-perl/Net-SSLeay/files/ dev-perl/Net-SSLeay/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: 56ba8e0934abe7b4086aabe6e49bd0f9223ba1b9 X-VCS-Branch: master Date: Mon, 11 Mar 2024 00:42:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 971b0fd1-fe4d-4d16-81b9-81a800168c2c X-Archives-Hash: 2cfe9cee1e43e5c0df2caa37bb2280c7 commit: 56ba8e0934abe7b4086aabe6e49bd0f9223ba1b9 Author: orbea riseup net> AuthorDate: Sun Mar 10 18:25:58 2024 +0000 Commit: orbea riseup net> CommitDate: Sun Mar 10 18:59:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=56ba8e09 dev-perl/Net-SSLeay: add 1.920.0-r1, 1.940.0 Signed-off-by: orbea riseup.net> dev-perl/Net-SSLeay/Manifest | 1 + dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild | 67 ++++++++++++++++++++++ dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild | 67 ++++++++++++++++++++++ .../files/Net-SSLeay-1.92-libressl-3.9.0.patch | 44 ++++++++++++++ .../files/Net-SSLeay-1.94-libressl.patch | 42 ++++++++++++++ 5 files changed, 221 insertions(+) diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest index 5859dc2..99ece84 100644 --- a/dev-perl/Net-SSLeay/Manifest +++ b/dev-perl/Net-SSLeay/Manifest @@ -1,2 +1,3 @@ DIST Net-SSLeay-1.90.tar.gz 534246 BLAKE2B 2510fa886db8b7c5f185aa1145ae1b50b7c4101a9bd80e17c8c1d77718765f288c9180464d831775c35aa94b5a6f6c8f717ecaeb4974f7280829b63f10567f22 SHA512 8a5f251b5ef1d8c2d619d984594a7a22ddeed2e5e726fe683a45f299d7878f4ca8ffab00480ebf5ef7a94ae1fcf6be05dfdaa68b8bfe2ad68443150765adb891 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 new file mode 100644 index 0000000..8d1b393 --- /dev/null +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0-r1.ebuild @@ -0,0 +1,67 @@ +# 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 ~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/Net-SSLeay-1.940.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild new file mode 100644 index 0000000..a2ad5d1 --- /dev/null +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.940.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_AUTHOR=CHRISN +DIST_VERSION=1.94 +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 ~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.94-libressl.patch" #903001 +) + +PERL_RM_FILES=( + # 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 new file mode 100644 index 0000000..4699989 --- /dev/null +++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.9.0.patch @@ -0,0 +1,44 @@ +#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.94-libressl.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.94-libressl.patch new file mode 100644 index 0000000..1eae0b7 --- /dev/null +++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.94-libressl.patch @@ -0,0 +1,42 @@ +#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 +@@ -7493,8 +7493,12 @@ SSL_CTX_set_tlsext_ticket_getkey_cb(ctx,callback=&PL_s + + #endif + ++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x3090000fL) ++ + int EVP_add_digest(const EVP_MD *digest) + ++#endif ++ + #ifndef OPENSSL_NO_SHA + + const EVP_MD *EVP_sha1() +@@ -7973,7 +7977,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 +@@ -7988,8 +7994,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);