dev-perl/Net-SSLeay: Uprev to upstream version
This brings in a new version which builds against OpenSSL 1.1.
BUG=chromium:1001245
TEST=Builds, git send-email works.
Change-Id: Ibfc0273468b67a2111a954e3c0018da8f20604bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/1823940
Tested-by: Mattias Nissler <mnissler@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 07e5a75..478196d 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1 +1,3 @@
-DIST Net-SSLeay-1.65.tar.gz 384413 SHA256 2fb1371120b85f018944d95736c107163f04ba56b6029c0709a2c3d6247b9c06 SHA512 e347ac7cc5ee22b9785953a5318d35fa3a2d5a21a2e726f49c74621d2dad9ea68373e208068dcd60d8a8d5ab027ae6e32fc0b671995d1645a14c2934eb5a884f WHIRLPOOL 15f38b5a026734f7a074b290979f3e346dfea125d02d8f63e7f5c163de7a4514456d3948ade61b74a53173e27aa221b9142736a98b9d6631c61f0239e6f0833b
+DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716
+DIST Net-SSLeay-1.85.tar.gz 418349 BLAKE2B 0f639145e5be9406264cc7ef6240a30e0d62e631bfe29b8d1cbc85ab3bf721e8d344a8472faaa87816a5d148cedd7f13faeec925d0632fc1b75ecd1c5c44f6d1 SHA512 74e0f2f56b707f1ff845c78c1fa7ce26a71b8f943bb99e994d4e065d1f42259fe4cd1a6a17d333459727534158f9541f116dbc8515122380807d9450b0faa26b
+DIST Net-SSLeay-1.88.tar.gz 436215 BLAKE2B 1a58296693cf41c464ac67a7f630598ccbf261ed0374a5381e3f718361b66418d13b5357bf7a49267a9e3bcd8d423fdedccd6b60d34aa60c975a5e3d1b0688e7 SHA512 37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.650.0-r1.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.650.0-r1.ebuild
deleted file mode 100644
index ba9007a..0000000
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.650.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MIKEM
-MODULE_VERSION=1.65
-inherit multilib perl-module
-
-DESCRIPTION="Net::SSLeay module for perl"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-# test? ( dev-perl/Test-Exception
-# dev-perl/Test-Warn
-# dev-perl/Test-NoWarnings )"
-
-#SRC_TEST=do
-
-export OPTIMIZE="$CFLAGS"
-export OPENSSL_PREFIX=${EPREFIX}/usr
-
-src_prepare() {
- sed -i \
- -e "/\$opts->{optimize} = '-O2 -g';/d" \
- -e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
- inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
- perl-module_src_prepare
-}
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild
new file mode 100644
index 0000000..f7f2993
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CHRISN
+DIST_VERSION=1.88
+DIST_EXAMPLES=("examples/*")
+inherit multilib perl-module
+
+DESCRIPTION="Perl extension for using OpenSSL"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="libressl test minimal examples"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ virtual/perl-MIME-Base64
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ 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.88-fix-libdir.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)
+ perl-module_src_configure
+}
+
+src_compile() {
+ mymake=(
+ OPTIMIZE="${CFLAGS}"
+ OPENSSL_PREFIX="${EPREFIX}"/usr
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
deleted file mode 100644
index 0090bfd..0000000
--- a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
---- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2015-08-02 05:54:14.000000000 +0000
-+++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2016-03-04 23:29:36.997983312 +0000
-@@ -47,15 +47,7 @@
- LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
- );
-
-- if ( $self->prompt(
-- "Do you want to run external tests?\n".
-- "These tests *will* *fail* if you do not have network connectivity.",
-- 'n',
-- ) =~ /^y/i ) {
-- $self->tests('t/*/*.t t/*/*/*.t');
-- } else {
-- $self->tests('t/local/*.t t/handle/local/*.t');
-- }
-+ $self->tests('t/local/*.t t/handle/local/*.t');
- }
-
- sub ssleay_get_build_opts {
diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
deleted file mode 100644
index d796625..0000000
--- a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
---- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2015-08-02 05:54:14.000000000 +0000
-+++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2016-03-04 23:28:49.543069218 +0000
-@@ -47,15 +47,7 @@
- LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
- );
-
-- if ( $self->prompt(
-- "Do you want to run external tests?\n".
-- "These tests *will* *fail* if you do not have network connectivity.",
-- 'n',
-- ) =~ /^y/i ) {
-- $self->tests('t/*/*.t t/*/*/*.t');
-- } else {
-- $self->tests('t/local/*.t t/handle/local/*.t');
-- }
-+ $self->tests('t/*/*.t t/*/*/*.t');
- }
-
- sub ssleay_get_build_opts {
diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-libdir.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-libdir.patch
new file mode 100644
index 0000000..d78acb9
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-libdir.patch
@@ -0,0 +1,27 @@
+Bug: https://bugs.gentoo.org/416339
+
+The previous patch for the above bug report used $ENV{LIBDIR} but this
+wasn't enough to help with cross-compiling. We could use $ENV{SYSROOT}
+but this results in a bogus RPATH entry. It is better to simply trust
+the toolchain, which may have its own sysroot applied.
+
+Cross-compiling Perl modules requires additional hackery but at least
+that hackery will work now. :)
+
+Chewi
+2017/12/03
+
+diff -Naur a/Makefile.PL b/Makefile.PL
+--- a/Makefile.PL 2017-10-13 01:38:01.000000000 +0100
++++ b/Makefile.PL 2017-12-03 10:52:27.304861804 +0000
+@@ -141,10 +141,8 @@
+ cccdlflags => '',
+ };
+ for ("$prefix/include", "$prefix/inc32", '/usr/kerberos/include') {
+- push @{$opts->{inc_paths}}, $_ if -f "$_/openssl/ssl.h";
+ }
+ for ($prefix, "$prefix/lib64", "$prefix/lib", "$prefix/out32dll") {
+- push @{$opts->{lib_paths}}, $_ if -d $_;
+ }
+
+ my $rsaref = $self->ssleay_is_rsaref;
diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-network-tests.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-network-tests.patch
new file mode 100644
index 0000000..a98c4c8
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.88-fix-network-tests.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.PL b/Makefile.PL
+index 31d9c74..91ac2b4 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -12,11 +12,7 @@ use Symbol qw(gensym);
+ # the Net-SSLeay loadable object on Windows
+ my $win_link_statically = 0;
+
+-my $tests = prompt(
+- "Do you want to run external tests?\n".
+- "These tests *will* *fail* if you do not have network connectivity.",
+- 'n',
+-) =~ /^y/i ? 't/*/*.t t/*/*/*.t' : 't/local/*.t t/handle/local/*.t';
++my $tests = ( 'yes' eq ( $ENV{NETWORK_TESTS} || '' ) ) ? 't/*/*.t t/*/*/*.t' : 't/local/*.t t/handle/local/*.t';
+
+ my %eumm_args = (
+ NAME => 'Net::SSLeay',
diff --git a/virtual/perl-MIME-Base64/metadata.xml b/virtual/perl-MIME-Base64/metadata.xml
index 36ee0f0..2b9a936 100644
--- a/virtual/perl-MIME-Base64/metadata.xml
+++ b/virtual/perl-MIME-Base64/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>perl</herd>
+ <maintainer type="project">
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.130.0-r3.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.130.0-r3.ebuild
deleted file mode 100644
index c5b05b8..0000000
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.130.0-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-MIME-Base64/perl-MIME-Base64-3.130.0-r3.ebuild,v 1.3 2014/07/09 19:08:55 dilfridge Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="
- || ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* ~perl-core/${PN#perl-}-${PV} )
- !<perl-core/${PN#perl-}-${PV}
- !>perl-core/${PN#perl-}-${PV}-r999
-"
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r5.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r5.ebuild
new file mode 100644
index 0000000..d2046c2
--- /dev/null
+++ b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="
+ || ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* =dev-lang/perl-5.26* =dev-lang/perl-5.24* ~perl-core/${PN#perl-}-${PV} )
+ dev-lang/perl:=
+ !<perl-core/${PN#perl-}-${PV}
+ !>perl-core/${PN#perl-}-${PV}-r999
+"
