Fixed the apache2.patch so that the fastcgi USE flag works. Removed unused

apache1.patch.
Package-Manager: portage-2.1.2.12

3 files changed, 29 insertions, 47 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 4890da3fff1d..077b0c7fa3d0 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/otrs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.35 2007/09/12 07:00:31 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.36 2007/09/14 05:53:38 wrobel Exp $
+
+  14 Sep 2007; <wrobel@gentoo.org> -files/apache1.patch,
+  files/apache2.patch:
+  Fixed the apache2.patch so that the fastcgi USE flag works. Removed unused
+  apache1.patch.
 
 *otrs-2.2.2 (12 Sep 2007)
 
diff --git a/www-apps/otrs/files/apache1.patch b/www-apps/otrs/files/apache1.patch
deleted file mode 100644
index 8711c0e396a2..000000000000
--- a/www-apps/otrs/files/apache1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- apache-httpd.include.conf	2003-10-06 19:16:35.000000000 -0400
-+++ apache1.edit	2005-08-01 18:54:44.000000000 -0400
-@@ -16,11 +16,11 @@
- <Location /otrs>
- #  ErrorDocument 403 /otrs/customer.pl
-   ErrorDocument 403 /otrs/index.pl
--  SetHandler  perl-script
--  PerlHandler Apache::Registry
-+#  SetHandler  perl-script
-+#  PerlHandler Apache::Registry
-   Options ExecCGI
--  PerlSendHeader On
--  PerlSetupEnv On
-+#  PerlSendHeader On
-+#  PerlSetupEnv On
- </Location>
- 
- # MaxRequestsPerChild (so no apache child will be to big!)
diff --git a/www-apps/otrs/files/apache2.patch b/www-apps/otrs/files/apache2.patch
index 6df9579226d5..45ef689c3e02 100644
--- a/www-apps/otrs/files/apache2.patch
+++ b/www-apps/otrs/files/apache2.patch
@@ -1,30 +1,25 @@
---- apache2-httpd.include.conf	2005-05-01 13:33:51.000000000 -0400
-+++ apache2.edit	2005-08-01 18:55:41.000000000 -0400
-@@ -7,21 +7,21 @@
- Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
+--- apache2-httpd.include.conf.orig	2007-09-14 07:49:10.000000000 +0200
++++ apache2-httpd.include.conf	2007-09-14 07:49:50.000000000 +0200
+@@ -11,7 +11,7 @@
+ <IfModule mod_perl.c>
  
- # load all otrs modules
--Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
-+#Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
+     # load all otrs modules
+-    Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
++    #Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
  
- # Apache::Reload - Reload Perl Modules when Changed on Disk
--PerlModule Apache::Reload
--PerlInitHandler Apache::Reload
-+#PerlModule Apache::Reload
-+#PerlInitHandler Apache::Reload
- 
- # set mod_perl2 options
- <Location /otrs>
- #  ErrorDocument 403 /otrs/customer.pl
-   AllowOverride None
-   ErrorDocument 403 /otrs/index.pl
--  SetHandler  perl-script
--  PerlHandler ModPerl::Registry
-+#  SetHandler  perl-script
-+#  PerlHandler ModPerl::Registry
-   Options +ExecCGI
--  PerlOptions +ParseHeaders
-+#  PerlOptions +ParseHeaders
-   Order allow,deny
-   Allow from all
- </Location>
+     # Apache::Reload - Reload Perl Modules when Changed on Disk
+     PerlModule Apache::Reload
+@@ -22,10 +22,10 @@
+ #        ErrorDocument 403 /otrs/customer.pl
+         AllowOverride None
+         ErrorDocument 403 /otrs/index.pl
+-        SetHandler  perl-script
+-        PerlHandler ModPerl::Registry
++        #SetHandler  perl-script
++        #PerlHandler ModPerl::Registry
+         Options +ExecCGI
+-        PerlOptions +ParseHeaders
++        #PerlOptions +ParseHeaders
+         Order allow,deny
+         Allow from all
+     </Location>