6.10 bump

This commit is contained in:
Petr Písař 2020-05-27 12:04:19 +02:00
parent 2753dd2f8c
commit d243b71a95
4 changed files with 53 additions and 8 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/HTTP-Daemon-6.04.tar.gz
/HTTP-Daemon-6.05.tar.gz
/HTTP-Daemon-6.06.tar.gz
/HTTP-Daemon-6.10.tar.gz

View File

@ -0,0 +1,37 @@
From 2726c84a553b2a855dd8292399f277f0d6e2e33a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 27 May 2020 12:18:44 +0200
Subject: [PATCH] An IPv6 zone separator must be URI-quoted
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is wrong:
$ perl -Ilib -e 'use HTTP::Daemon; $d=HTTP::Daemon->new(LocalAddr=>q{fe80::250:54ff:fe00:f01%ens3}) or die; print $d->url(), qq{\n}'
http://[fe80::250:54ff:fe00:f01%ens3]:50263/
The per-cent character must be quoted in an URI. This was fixed in
a 81bd91d29736061e6e9a0d78022e6ea9b6a72e70 commit, but broken later in
6.10 release.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/HTTP/Daemon.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/HTTP/Daemon.pm b/lib/HTTP/Daemon.pm
index cac7f84..260d5bb 100644
--- a/lib/HTTP/Daemon.pm
+++ b/lib/HTTP/Daemon.pm
@@ -47,6 +47,7 @@ sub url {
my $self = shift;
my $host = $self->sockhost;
+ $host =~ s/%/%25/g;
$host = "127.0.0.1" if $host eq "0.0.0.0";
$host = "::1" if $host eq "::";
$host = "[$host]" if $self->sockdomain == Socket::AF_INET6;
--
2.25.4

View File

@ -1,12 +1,15 @@
Name: perl-HTTP-Daemon
Version: 6.06
Release: 2%{?dist}
Version: 6.10
Release: 1%{?dist}
Summary: Simple HTTP server class
License: GPL+ or Artistic
URL: https://metacpan.org/release/HTTP-Daemon
Source0: https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Daemon-%{version}.tar.gz
# Use Makefile.PL without unneeded dependencies
Patch0: HTTP-Daemon-6.04-EU-MM-is-not-deprecated.patch
# Fix quoting a zone separator, proposed to an upstream,
# <https://github.com/libwww-perl/HTTP-Daemon/pull/46>
Patch1: HTTP-Daemon-6.10-An-IPv6-zone-separator-must-be-URI-quoted.patch
BuildArch: noarch
BuildRequires: make
BuildRequires: perl-generators
@ -20,18 +23,18 @@ BuildRequires: perl(HTTP::Date) >= 6
BuildRequires: perl(HTTP::Request) >= 6
BuildRequires: perl(HTTP::Response) >= 6
BuildRequires: perl(HTTP::Status) >= 6
BuildRequires: perl(IO::Socket::IP)
BuildRequires: perl(IO::Socket::IP) >= 0.25
BuildRequires: perl(LWP::MediaTypes) >= 6
BuildRequires: perl(Socket)
BuildRequires: perl(Sys::Hostname)
BuildRequires: perl(warnings)
# Tests only:
BuildRequires: perl(Config)
BuildRequires: perl(File::Spec)
BuildRequires: perl(HTTP::Tiny) >= 0.042
# LWP::UserAgent not used
BuildRequires: perl(Module::Metadata)
# Test not used if LWP::UserAgent is not installed
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::More) >= 0.98
BuildRequires: perl(Test::Needs)
# URI not used
# Optional tests:
@ -44,12 +47,12 @@ Requires: perl(HTTP::Date) >= 6
Requires: perl(HTTP::Request) >= 6
Requires: perl(HTTP::Response) >= 6
Requires: perl(HTTP::Status) >= 6
Requires: perl(IO::Socket::IP) >= 0.25
Requires: perl(LWP::MediaTypes) >= 6
Requires: perl(Sys::Hostname)
Conflicts: perl-libwww-perl < 6
# Remove underspecified dependencies
%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTTP::(Date|Request|Response|Status)|LWP::MediaTypes\\)$
%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTTP::(Date|Request|Response|Status)|IO::Socket::IP|LWP::MediaTypes\\)$
%description
Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen on a
@ -59,6 +62,7 @@ IO::Socket::IP, so you can perform socket operations directly on it too.
%prep
%setup -q -n HTTP-Daemon-%{version}
%patch0 -p1
%patch1 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@ -81,6 +85,9 @@ make test
%{_mandir}/man3/*
%changelog
* Wed May 27 2020 Petr Pisar <ppisar@redhat.com> - 6.10-1
- 6.10 bump
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.06-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (HTTP-Daemon-6.06.tar.gz) = 8e6dcf4451aaa6bd5f38508a087e5bb9b7f5105e8e243d09bdd3f4be3d7009222b3d9f8e494f049b48f0caebf36f239b8bbc7b8edc805f7d32b1bbeb38431732
SHA512 (HTTP-Daemon-6.10.tar.gz) = 939b646c5b2de4b5a77f1f5fd933425e97ce183416913a4871e8a931313e4f40bd5a72d4fc1ae264f13e1f32dbe0f428badf429ce86e34f48b2d3f91e0c0b03d