diff options
author | orbea <orbea@riseup.net> | 2023-05-29 12:37:08 -0700 |
---|---|---|
committer | orbea <orbea@riseup.net> | 2023-05-29 12:43:25 -0700 |
commit | 0c6641cc3ba9fb12a8867f7d87336996238dad10 (patch) | |
tree | f1660c32b8decf2f2c7606327fff55f9c01357a9 /dev-perl/Net-SSLeay | |
parent | dev-perl/Net-SSLeay: sync ::gentoo (diff) | |
download | libressl-0c6641cc3ba9fb12a8867f7d87336996238dad10.tar.gz libressl-0c6641cc3ba9fb12a8867f7d87336996238dad10.tar.bz2 libressl-0c6641cc3ba9fb12a8867f7d87336996238dad10.zip |
dev-perl/Net-SSLeay: Fix build with LibreSSL-3.8.0
Upstream-PR: https://github.com/radiator-software/p5-net-ssleay/pull/434
Signed-off-by: orbea <orbea@riseup.net>
Diffstat (limited to 'dev-perl/Net-SSLeay')
4 files changed, 104 insertions, 1 deletions
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild index 630cdf6..0f0f2f8 100644 --- a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild @@ -35,6 +35,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.88-fix-network-tests.patch" "${FILESDIR}/${PN}-1.88-fix-libdir.patch" "${FILESDIR}/${PN}-1.90-libressl.patch" + "${FILESDIR}/${PN}-1.92-libressl-3.8.0.patch" ) PERL_RM_FILES=( 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..dfe368a --- /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 ~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.8.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.920.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild index da87024..9ee02cd 100644 --- a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild @@ -35,7 +35,8 @@ BDEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.88-fix-network-tests.patch" - "${FILESDIR}/${PN}-1.92-libressl.patch" + "${FILESDIR}/${PN}-1.92-libressl.patch" #903001 + "${FILESDIR}/${PN}-1.92-libressl-3.8.0.patch" ) PERL_RM_FILES=( diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.8.0.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.8.0.patch new file mode 100644 index 0000000..d02333e --- /dev/null +++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl-3.8.0.patch @@ -0,0 +1,34 @@ +https://github.com/radiator-software/p5-net-ssleay/pull/434 + +From 79a06ce5f9a77d8c65d51035f8edb6043864f342 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(+) + +diff --git a/SSLeay.xs b/SSLeay.xs +index 102e89f..ae870c0 100644 +--- a/SSLeay.xs ++++ b/SSLeay.xs +@@ -7157,6 +7157,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 +@@ -7199,6 +7200,7 @@ const X509_POLICY_NODE * + X509_policy_node_get0_parent(node) + const X509_POLICY_NODE *node + ++#endif /* !(LibreSSL >= 3.7.0) */ + #endif + + ASN1_OBJECT * |