commit 872ed9ca772c55a14e07a3ac8028670d84711cee Author: Tim Biermann <tbier@posteo.de> Date: Thu Apr 23 13:58:58 2020 +0000 p5-lwp-protocol-https: 6.07 -> 6.08-TRIAL diff --git a/p5-lwp-protocol-https/.signature b/p5-lwp-protocol-https/.signature index 7c9cd258b..1567588cb 100644 --- a/p5-lwp-protocol-https/.signature +++ b/p5-lwp-protocol-https/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/X3XjbmrVoqgEz1xXw21+u/pLOpK3x3Feg3+hNkyQldclthnL6AUsEXA9Xa77mHcrY9Jh+stnpAuPvfqcns+Q8= -SHA256 (Pkgfile) = b17f774756eba325938ccb21e87f45feb49b141a0bc0fdb422b56c4a4f0add41 +RWSagIOpLGJF31rF87dtpvG5AxwU7xbr54WuHDm77WitC7Zq8cW1WE/3M+50QZfyJIW9hDu0Jw+Prs5sWt0CnRGdFXDpGlohFAo= +SHA256 (Pkgfile) = b99582c0f52574190939fb40152501c5a8aae5d0f9715d22aa2ad86a54183cf8 SHA256 (.footprint) = 3ec550573f084c099902b14e61937f5b7a237cb5f88f403c9953798e11a0d0ba -SHA256 (LWP-Protocol-https-6.07.tar.gz) = 522cc946cf84a1776304a5737a54b8822ec9e79b264d0ba0722a70473dbfb9e7 -SHA256 (certs.patch) = 4f39966c223a751b1e704850691cdfb7638b53ab6fdc174280bac22d2546f3a0 +SHA256 (LWP-Protocol-https-6.08-TRIAL.tar.gz) = cc76f67b0615ebc5bf82a01330ef75a50f6d37cac41559f0f4b7d2430f33cbbd diff --git a/p5-lwp-protocol-https/Pkgfile b/p5-lwp-protocol-https/Pkgfile index b64b74698..0b282b303 100644 --- a/p5-lwp-protocol-https/Pkgfile +++ b/p5-lwp-protocol-https/Pkgfile @@ -4,14 +4,12 @@ # Depends on: ca-certificates p5-io-socket-ssl p5-libwww p5-net-http name=p5-lwp-protocol-https -version=6.07 +version=6.08-TRIAL release=1 -source=(https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-$versio... -certs.patch) +source=(https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-$versio...) build() { - cd LWP-Protocol-https-$version - patch -p1 -i ../certs.patch + cd LWP-Protocol-https-${version/-TRIAL/} perl Makefile.PL INSTALLDIRS=vendor make make DESTDIR=$PKG install diff --git a/p5-lwp-protocol-https/certs.patch b/p5-lwp-protocol-https/certs.patch deleted file mode 100644 index a2edc4070..000000000 --- a/p5-lwp-protocol-https/certs.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/Makefile.PL.orig b/Makefile.PL -index fc8ef4a..26313e2 100644 ---- a/Makefile.PL.orig -+++ b/Makefile.PL -@@ -26,7 +26,6 @@ my %WriteMakefileArgs = ( - 'LWP::UserAgent' => '6.06', - 'Net::HTTPS' => 6, - 'IO::Socket::SSL' => "1.54", -- 'Mozilla::CA' => "20110101", - 'perl' => '5.008001', - }, - }, -diff --git a/lib/LWP/Protocol/https.pm.orig b/lib/LWP/Protocol/https.pm -index ed4d832..b8667cf 100644 ---- a/lib/LWP/Protocol/https.pm.orig -+++ b/lib/LWP/Protocol/https.pm -@@ -25,25 +25,7 @@ sub _extra_sock_opts - } - if ($ssl_opts{SSL_verify_mode}) { - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -- eval { -- require Mozilla::CA; -- }; -- if ($@) { -- if ($@ =~ /^Can't locate Mozilla\/CA\.pm/) { -- $@ = <<'EOT'; --Can't verify SSL peers without knowing which Certificate Authorities to trust -- --This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE --environment variable or by installing the Mozilla::CA module. -- --To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME --environment variable to 0. If you do this you can't be sure that you --communicate with the expected peer. --EOT -- } -- die $@; -- } -- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file(); -+ $ssl_opts{SSL_ca_file} = '/etc/ssl/certs/ca-certificates.crt'; - } - } - $self->{ssl_opts} = \%ssl_opts;