[libapache2-mod-perl2] 01/01: Add patch from Michael Schout to add a conditional define for Apache 2.4 (-D APACHE24) from https://rt.cpan.org/Public/Bug/Display.html?id=87620

[Ivan Kohler]

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

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

commit c89aa6a14eb2f36d877ddaecf14459badb3948a5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Aug 6 21:29:47 2013 -0700

    Add patch from Michael Schout to add a conditional define for Apache 2.4 (-D APACHE24) from https://rt.cpan.org/Public/Bug/Display.html?id=87620
---
 debian/changelog                                 |    6 +++-
 debian/patches/350-ap-test-apache24-define.patch |   36 ++++++++++++++++++++++
 debian/patches/series                            |    1 +
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 55effec..8a0bacb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-6) UNRELEASED; urgency=low
 
-
+  [ gregor herrmann ]
   * Add patch from Jorge Manuel B. S. Vicetto to adjust test module
     configuration to mod_authz_core changes in 2.4. Currently disabled since
     it doesn't seem to be needed during Debian builds.
@@ -10,6 +10,10 @@ libapache2-mod-perl2 (2.0.8+httpd24-r1449661-6) UNRELEASED; urgency=low
   * Drop lintian override (spelling-error-in-binary).
     lintian 2.5.14 ignores "teH" in ELF binaries.
 
+  [ Ivan Kohler ]
+  * Add patch from Michael Schout to add a conditional define for Apache 2.4
+    (-D APACHE24) from https://rt.cpan.org/Public/Bug/Display.html?id=87620
+
  -- gregor herrmann <gregoa at debian.org>  Sat, 22 Jun 2013 03:18:33 +0200
 
 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-5) unstable; urgency=low
diff --git a/debian/patches/350-ap-test-apache24-define.patch b/debian/patches/350-ap-test-apache24-define.patch
new file mode 100644
index 0000000..ec8cb1f
--- /dev/null
+++ b/debian/patches/350-ap-test-apache24-define.patch
@@ -0,0 +1,36 @@
+diff --git a/Apache-Test/lib/Apache/TestServer.pm b/Apache-Test/lib/Apache/TestServer.pm
+index 254aec6..a3bc3ab 100644
+--- 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/series b/debian/patches/series
index 1fd16de..ef953a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ avoid-db-linkage.patch
 320-cleanup-authn-authz-providers.patch
 #330-mod_authz_core.patch
 340-rewrite-2.4.patch
+350-ap-test-apache24-define.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git