[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.5-6-4-g8da066b

Dominic Hargreaves dom at earth.li
Sat May 19 19:50:18 UTC 2012


The following commit has been merged in the master branch:
commit e698497d06a7f8dd9ed4ea873113c7dc4265e2a8
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sat May 19 18:41:52 2012 +0100

    rebase/drop patches

diff --git a/debian/changelog b/debian/changelog
index 9a81046..689b8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libapache2-mod-perl2 (2.0.6-1) UNRELEASED; urgency=low
 
   * New upstream release
+    - rebase/drop some patches
 
  -- Dominic Hargreaves <dom at earth.li>  Sat, 19 May 2012 18:24:39 +0100
 
diff --git a/debian/patches/031-test-extra-args.patch b/debian/patches/031-test-extra-args.patch
index db9364d..0390daf 100644
--- a/debian/patches/031-test-extra-args.patch
+++ b/debian/patches/031-test-extra-args.patch
@@ -3,11 +3,11 @@ Subject: APACHE_TEST_EXTRA
  Honour $(APACHE_TEST_EXTRA_ARGS); Makefile.PL has apparently not been updated
  since this was added to Apache::Test.
 Forwarded: not-needed
-Last-Update: 2011-03-22
+Last-Update: 2012-05-19
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -783,12 +783,12 @@
+@@ -788,12 +788,12 @@ TEST_FILES =
  
  test_clean :
  	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
@@ -19,6 +19,6 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
 -	t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
 +	t/TEST $(APACHE_TEST_EXTRA_ARGS) -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
- 	$(MAKE) -k run_subtests
  
  run_subtests ::
+ 	cd ModPerl-Registry && $(MAKE) test
diff --git a/debian/patches/200_fix-pod-spelling-errors.patch b/debian/patches/200_fix-pod-spelling-errors.patch
index 5d4ccb7..5b7ea5e 100644
--- a/debian/patches/200_fix-pod-spelling-errors.patch
+++ b/debian/patches/200_fix-pod-spelling-errors.patch
@@ -163,25 +163,14 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  
  * Testing:
    Need to put Philippe's smoking test into the core
---- a/Apache-Reload/lib/Apache2/Reload.pm
-+++ b/Apache-Reload/lib/Apache2/Reload.pm
-@@ -360,7 +360,7 @@
- 
- =head2 Unregistering a module
- 
--In some cases, it might be necessary to explicitely stop reloading
-+In some cases, it might be necessary to explicitly stop reloading
- a module.
- 
-   Apache2::Reload->unregister_module('Some::Module');
 --- a/docs/api/Apache2/RequestUtil.pod
 +++ b/docs/api/Apache2/RequestUtil.pod
-@@ -813,7 +813,7 @@
- same code is called in a sub-request then the pnote of $r->prev is magically 
+@@ -815,7 +815,7 @@ Nothing, except it doesn't work as expected due to this pnotes bug: If the
+ same code is called in a sub-request then the pnote of $r-E<gt>prev is magically 
  updated at a distance to the same value!
  
 -Try explain why that is to anyone not deeply familar with perl internals!
-+Try explain why that is to anyone not deeply familiar with perl internals!
++Try to explain why that is to anyone not deeply familiar with perl internals!
  
  The fix is to avoid pnotes taking a ref to the invisible op_targ embededed in 
  the code by passing a simple lexical variable as the actual argument. That can be done in-line like this:
diff --git a/debian/patches/230-test-failures-fix.patch b/debian/patches/230-test-failures-fix.patch
deleted file mode 100644
index a7669da..0000000
--- a/debian/patches/230-test-failures-fix.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Description: Fixes for the testsuite to be compatible with >= LWP + HTTP:Headers 6.0.
- This patch is created from 4 upstream trunk commits folded.
- Resolves FTBFS for failures during the testsuite run.
- .
- Upstream commit log:
- * LWP 6.x uses HTTP/1.1 but t/response/TestAPI/request_rec.pm assumes it is always called using HTTP/1.0
- * HTTP::Headers at least in version 6.00 does not translate underscores to minus when storing headers but does so when they are read.
- * next try: restrict localization of $HTTP::Headers::TRANSLATE_UNDERSCORE to HTTP::Headers 6.00 only
- * fixed a wrong content-length header in t/filter/TestFilter/out_str_reverse.pm
-Origin: commit:1089411, http://svn.apache.org/viewvc?view=revision&revision=1089411
-Origin: commit:1089349, http://svn.apache.org/viewvc?view=revision&revision=1089349
-Origin: commit:1089363, http://svn.apache.org/viewvc?view=revision&revision=1089349
-Origin: commit:1089414, http://svn.apache.org/viewvc?view=revision&revision=1089414
-Bug-Ubuntu: https://launchpad.net/bugs/797716
-Bug-Debian: http://bugs.debian.org/628296
-From: Dave Walker (Daviey) <DaveWalker at ubuntu.com>
-Last-Update: 2011-06-15
-
---- a/t/api/err_headers_out.t
-+++ b/t/api/err_headers_out.t
-@@ -19,6 +19,14 @@
- 
-     ok t_cmp $res->code, 200, "OK";
- 
-+    # HTTP::Headers 6.00 makes the next 2 tests fail. When the response comes
-+    # in the header name is stored as "x-err_headers_out". But when it is to
-+    # be read below it is referred as "x-err-headers-out" and hence not found.
-+    local $HTTP::Headers::TRANSLATE_UNDERSCORE=
-+	$HTTP::Headers::TRANSLATE_UNDERSCORE;
-+    undef $HTTP::Headers::TRANSLATE_UNDERSCORE
-+	if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00;
-+
-     ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
-         "X-err_headers_out: made it";
- 
-@@ -36,6 +44,14 @@
- 
-     ok t_cmp $res->code, 404, "not found";
- 
-+    # HTTP::Headers 6.00 makes this test fail. When the response comes in
-+    # the header name is stored as "x-err_headers_out". But when it is to
-+    # be read below it is referred as "x-err-headers-out" and hence not found.
-+    local $HTTP::Headers::TRANSLATE_UNDERSCORE=
-+	$HTTP::Headers::TRANSLATE_UNDERSCORE;
-+    undef $HTTP::Headers::TRANSLATE_UNDERSCORE
-+	if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00;
-+
-     ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
-         "X-err_headers_out: made it";
- 
---- a/t/filter/TestFilter/out_str_reverse.pm
-+++ b/t/filter/TestFilter/out_str_reverse.pm
-@@ -16,12 +16,21 @@
- use Apache2::Const -compile => qw(OK M_POST);
- 
- use constant BUFF_LEN => 2;
-+use constant signature => "Reversed by mod_perl 2.0\n";
- 
- sub handler {
-     my $f = shift;
-     #warn "called\n";
- 
-     my $leftover = $f->ctx;
-+
-+    # We are about to change the length of the response body. Hence, we
-+    # have to adjust the content-length header.
-+    unless (defined $leftover) { # 1st invocation
-+	$f->r->headers_out->{'Content-Length'}+=length signature
-+	    if exists $f->r->headers_out->{'Content-Length'};
-+    }
-+
-     while ($f->read(my $buffer, BUFF_LEN)) {
-         #warn "buffer: [$buffer]\n";
-         $buffer = $leftover . $buffer if defined $leftover;
-@@ -34,7 +43,7 @@
- 
-     if ($f->seen_eos) {
-         $f->print(scalar reverse $leftover) if defined $leftover;
--        $f->print("Reversed by mod_perl 2.0\n");
-+        $f->print(signature);
-     }
-     else {
-         $f->ctx($leftover) if defined $leftover;
---- a/t/response/TestAPI/request_rec.pm
-+++ b/t/response/TestAPI/request_rec.pm
-@@ -57,8 +57,9 @@
- 
-     ok $r->protocol =~ /http/i;
- 
--    # HTTP 1.0
--    ok t_cmp $r->proto_num, 1000, 't->proto_num';
-+    # LWP >=6.00 uses HTTP/1.1, other HTTP/1.0
-+    ok t_cmp $r->proto_num, 1000+substr($r->the_request, -1),
-+	't->proto_num';
- 
-     ok t_cmp lc($r->hostname), lc($r->get_server_name), '$r->hostname';
- 
-@@ -124,7 +125,12 @@
- 
-         ok t_cmp $r->args, $args, '$r->args';
- 
--        ok t_cmp $r->the_request, "GET $base_uri$path_info?$args HTTP/1.0",
-+	# LWP uses HTTP/1.1 since 6.00
-+        ok t_cmp $r->the_request, qr!GET
-+				     \x20
-+				     \Q$base_uri$path_info\E\?\Q$args\E
-+				     \x20
-+				     HTTP/1\.\d!x,
-             '$r->the_request';
- 
-         {
diff --git a/debian/patches/240-perl-5.14-svrefcnt.patch b/debian/patches/240-perl-5.14-svrefcnt.patch
deleted file mode 100644
index 1e8ebc2..0000000
--- a/debian/patches/240-perl-5.14-svrefcnt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: adopt the Perl_sv_dup() changes in Perl 5.14
-
-Bug-Debian: http://bugs.debian.org/636651
-Origin: commit:1125476, http://svn.apache.org/viewvc?view=revision&revision=1125476
-
---- trunk/src/modules/perl/modperl_svptr_table.c	2010/04/11 12:20:06	932879
-+++ trunk/src/modules/perl/modperl_svptr_table.c	2011/05/20 17:22:24	1125476
-@@ -30,7 +30,7 @@
- #ifdef USE_ITHREADS
- 
- #if MP_PERL_BRANCH(5, 6)
--#   define my_sv_dup(s, p) sv_dup(s)
-+#   define my_sv_dup(s, p) SvREFCNT_inc(sv_dup(s))
- 
- typedef struct {
-     AV *stashes;
-@@ -39,7 +39,11 @@
- } CLONE_PARAMS;
- 
- #else
--#   define my_sv_dup(s, p) sv_dup(s, p)
-+#   ifdef sv_dup_inc
-+#       define my_sv_dup(s, p) sv_dup_inc(s, p)
-+#   else
-+#       define my_sv_dup(s, p) SvREFCNT_inc(sv_dup(s, p))
-+#   endif
- #endif
- 
- /*
-@@ -89,8 +93,7 @@
-             /* key is just a pointer we do not modify, no need to copy */
-             dst_ent->oldval = src_ent->oldval;
- 
--            dst_ent->newval =
--                SvREFCNT_inc(my_sv_dup((SV*)src_ent->newval, &parms));
-+            dst_ent->newval = my_sv_dup((SV*)src_ent->newval, &parms);
-         }
-     }
- 
diff --git a/debian/patches/260-perl-5.13-reference-counting-bug.patch b/debian/patches/260-perl-5.13-reference-counting-bug.patch
deleted file mode 100644
index 391911d..0000000
--- a/debian/patches/260-perl-5.13-reference-counting-bug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2099956795016f3bd08768dda195aeec7dc2267b Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Wed, 14 Dec 2011 22:51:27 +0200
-Subject: [PATCH] Fix a reference counting bug uncovered by Perl 5.13.6
-
-Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201201.mbox/%3C20120107065332.GA17481%40madeleine.local.invalid%3E
-
-As seen in
- http://bugs.debian.org/650675
- http://article.gmane.org/gmane.comp.apache.mod-perl.devel/9928
-
-perl since 5.13.6 with -Dusethreads makes mod_perl2 issue warnings like
-
- Attempt to free unreferenced scalar: SV 0x7f9c0c347490, Perl interpreter: 0x7f9c0c1a2dd0 during global destruction.
-
-on startup regardless of the Perl code executed.
-
-The double-freed scalar is the CV pointer for ModPerl::Util::exit()
-whose reference count wasn't increased properly.
----
- src/modules/perl/modperl_perl.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/modules/perl/modperl_perl.c b/src/modules/perl/modperl_perl.c
-index e992df4..1a2b3ce 100644
---- a/src/modules/perl/modperl_perl.c
-+++ b/src/modules/perl/modperl_perl.c
-@@ -55,7 +55,9 @@ void modperl_perl_core_global_init(pTHX)
- 
-     while (cglobals->name) {
-         GV *gv = gv_fetchpv(cglobals->core_name, TRUE, SVt_PVCV);
--        GvCV_set(gv, get_cv(cglobals->sub_name, TRUE));
-+        CV *cv = get_cv(cglobals->sub_name, TRUE);
-+        GvCV_set(gv, cv);
-+        SvREFCNT_inc(cv);
-         GvIMPORTED_CV_on(gv);
-         cglobals++;
-     }
--- 
-1.7.7.3
-
diff --git a/debian/patches/261-another-perl-5.13-reference-counting-bug.patch b/debian/patches/261-another-perl-5.13-reference-counting-bug.patch
deleted file mode 100644
index 066b264..0000000
--- a/debian/patches/261-another-perl-5.13-reference-counting-bug.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From cbf08a2de6f967863d764eb0bc620178c4ed43fe Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Sat, 17 Dec 2011 09:16:22 +0200
-Subject: [PATCH 2/2] Fix another reference counting bug uncovered by Perl
- 5.13.6
-
-Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201201.mbox/%3C20120107065332.GA17481%40madeleine.local.invalid%3E
-
-
-As seen in
- http://bugs.debian.org/650675
- http://article.gmane.org/gmane.comp.apache.mod-perl.devel/9928
-
-perl since 5.13.6 with -Dusethreads makes mod_perl2 issue warnings like
-
- Attempt to free unreferenced scalar: SV 0x7f9c0c347490, Perl interpreter: 0x7f9c0c1a2dd0 during global de
-struction.
-
-An earlier commit fixed some of these in modperl_perl_core_global_init(),
-follow the suit with new_constsub().
----
- src/modules/perl/modperl_const.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/modules/perl/modperl_const.c b/src/modules/perl/modperl_const.c
-index 8732d4f..39a3ec9 100644
---- a/src/modules/perl/modperl_const.c
-+++ b/src/modules/perl/modperl_const.c
-@@ -51,7 +51,9 @@ static void new_constsub(pTHX_ constants_lookup lookup,
-             gv_init(alias, caller_stash, name, name_len, TRUE);
-         }
- 
--        GvCV_set(alias, GvCV(*gvp));
-+        CV *cv = GvCV(*gvp);
-+        GvCV_set(alias, cv);
-+        SvREFCNT_inc(cv);
-     }
- }
- 
--- 
-1.7.7.3
-
diff --git a/debian/patches/262-format-security.patch b/debian/patches/262-format-security.patch
deleted file mode 100644
index 702877e..0000000
--- a/debian/patches/262-format-security.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 94bdae4a6c6e480e9b287813be2fd1eb01fd7bd3 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Fri, 9 Mar 2012 22:26:37 +0200
-Subject: [PATCH] Use controlled format strings for Perl_croak()
-
-This fixed builds with gcc -Werror=format-security.
----
- xs/APR/Pool/APR__Pool.h                     |    2 +-
- xs/Apache2/ServerUtil/Apache2__ServerUtil.h |    2 +-
- xs/Apache2/SubProcess/Apache2__SubProcess.h |    4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/xs/APR/Pool/APR__Pool.h b/xs/APR/Pool/APR__Pool.h
-index 4ea8da3..058864f 100644
---- a/xs/APR/Pool/APR__Pool.h
-+++ b/xs/APR/Pool/APR__Pool.h
-@@ -312,7 +312,7 @@ static apr_status_t mpxs_cleanup_run(void *data)
- #endif
- 
-     if (SvTRUE(ERRSV)) {
--        Perl_croak(aTHX_ SvPV_nolen(ERRSV));
-+        Perl_croak(aTHX_ "%s", SvPV_nolen(ERRSV));
-     }
- 
-     /* the return value is ignored by apr_pool_destroy anyway */
-diff --git a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h b/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
-index ced1c38..c64a140 100644
---- a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
-+++ b/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
-@@ -80,7 +80,7 @@ static apr_status_t mpxs_cleanup_run(void *data)
-     }
- 
-     if (SvTRUE(ERRSV)) {
--        Perl_croak(aTHX_ SvPV_nolen(ERRSV));
-+        Perl_croak(aTHX_ "%s", SvPV_nolen(ERRSV));
-     }
- 
-     /* the return value is ignored by apr_pool_destroy anyway */
-diff --git a/xs/Apache2/SubProcess/Apache2__SubProcess.h b/xs/Apache2/SubProcess/Apache2__SubProcess.h
-index aca73a3..ae9807f 100644
---- a/xs/Apache2/SubProcess/Apache2__SubProcess.h
-+++ b/xs/Apache2/SubProcess/Apache2__SubProcess.h
-@@ -135,7 +135,7 @@ MP_STATIC XS(MPXS_modperl_spawn_proc_prog)
-     const char *usage = "Usage: spawn_proc_prog($r, $command, [\\@argv])";
- 
-     if (items < 2) {
--        Perl_croak(aTHX_ usage);
-+        Perl_croak(aTHX_ "%s", usage);
-     }
- 
-     SP -= items;
-@@ -156,7 +156,7 @@ MP_STATIC XS(MPXS_modperl_spawn_proc_prog)
-                 av_items = len+1;
-             }
-             else {
--                Perl_croak(aTHX_ usage);
-+                Perl_croak(aTHX_ "%s", usage);
-             }
-         }
- 
--- 
-1.7.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
index c5f518b..bf5df9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,9 +9,4 @@ avoid-db-linkage.patch
 200_fix-pod-spelling-errors.patch
 210_fix-pod-errors.patch
 220_fix-bad-whatis-entry.patch
-230-test-failures-fix.patch
-240-perl-5.14-svrefcnt.patch
 250-lfs-perl-5.14.patch
-260-perl-5.13-reference-counting-bug.patch
-261-another-perl-5.13-reference-counting-bug.patch
-262-format-security.patch

-- 
Debian packaging of libapache2-mod-perl2



More information about the Pkg-perl-cvs-commits mailing list