[libnet-server-perl] 05/07: refresh patches with same/default quilt settings

Wed Jun 17 21:15:23 UTC 2015

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libnet-server-perl.

commit 18bbc0641c8a3aca64a2c63d909a87000052efb9
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Jun 17 23:09:50 2015 +0200

    refresh patches with same/default quilt settings
    
    Gbp-Dch: Ignore
---
 debian/patches/correct-SIG-confusion.patch         |  6 +-
 .../fix-manpage-has-errors-from-pod2man.patch      |  4 +-
 debian/patches/spelling-error.patch                | 90 ++++++++--------------
 3 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/debian/patches/correct-SIG-confusion.patch b/debian/patches/correct-SIG-confusion.patch
index 523f676..54ef5be 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 @@
+@@ -40,6 +40,9 @@ sub register_sig {
      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 @@
+@@ -66,6 +69,10 @@ sub unregister_sig { register_sig(shift(
  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 @@
+@@ -76,6 +83,10 @@ sub check_sigs {
  
  sub sig_is_registered {
      my $sig = shift;
diff --git a/debian/patches/fix-manpage-has-errors-from-pod2man.patch b/debian/patches/fix-manpage-has-errors-from-pod2man.patch
index cc673f5..3b05a38 100644
--- a/debian/patches/fix-manpage-has-errors-from-pod2man.patch
+++ b/debian/patches/fix-manpage-has-errors-from-pod2man.patch
@@ -6,8 +6,8 @@ Author: Salvatore Bonaccorso <carnil at debian.org>
 Last-Update: 2014-05-18
 
 ===================================================================
---- libnet-server-perl.orig/lib/Net/Server.pod
-+++ libnet-server-perl/lib/Net/Server.pod
+--- a/lib/Net/Server.pod
++++ b/lib/Net/Server.pod
 @@ -1,3 +1,5 @@
 +=encoding utf8
 +
diff --git a/debian/patches/spelling-error.patch b/debian/patches/spelling-error.patch
index 319400f..c68fc72 100644
--- a/debian/patches/spelling-error.patch
+++ b/debian/patches/spelling-error.patch
@@ -5,10 +5,8 @@ Author: intrigeri <intrigeri at debian.org>
 Reviewed-By: Xavier Guimard <x.guimard at free.fr>
 Last-Update: 2013-05-15
 
-Index: libnet-server-perl/lib/Net/Server.pod
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server.pod
-+++ libnet-server-perl/lib/Net/Server.pod
+--- a/lib/Net/Server.pod
++++ b/lib/Net/Server.pod
 @@ -194,7 +194,7 @@ Once started, the Net::Server will take
  waiting for connections.  Once a connection is received, the
  Net::Server will accept on the socket and will store the result (the
@@ -162,10 +160,8 @@ Index: libnet-server-perl/lib/Net/Server.pod
  allow_deny checking for IPv6 addresses.
  
  Thanks to Tatsuhiko Miyagawa for feedback, and for suggesting adding
-Index: libnet-server-perl/lib/Net/Server/PSGI.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/PSGI.pm
-+++ libnet-server-perl/lib/Net/Server/PSGI.pm
+--- a/lib/Net/Server/PSGI.pm
++++ b/lib/Net/Server/PSGI.pm
 @@ -206,7 +206,7 @@ rudimentary, then Net::Server::PSGI may
  Net::Server::PSGI takes Net::Server::HTTP one level farther.  It
  begins with base type MultiType defaulting to Net::Server::Fork.  It
@@ -175,10 +171,8 @@ Index: libnet-server-perl/lib/Net/Server/PSGI.pm
  The port has also been defaulted to port 80 - 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
-Index: libnet-server-perl/lib/Net/Server/PreFork.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/PreFork.pm
-+++ libnet-server-perl/lib/Net/Server/PreFork.pm
+--- a/lib/Net/Server/PreFork.pm
++++ b/lib/Net/Server/PreFork.pm
 @@ -623,7 +623,7 @@ value pairs.  Comments and white space a
  
  Process flow follows Net::Server until the loop phase.  At this point
@@ -197,10 +191,8 @@ Index: libnet-server-perl/lib/Net/Server/PreFork.pm
  this hook came from James FitzGibbon.
  
  =item C<$self-E<gt>parent_read_hook()>
-Index: libnet-server-perl/lib/Net/Server/Daemonize.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Daemonize.pm
-+++ libnet-server-perl/lib/Net/Server/Daemonize.pm
+--- a/lib/Net/Server/Daemonize.pm
++++ b/lib/Net/Server/Daemonize.pm
 @@ -313,7 +313,7 @@ Determine if the process is running as r
  
  =item check_pid_file
@@ -210,10 +202,8 @@ Index: libnet-server-perl/lib/Net/Server/Daemonize.pm
  of pid_file.  If file exists, open it and determine if the process
  that created it is still running.  This is done first by checking for
  a /proc file system and second using a "ps" command (BSD syntax).  (If
-Index: libnet-server-perl/lib/Net/Server/Proto.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Proto.pm
-+++ libnet-server-perl/lib/Net/Server/Proto.pm
+--- a/lib/Net/Server/Proto.pm
++++ b/lib/Net/Server/Proto.pm
 @@ -415,7 +415,7 @@ a bare hostname, or a hostname with IPv*
  
  In addition to being able to specify IPV as a separate parameter, ipv may
@@ -223,10 +213,8 @@ Index: libnet-server-perl/lib/Net/Server/Proto.pm
  
       1) Explicit IPv4 or IPv6 address - wins
       2) ipv specified in port
-Index: libnet-server-perl/lib/Net/Server/HTTP.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/HTTP.pm
-+++ libnet-server-perl/lib/Net/Server/HTTP.pm
+--- a/lib/Net/Server/HTTP.pm
++++ b/lib/Net/Server/HTTP.pm
 @@ -664,7 +664,7 @@ requested feature and is a standard and
  Net::Server::HTTP begins with base type MultiType defaulting to
  Net::Server::Fork.  It is easy to change it to any of the other
@@ -245,10 +233,8 @@ Index: libnet-server-perl/lib/Net/Server/HTTP.pm
  during _init_access_log.  If both of these exist, the http_request_info
  is formatted using http_log_format and the result is logged.
  
-Index: libnet-server-perl/lib/Net/Server/PreForkSimple.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/PreForkSimple.pm
-+++ libnet-server-perl/lib/Net/Server/PreForkSimple.pm
+--- a/lib/Net/Server/PreForkSimple.pm
++++ b/lib/Net/Server/PreForkSimple.pm
 @@ -435,16 +435,16 @@ specified in I<lock_file> (see below).
  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
@@ -296,10 +282,8 @@ Index: libnet-server-perl/lib/Net/Server/PreForkSimple.pm
  is suggested that all perl modules be used by this point, so that the
  most shared memory possible is used.
  
-Index: libnet-server-perl/lib/Net/Server/SIG.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/SIG.pm
-+++ libnet-server-perl/lib/Net/Server/SIG.pm
+--- a/lib/Net/Server/SIG.pm
++++ b/lib/Net/Server/SIG.pm
 @@ -137,7 +137,7 @@ to fix the unsafe problem.  If a process
  signal will short circuit the select.  Using this concept,
  Net::Server::SIG does the least work possible (changing one bit from 0
@@ -321,10 +305,8 @@ Index: libnet-server-perl/lib/Net/Server/SIG.pm
  
  =item C<sig_is_registered($SIG)>
  
-Index: libnet-server-perl/lib/Net/Server/Log/Log/Log4perl.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Log/Log/Log4perl.pm
-+++ libnet-server-perl/lib/Net/Server/Log/Log/Log4perl.pm
+--- 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.
  
  =item log4perl_poll
@@ -334,10 +316,8 @@ Index: libnet-server-perl/lib/Net/Server/Log/Log/Log4perl.pm
  with this polling value. This can also be the string "HUP" to re-read
  the log4perl_conf when a HUP signal is received. If set to 0, no
  polling is done. See L<Log::Log4perl> for more details.
-Index: libnet-server-perl/lib/Net/Server/Proto/TCP.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Proto/TCP.pm
-+++ libnet-server-perl/lib/Net/Server/Proto/TCP.pm
+--- 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
  =item C<object>
  
@@ -347,10 +327,8 @@ Index: libnet-server-perl/lib/Net/Server/Proto/TCP.pm
  
  =item C<log_connect>
  
-Index: libnet-server-perl/lib/Net/Server/Proto/UNIX.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Proto/UNIX.pm
-+++ libnet-server-perl/lib/Net/Server/Proto/UNIX.pm
+--- 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
  SOCK_STREAM socket type.  See L<Net::Server::Proto>.
  
@@ -365,10 +343,8 @@ Index: libnet-server-perl/lib/Net/Server/Proto/UNIX.pm
  command line parameters for a Net::Server.  See L<Net::Server> for
  more information on reading arguments.
  
-Index: libnet-server-perl/lib/Net/Server/Proto/SSL.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Proto/SSL.pm
-+++ libnet-server-perl/lib/Net/Server/Proto/SSL.pm
+--- 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
  
  =head1 SYNOPSIS
@@ -387,10 +363,8 @@ Index: libnet-server-perl/lib/Net/Server/Proto/SSL.pm
  
      use IO::Socket::SSL qw(inet4);
      use base qw(Net::Server::Fork);
-Index: libnet-server-perl/lib/Net/Server/Proto/SSLEAY.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Proto/SSLEAY.pm
-+++ libnet-server-perl/lib/Net/Server/Proto/SSLEAY.pm
+--- a/lib/Net/Server/Proto/SSLEAY.pm
++++ b/lib/Net/Server/Proto/SSLEAY.pm
 @@ -523,7 +523,7 @@ See L<Net::Server::Proto>.
  
  This module has reliably been used in situations receiving millions of
@@ -400,10 +374,8 @@ Index: libnet-server-perl/lib/Net/Server/Proto/SSLEAY.pm
  
  Protocol module for Net::Server.  This module implements a secure
  socket layer over tcp (also known as SSL).  See L<Net::Server::Proto>.
-Index: libnet-server-perl/lib/Net/Server/Proto/UNIXDGRAM.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Proto/UNIXDGRAM.pm
-+++ libnet-server-perl/lib/Net/Server/Proto/UNIXDGRAM.pm
+--- 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
  SOCK_DGRAM socket type.  See L<Net::Server::Proto>.
  
@@ -418,10 +390,8 @@ Index: libnet-server-perl/lib/Net/Server/Proto/UNIXDGRAM.pm
  command line parameters for a Net::Server.  See L<Net::Server> for
  more information on reading arguments.
  
-Index: libnet-server-perl/lib/Net/Server/Proto/UDP.pm
-===================================================================
---- libnet-server-perl.orig/lib/Net/Server/Proto/UDP.pm
-+++ libnet-server-perl/lib/Net/Server/Proto/UDP.pm
+--- a/lib/Net/Server/Proto/UDP.pm
++++ b/lib/Net/Server/Proto/UDP.pm
 @@ -121,7 +121,7 @@ See L<Net::Server::Proto>.
  
  =head1 PARAMETERS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-server-perl.git

