[libnet-server-perl] 05/07: Refresh patch offsets
Xavier Guimard
xguimard-guest at moszumanska.debian.org
Thu Oct 26 05:22:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
xguimard-guest pushed a commit to branch master
in repository libnet-server-perl.
commit 88430cc41f28c1ae88cb62b6bbbc14d1c29bf38d
Author: Xavier Guimard <Xavier Guimard x.guimard at free.fr>
Date: Thu Oct 26 07:08:40 2017 +0200
Refresh patch offsets
---
debian/patches/correct-SIG-confusion.patch | 6 +--
debian/patches/series | 3 --
debian/patches/spelling-error.patch | 74 +++++++++++++++---------------
3 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/debian/patches/correct-SIG-confusion.patch b/debian/patches/correct-SIG-confusion.patch
index e4d8a21..9a6ceb3 100644
--- a/debian/patches/correct-SIG-confusion.patch
+++ b/debian/patches/correct-SIG-confusion.patch
@@ -7,7 +7,7 @@ Last-Update: 2013-06-20
--- a/lib/Net/Server/SIG.pm
+++ b/lib/Net/Server/SIG.pm
-@@ -40,6 +40,9 @@ sub register_sig {
+@@ -36,6 +36,9 @@
my $code_ref = shift;
my $ref = ref($code_ref);
@@ -17,7 +17,7 @@ Last-Update: 2013-06-20
if (! $ref) {
if ($code_ref eq 'DEFAULT') {
delete $_SIG{$sig};
-@@ -66,6 +69,10 @@ sub unregister_sig { register_sig(shift(
+@@ -62,6 +65,10 @@
sub check_sigs {
my @found;
foreach my $sig (keys %_SIG){
@@ -28,7 +28,7 @@ Last-Update: 2013-06-20
next if ! $_SIG{$sig};
$_SIG{$sig} = 0;
push @found, $sig;
-@@ -76,6 +83,10 @@ sub check_sigs {
+@@ -72,6 +79,10 @@
sub sig_is_registered {
my $sig = shift;
diff --git a/debian/patches/series b/debian/patches/series
index 01ad569..c09b261 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
spelling-error.patch
correct-SIG-confusion.patch
fix-manpage-has-errors-from-pod2man.patch
-debug-output.patch
-Use_File::Temp::tempdir_in_UNIX_socket_test_example.patch
-Use_File::Temp::tempfile_instead_of_POSIX::tmpnam_for_lock_file.patch
diff --git a/debian/patches/spelling-error.patch b/debian/patches/spelling-error.patch
index 94ffc28..c6d0ce4 100644
--- a/debian/patches/spelling-error.patch
+++ b/debian/patches/spelling-error.patch
@@ -8,7 +8,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server.pod
+++ b/lib/Net/Server.pod
-@@ -194,7 +194,7 @@ Once started, the Net::Server will take
+@@ -194,7 +194,7 @@
waiting for connections. Once a connection is received, the
Net::Server will accept on the socket and will store the result (the
client connection) in $self-E<gt>{server}-E<gt>{client}. This
@@ -17,7 +17,7 @@ Last-Update: 2016-03-14
servers are slightly different in that they will perform a B<recv>
instead of an B<accept>.
-@@ -374,7 +374,7 @@ been parsed. The post_configure_hook is
+@@ -374,7 +374,7 @@
validation.
Some emails have asked why we use this "template" method. The idea is
@@ -26,7 +26,7 @@ Last-Update: 2016-03-14
and you are also creating a way to get the values into the data
structure. The template is the way to get the values to the servers
data structure. One of the possibilities (that probably isn't used
-@@ -633,7 +633,7 @@ if the C<port> argument omits a host spe
+@@ -633,7 +633,7 @@
L<Net::Server::Proto>. See L<IO::Socket>. Configuration passed to new
or run may be either a scalar containing a single host or an arrayref
of hosts - if the hosts array is shorter than the ports array, the
@@ -35,7 +35,7 @@ Last-Update: 2016-03-14
of the ports array.
If an IPv4 address is passed, an IPv4 socket will be created. If an
-@@ -664,7 +664,7 @@ specification can be passed as part of t
+@@ -664,7 +664,7 @@
host => '*/IPv*', # same (any IPv6 or IPv4)
ipv => 4,
@@ -44,7 +44,7 @@ Last-Update: 2016-03-14
=item proto
-@@ -677,7 +677,7 @@ extending the Net::Server::Proto class m
+@@ -677,7 +677,7 @@
passed to new or run may be either a scalar containing a single proto
or an arrayref of protos - if the protos array is shorter than the
ports array, the last proto entry will be used to augment the protos
@@ -53,7 +53,7 @@ Last-Update: 2016-03-14
Additionally the proto may also contain the ipv specification.
-@@ -845,13 +845,13 @@ server is still running as root. Defaul
+@@ -845,13 +845,13 @@
=item user
@@ -69,7 +69,7 @@ Last-Update: 2016-03-14
Defaults to "nobody." If you would like the server to run as root,
you will have to specify C<group> equal to "root".
-@@ -894,7 +894,7 @@ property that is tied to the already ope
+@@ -894,7 +894,7 @@
Boolean. Default undef (not set). If set, the parent will not
attempt to close child processes if the parent receives a SIG HUP.
@@ -78,7 +78,7 @@ Last-Update: 2016-03-14
set of children.
Children of a Fork server will exit after their current request.
-@@ -1158,12 +1158,12 @@ the server.
+@@ -1158,12 +1158,12 @@
=item C<$self-E<gt>bind>
@@ -93,7 +93,7 @@ Last-Update: 2016-03-14
signals are set to run server_close. Sig PIPE is set to IGNORE. Sig
CHLD is set to sig_chld. And sig HUP is set to call sig_hup.
-@@ -1323,11 +1323,11 @@ the process will still be running as the
+@@ -1323,11 +1323,11 @@
=item C<$self-E<gt>pre_loop_hook()>
This hook occurs after chroot, change of user, and change of group has
@@ -107,7 +107,7 @@ Last-Update: 2016-03-14
accept_multi_port request (accept_multi_port is used if there are
multiple bound ports to accept on, or if the "multi_port"
configuration parameter is set to true). This hook is intended to
-@@ -1337,7 +1337,7 @@ post_bind_hook. No internal support is
+@@ -1337,7 +1337,7 @@
handles or adding them to the IO::Socket. Care must be used in how
much occurs during the can_read_hook as a long response time will
result in the server being susceptible to DOS attacks. A return value
@@ -116,7 +116,7 @@ Last-Update: 2016-03-14
on to the post_accept and process_request phases.
It is generally suggested that other avenues be pursued for sending
-@@ -1470,7 +1470,7 @@ Should return a hashref.
+@@ -1470,7 +1470,7 @@
Called when log_file is set to 'Sys::Syslog' and an error occurs while
writing to the syslog. It is passed two arguments, the value of $@,
and an arrayref containing the arguments that were passed to the log
@@ -125,7 +125,7 @@ Last-Update: 2016-03-14
=item C<$self-E<gt>log>
-@@ -1654,7 +1654,7 @@ parent/child communication on PreFork.pm
+@@ -1657,7 +1657,7 @@
Thanks to Carl Lewis for suggesting "-" in user names.
@@ -134,7 +134,7 @@ Last-Update: 2016-03-14
Thanks to Tim Watt for adding udp_broadcast to Proto::UDP.
-@@ -1694,7 +1694,7 @@ lock_file once during parent call. This
+@@ -1697,7 +1697,7 @@
systems supporting flock. Rob also suggested not closing STDIN/STDOUT
but instead reopening them to /dev/null to prevent spurious warnings.
Also suggested short circuit in post_accept if in UDP. Also for
@@ -143,7 +143,7 @@ Last-Update: 2016-03-14
Thanks to Mark Martinec for suggesting additional log messages for
failure during accept.
-@@ -1714,7 +1714,7 @@ And for additional fixes later.
+@@ -1717,7 +1717,7 @@
Thanks to Steven Lembark for pointing out that no_client_stdout wasn't
working with the Multiplex server.
@@ -152,7 +152,7 @@ Last-Update: 2016-03-14
be passed through the ->log method and for suggesting we allow more
types of characters through in syslog_ident. Also to Peter Beckman
for pointing out that a poorly setup localhost will cause tests to
-@@ -1779,7 +1779,7 @@ Thanks to Mark Martinec for much of the
+@@ -1782,7 +1782,7 @@
IPv6 going.
Thanks to the munin developers and Nicolai Langfeldt for hosting the
@@ -163,7 +163,7 @@ Last-Update: 2016-03-14
Thanks to Tatsuhiko Miyagawa for feedback, and for suggesting adding
--- a/lib/Net/Server/PSGI.pm
+++ b/lib/Net/Server/PSGI.pm
-@@ -206,7 +206,7 @@ rudimentary, then Net::Server::PSGI may
+@@ -202,7 +202,7 @@
Net::Server::PSGI takes Net::Server::HTTP one level farther. It
begins with base type MultiType defaulting to Net::Server::Fork. It
is easy to change it to any of the other Net::Server flavors by
@@ -174,7 +174,7 @@ Last-Update: 2016-03-14
very easily add ssl by including, proto=>"ssl" and provide a
--- a/lib/Net/Server/PreFork.pm
+++ b/lib/Net/Server/PreFork.pm
-@@ -623,7 +623,7 @@ value pairs. Comments and white space a
+@@ -636,7 +636,7 @@
Process flow follows Net::Server until the loop phase. At this point
C<min_servers> are forked and wait for connections. When a child
@@ -183,7 +183,7 @@ Last-Update: 2016-03-14
that information to the parent, which keeps track and makes sure there
are enough children to fulfill C<min_servers>, C<min_spare_servers>,
C<max_spare_servers>, and C<max_servers>.
-@@ -639,7 +639,7 @@ provided by PreForkSimple. See L<Net::S
+@@ -652,7 +652,7 @@
This hook occurs at the top of run_n_children which is called each
time the server goes to start more child processes. This gives the
@@ -194,7 +194,7 @@ Last-Update: 2016-03-14
=item C<$self-E<gt>parent_read_hook()>
--- a/lib/Net/Server/Daemonize.pm
+++ b/lib/Net/Server/Daemonize.pm
-@@ -313,7 +313,7 @@ Determine if the process is running as r
+@@ -309,7 +309,7 @@
=item check_pid_file
@@ -205,7 +205,7 @@ Last-Update: 2016-03-14
a /proc file system and second using a "ps" command (BSD syntax). (If
--- a/lib/Net/Server/Proto.pm
+++ b/lib/Net/Server/Proto.pm
-@@ -415,7 +415,7 @@ a bare hostname, or a hostname with IPv*
+@@ -411,7 +411,7 @@
In addition to being able to specify IPV as a separate parameter, ipv may
also be passed as a part of the host, as part of the port, as part of the protocol
@@ -216,7 +216,7 @@ Last-Update: 2016-03-14
2) ipv specified in port
--- a/lib/Net/Server/HTTP.pm
+++ b/lib/Net/Server/HTTP.pm
-@@ -664,7 +664,7 @@ requested feature and is a standard and
+@@ -660,7 +660,7 @@
Net::Server::HTTP begins with base type MultiType defaulting to
Net::Server::Fork. It is easy to change it to any of the other
Net::Server flavors by passing server_type => $other_flavor in the
@@ -225,7 +225,7 @@ Last-Update: 2016-03-14
but could easily be changed to another through the server
configuration. You can also very easily add ssl by including,
proto=>"ssl" and provide a SSL_cert_file and SSL_key_file.
-@@ -749,7 +749,7 @@ Calls send_status with 500 and the argum
+@@ -745,7 +745,7 @@
=item c<log_http_request>
Called at the end of post_process_request. The default method looks
@@ -236,7 +236,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server/PreForkSimple.pm
+++ b/lib/Net/Server/PreForkSimple.pm
-@@ -435,16 +435,16 @@ specified in I<lock_file> (see below).
+@@ -435,16 +435,16 @@
IPC::Semaphore (thanks to Bennett Todd) for giving some sample code.
The pipe option reads on a pipe to choose the next. the flock option
should be the most bulletproof while the pipe option should be the
@@ -256,7 +256,7 @@ Last-Update: 2016-03-14
temporary filename. If default value is used the lock_file will be
removed when the server closes.
-@@ -513,7 +513,7 @@ value pairs. Comments and white space a
+@@ -513,7 +513,7 @@
Process flow follows Net::Server until the loop phase. At this point
C<max_servers> are forked and wait for connections. When a child
@@ -265,7 +265,7 @@ Last-Update: 2016-03-14
that information to the parent, which keeps track and makes sure there
are always C<max_servers> running.
-@@ -528,14 +528,14 @@ hooks provided by the Net::Server base c
+@@ -528,14 +528,14 @@
This hook occurs at the top of run_n_children which is called each
time the server goes to start more child processes. This gives the
@@ -285,7 +285,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server/SIG.pm
+++ b/lib/Net/Server/SIG.pm
-@@ -137,7 +137,7 @@ to fix the unsafe problem. If a process
+@@ -133,7 +133,7 @@
signal will short circuit the select. Using this concept,
Net::Server::SIG does the least work possible (changing one bit from 0
to 1). And depends upon the actual processing of the signals to take
@@ -294,7 +294,7 @@ Last-Update: 2016-03-14
function. See the example shown above and also see the sigtest.pl
script located in the examples directory of this distribution.
-@@ -161,9 +161,9 @@ register_sig(SIG,'DEFAULT')
+@@ -157,9 +157,9 @@
=item C<check_sigs()>
@@ -308,7 +308,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server/Log/Log/Log4perl.pm
+++ b/lib/Net/Server/Log/Log/Log4perl.pm
-@@ -100,7 +100,7 @@ is not readable, will die.
+@@ -97,7 +97,7 @@
=item log4perl_poll
@@ -319,7 +319,7 @@ Last-Update: 2016-03-14
polling is done. See L<Log::Log4perl> for more details.
--- a/lib/Net/Server/Proto/TCP.pm
+++ b/lib/Net/Server/Proto/TCP.pm
-@@ -188,7 +188,7 @@ See L<Net::Server> for more information
+@@ -184,7 +184,7 @@
=item C<object>
Returns an object with parameters suitable for eventual creation of
@@ -330,7 +330,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server/Proto/UNIX.pm
+++ b/lib/Net/Server/Proto/UNIX.pm
-@@ -116,11 +116,11 @@ Protocol module for Net::Server. This m
+@@ -132,11 +132,11 @@
SOCK_STREAM socket type. See L<Net::Server::Proto>.
Any sockets created during startup will be chown'ed to the user and
@@ -346,7 +346,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server/Proto/SSL.pm
+++ b/lib/Net/Server/Proto/SSL.pm
-@@ -239,7 +239,7 @@ Net::Server::Proto::SSL - Net::Server SS
+@@ -235,7 +235,7 @@
=head1 SYNOPSIS
@@ -355,7 +355,7 @@ Last-Update: 2016-03-14
module. Recent versions include code that overcomes original limitations.
See L<Net::Server::Proto>.
-@@ -303,7 +303,7 @@ Net::SSLeay. See L<Net::Server::Proto>.
+@@ -299,7 +299,7 @@
If you know that your server will only need IPv4 (which is the default
for Net::Server), you can load IO::Socket::SSL in inet4 mode which
will prevent it from using Socket6 and IO::Socket::INET6 since they
@@ -366,7 +366,7 @@ Last-Update: 2016-03-14
use base qw(Net::Server::Fork);
--- a/lib/Net/Server/Proto/SSLEAY.pm
+++ b/lib/Net/Server/Proto/SSLEAY.pm
-@@ -523,7 +523,7 @@ See L<Net::Server::Proto>.
+@@ -519,7 +519,7 @@
This module has reliably been used in situations receiving millions of
hits on a single box per day. If anybody has any successes or ideas
@@ -377,7 +377,7 @@ Last-Update: 2016-03-14
socket layer over tcp (also known as SSL). See L<Net::Server::Proto>.
--- a/lib/Net/Server/Proto/UNIXDGRAM.pm
+++ b/lib/Net/Server/Proto/UNIXDGRAM.pm
-@@ -92,11 +92,11 @@ Protocol module for Net::Server. This m
+@@ -88,11 +88,11 @@
SOCK_DGRAM socket type. See L<Net::Server::Proto>.
Any sockets created during startup will be chown'ed to the user and
@@ -393,7 +393,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server/Proto/UDP.pm
+++ b/lib/Net/Server/Proto/UDP.pm
-@@ -121,7 +121,7 @@ See L<Net::Server::Proto>.
+@@ -117,7 +117,7 @@
=head1 PARAMETERS
@@ -402,7 +402,7 @@ Last-Update: 2016-03-14
normal command line parameters for a Net::Server. See
L<Net::Server> for more information on reading arguments.
-@@ -159,7 +159,7 @@ Default is undef.
+@@ -155,7 +155,7 @@
=item C<object>
Returns an object with parameters suitable for eventual creation of
@@ -413,7 +413,7 @@ Last-Update: 2016-03-14
--- a/lib/Net/Server/Multiplex.pm
+++ b/lib/Net/Server/Multiplex.pm
-@@ -313,7 +313,7 @@ convenient inet style STDIN/STDOUT handl
+@@ -311,7 +311,7 @@
deamonization and pid tracking, and restartability -SIGHUP) and some
nice features of IO::Multiplex (automatic buffered IO and
per-file-handle objects) and combines them for an easy-to-use
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-server-perl.git
More information about the Pkg-perl-cvs-commits
mailing list