- updated to recent version,

Changed files:
    otrs-paths.patch -> 1.2

diff --git a/otrs-paths.patch b/otrs-paths.patch
index 8203ee8f97fba5eab0b59e25c542b57af56da442..1b875bd97f82b9d1dc2bb5e8ebbc1f439ac20f95 100644 (file)
--- a/otrs-paths.patch
+++ b/otrs-paths.patch
@@ -1,6 +1,7 @@
---- otrs/Kernel/Config/Defaults.pm.fix 2005-11-03 10:19:56.857440512 +0100
-+++ otrs/Kernel/Config/Defaults.pm     2005-11-03 10:22:15.957294120 +0100
-@@ -235,7 +235,7 @@
+diff -ruN otrs-2.2.5.orig/Kernel/Config/Defaults.pm otrs-2.2.5/Kernel/Config/Defaults.pm
+--- otrs-2.2.5.orig/Kernel/Config/Defaults.pm  2008-02-03 21:40:07.000000000 +0100
++++ otrs-2.2.5/Kernel/Config/Defaults.pm       2008-02-03 21:40:39.000000000 +0100
+@@ -252,7 +252,7 @@
  #    $Self->{'LogModule::SysLog::Charset'} = 'utf-8';
  
      # param for LogModule Kernel::System::Log::File (required!)
@@ -9,7 +10,7 @@
  
      # param if the date (yyyy-mm) should be added as suffix to
      # logfile [0|1]
-@@ -614,7 +614,7 @@
+@@ -742,7 +742,7 @@
      # directories                                         #
      # --------------------------------------------------- #
      # root directory
@@ -18,50 +19,66 @@
      # tmp dir
      $Self->{'TempDir'} = '<OTRS_CONFIG_Home>/var/tmp';
      # html template dir
---- otrs/Kernel/Config.pm.dist.fix     2005-11-03 10:22:43.521103784 +0100
-+++ otrs/Kernel/Config.pm.dist 2005-11-03 10:23:30.985888040 +0100
-@@ -58,7 +58,7 @@
+diff -ruN otrs-2.2.5.orig/Kernel/Config.pm.dist otrs-2.2.5/Kernel/Config.pm.dist
+--- otrs-2.2.5.orig/Kernel/Config.pm.dist      2008-02-03 21:40:07.000000000 +0100
++++ otrs-2.2.5/Kernel/Config.pm.dist   2008-02-03 21:41:00.000000000 +0100
+@@ -59,7 +59,7 @@
      # ---------------------------------------------------- #
      # fs root directory
      # ---------------------------------------------------- #
 -    $Self->{Home} = '/opt/otrs';
 +    $Self->{Home} = '/usr/share/otrs';
  
-     # **************************************************** #
+     # ---------------------------------------------------- #
      # insert your own config settings "here"               #
---- otrs/scripts/apache-httpd.include.conf.fix 2005-11-03 10:25:08.160115312 +0100
-+++ otrs/scripts/apache-httpd.include.conf     2005-11-03 10:36:12.123177584 +0100
-@@ -3,11 +3,11 @@
+diff -ruN otrs-2.2.5.orig/scripts/apache2-httpd.include.conf otrs-2.2.5/scripts/apache2-httpd.include.conf
+--- otrs-2.2.5.orig/scripts/apache2-httpd.include.conf 2008-02-03 21:40:07.000000000 +0100
++++ otrs-2.2.5/scripts/apache2-httpd.include.conf      2008-02-03 21:44:40.000000000 +0100
+@@ -4,20 +4,20 @@
  # --
  
- # agent, admin and customer frontend (mod_alias required!)
+ # agent, admin and customer frontend
 -ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/"
 -Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
 +ScriptAlias /otrs/ "/usr/share/otrs/bin/cgi-bin/"
 +Alias /otrs-web/ "/usr/share/otrs/var/httpd/htdocs/"
  
- # load all otrs modules (speed improvement!)
--#Perlrequire /opt/otrs/scripts/apache-perl-startup.pl
-+#Perlrequire /usr/share/otrs/scripts/apache-perl-startup.pl
+ # if mod_perl is used
+ <IfModule mod_perl.c>
  
- # Apache::StatINC - Reload %INC files when updated on disk 
- # (just use it for testing, setup, ... not for high productiv systems)
---- otrs/scripts/apache-perl-startup.pl.fix    2005-11-03 10:34:39.449266160 +0100
-+++ otrs/scripts/apache-perl-startup.pl        2005-11-03 10:35:42.872624344 +0100
-@@ -7,8 +7,8 @@
- # --
- # set otrs lib path!
- # --
--use lib "/opt/otrs/";
--use lib "/opt/otrs/Kernel/cpan-lib";
-+use lib "/usr/share/otrs/";
-+use lib "/usr/share/otrs/Kernel/cpan-lib";
+     # load all otrs modules
+-    Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
++    Perlrequire /usr/share/otrs/scripts/apache2-perl-startup.pl
  
- use Apache::Registry ();       # for things in the "/programs" URL
+     # Apache::Reload - Reload Perl Modules when Changed on Disk
+     PerlModule Apache::Reload
+     PerlInitHandler Apache::Reload
+ 
+-    # set mod_perl2 options
++    # set mod_perl2 usr/shareions
+     <Location /otrs>
+ #        ErrorDocument 403 /otrs/customer.pl
+         AllowOverride None
+@@ -33,13 +33,13 @@
+ </IfModule>
  
---- otrs/scripts/apache2-httpd.include.conf.fix        2005-11-03 10:36:30.228425168 +0100
-+++ otrs/scripts/apache2-httpd.include.conf    2005-11-03 10:38:01.933483880 +0100
-@@ -3,11 +3,11 @@
+ # directory settings
+-<Directory "/opt/otrs/bin/cgi-bin/">
++<Directory "/usr/share/otrs/bin/cgi-bin/">
+     AllowOverride None
+     Options +ExecCGI -Includes
+     Order allow,deny
+     Allow from all
+ </Directory>
+-<Directory "/opt/otrs/var/httpd/htdocs/">
++<Directory "/usr/share/otrs/var/httpd/htdocs/">
+     AllowOverride None
+     Order allow,deny
+     Allow from all
+diff -ruN otrs-2.2.5.orig/scripts/apache2-httpd-new.include.conf otrs-2.2.5/scripts/apache2-httpd-new.include.conf
+--- otrs-2.2.5.orig/scripts/apache2-httpd-new.include.conf     2008-02-03 21:40:07.000000000 +0100
++++ otrs-2.2.5/scripts/apache2-httpd-new.include.conf  2008-02-03 21:45:48.000000000 +0100
+@@ -4,21 +4,21 @@
  # --
  
  # agent, admin and customer frontend
@@ -70,14 +87,25 @@
 +ScriptAlias /otrs/ "/usr/share/otrs/bin/cgi-bin/"
 +Alias /otrs-web/ "/usr/share/otrs/var/httpd/htdocs/"
  
- # load all otrs modules
--Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
-+Perlrequire /usr/share/otrs/scripts/apache2-perl-startup.pl
+ # if mod_perl is used
+ <IfModule mod_perl.c>
+ 
+     # load all otrs modules
+-    Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
++    Perlrequire /usr/share/otrs/scripts/apache2-perl-startup.pl
+ 
+     # Apache::Reload - Reload Perl Modules when Changed on Disk
+     PerlModule Apache2::Reload
+     PerlInitHandler Apache2::Reload
+     PerlModule Apache2::RequestRec
  
- # Apache::Reload - Reload Perl Modules when Changed on Disk
- PerlModule Apache::Reload
-@@ -27,13 +27,13 @@
- </Location>
+-    # set mod_perl2 options
++    # set mod_perl2 usr/shareions
+     <Location /otrs>
+ #        ErrorDocument 403 /otrs/customer.pl
+         ErrorDocument 403 /otrs/index.pl
+@@ -34,13 +34,13 @@
+ </IfModule>
  
  # directory settings
 -<Directory "/opt/otrs/bin/cgi-bin/">
@@ -92,12 +120,13 @@
      AllowOverride None
      Order allow,deny
      Allow from all
---- otrs/scripts/apache2-perl-startup.pl.fix   2005-11-03 09:43:51.286657312 +0100
-+++ otrs/scripts/apache2-perl-startup.pl       2005-11-03 09:44:37.094693432 +0100
-@@ -9,8 +9,8 @@
- # --
+diff -ruN otrs-2.2.5.orig/scripts/apache2-perl-startup.pl otrs-2.2.5/scripts/apache2-perl-startup.pl
+--- otrs-2.2.5.orig/scripts/apache2-perl-startup.pl    2008-02-03 21:40:07.000000000 +0100
++++ otrs-2.2.5/scripts/apache2-perl-startup.pl 2008-02-03 21:45:17.000000000 +0100
+@@ -7,8 +7,8 @@
+ $ENV{MOD_PERL} =~ /mod_perl/ or die "MOD_PERL not used!";
+ 
  # set otrs lib path!
- # --
 -use lib "/opt/otrs/";
 -use lib "/opt/otrs/Kernel/cpan-lib";
 +use lib "/usr/share/otrs/";
@@ -105,36 +134,38 @@
  
  # pull in things we will use in most requests so it is read and compiled
  # exactly once
---- otrs/scripts/apache2-httpd-new.include.conf.fix    2005-11-03 10:48:27.975311056 +0100
-+++ otrs/scripts/apache2-httpd-new.include.conf        2005-11-03 10:49:24.458724272 +0100
-@@ -3,11 +3,11 @@
+diff -ruN otrs-2.2.5.orig/scripts/apache-httpd.include.conf otrs-2.2.5/scripts/apache-httpd.include.conf
+--- otrs-2.2.5.orig/scripts/apache-httpd.include.conf  2008-02-03 21:40:07.000000000 +0100
++++ otrs-2.2.5/scripts/apache-httpd.include.conf       2008-02-03 21:42:27.000000000 +0100
+@@ -4,14 +4,14 @@
  # --
  
- # agent, admin and customer frontend
+ # agent, admin and customer frontend (mod_alias required!)
 -ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/"
 -Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
 +ScriptAlias /otrs/ "/usr/share/otrs/bin/cgi-bin/"
 +Alias /otrs-web/ "/usr/share/otrs/var/httpd/htdocs/"
  
- # load all otrs modules
--Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
-+Perlrequire /usr/share/otrs/scripts/apache2-perl-startup.pl
+ # if mod_perl is used
+ <IfModule mod_perl.c>
  
- # Apache::Reload - Reload Perl Modules when Changed on Disk
- PerlModule Apache2::Reload
-@@ -29,13 +29,13 @@
- </Location>
+     # load all otrs modules (speed improvement!)
+-#   Perlrequire /opt/otrs/scripts/apache-perl-startup.pl
++#   Perlrequire /usr/share/otrs/scripts/apache-perl-startup.pl
+ 
+     # Apache::StatINC - Reload %INC files when updated on disk
+     # (just use it for testing, setup, ... not for high productiv systems)
+diff -ruN otrs-2.2.5.orig/scripts/apache-perl-startup.pl otrs-2.2.5/scripts/apache-perl-startup.pl
+--- otrs-2.2.5.orig/scripts/apache-perl-startup.pl     2008-02-03 21:40:07.000000000 +0100
++++ otrs-2.2.5/scripts/apache-perl-startup.pl  2008-02-03 21:42:56.000000000 +0100
+@@ -5,8 +5,8 @@
+ $ENV{GATEWAY_INTERFACE} =~ /^CGI-Perl/ or die "GATEWAY_INTERFACE not Perl!";
+ 
+ # set otrs lib path!
+-use lib "/opt/otrs/";
+-use lib "/opt/otrs/Kernel/cpan-lib";
++use lib "/usr/share/otrs/";
++use lib "/usr/share/otrs/Kernel/cpan-lib";
+ 
+ use Apache::Registry ();       # for things in the "/programs" URL
  
- # directory settings
--<Directory "/opt/otrs/bin/cgi-bin/">
-+<Directory "/usr/share/otrs/bin/cgi-bin/">
-     AllowOverride None
-     Options +ExecCGI -Includes
-     Order allow,deny
-     Allow from all
- </Directory>
--<Directory "/opt/otrs/var/httpd/htdocs/">
-+<Directory "/usr/share/otrs/var/httpd/htdocs/">
-     AllowOverride None
-     Order allow,deny
-     Allow from all