diff --git a/.gitignore b/.gitignore index 8c2fc50..fa237b0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /HTTP-Message-6.36.tar.gz /HTTP-Message-6.37.tar.gz /HTTP-Message-6.40.tar.gz +/HTTP-Message-6.42.tar.gz diff --git a/0001-Remove-dependency-to-IO-Uncompress-Gunzip.patch b/0001-Remove-dependency-to-IO-Uncompress-Gunzip.patch new file mode 100644 index 0000000..829783d --- /dev/null +++ b/0001-Remove-dependency-to-IO-Uncompress-Gunzip.patch @@ -0,0 +1,87 @@ +From ebd640dbd41052a362a77e3fbf80089501a971a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= +Date: Tue, 18 Oct 2022 14:38:31 +0200 +Subject: [PATCH 1/2] Remove dependency to IO::Uncompress::Gunzip + +Was replaced by Compress::Raw::Zlib +--- + META.json | 1 - + Makefile.PL | 2 -- + cpanfile | 1 - + lib/HTTP/Message.pm | 2 +- + t/request.t | 2 +- + 5 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/META.json b/META.json +index 41af8109..c7a1b138 100644 +--- a/META.json ++++ b/META.json +@@ -64,7 +64,6 @@ + "IO::Compress::Gzip" : "0", + "IO::HTML" : "0", + "IO::Uncompress::Bunzip2" : "2.021", +- "IO::Uncompress::Gunzip" : "0", + "IO::Uncompress::Inflate" : "0", + "IO::Uncompress::RawInflate" : "0", + "LWP::MediaTypes" : "6", +diff --git a/Makefile.PL b/Makefile.PL +index d27245b5..fde5a97b 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -30,7 +30,6 @@ my %WriteMakefileArgs = ( + "IO::Compress::Gzip" => 0, + "IO::HTML" => 0, + "IO::Uncompress::Bunzip2" => "2.021", +- "IO::Uncompress::Gunzip" => 0, + "IO::Uncompress::Inflate" => 0, + "IO::Uncompress::RawInflate" => 0, + "LWP::MediaTypes" => 6, +@@ -77,7 +76,6 @@ my %FallbackPrereqs = ( + "IO::Compress::Gzip" => 0, + "IO::HTML" => 0, + "IO::Uncompress::Bunzip2" => "2.021", +- "IO::Uncompress::Gunzip" => 0, + "IO::Uncompress::Inflate" => 0, + "IO::Uncompress::RawInflate" => 0, + "LWP::MediaTypes" => 6, +diff --git a/cpanfile b/cpanfile +index 56063085..877bb3cb 100644 +--- a/cpanfile ++++ b/cpanfile +@@ -14,7 +14,6 @@ requires "IO::Compress::Deflate" => "0"; + requires "IO::Compress::Gzip" => "0"; + requires "IO::HTML" => "0"; + requires "IO::Uncompress::Bunzip2" => "2.021"; +-requires "IO::Uncompress::Gunzip" => "0"; + requires "IO::Uncompress::Inflate" => "0"; + requires "IO::Uncompress::RawInflate" => "0"; + requires "LWP::MediaTypes" => "6"; +diff --git a/lib/HTTP/Message.pm b/lib/HTTP/Message.pm +index bda7c15d..222655dc 100644 +--- a/lib/HTTP/Message.pm ++++ b/lib/HTTP/Message.pm +@@ -493,7 +493,7 @@ sub decodable + # XXX preferably we should determine if the modules are available without loading + # them here + eval { +- require IO::Uncompress::Gunzip; ++ require Compress::Raw::Zlib; + push(@enc, "gzip", "x-gzip"); + }; + eval { +diff --git a/t/request.t b/t/request.t +index 929993dc..c9d868b2 100644 +--- a/t/request.t ++++ b/t/request.t +@@ -16,7 +16,7 @@ $req->accept_decodable; + is( $req->method, "GET" ); + is( $req->uri, "http://www.example.com" ); + like( $req->header("Accept-Encoding"), qr/\bgzip\b/ ) +- ; # assuming IO::Uncompress::Gunzip is there ++ ; # assuming Compress::Raw::Zlib is there + + $req->dump( prefix => "# " ); + +-- +2.37.3 + diff --git a/0002-Remove-dependency-to-IO-Uncompress-Bunzip2.patch b/0002-Remove-dependency-to-IO-Uncompress-Bunzip2.patch new file mode 100644 index 0000000..a2997b1 --- /dev/null +++ b/0002-Remove-dependency-to-IO-Uncompress-Bunzip2.patch @@ -0,0 +1,109 @@ +From fa898236093eb610a820af399d897be2ab6c5a36 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= +Date: Tue, 18 Oct 2022 14:48:09 +0200 +Subject: [PATCH 2/2] Remove dependency to IO::Uncompress::Bunzip2 + +Was replaced by Compress::Raw::Bzip2 +--- + META.json | 1 - + Makefile.PL | 2 -- + cpanfile | 1 - + dist.ini | 1 - + lib/HTTP/Message.pm | 2 +- + t/message.t | 4 ++-- + 6 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/META.json b/META.json +index c7a1b138..c4b4926e 100644 +--- a/META.json ++++ b/META.json +@@ -63,7 +63,6 @@ + "IO::Compress::Deflate" : "0", + "IO::Compress::Gzip" : "0", + "IO::HTML" : "0", +- "IO::Uncompress::Bunzip2" : "2.021", + "IO::Uncompress::Inflate" : "0", + "IO::Uncompress::RawInflate" : "0", + "LWP::MediaTypes" : "6", +diff --git a/Makefile.PL b/Makefile.PL +index fde5a97b..ef00fed2 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -29,7 +29,6 @@ my %WriteMakefileArgs = ( + "IO::Compress::Deflate" => 0, + "IO::Compress::Gzip" => 0, + "IO::HTML" => 0, +- "IO::Uncompress::Bunzip2" => "2.021", + "IO::Uncompress::Inflate" => 0, + "IO::Uncompress::RawInflate" => 0, + "LWP::MediaTypes" => 6, +@@ -75,7 +74,6 @@ my %FallbackPrereqs = ( + "IO::Compress::Deflate" => 0, + "IO::Compress::Gzip" => 0, + "IO::HTML" => 0, +- "IO::Uncompress::Bunzip2" => "2.021", + "IO::Uncompress::Inflate" => 0, + "IO::Uncompress::RawInflate" => 0, + "LWP::MediaTypes" => 6, +diff --git a/cpanfile b/cpanfile +index 877bb3cb..86434741 100644 +--- a/cpanfile ++++ b/cpanfile +@@ -13,7 +13,6 @@ requires "IO::Compress::Bzip2" => "2.021"; + requires "IO::Compress::Deflate" => "0"; + requires "IO::Compress::Gzip" => "0"; + requires "IO::HTML" => "0"; +-requires "IO::Uncompress::Bunzip2" => "2.021"; + requires "IO::Uncompress::Inflate" => "0"; + requires "IO::Uncompress::RawInflate" => "0"; + requires "LWP::MediaTypes" => "6"; +diff --git a/dist.ini b/dist.ini +index 8b61a194..5f0ed9c6 100644 +--- a/dist.ini ++++ b/dist.ini +@@ -18,7 +18,6 @@ HTTP::Date = 6 + IO::Compress::Brotli = 0.004001 + IO::Compress::Bzip2 = 2.021 + IO::Uncompress::Brotli = 0.004001 +-IO::Uncompress::Bunzip2 = 2.021 + LWP::MediaTypes = 6 + MIME::Base64 = 2.1 + perl = 5.008001 +diff --git a/lib/HTTP/Message.pm b/lib/HTTP/Message.pm +index 222655dc..9182db7f 100644 +--- a/lib/HTTP/Message.pm ++++ b/lib/HTTP/Message.pm +@@ -502,7 +502,7 @@ sub decodable + push(@enc, "deflate"); + }; + eval { +- require IO::Uncompress::Bunzip2; ++ require Compress::Raw::Bzip2; + push(@enc, "x-bzip2", "bzip2"); + }; + eval { +diff --git a/t/message.t b/t/message.t +index ef044a73..cf86f0c6 100644 +--- a/t/message.t ++++ b/t/message.t +@@ -500,7 +500,7 @@ is($m->decoded_content, "Hello World!"); + ok(!$m->header("Client-Warning")); + + +-if (eval "require IO::Uncompress::Bunzip2") { ++if (eval "require Compress::Raw::Bzip2") { + for my $encoding (qw/x-bzip2 bzip2/) { + $m = HTTP::Message->new([ + "Content-Type" => "text/plain", +@@ -531,7 +531,7 @@ if (eval "require IO::Uncompress::Bunzip2") { + } + } + else { +- skip("Need IO::Uncompress::Bunzip2", undef) for 1..18; ++ skip("Need Compress::Raw::Bzip2", undef) for 1..18; + } + + # test decoding of XML content +-- +2.37.3 + diff --git a/0003-Remove-dependencies-from-tests.patch b/0003-Remove-dependencies-from-tests.patch new file mode 100644 index 0000000..c87ecb9 --- /dev/null +++ b/0003-Remove-dependencies-from-tests.patch @@ -0,0 +1,12 @@ +diff -u -r HTTP-Message-6.42.orig/t/00-report-prereqs.dd HTTP-Message-6.42/t/00-report-prereqs.dd +--- HTTP-Message-6.42.orig/t/00-report-prereqs.dd 2022-10-21 14:21:26.925372217 +0200 ++++ HTTP-Message-6.42/t/00-report-prereqs.dd 2022-10-21 14:21:39.675403248 +0200 +@@ -41,8 +41,6 @@ + 'IO::Compress::Deflate' => '0', + 'IO::Compress::Gzip' => '0', + 'IO::HTML' => '0', +- 'IO::Uncompress::Bunzip2' => '2.021', +- 'IO::Uncompress::Gunzip' => '0', + 'IO::Uncompress::Inflate' => '0', + 'IO::Uncompress::RawInflate' => '0', + 'LWP::MediaTypes' => '6', diff --git a/perl-HTTP-Message.spec b/perl-HTTP-Message.spec index 8c275a1..ef593e7 100644 --- a/perl-HTTP-Message.spec +++ b/perl-HTTP-Message.spec @@ -2,7 +2,7 @@ %bcond_without perl_HTTP_Message_enables_Clone Name: perl-HTTP-Message -Version: 6.40 +Version: 6.42 Release: 1%{?dist} Summary: HTTP style message # CONTRIBUTING.md: CC0 @@ -10,6 +10,9 @@ Summary: HTTP style message License: (GPL+ or Artistic) and CC0 URL: https://metacpan.org/release/HTTP-Message Source0: https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-%{version}.tar.gz +Patch0: 0001-Remove-dependency-to-IO-Uncompress-Gunzip.patch +Patch1: 0002-Remove-dependency-to-IO-Uncompress-Bunzip2.patch +Patch2: 0003-Remove-dependencies-from-tests.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -33,8 +36,6 @@ BuildRequires: perl(IO::Compress::Bzip2) >= 2.021 BuildRequires: perl(IO::Compress::Deflate) BuildRequires: perl(IO::Compress::Gzip) BuildRequires: perl(IO::HTML) -BuildRequires: perl(IO::Uncompress::Bunzip2) >= 2.021 -BuildRequires: perl(IO::Uncompress::Gunzip) BuildRequires: perl(IO::Uncompress::Inflate) BuildRequires: perl(IO::Uncompress::RawInflate) BuildRequires: perl(LWP::MediaTypes) >= 6 @@ -68,8 +69,6 @@ Requires: perl(IO::Compress::Bzip2) >= 2.021 Requires: perl(IO::Compress::Deflate) Requires: perl(IO::Compress::Gzip) Requires: perl(IO::HTML) -Requires: perl(IO::Uncompress::Bunzip2) >= 2.021 -Requires: perl(IO::Uncompress::Gunzip) Requires: perl(IO::Uncompress::Inflate) Requires: perl(IO::Uncompress::RawInflate) Requires: perl(LWP::MediaTypes) >= 6 @@ -102,6 +101,9 @@ with "%{_libexecdir}/%{name}/test". %prep %setup -q -n HTTP-Message-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Help generators to recognize Perl scripts for F in t/*.t; do perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F" @@ -138,6 +140,9 @@ make test %{_libexecdir}/%{name} %changelog +* Fri Oct 21 2022 Michal Josef Špaček - 6.42-1 +- 0.42 bump + * Tue Oct 18 2022 Michal Josef Špaček - 6.40-1 - 6.40 bump diff --git a/sources b/sources index f4a65e3..5e234c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (HTTP-Message-6.40.tar.gz) = 24a55c233afa26d0402aa22793a02e1fa3b3ad661c1e6746eda116f41807b03fb3412de0bc9a4dad12c49ec0e342b78fe91e323257164388bd96162428dcd979 +SHA512 (HTTP-Message-6.42.tar.gz) = bdbb9abccf5657e5e3f8d8ab049d60327e03472babe600ab66009d10d7d9aab543e4a77c8992d232e0ec3f56dad40753968b92828ec09eb2141160bdc4ac5757