[SCM] Debian packaging of libnet-server-perl branch, master, updated. debian/2.007-1-5-gf821e24

[Xavier Guimard]

The following commit has been merged in the master branch:
commit f821e247bbbd593e6291f173e665cd57dfb0436b
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sat Jun 15 08:09:48 2013 +0200

    Update signal confusion patch after discussion with Steinar
    
    Closes: #708180

diff --git a/debian/changelog b/debian/changelog
index 1c5fee8..dcd20e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,10 @@
-libnet-server-perl (2.007-2) UNRELEASED; urgency=low
-
-  TODO:
-  - correct-SIG-confusion.patch: the description doesn't look good
-    (and in general, after reading the debian and RT bug log, I'm not sure
-    this is the best fix. but I don't understand it enough either ...)
+libnet-server-perl (2.007-2) unstable; urgency=low
 
   * Update spelling errors patch
   * Fix "applications die() because of SIGCHLD vs. SIGCLD confusion"
     using a patch (Closes: #708180)
 
- -- Xavier Guimard <x.guimard at free.fr>  Sun, 02 Jun 2013 08:11:44 +0200
+ -- Xavier Guimard <x.guimard at free.fr>  Sat, 15 Jun 2013 08:09:09 +0200
 
 libnet-server-perl (2.007-1) unstable; urgency=low
 
diff --git a/debian/patches/correct-SIG-confusion.patch b/debian/patches/correct-SIG-confusion.patch
index 72ca0b9..3b2b09d 100644
--- a/debian/patches/correct-SIG-confusion.patch
+++ b/debian/patches/correct-SIG-confusion.patch
@@ -3,16 +3,17 @@ Origin: vendor
 Bug-Debian: http://bugs.debian.org/708180
 Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=85308
 Reviewed-By: Xavier Guimard <x.guimard at free.fr>
-Last-Update: 2013-04-02
+Last-Update: 2013-06-15
 
 --- a/lib/Net/Server/SIG.pm
 +++ b/lib/Net/Server/SIG.pm
-@@ -55,7 +55,7 @@
-     } elsif ($ref eq 'CODE') {
-         $_SIG{$sig} = 0;
-         $_SIG_SUB{$sig} = $code_ref;
--        $SIG{$sig} = sub{ $Net::Server::SIG::_SIG{$_[0]} = 1; };
-+        $SIG{$sig} = sub{ $Net::Server::SIG::_SIG{$sig} = 1; };
-     } else {
-         die "Unsupported sig type -- must be 'DEFAULT' or a code ref.";
-     }
+@@ -40,6 +40,9 @@
+     my $code_ref = shift;
+     my $ref = ref($code_ref);
+ 
++    # Added by Debian maintainer to close #708180
++    $sig = 'CLD' if ($sig eq 'CHLD');
++
+     if (! $ref) {
+         if ($code_ref eq 'DEFAULT') {
+             delete $_SIG{$sig};

-- 
Debian packaging of libnet-server-perl