[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 2f6953601a3e3caabefd10c595c24b4bb1414efa
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Jun 5 21:09:39 2012 +0200

    Drop 06_cidr-workaround.patch (upstream applied some flavour of it).

diff --git a/debian/patches/06_cidr-workaround.patch b/debian/patches/06_cidr-workaround.patch
deleted file mode 100644
index 5680c2b..0000000
--- a/debian/patches/06_cidr-workaround.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: 
-Description: this patch was created by Carsten Wolff <carsten at wolffcarsten.de>
-It should be removed after the problem is fixed in libnet-cidr-perl
---- a/lib/Net/Server.pm
-+++ b/lib/Net/Server.pm
-@@ -824,25 +824,29 @@
-     && $#{ $prop->{cidr_allow} } == -1
-     && $#{ $prop->{cidr_deny} }  == -1;
- 
-+  ### work around Net::CIDR::cidrlookup() croaking,
-+  ### if first parameter is an IPv4 address in IPv6 notation.
-+  my $peeraddr = ($prop->{peeraddr} =~ /^\s*::ffff:([0-9.]+\s*)$/) ? $1 : $prop->{peeraddr};
-+
-   ### if the addr or host matches a deny, reject it immediately
-   foreach ( @{ $prop->{deny} } ){
-     return 0 if $prop->{peerhost} =~ /^$_$/ && defined($prop->{reverse_lookups});
--    return 0 if $prop->{peeraddr} =~ /^$_$/;
-+    return 0 if $peeraddr =~ /^$_$/;
-   }
-   if ($#{ $prop->{cidr_deny} } != -1) {
-     require Net::CIDR;
--    return 0 if Net::CIDR::cidrlookup($prop->{peeraddr}, @{ $prop->{cidr_deny} });
-+    return 0 if Net::CIDR::cidrlookup($peeraddr, @{ $prop->{cidr_deny} });
-   }
- 
- 
-   ### if the addr or host isn't blocked yet, allow it if it is allowed
-   foreach ( @{ $prop->{allow} } ){
-     return 1 if $prop->{peerhost} =~ /^$_$/ && defined($prop->{reverse_lookups});
--    return 1 if $prop->{peeraddr} =~ /^$_$/;
-+    return 1 if $peeraddr =~ /^$_$/;
-   }
-   if ($#{ $prop->{cidr_allow} } != -1) {
-     require Net::CIDR;
--    return 1 if Net::CIDR::cidrlookup($prop->{peeraddr}, @{ $prop->{cidr_allow} });
-+    return 1 if Net::CIDR::cidrlookup($peeraddr, @{ $prop->{cidr_allow} });
-   }
- 
-   return 0;
diff --git a/debian/patches/series b/debian/patches/series
index f6f7012..9b13be4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-06_cidr-workaround.patch
 07_spelling.patch
 08_propagate-dynamic-port-data-across-a-hup.patch

-- 
Debian packaging of libnet-server-perl