[libapache2-mod-perl2] 02/03: remove obsolete patches
Niko Tyni
ntyni at moszumanska.debian.org
Thu May 14 06:43:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
ntyni pushed a commit to branch master
in repository libapache2-mod-perl2.
commit 781a167ffaf36c814449ef55cd8b7a604a3d73cd
Author: Niko Tyni <ntyni at debian.org>
Date: Wed May 13 23:38:22 2015 +0300
remove obsolete patches
---
debian/patches/350-ap-test-apache24-define.patch | 41 -----------------
...t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch | 28 ------------
...iling-tests-in-t-perl-ithreads3.t-as-TODO.patch | 31 -------------
...-modperl_threaded_mpm-et-al.-from-XS-code.patch | 52 ----------------------
debian/patches/series | 4 --
5 files changed, 156 deletions(-)
diff --git a/debian/patches/350-ap-test-apache24-define.patch b/debian/patches/350-ap-test-apache24-define.patch
deleted file mode 100644
index 3e85dac..0000000
--- a/debian/patches/350-ap-test-apache24-define.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: add a conditional define for Apache 2.4 (-D APACHE24)
-Origin: CPAN RT
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=87620
-Author: Michael Schout
-Reviewed-by: Ivan Kohler <ivan at freeside.biz>
-Last-Update: 2014-06-27
-
---- a/Apache-Test/lib/Apache/TestServer.pm
-+++ b/Apache-Test/lib/Apache/TestServer.pm
-@@ -85,6 +85,15 @@ sub post_config {
- $self->{rev} = 0; # unknown
- }
-
-+ ($self->{revminor}) = $self->{version} =~ m|/\d\.(\d)|;
-+
-+ if ($self->{revminor}) {
-+ debug "Matched Apache revminor $self->{version} $self->{revminor}";
-+ }
-+ else {
-+ $self->{revminor} = 0;
-+ }
-+
- $self;
- }
-
-@@ -126,7 +135,14 @@ sub pid_file {
-
- sub dversion {
- my $self = shift;
-- "-D APACHE$self->{rev}";
-+
-+ my $dv = "-D APACHE$self->{rev}";
-+
-+ if ($self->{rev} == 2 and $self->{revminor} >= 4) {
-+ $dv .= " -D APACHE24";
-+ }
-+
-+ return $dv;
- }
-
- sub config_defines {
diff --git a/debian/patches/380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch b/debian/patches/380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch
deleted file mode 100644
index b3a5c8e..0000000
--- a/debian/patches/380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e2dba731a20ae4866c2a10e42282f8b25993383e Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Tue, 15 Jul 2014 21:20:06 +0300
-Subject: [PATCH 2/2] Fix reload.t as per r1565579. Reported in CPAN RT#96656.
-
-Author: Steve Hay <steve.m.hay at googlemail.com>
-Origin: upstream, http://svn.apache.org/viewvc?view=revision&revision=1605020
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=96656
----
- Apache-Reload/t/lib/Apache2/TestReload.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Apache-Reload/t/lib/Apache2/TestReload.pm b/Apache-Reload/t/lib/Apache2/TestReload.pm
-index 65f0f04..aa4215f 100644
---- a/Apache-Reload/t/lib/Apache2/TestReload.pm
-+++ b/Apache-Reload/t/lib/Apache2/TestReload.pm
-@@ -15,7 +15,7 @@ our $pass = 0;
- sub handler {
- my $r = shift;
- $pass++;
-- if ($r->args eq 'last') {
-+ if (defined $r->args and $r->args eq 'last') {
- Apache2::Reload->unregister_module($package);
- ModPerl::Util::unload_package($package);
- $pass = 0;
---
-2.0.1
-
diff --git a/debian/patches/420-Mark-failing-tests-in-t-perl-ithreads3.t-as-TODO.patch b/debian/patches/420-Mark-failing-tests-in-t-perl-ithreads3.t-as-TODO.patch
deleted file mode 100644
index 787657c..0000000
--- a/debian/patches/420-Mark-failing-tests-in-t-perl-ithreads3.t-as-TODO.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4b367c94eca583b13e9e808569bd26c40f0f90e0 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Thu, 7 Aug 2014 00:45:59 +0300
-Subject: [PATCH 3/3] Mark failing tests in t/perl/ithreads3.t as TODO
-
-The tests date back to 2007 (r607681) in the threading branch
-but have only now got onto the trunk. It's currently unclear
-how well they work for others with a -Dusethreads perl.
-
-Upstream thread at
- http://mail-archives.apache.org/mod_mbox/perl-dev/201408.mbox/%3C20140807141231.GA24545%40estella.local.invalid%3E
----
- t/perl/ithreads3.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/perl/ithreads3.t b/t/perl/ithreads3.t
-index ef3feb5..e2346a7 100644
---- a/t/perl/ithreads3.t
-+++ b/t/perl/ithreads3.t
-@@ -6,7 +6,7 @@ use Apache::Test;
- use Apache::TestUtil;
- use Apache::TestRequest 'GET_BODY';
-
--plan tests => 6, need_apache_mpm('worker') && need_perl('ithreads');
-+plan tests => 6, todo => [3, 4, 5], need_apache_mpm('worker') && need_perl('ithreads');
-
- my $module = 'TestPerl::ithreads3';
-
---
-2.1.0.rc1
-
diff --git a/debian/patches/430-Don-t-call-modperl_threaded_mpm-et-al.-from-XS-code.patch b/debian/patches/430-Don-t-call-modperl_threaded_mpm-et-al.-from-XS-code.patch
deleted file mode 100644
index 7bbdcf5..0000000
--- a/debian/patches/430-Don-t-call-modperl_threaded_mpm-et-al.-from-XS-code.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 24822cbe0efcbbac116100cafb7e475b990275b2 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Tue, 14 Oct 2014 23:04:41 +0300
-Subject: [PATCH] Don't call modperl_threaded_mpm() et al. from XS code
-
-r594345 (and later r1241983 and r1245916, all merged into trunk with
-r1602105) modified modperl_trace() to call functions that are provided
-by mod_perl.c. However, the same code is compiled into the APR XS module
-without mod_perl.o linkage, so we end up with missing symbols in APR.so.
-
-% objdump -T blib/arch/auto/APR/APR.so|grep UND|grep modperl
-0000000000000000 D *UND* 0000000000000000 modperl_is_running
-0000000000000000 D *UND* 0000000000000000 modperl_threaded_mpm
-0000000000000000 D *UND* 0000000000000000 modperl_threads_started
-
-For the most part these missing symbols don't matter when modperl_trace()
-doesn't actually get called, but CPAN modules like Apache-Gallery that
-use APR and run their suites with PERL_DL_NONLAZY=1 now fail their tests
-because of this.
-
-Guard the problematic invocations with #ifndef MP_IN_XS, which is
-defined for the XS module builds.
-
-Bug-Debian: https://bugs.debian.org/765174
-Applied-Upstream: in revision 1632172
----
- src/modules/perl/modperl_common_log.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/modules/perl/modperl_common_log.c b/src/modules/perl/modperl_common_log.c
-index 3335257..3bdb359 100644
---- a/src/modules/perl/modperl_common_log.c
-+++ b/src/modules/perl/modperl_common_log.c
-@@ -53,6 +53,7 @@ void modperl_trace(const char *func, const char *fmt, ...)
- http://apr.apache.org/docs/apr/1.4/group__apr__lib.html#gad2cd3594aeaafd45931d1034965f48c1
- */
-
-+#ifndef MP_IN_XS
- /* PERL_GET_CONTEXT yields nonsense until the first interpreter is
- * created. Hence the modperl_is_running() question. */
- if (modperl_threaded_mpm()) {
-@@ -77,6 +78,7 @@ void modperl_trace(const char *func, const char *fmt, ...)
- apr_file_printf(logfile, "[pid=%lu] ", (unsigned long)getpid());
- #endif
- }
-+#endif
-
- if (func && *func) {
- apr_file_printf(logfile, "%s: ", func);
---
-2.1.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 5280589..46e17a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,8 +10,4 @@ avoid-db-linkage.patch
220_fix-bad-whatis-entry.patch
260_fix_pipelined_response_deadlock.patch
#330-mod_authz_core.patch
-350-ap-test-apache24-define.patch
360-conditional-linux-pid-module.patch
-380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch
-420-Mark-failing-tests-in-t-perl-ithreads3.t-as-TODO.patch
-430-Don-t-call-modperl_threaded_mpm-et-al.-from-XS-code.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git
More information about the Pkg-perl-cvs-commits
mailing list