[libapache2-mod-perl2] 05/05: refresh all patches to apply cleanly

Damyan Ivanov dmn at moszumanska.debian.org
Thu Jun 19 20:22:22 UTC 2014 

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libapache2-mod-perl2.

commit 22367e10a66ee026142cc57db7b1ef6a78a76582
Author: Damyan Ivanov <dmn at debian.org>
Date:   Thu Jun 19 20:20:38 2014 +0000

    refresh all patches to apply cleanly
    
    some hunks are just dropped as upstream has them
---
 debian/patches/004-bugs-to-debian-bts.patch        |  2 +-
 .../006_man_section_and_build_warnings.patch       |  2 +-
 debian/patches/031-test-extra-args.patch           |  2 +-
 debian/patches/200_fix-pod-spelling-errors.patch   |  6 +++---
 .../260_fix_pipelined_response_deadlock.patch      |  8 +++----
 .../patches/290-httpd-transition-test-todo.patch   |  4 +---
 debian/patches/300-http-headers-version.patch      | 10 ++++-----
 debian/patches/310-defaultruntimedir.patch         | 15 +++----------
 .../320-cleanup-authn-authz-providers.patch        | 25 ----------------------
 debian/patches/avoid-db-linkage.patch              |  2 +-
 10 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/debian/patches/004-bugs-to-debian-bts.patch b/debian/patches/004-bugs-to-debian-bts.patch
index 3c95a6a..65baa4e 100644
--- a/debian/patches/004-bugs-to-debian-bts.patch
+++ b/debian/patches/004-bugs-to-debian-bts.patch
@@ -5,7 +5,7 @@ Last-Update: 2011-03-22
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/lib/ModPerl/TestReport.pm
 +++ b/lib/ModPerl/TestReport.pm
-@@ -97,7 +97,11 @@ sub package2filename {
+@@ -98,7 +98,11 @@ sub package2filename {
      return $package;
  }
  
diff --git a/debian/patches/006_man_section_and_build_warnings.patch b/debian/patches/006_man_section_and_build_warnings.patch
index d465682..9a10318 100644
--- a/debian/patches/006_man_section_and_build_warnings.patch
+++ b/debian/patches/006_man_section_and_build_warnings.patch
@@ -7,7 +7,7 @@ Last-Update: 2011-03-22
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/lib/ModPerl/BuildMM.pm
 +++ b/lib/ModPerl/BuildMM.pm
-@@ -281,7 +281,7 @@ sub ModPerl::BuildMM::MY::postamble {
+@@ -282,7 +282,7 @@ sub ModPerl::BuildMM::MY::postamble {
                  $man =~ s!/!::!g;
  
                  push @target,
diff --git a/debian/patches/031-test-extra-args.patch b/debian/patches/031-test-extra-args.patch
index fbee5f3..f883ef4 100644
--- a/debian/patches/031-test-extra-args.patch
+++ b/debian/patches/031-test-extra-args.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-05-19
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -788,12 +788,12 @@ TEST_FILES =
+@@ -840,12 +840,12 @@ TEST_FILES =
  
  test_clean :
  	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
diff --git a/debian/patches/200_fix-pod-spelling-errors.patch b/debian/patches/200_fix-pod-spelling-errors.patch
index cea9474..895bccb 100644
--- a/debian/patches/200_fix-pod-spelling-errors.patch
+++ b/debian/patches/200_fix-pod-spelling-errors.patch
@@ -34,7 +34,7 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  this with a call to one of the t_*_is_expected() functions.
 --- a/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
 +++ b/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
-@@ -63,7 +63,7 @@ use constant D_WARN    => 2;
+@@ -64,7 +64,7 @@ use constant D_WARN    => 2;
  use constant D_COMPILE => 4;
  use constant D_NOISE   => 8;
  
@@ -118,7 +118,7 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  
 --- a/lib/Apache2/compat.pm
 +++ b/lib/Apache2/compat.pm
-@@ -254,7 +254,7 @@ sub override_mp2_api {
+@@ -255,7 +255,7 @@ sub override_mp2_api {
  }
  
  # restore_mp2_api does the opposite of override_mp2_api(), it removes
@@ -129,7 +129,7 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  
 --- a/lib/Apache2/porting.pm
 +++ b/lib/Apache2/porting.pm
-@@ -84,9 +84,9 @@ BEGIN {
+@@ -85,9 +85,9 @@ BEGIN {
          $package =~ s|/|::|g;
          $package =~ s|.pm$||;
  
diff --git a/debian/patches/260_fix_pipelined_response_deadlock.patch b/debian/patches/260_fix_pipelined_response_deadlock.patch
index 81c14e9..8a653cf 100644
--- a/debian/patches/260_fix_pipelined_response_deadlock.patch
+++ b/debian/patches/260_fix_pipelined_response_deadlock.patch
@@ -30,7 +30,7 @@ Origin: https://rt.cpan.org/Public/Bug/Display.html?id=82409
 
 --- a/t/filter/TestFilter/in_str_declined.pm
 +++ b/t/filter/TestFilter/in_str_declined.pm
-@@ -35,13 +35,17 @@ sub handler {
+@@ -36,13 +36,17 @@ sub handler {
  sub response {
      my $r = shift;
  
@@ -52,7 +52,7 @@ Origin: https://rt.cpan.org/Public/Bug/Display.html?id=82409
  
 --- a/t/filter/TestFilter/in_str_declined_read.pm
 +++ b/t/filter/TestFilter/in_str_declined_read.pm
-@@ -31,14 +31,19 @@ sub handler {
+@@ -32,14 +32,19 @@ sub handler {
  sub response {
      my $r = shift;
  
@@ -77,7 +77,7 @@ Origin: https://rt.cpan.org/Public/Bug/Display.html?id=82409
      Apache2::Const::OK;
 --- a/t/filter/TestFilter/in_str_msg.pm
 +++ b/t/filter/TestFilter/in_str_msg.pm
-@@ -76,10 +76,10 @@ my $expected = "UPCASED";
+@@ -77,10 +77,10 @@ my $expected = "UPCASED";
  sub response {
      my $r = shift;
  
@@ -92,7 +92,7 @@ Origin: https://rt.cpan.org/Public/Bug/Display.html?id=82409
  
 --- a/t/response/TestModperl/post_utf8.pm
 +++ b/t/response/TestModperl/post_utf8.pm
-@@ -29,14 +29,14 @@ sub handler {
+@@ -30,14 +30,14 @@ sub handler {
  #    $r->content_type("text/plain; charset=utf-8");
  #    $r->print("expected: $expected_utf8\n");
  
diff --git a/debian/patches/290-httpd-transition-test-todo.patch b/debian/patches/290-httpd-transition-test-todo.patch
index 8457799..a181f81 100644
--- a/debian/patches/290-httpd-transition-test-todo.patch
+++ b/debian/patches/290-httpd-transition-test-todo.patch
@@ -5,11 +5,9 @@ Author: Dominic Hargreaves <dom at earth.li>
 Reviewed-by: gregor herrmann <gregoa at debian.org>
 Last-Update: 2013-06-03
 
-diff --git a/t/directive/perlloadmodule3.t b/t/directive/perlloadmodule3.t
-index 8c1d0dc..92d7199 100644
 --- a/t/directive/perlloadmodule3.t
 +++ b/t/directive/perlloadmodule3.t
-@@ -14,7 +14,7 @@ my $path = Apache::TestRequest::module2path($module);
+@@ -15,7 +15,7 @@ my $path = Apache::TestRequest::module2p
  # smaller portions of information, but requires a more elaborate
  # logic. Alternatively could use diff($expected, $received).
  
diff --git a/debian/patches/300-http-headers-version.patch b/debian/patches/300-http-headers-version.patch
index 5f4dd82..eb008a8 100644
--- a/debian/patches/300-http-headers-version.patch
+++ b/debian/patches/300-http-headers-version.patch
@@ -7,7 +7,7 @@ Last-Update: 2013-06-03
 
 --- a/t/api/err_headers_out.t
 +++ b/t/api/err_headers_out.t
-@@ -5,6 +5,8 @@
+@@ -6,6 +6,8 @@ use Apache::Test;
  use Apache::TestRequest;
  use Apache::TestUtil;
  
@@ -16,20 +16,20 @@ Last-Update: 2013-06-03
  plan tests => 6, need 'HTML::HeadParser';
  
  my $location = '/TestAPI__err_headers_out';
-@@ -25,7 +27,7 @@
+@@ -26,7 +28,7 @@ my $location = '/TestAPI__err_headers_ou
      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;
+-	if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION >= 6.00;
 +	if defined HTTP::Headers->VERSION and version->parse(HTTP::Headers->VERSION) >= version->parse(6.00);
  
      ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
          "X-err_headers_out: made it";
-@@ -50,7 +52,7 @@
+@@ -51,7 +53,7 @@ my $location = '/TestAPI__err_headers_ou
      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;
+-	if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION >= 6.00;
 +	if defined HTTP::Headers->VERSION and version->parse(HTTP::Headers->VERSION) >= version->parse(6.00);
  
      ok t_cmp $res->header('X-err_headers_out'), "err_headers_out",
diff --git a/debian/patches/310-defaultruntimedir.patch b/debian/patches/310-defaultruntimedir.patch
index 651f1f8..e440108 100644
--- a/debian/patches/310-defaultruntimedir.patch
+++ b/debian/patches/310-defaultruntimedir.patch
@@ -11,9 +11,9 @@ Last-Update: 2013-06-04
 
 --- a/Apache-Test/lib/Apache/TestConfig.pm
 +++ b/Apache-Test/lib/Apache/TestConfig.pm
-@@ -2148,6 +2148,10 @@
- ErrorLog    @t_logs@/error_log
- LogLevel    debug
+@@ -2154,6 +2154,10 @@ LogLevel    debug
+ </IfVersion>
+ </IfModule>
  
 +<IfVersion > 2.4.1>
 +    DefaultRunTimeDir "@t_logs@"
@@ -22,12 +22,3 @@ Last-Update: 2013-06-04
  <IfModule mod_log_config.c>
      TransferLog @t_logs@/access_log
  </IfModule>
---- a/t/conf/extra.conf.in
-+++ b/t/conf/extra.conf.in
-@@ -1,6 +1,5 @@
- # needed to test $r->psignature
- ServerSignature On
--DefaultRuntimeDir run/
- 
- # The following tests require more than one interpreter during the
- # same request:
diff --git a/debian/patches/320-cleanup-authn-authz-providers.patch b/debian/patches/320-cleanup-authn-authz-providers.patch
index 0a2f0a7..ee164fd 100644
--- a/debian/patches/320-cleanup-authn-authz-providers.patch
+++ b/debian/patches/320-cleanup-authn-authz-providers.patch
@@ -16,28 +16,3 @@ Bug-Debian: http://bugs.debian.org/711213
  src/modules/perl/modperl_cmd.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/modules/perl/modperl_cmd.c b/src/modules/perl/modperl_cmd.c
-index 4ae0a62..d14b330 100644
---- a/src/modules/perl/modperl_cmd.c
-+++ b/src/modules/perl/modperl_cmd.c
-@@ -419,7 +419,7 @@ MP_CMD_SRV_DECLARE(init_handlers)
- 
- MP_CMD_SRV_DECLARE2(authz_provider)
- {
--    apr_pool_t *p = parms->server->process->pool;
-+    apr_pool_t *p = parms->pool;
-     char *name = apr_pstrdup(p, arg1);
-     char *cb = apr_pstrdup(p, arg2);
- 
-@@ -431,7 +431,7 @@ MP_CMD_SRV_DECLARE2(authz_provider)
- 
- MP_CMD_SRV_DECLARE2(authn_provider)
- {
--    apr_pool_t *p = parms->server->process->pool;
-+    apr_pool_t *p = parms->pool;
-     char *name = apr_pstrdup(p, arg1);
-     char *cb = apr_pstrdup(p, arg2);
- 
--- 
-1.7.10.4
-
diff --git a/debian/patches/avoid-db-linkage.patch b/debian/patches/avoid-db-linkage.patch
index adf4155..a313287 100644
--- a/debian/patches/avoid-db-linkage.patch
+++ b/debian/patches/avoid-db-linkage.patch
@@ -6,7 +6,7 @@ Last-Update: 2011-04-10
 Forwarded: not-needed
 --- a/lib/Apache2/Build.pm
 +++ b/lib/Apache2/Build.pm
-@@ -1184,6 +1184,8 @@ sub apru_link_flags {
+@@ -1175,6 +1175,8 @@ sub apru_link_flags {
      # resolve the symbols right during linking
      for ($self->apu_config_path, $self->apr_config_path) {
          my $flags = '--link-ld --libs';

-- 
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