[SCM] Debian packaging of libnet-server-perl branch, master, updated. debian/0.99-4-14-g46d10dd

[intrigeri]

The following commit has been merged in the master branch:
commit 649d550ee03f27328e139e621bd3ee85e399c0f2
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Jun 5 22:00:17 2012 +0200

    Drop 08_propagate-dynamic-port-data-across-a-hup.patch (upstream supposedly fixed their handling of HUP vs. rebinding to ports).

diff --git a/debian/patches/08_propagate-dynamic-port-data-across-a-hup.patch b/debian/patches/08_propagate-dynamic-port-data-across-a-hup.patch
deleted file mode 100644
index 6e9d4cc..0000000
--- a/debian/patches/08_propagate-dynamic-port-data-across-a-hup.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/lib/Net/Server.pm b/lib/Net/Server.pm
-index 4c5e8d9..31f2cdf 100644
---- a/lib/Net/Server.pm
-+++ b/lib/Net/Server.pm
-@@ -419,8 +419,15 @@ sub bind {
-     foreach my $info (split /\n/, $ENV{BOUND_SOCKETS}) {
-       my ($fd, $hup_string) = split /\|/, $info, 2;
-       $fd = ($fd =~ /^(\d+)$/) ? $1 : $self->fatal("Bad file descriptor");
-+
-+      # if our config wants port 0 (dynamically-allocated port from
-+      # the OS), we want to make sure we can reconnect to those.
-+      my $dynamic_hup_string = $hup_string;
-+      $dynamic_hup_string =~ s/\|\d+\|/|0|/;
-+
-       foreach my $sock ( @{ $prop->{sock} } ){
--        if ($hup_string eq $sock->hup_string) {
-+        if (($hup_string eq $sock->hup_string) or
-+            ($dynamic_hup_string eq $sock->hup_string)) {
-           $sock->log_connect($self);
-           $sock->reconnect($fd, $self);
-           last;
-diff --git a/lib/Net/Server/Proto/TCP.pm b/lib/Net/Server/Proto/TCP.pm
-index 437f5d4..df7221c 100644
---- a/lib/Net/Server/Proto/TCP.pm
-+++ b/lib/Net/Server/Proto/TCP.pm
-@@ -104,9 +104,16 @@ sub reconnect {
-   my $fd   = shift;
-   my $server = shift;
- 
-+  my $port = $sock->NS_port;
-+
-   $sock->fdopen( $fd, 'w' )
-     or $server->fatal("Error opening to file descriptor ($fd) [$!]");
- 
-+  if ($port == 0 && ($port = $sock->sockport)) {
-+    $sock->NS_port($port);
-+    $server->log(2,"Bound to auto-assigned port $port");
-+  }
-+
- }
- 
- ### allow for endowing the child
diff --git a/debian/patches/series b/debian/patches/series
index d2f5d18..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-08_propagate-dynamic-port-data-across-a-hup.patch

-- 
Debian packaging of libnet-server-perl