Convert mod_perl.conf to apache-2.4 #550246.

4 files changed, 72 insertions, 14 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index 54d12515fef4..7931ea6eee58 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.120 2015/05/12 17:22:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.121 2015/05/24 02:44:06 vapier Exp $
+
+  24 May 2015; Mike Frysinger <vapier@gentoo.org> mod_perl-2.0.8.ebuild,
+  files/2.0.3/75_mod_perl.conf, +files/2.0.3/75_mod_perl.conf.2.2:
+  Convert mod_perl.conf to apache-2.4 #550246.
 
   12 May 2015; Pacho Ramos <pacho@gentoo.org> mod_perl-2.0.8-r1.ebuild:
   Needs apache 2.4 now
diff --git a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
index 596d2cc73c6e..9cf7b7b4394f 100644
--- a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
+++ b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
@@ -14,36 +14,40 @@ Alias /cgi-perl/ /var/www/localhost/perl/
 <Location /perl-status>
 	SetHandler perl-script
 	PerlResponseHandler Apache2::Status
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
+	Require host localhost
 </Location>
 
 <Directory /home/*/public_html/perl>
 	SetHandler perl-script
 	PerlResponseHandler ModPerl::PerlRun
-	Options -Indexes ExecCGI
 	PerlOptions +ParseHeaders
+
+	# Clear all existing options and only permit cgi.
+	Options ExecCGI
 </Directory>
 
 # set Apache::Registry Mode for /perl Alias
 <Location /perl/*.pl>
 	SetHandler perl-script
 	PerlResponseHandler ModPerl::Registry
-	Options -Indexes ExecCGI
 	PerlSendHeader On
-	Order allow,deny
-	Allow from all
+
+	# Clear all existing options and only permit cgi.
+	Options ExecCGI
+
+	Require all granted
 </Location>
 
 # set Apache::PerlRun Mode for /cgi-perl Alias
 <Location /cgi-perl/*.pl>
 	SetHandler perl-script
 	PerlResponseHandler ModPerl::PerlRun
-	Options -Indexes ExecCGI
 	PerlSendHeader On
-	Order allow,deny
-	Allow from all
+
+	# Clear all existing options and only permit cgi.
+	Options ExecCGI
+
+	Require all granted
 </Location>
 </IfDefine>
 
diff --git a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf.2.2 b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf.2.2
new file mode 100644
index 000000000000..596d2cc73c6e
--- /dev/null
+++ b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf.2.2
@@ -0,0 +1,50 @@
+<IfDefine PERL>
+LoadModule perl_module modules/mod_perl.so
+
+#PerlTrace all
+PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl"
+PerlModule ModPerl::Registry
+
+# Provide two aliases to the same cgi-bin directory, to see the effects of the
+# 2 different mod_perl modes for Apache2::Registry Mode
+Alias /perl/ /var/www/localhost/perl/
+# for Apache2::Perlrun Mode
+Alias /cgi-perl/ /var/www/localhost/perl/
+
+<Location /perl-status>
+	SetHandler perl-script
+	PerlResponseHandler Apache2::Status
+	Order deny,allow
+	Deny from all
+	Allow from 127.0.0.1
+</Location>
+
+<Directory /home/*/public_html/perl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::PerlRun
+	Options -Indexes ExecCGI
+	PerlOptions +ParseHeaders
+</Directory>
+
+# set Apache::Registry Mode for /perl Alias
+<Location /perl/*.pl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::Registry
+	Options -Indexes ExecCGI
+	PerlSendHeader On
+	Order allow,deny
+	Allow from all
+</Location>
+
+# set Apache::PerlRun Mode for /cgi-perl Alias
+<Location /cgi-perl/*.pl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::PerlRun
+	Options -Indexes ExecCGI
+	PerlSendHeader On
+	Order allow,deny
+	Allow from all
+</Location>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_perl/mod_perl-2.0.8.ebuild b/www-apache/mod_perl/mod_perl-2.0.8.ebuild
index 2adbb859aa04..29ec8858f019 100644
--- a/www-apache/mod_perl/mod_perl-2.0.8.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.8.ebuild,v 1.11 2014/11/27 23:45:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.8.ebuild,v 1.12 2015/05/24 02:44:06 vapier Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ PDEPEND=">=dev-perl/Apache-Reload-0.11
 	>=dev-perl/Apache-SizeLimit-0.95"
 
 APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
-APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_CONF="2.0.3/75_${PN}.2.2"
 APACHE2_MOD_DEFINE="PERL"
 
 SRC_TEST="do"