Compare commits
No commits in common. "c8s" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
11
.gitignore
vendored
11
.gitignore
vendored
@ -1,2 +1,11 @@
|
||||
SOURCES/HTTP-Daemon-6.01.tar.gz
|
||||
/HTTP-Daemon-6.00.tar.gz
|
||||
/HTTP-Daemon-6.01.tar.gz
|
||||
/HTTP-Daemon-6.04.tar.gz
|
||||
/HTTP-Daemon-6.05.tar.gz
|
||||
/HTTP-Daemon-6.06.tar.gz
|
||||
/HTTP-Daemon-6.10.tar.gz
|
||||
/HTTP-Daemon-6.12.tar.gz
|
||||
/HTTP-Daemon-6.13.tar.gz
|
||||
/HTTP-Daemon-6.14.tar.gz
|
||||
/HTTP-Daemon-6.15.tar.gz
|
||||
/HTTP-Daemon-6.16.tar.gz
|
||||
|
@ -1,305 +0,0 @@
|
||||
From 067faffb8e596a53c9ac2ed7e571472f7a163681 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 16 Jan 2017 16:13:08 +0100
|
||||
Subject: [PATCH] Add IPv6 support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This patch ports the code from IO::Socket::INET to IO::Socket::IP in
|
||||
order to support IPv6.
|
||||
|
||||
CPAN RT #91699, #71395.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Makefile.PL | 1 +
|
||||
README | 24 ++++++++++++------------
|
||||
lib/HTTP/Daemon.pm | 43 ++++++++++++++++++++++++++++---------------
|
||||
t/chunked.t | 34 +++++++++++++++++++++++-----------
|
||||
4 files changed, 64 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index 09c7e86..85d5712 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -14,6 +14,7 @@ WriteMakefile(
|
||||
PREREQ_PM => {
|
||||
'Sys::Hostname' => 0,
|
||||
'IO::Socket' => 0,
|
||||
+ 'IO::Socket::IP' => 0,
|
||||
'HTTP::Request' => 6,
|
||||
'HTTP::Response' => 6,
|
||||
'HTTP::Status' => 6,
|
||||
diff --git a/README b/README
|
||||
index be5a20a..ddb3b6e 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -24,12 +24,12 @@ SYNOPSIS
|
||||
DESCRIPTION
|
||||
Instances of the `HTTP::Daemon' class are HTTP/1.1 servers that listen
|
||||
on a socket for incoming requests. The `HTTP::Daemon' is a subclass of
|
||||
- `IO::Socket::INET', so you can perform socket operations directly on it
|
||||
+ `IO::Socket::IP', so you can perform socket operations directly on it
|
||||
too.
|
||||
|
||||
The accept() method will return when a connection from a client is
|
||||
available. The returned value will be an `HTTP::Daemon::ClientConn'
|
||||
- object which is another `IO::Socket::INET' subclass. Calling the
|
||||
+ object which is another `IO::Socket::IP' subclass. Calling the
|
||||
get_request() method on this object will read data from the client and
|
||||
return an `HTTP::Request' object. The ClientConn object also provide
|
||||
methods to send back various responses.
|
||||
@@ -40,13 +40,13 @@ DESCRIPTION
|
||||
responses that conform to the HTTP/1.1 protocol.
|
||||
|
||||
The following methods of `HTTP::Daemon' are new (or enhanced) relative
|
||||
- to the `IO::Socket::INET' base class:
|
||||
+ to the `IO::Socket::IP' base class:
|
||||
|
||||
$d = HTTP::Daemon->new
|
||||
$d = HTTP::Daemon->new( %opts )
|
||||
The constructor method takes the same arguments as the
|
||||
- `IO::Socket::INET' constructor, but unlike its base class it can
|
||||
- also be called without any arguments. The daemon will then set up a
|
||||
+ `IO::Socket::IP' constructor, but unlike its base class it can also
|
||||
+ be called without any arguments. The daemon will then set up a
|
||||
listen queue of 5 connections and allocate some random port number.
|
||||
|
||||
A server that wants to bind to some specific address on the standard
|
||||
@@ -57,8 +57,8 @@ DESCRIPTION
|
||||
LocalPort => 80,
|
||||
);
|
||||
|
||||
- See IO::Socket::INET for a description of other arguments that can
|
||||
- be used configure the daemon during construction.
|
||||
+ See IO::Socket::IP for a description of other arguments that can be
|
||||
+ used configure the daemon during construction.
|
||||
|
||||
$c = $d->accept
|
||||
$c = $d->accept( $pkg )
|
||||
@@ -71,7 +71,7 @@ DESCRIPTION
|
||||
|
||||
The accept method will return `undef' if timeouts have been enabled
|
||||
and no connection is made within the given time. The timeout()
|
||||
- method is described in IO::Socket.
|
||||
+ method is described in IO::Socket::IP.
|
||||
|
||||
In list context both the client object and the peer address will be
|
||||
returned; see the description of the accept method IO::Socket for
|
||||
@@ -89,9 +89,9 @@ DESCRIPTION
|
||||
The default is the string "libwww-perl-daemon/#.##" where "#.##" is
|
||||
replaced with the version number of this module.
|
||||
|
||||
- The `HTTP::Daemon::ClientConn' is a `IO::Socket::INET' subclass.
|
||||
- Instances of this class are returned by the accept() method of
|
||||
- `HTTP::Daemon'. The following methods are provided:
|
||||
+ The `HTTP::Daemon::ClientConn' is a `IO::Socket::IP' subclass. Instances
|
||||
+ of this class are returned by the accept() method of `HTTP::Daemon'. The
|
||||
+ following methods are provided:
|
||||
|
||||
$c->get_request
|
||||
$c->get_request( $headers_only )
|
||||
@@ -227,7 +227,7 @@ DESCRIPTION
|
||||
SEE ALSO
|
||||
RFC 2616
|
||||
|
||||
- IO::Socket::INET, IO::Socket
|
||||
+ IO::Socket::IP, IO::Socket
|
||||
|
||||
COPYRIGHT
|
||||
Copyright 1996-2003, Gisle Aas
|
||||
diff --git a/lib/HTTP/Daemon.pm b/lib/HTTP/Daemon.pm
|
||||
index 27a7bf4..0e22b77 100644
|
||||
--- a/lib/HTTP/Daemon.pm
|
||||
+++ b/lib/HTTP/Daemon.pm
|
||||
@@ -5,8 +5,10 @@ use vars qw($VERSION @ISA $PROTO $DEBUG);
|
||||
|
||||
$VERSION = "6.01";
|
||||
|
||||
-use IO::Socket qw(AF_INET INADDR_ANY INADDR_LOOPBACK inet_ntoa);
|
||||
-@ISA=qw(IO::Socket::INET);
|
||||
+use Socket qw(AF_INET AF_INET6 INADDR_ANY IN6ADDR_ANY
|
||||
+ INADDR_LOOPBACK IN6ADDR_LOOPBACK inet_ntop sockaddr_family);
|
||||
+use IO::Socket::IP;
|
||||
+@ISA=qw(IO::Socket::IP);
|
||||
|
||||
$PROTO = "HTTP/1.1";
|
||||
|
||||
@@ -40,15 +42,26 @@ sub url
|
||||
my $self = shift;
|
||||
my $url = $self->_default_scheme . "://";
|
||||
my $addr = $self->sockaddr;
|
||||
- if (!$addr || $addr eq INADDR_ANY) {
|
||||
+ if (!$addr || $addr eq INADDR_ANY || $addr eq IN6ADDR_ANY) {
|
||||
require Sys::Hostname;
|
||||
$url .= lc Sys::Hostname::hostname();
|
||||
}
|
||||
elsif ($addr eq INADDR_LOOPBACK) {
|
||||
- $url .= inet_ntoa($addr);
|
||||
+ $url .= inet_ntop(AF_INET, $addr);
|
||||
+ }
|
||||
+ elsif ($addr eq IN6ADDR_LOOPBACK) {
|
||||
+ $url .= '[' . inet_ntop(AF_INET6, $addr) . ']';
|
||||
}
|
||||
else {
|
||||
- $url .= gethostbyaddr($addr, AF_INET) || inet_ntoa($addr);
|
||||
+ my $host = $addr->sockhostname;
|
||||
+ if (!defined $host) {
|
||||
+ if (sockaddr_family($addr) eq AF_INET6) {
|
||||
+ $host = '[' . inet_ntop(AF_INET6, $addr) . ']';
|
||||
+ } else {
|
||||
+ $host = inet_ntop(AF_INET6, $addr);
|
||||
+ }
|
||||
+ }
|
||||
+ $url .= $host;
|
||||
}
|
||||
my $port = $self->sockport;
|
||||
$url .= ":$port" if $port != $self->_default_port;
|
||||
@@ -77,8 +90,8 @@ sub product_tokens
|
||||
package HTTP::Daemon::ClientConn;
|
||||
|
||||
use vars qw(@ISA $DEBUG);
|
||||
-use IO::Socket ();
|
||||
-@ISA=qw(IO::Socket::INET);
|
||||
+use IO::Socket::IP ();
|
||||
+@ISA=qw(IO::Socket::IP);
|
||||
*DEBUG = \$HTTP::Daemon::DEBUG;
|
||||
|
||||
use HTTP::Request ();
|
||||
@@ -645,12 +658,12 @@ HTTP::Daemon - a simple http server class
|
||||
|
||||
Instances of the C<HTTP::Daemon> class are HTTP/1.1 servers that
|
||||
listen on a socket for incoming requests. The C<HTTP::Daemon> is a
|
||||
-subclass of C<IO::Socket::INET>, so you can perform socket operations
|
||||
+subclass of C<IO::Socket::IP>, so you can perform socket operations
|
||||
directly on it too.
|
||||
|
||||
The accept() method will return when a connection from a client is
|
||||
available. The returned value will be an C<HTTP::Daemon::ClientConn>
|
||||
-object which is another C<IO::Socket::INET> subclass. Calling the
|
||||
+object which is another C<IO::Socket::IP> subclass. Calling the
|
||||
get_request() method on this object will read data from the client and
|
||||
return an C<HTTP::Request> object. The ClientConn object also provide
|
||||
methods to send back various responses.
|
||||
@@ -661,7 +674,7 @@ desirable. Also note that the user is responsible for generating
|
||||
responses that conform to the HTTP/1.1 protocol.
|
||||
|
||||
The following methods of C<HTTP::Daemon> are new (or enhanced) relative
|
||||
-to the C<IO::Socket::INET> base class:
|
||||
+to the C<IO::Socket::IP> base class:
|
||||
|
||||
=over 4
|
||||
|
||||
@@ -670,7 +683,7 @@ to the C<IO::Socket::INET> base class:
|
||||
=item $d = HTTP::Daemon->new( %opts )
|
||||
|
||||
The constructor method takes the same arguments as the
|
||||
-C<IO::Socket::INET> constructor, but unlike its base class it can also
|
||||
+C<IO::Socket::IP> constructor, but unlike its base class it can also
|
||||
be called without any arguments. The daemon will then set up a listen
|
||||
queue of 5 connections and allocate some random port number.
|
||||
|
||||
@@ -682,7 +695,7 @@ HTTP port will be constructed like this:
|
||||
LocalPort => 80,
|
||||
);
|
||||
|
||||
-See L<IO::Socket::INET> for a description of other arguments that can
|
||||
+See L<IO::Socket::IP> for a description of other arguments that can
|
||||
be used configure the daemon during construction.
|
||||
|
||||
=item $c = $d->accept
|
||||
@@ -699,7 +712,7 @@ class a subclass of C<HTTP::Daemon::ClientConn>.
|
||||
|
||||
The accept method will return C<undef> if timeouts have been enabled
|
||||
and no connection is made within the given time. The timeout() method
|
||||
-is described in L<IO::Socket>.
|
||||
+is described in L<IO::Socket::IP>.
|
||||
|
||||
In list context both the client object and the peer address will be
|
||||
returned; see the description of the accept method L<IO::Socket> for
|
||||
@@ -721,7 +734,7 @@ replaced with the version number of this module.
|
||||
|
||||
=back
|
||||
|
||||
-The C<HTTP::Daemon::ClientConn> is a C<IO::Socket::INET>
|
||||
+The C<HTTP::Daemon::ClientConn> is a C<IO::Socket::IP>
|
||||
subclass. Instances of this class are returned by the accept() method
|
||||
of C<HTTP::Daemon>. The following methods are provided:
|
||||
|
||||
@@ -895,7 +908,7 @@ Return a reference to the corresponding C<HTTP::Daemon> object.
|
||||
|
||||
RFC 2616
|
||||
|
||||
-L<IO::Socket::INET>, L<IO::Socket>
|
||||
+L<IO::Socket::IP>, L<IO::Socket>
|
||||
|
||||
=head1 COPYRIGHT
|
||||
|
||||
diff --git a/t/chunked.t b/t/chunked.t
|
||||
index e11799f..c274b11 100644
|
||||
--- a/t/chunked.t
|
||||
+++ b/t/chunked.t
|
||||
@@ -95,18 +95,30 @@ my $can_fork = $Config{d_fork} ||
|
||||
my $tests = @TESTS;
|
||||
my $tport = 8333;
|
||||
|
||||
-my $tsock = IO::Socket::INET->new(LocalAddr => '0.0.0.0',
|
||||
- LocalPort => $tport,
|
||||
- Listen => 1,
|
||||
- ReuseAddr => 1);
|
||||
+my @addresses = (
|
||||
+ { server => '::', client => '::1' },
|
||||
+ { server => '0.0.0.0', client => '127.0.0.1' }
|
||||
+);
|
||||
+my $family;
|
||||
+for my $id (0..$#addresses) {
|
||||
+ my $tsock = IO::Socket::IP->new(LocalAddr => $addresses[$id]->{server},
|
||||
+ LocalPort => $tport,
|
||||
+ Listen => 1,
|
||||
+ ReuseAddr => 1);
|
||||
+ if ($tsock) {
|
||||
+ close $tsock;
|
||||
+ $family = $id;
|
||||
+ last;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
if (!$can_fork) {
|
||||
plan skip_all => "This system cannot fork";
|
||||
}
|
||||
-elsif (!$tsock) {
|
||||
- plan skip_all => "Cannot listen on 0.0.0.0:$tport";
|
||||
+elsif (!defined $family) {
|
||||
+ plan skip_all => "Cannot listen on unspecifed address and port $tport";
|
||||
}
|
||||
else {
|
||||
- close $tsock;
|
||||
plan tests => $tests;
|
||||
}
|
||||
|
||||
@@ -132,9 +144,9 @@ if ($pid = fork) {
|
||||
open my $fh, "| socket localhost $tport" or die;
|
||||
print $fh $test;
|
||||
}
|
||||
- use IO::Socket::INET;
|
||||
- my $sock = IO::Socket::INET->new(
|
||||
- PeerAddr => "127.0.0.1",
|
||||
+ use IO::Socket::IP;
|
||||
+ my $sock = IO::Socket::IP->new(
|
||||
+ PeerAddr => $addresses[$family]->{client},
|
||||
PeerPort => $tport,
|
||||
) or die;
|
||||
if (0) {
|
||||
@@ -158,7 +170,7 @@ if ($pid = fork) {
|
||||
} else {
|
||||
die "cannot fork: $!" unless defined $pid;
|
||||
my $d = HTTP::Daemon->new(
|
||||
- LocalAddr => '0.0.0.0',
|
||||
+ LocalAddr => $addresses[$family]->{server},
|
||||
LocalPort => $tport,
|
||||
ReuseAddr => 1,
|
||||
) or die;
|
||||
--
|
||||
2.7.4
|
||||
|
@ -1,48 +0,0 @@
|
||||
From b54702ab21edbf1ea0dbc00d978aecc89e5764d6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 18 Sep 2017 15:21:16 +0200
|
||||
Subject: [PATCH] Handle undef and empty LocalAddr
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
IO::Socket::INET interprets undefined and empty string LocalAddr
|
||||
arguments as an unspecified address while IO::Socket::IP returns an
|
||||
error. This seems to be one of the differences between the two
|
||||
Socket implementations. Recent IO::Socket::IP (0.39) accepts undefined
|
||||
value, but still bail outs on an empty string.
|
||||
|
||||
To improve compatibility, this patch adds a special handling for these
|
||||
two values to be accepted as an unspecified value. Though this should
|
||||
be corrected on IO::Socket:IP side probably.
|
||||
|
||||
CPAN RT#91699
|
||||
CPAN RT#123069
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
lib/HTTP/Daemon.pm | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/lib/HTTP/Daemon.pm b/lib/HTTP/Daemon.pm
|
||||
index 0e22b77..1e9d48e 100644
|
||||
--- a/lib/HTTP/Daemon.pm
|
||||
+++ b/lib/HTTP/Daemon.pm
|
||||
@@ -18,6 +18,14 @@ sub new
|
||||
my($class, %args) = @_;
|
||||
$args{Listen} ||= 5;
|
||||
$args{Proto} ||= 'tcp';
|
||||
+ # Handle undefined or empty local address the same way as
|
||||
+ # IO::Socket::INET -- use unspecified address
|
||||
+ for my $key (qw(LocalAddr LocalHost)) {
|
||||
+ if (exists $args{$key} &&
|
||||
+ (!defined($args{$key}) || $args{$key} eq '')) {
|
||||
+ delete $args{$key};
|
||||
+ }
|
||||
+ }
|
||||
return $class->SUPER::new(%args);
|
||||
}
|
||||
|
||||
--
|
||||
2.13.5
|
||||
|
@ -1,55 +0,0 @@
|
||||
From e49f553aa8be21e5df72452e50af2e9f0b82ecad Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Wed, 23 May 2018 17:31:42 +0200
|
||||
Subject: [PATCH] Resolve specific socket addresses correctly
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Previous code did not formatted specific (not 0.0.0.0 or ::)
|
||||
correctly:
|
||||
|
||||
$ perl -MHTTP::Daemon -e '$d=HTTP::Daemon->new(LocalAddr=>q{127.0.0.2}) or die; print $d->url, qq{\n}'
|
||||
Can't call method "sockhostname" without a package or object reference at /usr/share/perl5/vendor_perl/HTTP/Daemon.pm line 64.
|
||||
|
||||
This patch also fixes formatting numerical IPv6 addresses. It seems
|
||||
that IO::Socket::IP::sockhostname() formats unresolvable addresses too.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
lib/HTTP/Daemon.pm | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/HTTP/Daemon.pm b/lib/HTTP/Daemon.pm
|
||||
index 1e9d48e..216c73f 100644
|
||||
--- a/lib/HTTP/Daemon.pm
|
||||
+++ b/lib/HTTP/Daemon.pm
|
||||
@@ -61,12 +61,23 @@ sub url
|
||||
$url .= '[' . inet_ntop(AF_INET6, $addr) . ']';
|
||||
}
|
||||
else {
|
||||
- my $host = $addr->sockhostname;
|
||||
+ my $host = $self->sockhostname;
|
||||
+ # sockhostname() seems to return a stringified IP address if not
|
||||
+ # resolvable, then quote it for a port separator and an IPv6 zone separator.
|
||||
+ # But be paranoid for a case when it already contains a bracket.
|
||||
+ if (defined $host and $host =~ /:/) {
|
||||
+ if ($host =~ /[\[\]]/) {
|
||||
+ $host = undef;
|
||||
+ } else {
|
||||
+ $host =~ s/%/%25/g;
|
||||
+ $host = '[' . $host . ']';
|
||||
+ }
|
||||
+ }
|
||||
if (!defined $host) {
|
||||
if (sockaddr_family($addr) eq AF_INET6) {
|
||||
$host = '[' . inet_ntop(AF_INET6, $addr) . ']';
|
||||
} else {
|
||||
- $host = inet_ntop(AF_INET6, $addr);
|
||||
+ $host = inet_ntop(AF_INET, $addr);
|
||||
}
|
||||
}
|
||||
$url .= $host;
|
||||
--
|
||||
2.14.3
|
||||
|
92
HTTP-Daemon-6.04-EU-MM-is-not-deprecated.patch
Normal file
92
HTTP-Daemon-6.04-EU-MM-is-not-deprecated.patch
Normal file
@ -0,0 +1,92 @@
|
||||
From 30b91a0898e50874886343b66d27f78eaf960faf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Tue, 2 Apr 2019 16:54:42 +0200
|
||||
Subject: [PATCH] EU::MM is not deprecated
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Contrary to the warning in the Makefile.PL, only ExtUtils::MakeMaker
|
||||
is a full-fledged system. Module::Build is not maintained anymore and
|
||||
Module::Build::Tiny contains design flaws regarding XS compilation.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
Makefile.PL | 61 -----------------------------------------------------
|
||||
1 file changed, 61 deletions(-)
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index 5915c46..e98af42 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -9,67 +9,6 @@ use warnings;
|
||||
use 5.006;
|
||||
use ExtUtils::MakeMaker;
|
||||
|
||||
-BEGIN {
|
||||
-my %configure_requires = (
|
||||
- 'ExtUtils::MakeMaker' => '0',
|
||||
- 'Module::Build::Tiny' => '0.034',
|
||||
-);
|
||||
-
|
||||
-my %errors = map {
|
||||
- eval "require $_; $_->VERSION($configure_requires{$_}); 1";
|
||||
- $_ => $@,
|
||||
-} keys %configure_requires;
|
||||
-
|
||||
-if (grep $_, values %errors)
|
||||
-{
|
||||
- warn "Errors from configure prereqs:\n"
|
||||
- . do {
|
||||
- require Data::Dumper; Data::Dumper->new([ \%errors ])->Indent(2)->Terse(1)->Sortkeys(1)->Dump;
|
||||
- };
|
||||
-}
|
||||
-
|
||||
-if (not $ENV{PERL_MM_FALLBACK_SILENCE_WARNING})
|
||||
-{
|
||||
- warn <<'EOW';
|
||||
-*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***
|
||||
-
|
||||
-If you're seeing this warning, your toolchain is really, really old* and
|
||||
-you'll almost certainly have problems installing CPAN modules from this
|
||||
-century. But never fear, dear user, for we have the technology to fix this!
|
||||
-
|
||||
-If you're using CPAN.pm to install things, then you can upgrade it using:
|
||||
-
|
||||
- cpan CPAN
|
||||
-
|
||||
-If you're using CPANPLUS to install things, then you can upgrade it using:
|
||||
-
|
||||
- cpanp CPANPLUS
|
||||
-
|
||||
-If you're using cpanminus, you shouldn't be seeing this message in the first
|
||||
-place, so please file an issue on github.
|
||||
-
|
||||
-If you're using a packaging tool through a unix distribution, this issue
|
||||
-should be reported to the package manager.
|
||||
-
|
||||
-If you're installing manually, please retrain your fingers to run Build.PL
|
||||
-when present instead of Makefile.PL.
|
||||
-
|
||||
-This public service announcement was brought to you by the Perl Toolchain
|
||||
-Gang, the irc.perl.org #toolchain IRC channel, and the number 42.
|
||||
-
|
||||
-----
|
||||
-
|
||||
-* Alternatively, you are doing something overly clever, in which case you
|
||||
-should consider setting the 'prefer_installer' config option in CPAN.pm, or
|
||||
-'prefer_makefile' in CPANPLUS, to 'mb" and '0' respectively.
|
||||
-
|
||||
-You can also silence this warning for future installations by setting the
|
||||
-PERL_MM_FALLBACK_SILENCE_WARNING environment variable.
|
||||
-EOW
|
||||
- sleep 10 if -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
|
||||
-}
|
||||
-} # end BEGIN
|
||||
-
|
||||
my %WriteMakefileArgs = (
|
||||
"ABSTRACT" => "A simple http server class",
|
||||
"AUTHOR" => "Gisle Aas <gisle\@activestate.com>",
|
||||
--
|
||||
2.20.1
|
||||
|
15
gating.yaml
Normal file
15
gating.yaml
Normal file
@ -0,0 +1,15 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
|
||||
# RHEL
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
2
perl-HTTP-Daemon.rpmlintrc
Normal file
2
perl-HTTP-Daemon.rpmlintrc
Normal file
@ -0,0 +1,2 @@
|
||||
from Config import *
|
||||
addFilter("-tests.noarch: W: no-documentation");
|
@ -1,23 +1,22 @@
|
||||
# Perform optional tests
|
||||
%{bcond_without perl_HTTP_Daemon_enables_optional_test}
|
||||
|
||||
Name: perl-HTTP-Daemon
|
||||
Version: 6.01
|
||||
Release: 23%{?dist}
|
||||
Version: 6.16
|
||||
Release: 7%{?dist}
|
||||
Summary: Simple HTTP server class
|
||||
License: GPL+ or Artistic
|
||||
URL: http://search.cpan.org/dist/HTTP-Daemon/
|
||||
Source0: http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Daemon-%{version}.tar.gz
|
||||
# Support IPv6, bug #1413065, CPAN RT#91699, CPAN RT#71395,
|
||||
# proposed to upstream
|
||||
Patch0: HTTP-Daemon-6.01-Add-IPv6-support.patch
|
||||
# Accept undefined and empty-string LocalAddr as IO::Socket::INET does,
|
||||
# CPAN RT#91699, CPAN RT#123069
|
||||
Patch1: HTTP-Daemon-6.01-Handle-undef-and-empty-LocalAddr.patch
|
||||
# Fix formatting specific non-local addresses, bug #1578026, CPAN RT#125242
|
||||
Patch2: HTTP-Daemon-6.01-Resolve-specific-socket-addresses-correctly.patch
|
||||
License: GPL-1.0-or-later OR Artistic-1.0-Perl
|
||||
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
|
||||
BuildArch: noarch
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: make
|
||||
BuildRequires: findutils
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl(:VERSION) >= 5.8.1
|
||||
BuildRequires: perl(:VERSION) >= 5.6
|
||||
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
|
||||
BuildRequires: perl(strict)
|
||||
# Run-time:
|
||||
@ -26,60 +25,208 @@ 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.32
|
||||
BuildRequires: perl(LWP::MediaTypes) >= 6
|
||||
BuildRequires: perl(Socket)
|
||||
BuildRequires: perl(Sys::Hostname)
|
||||
BuildRequires: perl(vars)
|
||||
# Tests only:
|
||||
BuildRequires: perl(Config)
|
||||
# IO::Socket not used
|
||||
# LWP::RobotUA not used
|
||||
# LWP::UserAgent not used
|
||||
# Test not used
|
||||
BuildRequires: perl(Test::More)
|
||||
# URI not used
|
||||
BuildRequires: perl(warnings)
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
|
||||
# Tests only:
|
||||
BuildRequires: perl(lib)
|
||||
BuildRequires: perl(Config)
|
||||
BuildRequires: perl(File::Spec)
|
||||
BuildRequires: perl(File::Temp)
|
||||
BuildRequires: perl(IO::Select)
|
||||
BuildRequires: perl(MIME::Base64)
|
||||
BuildRequires: perl(Module::Metadata)
|
||||
BuildRequires: perl(Test)
|
||||
BuildRequires: perl(Test::More) >= 0.98
|
||||
BuildRequires: perl(Test::Needs)
|
||||
BuildRequires: perl(URI)
|
||||
# Optional tests:
|
||||
%if %{with perl_HTTP_Daemon_enables_optional_test} && !%{defined %perl_bootstrap}
|
||||
BuildRequires: perl(LWP::RobotUA)
|
||||
BuildRequires: perl(LWP::UserAgent) >= 6.37
|
||||
# CPAN::Meta not helpful
|
||||
# CPAN::Meta::Prereqs not helpful
|
||||
%endif
|
||||
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.32
|
||||
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)\\)$
|
||||
# Remove private test modules
|
||||
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
|
||||
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((TestServer|TestServer::(BasicTests|Reflect))\\)$
|
||||
|
||||
%description
|
||||
Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen on a
|
||||
socket for incoming requests. The HTTP::Daemon is a subclass of
|
||||
IO::Socket::IP, so you can perform socket operations directly on it too.
|
||||
|
||||
%package tests
|
||||
Summary: Tests for %{name}
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: perl-Test-Harness
|
||||
# perl-generators doesn't detect 'use Test::Needs 'LWP::RobotUA';'
|
||||
Requires: perl(LWP::RobotUA)
|
||||
# perl-generators doesn't detect 'use Test::Needs 'LWP::UserAgent';'
|
||||
Requires: perl(LWP::UserAgent) >= 6.37
|
||||
|
||||
%description tests
|
||||
Tests from %{name}. Execute them
|
||||
with "%{_libexecdir}/%{name}/test".
|
||||
|
||||
%prep
|
||||
%setup -q -n HTTP-Daemon-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch -P0 -p1
|
||||
# Help generators to recognize Perl scripts
|
||||
for F in $(find t/ -name '*.t'); do
|
||||
perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F"
|
||||
chmod +x "$F"
|
||||
done
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
|
||||
make %{?_smp_mflags}
|
||||
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
|
||||
%{make_build}
|
||||
|
||||
%install
|
||||
make pure_install DESTDIR=%{buildroot}
|
||||
%{make_install}
|
||||
# Install tests
|
||||
mkdir -p %{buildroot}%{_libexecdir}/%{name}
|
||||
cp -a t %{buildroot}%{_libexecdir}/%{name}
|
||||
cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
|
||||
#!/bin/sh
|
||||
cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" -r
|
||||
EOF
|
||||
chmod +x %{buildroot}%{_libexecdir}/%{name}/test
|
||||
%{_fixperms} %{buildroot}/*
|
||||
|
||||
%check
|
||||
make test
|
||||
|
||||
%files
|
||||
%doc Changes README
|
||||
%license LICENCE
|
||||
%doc Changes CONTRIBUTING README
|
||||
%{perl_vendorlib}/*
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%files tests
|
||||
%{_libexecdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.16-7
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Aug 26 2024 Jitka Plesnikova <jplesnik@redhat.com> - 6.16-6
|
||||
- Fix filters of dependencies
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.16-5
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.16-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.16-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Feb 24 2023 Michal Josef Špaček <mspacek@redhat.com> - 6.16-1
|
||||
- 6.16 bump
|
||||
- Fix minimal version of IO::Socket::IP
|
||||
- Fix requires/provided modules in *tests package
|
||||
|
||||
* Thu Feb 23 2023 Michal Josef Špaček <mspacek@redhat.com> - 6.15-1
|
||||
- 6.15 bump
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.14-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Oct 25 2022 Michal Josef Špaček <mspacek@redhat.com> - 6.14-8
|
||||
- Update license to SPDX format
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.14-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jun 03 2022 Jitka Plesnikova <jplesnik@redhat.com> - 6.14-6
|
||||
- Perl 5.36 re-rebuild of bootstrapped packages
|
||||
|
||||
* Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 6.14-5
|
||||
- Perl 5.36 rebuild
|
||||
|
||||
* Mon Apr 25 2022 Michal Josef Špaček <mspacek@redhat.com> - 6.14-4
|
||||
- Remove dependency to Module::Build::Tiny (patched by patch0)
|
||||
|
||||
* Tue Mar 22 2022 Adam Williamson <awilliam@redhat.com> - 6.14-3
|
||||
- Rebuild with no changes to fix update mess on F36
|
||||
|
||||
* Tue Mar 22 2022 Michal Josef Špaček <mspacek@redhat.com> - 6.14-2
|
||||
- Fix cycle dependencies (bug #2063824)
|
||||
|
||||
* Fri Mar 04 2022 Michal Josef Špaček <mspacek@redhat.com> - 6.14-1
|
||||
- 6.14 bump
|
||||
- Package unit tests
|
||||
|
||||
* Thu Feb 10 2022 Michal Josef Špaček <mspacek@redhat.com> - 6.13-1
|
||||
- 6.13 bump
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.12-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.12-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 6.12-5
|
||||
- Perl 5.34 rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.12-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.12-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 6.12-2
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Fri Jun 05 2020 Petr Pisar <ppisar@redhat.com> - 6.12-1
|
||||
- 6.12 bump
|
||||
|
||||
* 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
|
||||
|
||||
* Fri Aug 30 2019 Petr Pisar <ppisar@redhat.com> - 6.06-1
|
||||
- 6.06 bump
|
||||
|
||||
* Mon Jul 29 2019 Petr Pisar <ppisar@redhat.com> - 6.05-1
|
||||
- 6.05 bump
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 6.04-2
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Tue Apr 02 2019 Petr Pisar <ppisar@redhat.com> - 6.04-1
|
||||
- 6.04 bump
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.01-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.01-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 6.01-24
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Wed May 23 2018 Petr Pisar <ppisar@redhat.com> - 6.01-23
|
||||
- Fix formatting numerical non-local specific IPv6 addresses (bug #1578026)
|
||||
|
||||
|
5
plans/sanity.fmf
Normal file
5
plans/sanity.fmf
Normal file
@ -0,0 +1,5 @@
|
||||
summary: Sanity tests
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (HTTP-Daemon-6.01.tar.gz) = 8d2b8cd9c9386defb256457e160492d78cd6a7d962514522c62d6f8d3dd1cb6f7019b7a1a70b13f340ef54538eef02629a13861864f2f79306f1da7255fa887b
|
||||
SHA512 (HTTP-Daemon-6.16.tar.gz) = 09e3c5c98c6f22bcb494eae9a28990d52a98c3b1be1b0ca001fc364b3891f7f43f0468aa7274070c64ca11c6b6313591e064084c0b2f5bc6b8bd71708f390d64
|
||||
|
11
tests/upstream-tests.fmf
Normal file
11
tests/upstream-tests.fmf
Normal file
@ -0,0 +1,11 @@
|
||||
summary: Upstream tests
|
||||
component: perl-HTTP-Daemon
|
||||
require: perl-HTTP-Daemon-tests
|
||||
test: /usr/libexec/perl-HTTP-Daemon/test
|
||||
enabled: true
|
||||
tag:
|
||||
- rhel-buildroot
|
||||
adjust:
|
||||
- enabled: false
|
||||
when: distro < rhel-10 or distro < centos-stream-10
|
||||
continue: false
|
Loading…
Reference in New Issue
Block a user