[SCM] Debian packaging of libembperl-perl branch, master, updated. debian/2.5.0_rc3-1-10-g471e242

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 2cf5f8c3cb290e420b117ac7a60795ae9f48ae1e
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Jun 18 23:17:47 2013 +0200

    new load_apache24_mpm.patch, updating apache config used for tests

diff --git a/debian/patches/load_apache24_mpm.patch b/debian/patches/load_apache24_mpm.patch
new file mode 100644
index 0000000..c2e709c
--- /dev/null
+++ b/debian/patches/load_apache24_mpm.patch
@@ -0,0 +1,44 @@
+Description: update shipped httpd.conf to work with apache2.4
+Author: Florian Schlichting <fsfs at debian.org>
+Forwarded: todo
+
+--- a/test/conf/httpd.min.conf.src
++++ b/test/conf/httpd.min.conf.src
+@@ -41,6 +41,8 @@
+ 
+ print OFH "LoadModule embperl_module \"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
+ 
++print OFH "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n"; # if apache2.4
++
+ 
+ print OFH <<EOD ;
+ ErrorLog tmp/httpd.err.log
+@@ -64,7 +66,6 @@
+ 
+ print OFH <<EOD ;
+ TypesConfig conf/null
+-LockFile tmp/httpd.lock
+ 
+ 
+ PerlSetEnv EMBPERL_SRC \"$EPPATH\"
+--- a/test/conf/httpd.conf.src
++++ b/test/conf/httpd.conf.src
+@@ -56,6 +56,10 @@
+ 
+ print OFH "LoadModule embperl_module \"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
+ 
++print OFH "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n"; # if apache24
++print OFH "LoadModule authn_core_module /usr/lib/apache2/modules/mod_authn_core.so\n"; # if apache24
++print OFH "LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so\n"; # if apache24
++
+ ##print OFH "PassEnv ACTION_PREFIX\n" ;
+ print OFH "PerlPassEnv TEST_PRELOAD\n" ;
+ 
+@@ -118,7 +122,6 @@
+ print OFH <<EOD ;
+ 
+ TypesConfig conf/null
+-LockFile tmp/httpd.lock
+ 
+ 
+ # needs mod_log_config
diff --git a/debian/patches/series b/debian/patches/series
index 3e04984..3db7ffd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 delay.patch
+load_apache24_mpm.patch

-- 
Debian packaging of libembperl-perl