[SCM] Debian packaging of libnet-server-perl branch, master, updated. a29f5e444a4f3266f106cdb369360a3afc5eda97
gregor herrmann
gregoa at debian.org
Tue Sep 20 20:11:00 UTC 2011
The following commit has been merged in the master branch:
commit c95f4b6da0d407055d3a4fc56f0fdb0d75ee6456
Author: gregor herrmann <gregoa at debian.org>
Date: Tue Sep 20 21:40:26 2011 +0200
Convert remaining patches to quilt.
diff --git a/debian/patches/03_rt-cpan-65891-reap-children.dpatch b/debian/patches/03_rt-cpan-65891-reap-children.dpatch
deleted file mode 100755
index bcfce05..0000000
--- a/debian/patches/03_rt-cpan-65891-reap-children.dpatch
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh -e
-## 03_rt-cpan-65891-reap-children.dpatch by Carsten Wolff <carsten at wolffcarsten.de>
-## (taken from cpan RT Bug#65891)
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Comments USER and ACCESS entries in rscsi file.
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- lib/Net/Server/PreFork.pm 2010-07-08 21:13:47.000000000 +0200
-+++ lib/Net/Server/PreFork.pm.new 2011-01-04 18:48:54.103050023 +0100
-@@ -331,4 +331,13 @@
- );
-
-+ ### reclaim process exit status from any terminated child process
-+ ### inherited from a previous incarnation whose SIGCHLD signal was
-+ ### ignored during a blind period between a restart and the moment
-+ ### when the SIGCHLD handler was established just now
-+ while ( defined(my $chld = waitpid(-1, WNOHANG)) ){
-+ last unless $chld > 0;
-+ $self->{reaped_children}->{$chld} = 1;
-+ }
-+
- ### loop on reading info from the children
- while( 1 ){
---- lib/Net/Server/PreForkSimple.pm 2010-05-05 05:01:58.000000000 +0200
-+++ lib/Net/Server/PreForkSimple.pm.new 2011-01-04 18:40:23.631629852 +0100
-@@ -332,4 +332,13 @@
- );
-
-+ ### reclaim process exit status from any terminated child process
-+ ### inherited from a previous incarnation whose SIGCHLD signal was
-+ ### ignored during a blind period between a restart and the moment
-+ ### when the SIGCHLD handler was established just now
-+ while ( defined(my $chld = waitpid(-1, WNOHANG)) ){
-+ last unless $chld > 0;
-+ $self->delete_child($chld);
-+ }
-+
- ### loop forever
- while( 1 ){
diff --git a/debian/patches/03_rt-cpan-65891-reap-children.patch b/debian/patches/03_rt-cpan-65891-reap-children.patch
new file mode 100644
index 0000000..7eefa1d
--- /dev/null
+++ b/debian/patches/03_rt-cpan-65891-reap-children.patch
@@ -0,0 +1,42 @@
+Description: Comments USER and ACCESS entries in rscsi file.
+Bug: http://rt.cpan.org/Public/Bug/Display.html?id=65891
+Forwarded: http://rt.cpan.org/Public/Bug/Display.html?id=65891
+Author: Carsten Wolff <carsten at wolffcarsten.de>
+Last-Update: 2011-09-20
+
+--- a/lib/Net/Server/PreFork.pm
++++ b/lib/Net/Server/PreFork.pm
+@@ -330,6 +330,15 @@
+ # },
+ );
+
++ ### reclaim process exit status from any terminated child process
++ ### inherited from a previous incarnation whose SIGCHLD signal was
++ ### ignored during a blind period between a restart and the moment
++ ### when the SIGCHLD handler was established just now
++ while ( defined(my $chld = waitpid(-1, WNOHANG)) ){
++ last unless $chld > 0;
++ $self->{reaped_children}->{$chld} = 1;
++ }
++
+ ### loop on reading info from the children
+ while( 1 ){
+
+--- a/lib/Net/Server/PreForkSimple.pm
++++ b/lib/Net/Server/PreForkSimple.pm
+@@ -331,6 +331,15 @@
+ # },
+ );
+
++ ### reclaim process exit status from any terminated child process
++ ### inherited from a previous incarnation whose SIGCHLD signal was
++ ### ignored during a blind period between a restart and the moment
++ ### when the SIGCHLD handler was established just now
++ while ( defined(my $chld = waitpid(-1, WNOHANG)) ){
++ last unless $chld > 0;
++ $self->delete_child($chld);
++ }
++
+ ### loop forever
+ while( 1 ){
+
diff --git a/debian/patches/04_fix-pod-error-in-http-manapage.dpatch b/debian/patches/04_fix-pod-error-in-http-manapage.dpatch
deleted file mode 100644
index b674ad8..0000000
--- a/debian/patches/04_fix-pod-error-in-http-manapage.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-## 04_fix-pod-error-in-http-manapage.dpatch by Carsten Wolff <carsten at wolffcarsten.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Comments USER and ACCESS entries in rscsi file.
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- lib/Net/Server/HTTP.pm (Revision 71815)
-+++ lib/Net/Server/HTTP.pm (Arbeitskopie)
-@@ -289,6 +289,8 @@
-
- Calls send_status with 501 and the argument passed to send_501.
-
-+=back
-+
- =head1 COMMAND LINE ARGUMENTS
-
- In addition to the command line arguments of the Net::Server
diff --git a/debian/patches/04_fix-pod-error-in-http-manapage.patch b/debian/patches/04_fix-pod-error-in-http-manapage.patch
new file mode 100644
index 0000000..2d22a31
--- /dev/null
+++ b/debian/patches/04_fix-pod-error-in-http-manapage.patch
@@ -0,0 +1,16 @@
+Description: Comments USER and ACCESS entries in rscsi file.
+Forwarded: no
+Author: Carsten Wolff <carsten at wolffcarsten.de>
+Last-Update: 2011-09-20
+
+--- a/lib/Net/Server/HTTP.pm
++++ b/lib/Net/Server/HTTP.pm
+@@ -289,6 +289,8 @@
+
+ Calls send_status with 501 and the argument passed to send_501.
+
++=back
++
+ =head1 COMMAND LINE ARGUMENTS
+
+ In addition to the command line arguments of the Net::Server
diff --git a/debian/patches/05_ipv6-support.dpatch b/debian/patches/05_ipv6-support.patch
old mode 100755
new mode 100644
similarity index 73%
rename from debian/patches/05_ipv6-support.dpatch
rename to debian/patches/05_ipv6-support.patch
index 3c6beca..e6e6b14
--- a/debian/patches/05_ipv6-support.dpatch
+++ b/debian/patches/05_ipv6-support.patch
@@ -1,39 +1,22 @@
-#! /bin/sh -e
-## 05_ipv6-support.dpatch: ipv6 support in Net::Server
-##
-## DP: this patch was originally found at
-## DP: http://dev.fiqz.com/svn/fiqz/patches/perl-Net-Server-0.86-ipv6.patch
-## DP:
-## DP: it was then updated by sean finney <seanius at debian.org> to apply against
-## DP: the latest version of Net-Server in debian, and modified for new
-## DP: stricter perl coding/syntax conventions.
-## DP:
-## DP: after that, it was improved by Carsten Wolff <carsten at wolffcarsten.de>
-## DP: to make it work with all Net::Server personalities and to make the code
-## DP: a little nicer.
-## DP:
-## DP: There's an outstanding issue with Net::CIDR::cidrlookup, when the listening
-## DP: socket is an IPv4/IPv6 wildcard socket, but this should be fixed in Net::CIDR
-## DP: rather than worked around here.
+Description: this patch was originally found at
+ http://dev.fiqz.com/svn/fiqz/patches/perl-Net-Server-0.86-ipv6.patch
+ it was then updated by sean finney <seanius at debian.org> to apply against
+ the latest version of Net-Server in debian, and modified for new
+ stricter perl coding/syntax conventions.
+ .
+ after that, it was improved by Carsten Wolff <carsten at wolffcarsten.de>
+ to make it work with all Net::Server personalities and to make the code
+ a little nicer.
+ .
+ There's an outstanding issue with Net::CIDR::cidrlookup, when the listening
+ socket is an IPv4/IPv6 wildcard socket, but this should be fixed in Net::CIDR
+ rather than worked around here.
+Origin: http://dev.fiqz.com/svn/fiqz/patches/perl-Net-Server-0.86-ipv6.patch
+Forwarded: no
+Last-Update: 2011-09-20
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -ur lib.orig/Net/Server/Proto/SSLEAY.pm lib/Net/Server/Proto/SSLEAY.pm
---- lib.orig/Net/Server/Proto/SSLEAY.pm 2010-07-09 18:44:48.000000000 +0200
-+++ lib/Net/Server/Proto/SSLEAY.pm 2011-04-06 16:32:19.835579843 +0200
+--- a/lib/Net/Server/Proto/SSLEAY.pm
++++ b/lib/Net/Server/Proto/SSLEAY.pm
@@ -23,7 +23,7 @@
use strict;
@@ -66,9 +49,8 @@ diff -ur lib.orig/Net/Server/Proto/SSLEAY.pm lib/Net/Server/Proto/SSLEAY.pm
elsif ($port =~ /^(\w+)$/) { # allow for things like "80"
($host, $port) = ($default_host, $1);
}
-diff -ur lib.orig/Net/Server/Proto/SSL.pm lib/Net/Server/Proto/SSL.pm
---- lib.orig/Net/Server/Proto/SSL.pm 2010-05-05 05:13:03.000000000 +0200
-+++ lib/Net/Server/Proto/SSL.pm 2011-04-05 14:39:39.788076698 +0200
+--- a/lib/Net/Server/Proto/SSL.pm
++++ b/lib/Net/Server/Proto/SSL.pm
@@ -39,10 +39,14 @@
my $prop = $server->{server};
my $host;
@@ -85,9 +67,8 @@ diff -ur lib.orig/Net/Server/Proto/SSL.pm lib/Net/Server/Proto/SSL.pm
### allow for things like "80"
}elsif( $port =~ /^(\w+)$/ ){
($host,$port) = ($default_host,$1);
-diff -ur lib.orig/Net/Server/Proto/TCP.pm lib/Net/Server/Proto/TCP.pm
---- lib.orig/Net/Server/Proto/TCP.pm 2010-05-05 06:41:08.000000000 +0200
-+++ lib/Net/Server/Proto/TCP.pm 2011-04-05 14:29:26.123577536 +0200
+--- a/lib/Net/Server/Proto/TCP.pm
++++ b/lib/Net/Server/Proto/TCP.pm
@@ -23,10 +23,10 @@
use strict;
@@ -117,9 +98,8 @@ diff -ur lib.orig/Net/Server/Proto/TCP.pm lib/Net/Server/Proto/TCP.pm
### allow for things like "80"
}elsif( $port =~ /^(\w+)$/ ){
($host,$port) = ($default_host,$1);
-diff -ur lib.orig/Net/Server.pm lib/Net/Server.pm
---- lib.orig/Net/Server.pm 2010-07-09 16:55:31.000000000 +0200
-+++ lib/Net/Server.pm 2011-04-06 16:33:57.739576765 +0200
+--- a/lib/Net/Server.pm
++++ b/lib/Net/Server.pm
@@ -25,7 +25,8 @@
use strict;
diff --git a/debian/patches/06_cidr-workaround.dpatch b/debian/patches/06_cidr-workaround.patch
old mode 100755
new mode 100644
similarity index 61%
rename from debian/patches/06_cidr-workaround.dpatch
rename to debian/patches/06_cidr-workaround.patch
index e17bf98..5680c2b
--- a/debian/patches/06_cidr-workaround.dpatch
+++ b/debian/patches/06_cidr-workaround.patch
@@ -1,27 +1,8 @@
-#! /bin/sh -e
-## 06_cidr-workaround.dpatch: workaround for bug in Net::CIDR::cidrlookup()
-##
-## DP: this patch was created by Carsten Wolff <carsten at wolffcarsten.de>
-## DP: It should be removed after the problem is fixed in libnet-cidr-perl
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -ur libnet-server-perl.orig/lib/Net/Server.pm libnet-server-perl.new/lib/Net/Server.pm
---- libnet-server-perl.orig/lib/Net/Server.pm 2011-04-07 11:44:54.973953140 +0200
-+++ libnet-server-perl.new/lib/Net/Server.pm 2011-04-07 14:11:28.637453856 +0200
+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;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9a0fdc4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+03_rt-cpan-65891-reap-children.patch
+04_fix-pod-error-in-http-manapage.patch
+05_ipv6-support.patch
+06_cidr-workaround.patch
--
Debian packaging of libnet-server-perl
More information about the Pkg-perl-cvs-commits
mailing list