Please test.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 80 insertions, 14 deletions

diff --git a/www-apache/mod_perl/files/75_mod_perl.conf b/www-apache/mod_perl/files/75_mod_perl.conf
index 4933e9af9fef..96455b51e209 100644
--- a/www-apache/mod_perl/files/75_mod_perl.conf
+++ b/www-apache/mod_perl/files/75_mod_perl.conf
@@ -1,11 +1,56 @@
 <IfDefine PERL>
   <IfModule !mod_perl.c>
-    LoadModule perl_module    extramodules/mod_perl.so
+    LoadModule perl_module    modules/mod_perl.so
   </IfModule>
 </IfDefine>
 
 <IfModule mod_perl.c>
-  #PerlTrace all
-  PerlRequire "/etc/apache2/conf/modules.d/apache2-mod_perl-startup.pl"
+	#PerlTrace all
+	PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl"
+
+	#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/
+
+	<IfModule mod_access.c>
+	<Location /perl-status>
+        	SetHandler perl-script
+		PerlResponseHandler Apache2::Status
+        	Order deny,allow
+        	Deny from all
+        	Allow from 127.0.0.1
+	</Location>
+	</IfModule>
+
+    <Directory /home/*/public_html/perl>
+        SetHandler perl-script
+        PerlResponseHandler ModPerl::PerlRun
+        Options -Indexes ExecCGI
+		PerlOptions +ParseHeaders
+    </Directory>
+
+    PerlModule ModPerl::Registry
+    #set Apache::Registry Mode for /perl Alias
+    # To set subdirectories to use perl set the following 
+    # and comment the orignial:
+    # <Location ~ "^/perl/.*\.pl$">
+    <Location  "^/perl/*.pl>
+        SetHandler perl-script
+        PerlResponseHandler ModPerl::Registry
+        Options -Indexes ExecCGI
+        PerlSendHeader On
+    </Location>
+
+    #set Apache::PerlRun Mode for /cgi-perl Alias
+    <Location /cgi-perl/*.pl>
+        SetHandler perl-script
+        PerlResponseHandler ModPerl::PerlRun
+        Options -Indexes ExecCGI
+        PerlSendHeader On
+    </Location>
+
 </ifModule>
 
diff --git a/www-apache/mod_perl/files/apache2-mod_perl-startup.pl b/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
index 8e8fca3b24f5..afc048ac125b 100644
--- a/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
+++ b/www-apache/mod_perl/files/apache2-mod_perl-startup.pl
@@ -1,26 +1,24 @@
-use Apache2 ();
-
 use lib qw(/home/httpd/perl);
 
 # enable if the mod_perl 1.0 compatibility is needed
-#use Apache::compat ();
+#use Apache2::compat ();
 
 use ModPerl::Util (); #for CORE::GLOBAL::exit
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
 
-use Apache::Server ();
-use Apache::ServerUtil ();
-use Apache::Connection ();
-use Apache::Log ();
+use Apache2::ServerRec ();
+use Apache2::ServerUtil ();
+use Apache2::Connection ();
+use Apache2::Log ();
 
 use APR::Table ();
 
 use ModPerl::Registry ();
 
-use Apache::Const -compile => ':common';
+use Apache2::Const -compile => ':common';
 use APR::Const -compile => ':common';
 
 1;
diff --git a/www-apache/mod_perl/files/digest-mod_perl-2.0.1 b/www-apache/mod_perl/files/digest-mod_perl-2.0.1
new file mode 100644
index 000000000000..9357f7c53bb0
--- /dev/null
+++ b/www-apache/mod_perl/files/digest-mod_perl-2.0.1
@@ -0,0 +1 @@
+MD5 fd9cb8ce794bb3ae3c8c288e18bf5b8f mod_perl-2.0.1.tar.gz 3694355
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.1-makefile.patch b/www-apache/mod_perl/files/mod_perl-2.0.1-makefile.patch
new file mode 100644
index 000000000000..583018f78ec6
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.1-makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2005-07-25 11:37:50.000000000 -0400
++++ Makefile	2005-07-25 11:38:12.000000000 -0400
+@@ -966,7 +966,7 @@ run_tests : test_clean
+ 	$(PASSENV) \
+ 	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
+ 	t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
+-	cd ModPerl-Registry && $(MAKE) test
++	cd ModPerl-Registry && TMPDIR=$(HOME) $(MAKE) test
+ 
+ test :: pure_all run_tests test_clean
+ 
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch
new file mode 100644
index 000000000000..0930278aeba3
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch
@@ -0,0 +1,11 @@
+--- t/conf/modperl_extra.pl.orig	2005-05-16 18:27:45.000000000 +1000
++++ t/conf/modperl_extra.pl	2005-05-16 18:34:46.000000000 +1000
+@@ -136,6 +136,8 @@
+ sub test_modperl_env {
+     # see t/response/TestModperl/env.pm
+     $ENV{MODPERL_EXTRA_PL} = __FILE__;
++    $ENV{TMPDIR} = __FILE__;
++    $ENV{TMPDIR} =~ s,/work/.*,/temp,;
+ }
+ 
+ 1;