[SCM] Debian packaging of libapache2-mod-perl2 branch, master, updated. debian/2.0.8+httpd24-r1449661-2-7-g5e424cb

[gregor herrmann]

The following commit has been merged in the master branch:
commit 51d995b84d8e13c93f7dfc223df57e8077abce31
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jun 4 17:00:01 2013 +0200

    Add patch 310-defaultruntimedir.patch:
    
    Set DefaultRuntimeDir in the created apache config for Apache::Test in
    Apache-Test/lib/Apache/TestConfig.pm.

diff --git a/debian/patches/310-defaultruntimedir.patch b/debian/patches/310-defaultruntimedir.patch
new file mode 100644
index 0000000..70d277f
--- /dev/null
+++ b/debian/patches/310-defaultruntimedir.patch
@@ -0,0 +1,19 @@
+Description: Since Apache 2.4, DefaultRuntimeDir needs to be set,
+ otherwise mod_auth_digest tries to write to /var/run and fails (depending
+ on permissions). Set DefaultRuntimeDir in the generated httpd.conf of
+ Apache::Test.
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-06-04
+
+--- a/Apache-Test/lib/Apache/TestConfig.pm
++++ b/Apache-Test/lib/Apache/TestConfig.pm
+@@ -2142,6 +2142,7 @@
+ Listen     0.0.0.0:@Port@
+ 
+ ServerRoot   "@ServerRoot@"
++DefaultRuntimeDir "@ServerRoot@/run"
+ DocumentRoot "@DocumentRoot@"
+ 
+ PidFile     @t_pid_file@
diff --git a/debian/patches/310-rundir.patch b/debian/patches/310-rundir.patch
deleted file mode 100644
index 8a91ce7..0000000
--- a/debian/patches/310-rundir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: add DefaultRuntimeDir in test apache config
- The tests in ModPerl-Registry/ and Apache-Reload/ need DefaultRuntimeDir
- set, otherwise mod_auth_digest tries to write to /var/run and fails.
-Origin: vendor
-Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-06-03
-
---- a/ModPerl-Registry/t/conf/extra.conf.in
-+++ b/ModPerl-Registry/t/conf/extra.conf.in
-@@ -1,5 +1,7 @@
- #this file will be Include-d by @ServerRoot@/httpd.conf
- 
-+DefaultRuntimeDir run/
-+
- # Adjust PerlInterpMax and PerlInterpMaxSpare if the requirements change
- # at the moment all tests require only 1 interprter
- <IfDefine PERL_USEITHREADS>
---- a/Apache-Reload/t/conf/extra.conf.in
-+++ b/Apache-Reload/t/conf/extra.conf.in
-@@ -1,3 +1,5 @@
-+DefaultRuntimeDir run/
-+
- PerlSwitches -I at ServerRoot@/../../Apache-Test/lib   \
-              -I at ServerRoot@/../../blib/lib          \
-              -I at ServerRoot@/../../blib/arch
diff --git a/debian/patches/series b/debian/patches/series
index aeb6f3a..46f384d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,4 @@ avoid-db-linkage.patch
 280-ignore-sysconf-for-defines.patch
 290-httpd-transition-test-todo.patch
 300-http-headers-version.patch
-310-rundir.patch
+310-defaultruntimedir.patch

-- 
Debian packaging of libapache2-mod-perl2