Date: Monday, June 27, 2022 @ 18:58:19 Author: felixonmars Revision: 449502
upgpkg: perl-lwp-protocol-https 6.10-4: remove Mozilla::CA hack Modified: perl-lwp-protocol-https/trunk/PKGBUILD Deleted: perl-lwp-protocol-https/trunk/certs.patch -------------+ PKGBUILD | 21 +++++++-------------- certs.patch | 43 ------------------------------------------- 2 files changed, 7 insertions(+), 57 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-27 18:40:24 UTC (rev 449501) +++ PKGBUILD 2022-06-27 18:58:19 UTC (rev 449502) @@ -2,36 +2,29 @@ pkgname=perl-lwp-protocol-https pkgver=6.10 -pkgrel=3 +pkgrel=4 pkgdesc="Provide https support for LWP::UserAgent" arch=('any') url="https://metacpan.org/release/LWP-Protocol-https" license=('PerlArtistic' 'GPL') -depends=('ca-certificates' 'perl-io-socket-ssl' 'perl-net-http' 'perl-libwww') +depends=('ca-certificates' 'perl-io-socket-ssl' 'perl-mozilla-ca' 'perl-net-http' 'perl-libwww') checkdepends=('perl-test-requiresinternet') options=('!emptydirs') -source=("https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/LWP-Protocol-https-$pkgver.tar.gz" - certs.patch) -sha512sums=('4d3c89dab6fadcb574c176977ca6debba177ee3f817e87319d9cd81e0a0b09214e271c2e97edc456dad2f4a1ebf8c6266a4ae52c3a93144880a5b32db97e7a31' - '96f401471199c368895eb9b0e819a7287ed9e25953f756585ef7e809010e5d19c8b0614f3cd99cad0c33ca7c9a609ceea4b90569d3f7dec546cc8eeecd810d26') +source=("https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/LWP-Protocol-https-$pkgver.tar.gz") +sha512sums=('4d3c89dab6fadcb574c176977ca6debba177ee3f817e87319d9cd81e0a0b09214e271c2e97edc456dad2f4a1ebf8c6266a4ae52c3a93144880a5b32db97e7a31') -prepare() { - cd LWP-Protocol-https-${pkgver} - patch -p1 -i ../certs.patch -} - build() { - cd LWP-Protocol-https-${pkgver} + cd LWP-Protocol-https-$pkgver perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd LWP-Protocol-https-${pkgver} + cd LWP-Protocol-https-$pkgver make test } package() { - cd LWP-Protocol-https-${pkgver} + cd LWP-Protocol-https-$pkgver make DESTDIR="$pkgdir" install } Deleted: certs.patch =================================================================== --- certs.patch 2022-06-27 18:40:24 UTC (rev 449501) +++ certs.patch 2022-06-27 18:58:19 UTC (rev 449502) @@ -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 = ( - "IO::Socket::SSL" => "1.54", - "LWP::Protocol::http" => 0, - "LWP::UserAgent" => "6.06", -- "Mozilla::CA" => 20180117, - "Net::HTTPS" => 6, - "base" => 0, - "strict" => 0 -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;