SOURCES: otrs-paths.patch - 2.3.4 - started update

blues blues at pld-linux.org
Wed Feb 11 12:45:39 CET 2009


Author: blues                        Date: Wed Feb 11 11:45:39 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.3.4 - started update

---- Files affected:
SOURCES:
   otrs-paths.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/otrs-paths.patch
diff -u SOURCES/otrs-paths.patch:1.3 SOURCES/otrs-paths.patch:1.4
--- SOURCES/otrs-paths.patch:1.3	Sun Feb  3 23:07:27 2008
+++ SOURCES/otrs-paths.patch	Wed Feb 11 12:45:33 2009
@@ -1,12 +1,11 @@
-diff -ruN otrs-2.2.5.orig/bin/Cron.sh otrs-2.2.5/bin/Cron.sh
---- otrs-2.2.5.orig/bin/Cron.sh	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/bin/Cron.sh	2008-02-03 22:57:12.000000000 +0100
-@@ -49,12 +49,12 @@
+--- ./bin/Cron.sh.org	2009-02-11 12:39:13.747483330 +0100
++++ ./bin/Cron.sh	2009-02-11 12:40:05.377477480 +0100
+@@ -44,12 +44,12 @@ cd "`dirname $0`/../"
  OTRS_HOME="`pwd`"
  cd -
  
 -#OTRS_ROOT=/opt/OpenTRS
-+#OTRS_ROOT=/usr/share/OpenTRS
++#OTRS_ROOT=/usr/share/otrs
  if test -e $OTRS_HOME/var/cron; then
      OTRS_ROOT=$OTRS_HOME
  else
@@ -16,10 +15,9 @@
      exit 5;
  fi
  
-diff -ruN otrs-2.2.5.orig/bin/SetPermissions.sh otrs-2.2.5/bin/SetPermissions.sh
---- otrs-2.2.5.orig/bin/SetPermissions.sh	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/bin/SetPermissions.sh	2008-02-03 22:57:12.000000000 +0100
-@@ -28,7 +28,7 @@
+--- ./bin/SetPermissions.sh.org	2009-02-11 12:40:15.234559506 +0100
++++ ./bin/SetPermissions.sh	2009-02-11 12:40:40.067473048 +0100
+@@ -28,7 +28,7 @@ if ! test $1 || ! test $2 || ! test $3; 
      echo ""
      echo "Usage: SetPermissions.sh <OTRS_HOME> <OTRS_USER> <WEBSERVER_USER> [OTRS_GROUP] [WEB_GROUP]"
      echo ""
@@ -28,10 +26,9 @@
      echo ""
      exit 1;
  else
-diff -ruN otrs-2.2.5.orig/CHANGES otrs-2.2.5/CHANGES
---- otrs-2.2.5.orig/CHANGES	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/CHANGES	2008-02-03 22:57:12.000000000 +0100
-@@ -817,7 +817,7 @@
+--- ./CHANGES.org	2009-02-11 12:40:52.087608830 +0100
++++ ./CHANGES	2009-02-11 12:41:43.544347438 +0100
+@@ -1582,7 +1582,7 @@
   - (2006/09/27) fixed bug #1358 - Customer History > All customer tickets.
      returns an incorrect number of tickets
   - (2006/09/27) fixed bug #1293 - Can't use an undefined value as a HASH
@@ -40,7 +37,7 @@
      line 194
   - (2006/09/27) fixed bug #1356 - mssql driver bug - Stats module of OTRS 2.1
      beta 2 - "Cant use string ("0")".
-@@ -2381,7 +2381,7 @@
+@@ -3146,7 +3146,7 @@
      (e. g. Kernel/Language/bg.pm). Updated docu.
   - (2002/11/21) moved var/cron/* to var/cron/*.dist (.dist is not used) to make
      updates easier! Thanks to Bryan Fullerton!
@@ -49,7 +46,7 @@
      because the web-installer needs this stuff in this location. %doc isn't
      consistent on different linux distributions!
   - (2002/11/15) fixed bug [48], custom modules don't work/load -
-@@ -2554,7 +2554,7 @@
+@@ -3319,7 +3319,7 @@
   - fixed bug[12] fetchmail lock problem - http://bugs.otrs.org/show_bug.cgi?id=12
   - fixed bug[11] typos - http://bugs.otrs.org/show_bug.cgi?id=11
   - fixed bug[10] user_preferences table  - http://bugs.otrs.org/show_bug.cgi?id=10
@@ -58,1268 +55,3 @@
      No such file or directory! - http://bugs.otrs.org/show_bug.cgi?id=9
   - fixed HTML table bug in AdminArea::Queue (just with Netscape)
   - fixed SQL table preferences bug (use script/DBUpdate.mysql.sql)
-diff -ruN otrs-2.2.5.orig/INSTALL otrs-2.2.5/INSTALL
---- otrs-2.2.5.orig/INSTALL	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/INSTALL	2008-02-03 22:57:12.000000000 +0100
-@@ -26,12 +26,12 @@
- =============
- 
- This few steps describe an OTRS installation incl. webserver and database
--settings. The OTRS user is "otrs" and the home (root) directory is /opt/otrs
-+settings. The OTRS user is "otrs" and the home (root) directory is /usr/share/otrs
- (of course you can choose an other directory or/and OTRS user).
- 
- 1. Install tar.gz:
-    ---------------
--   $shell: cd /opt/
-+   $shell: cd /usr/share/
-    $shell: tar -xzvf otrs-x.x.x.tar.gz
-    $shell: mv otrs-x.x.x otrs
- 
-@@ -74,7 +74,7 @@
-    ------------
-     Add user:
-     ---------
--    $shell: useradd -d /opt/otrs/ -c 'OTRS user' otrs
-+    $shell: useradd -d /usr/share/otrs/ -c 'OTRS user' otrs
- 
-     Add user to webserver group (if the webserver is not running with OTRS user):
-     -----------------------------------------------------------------------------
-@@ -101,10 +101,10 @@
- 
- 5. Check if all needed modules are installed:
-    ------------------------------------------
--      $shell:~> perl -cw /opt/otrs/bin/cgi-bin/index.pl
--      /opt/otrs/bin/cgi-bin/index.pl syntax OK
--      $shell:~> perl -cw /opt/otrs/bin/PostMaster.pl
--      /opt/otrs/bin/PostMaster.pl syntax OK
-+      $shell:~> perl -cw /usr/share/otrs/bin/cgi-bin/index.pl
-+      /usr/share/otrs/bin/cgi-bin/index.pl syntax OK
-+      $shell:~> perl -cw /usr/share/otrs/bin/PostMaster.pl
-+      /usr/share/otrs/bin/PostMaster.pl syntax OK
-       $shell:~>
- 
-     If you get "syntax OK" it seems to be Ok. Go ahead.
-@@ -118,9 +118,9 @@
-    Set the file permissions with
-    "$HOME/bin/SetPermissions.sh <OTRS_HOME> <OTRS_USER> <WEBSERVER_USER> [OTRS_GROUP] [WEB_GROUP]"
-    e. g.
--     Webserver with OTRS user: "SetPermissions.sh /opt/otrs otrs otrs"
--     Webserver with wwwrun user (e. g. SuSE): "SetPermissions.sh /opt/otrs otrs wwwrun"
--     Webserver with apache user (e. g. Redhat): "SetPermissions.sh /opt/otrs otrs apache apache apache"
-+     Webserver with OTRS user: "SetPermissions.sh /usr/share/otrs otrs otrs"
-+     Webserver with wwwrun user (e. g. SuSE): "SetPermissions.sh /usr/share/otrs otrs wwwrun"
-+     Webserver with apache user (e. g. Redhat): "SetPermissions.sh /usr/share/otrs otrs apache apache apache"
- 
- 8. Database setup:
-    ---------------
-@@ -146,7 +146,7 @@
- 11. First Email:
-    ------------
-    pipe an email directly into $OTRS_HOME/bin/Postmaster.pl
--    (e. g. 'cat /opt/otrs/doc/test-email-1.box | /opt/otrs/bin/PostMaster.pl').
-+    (e. g. 'cat /usr/share/otrs/doc/test-email-1.box | /usr/share/otrs/bin/PostMaster.pl').
- 
- 12. Cronjobs for the OTRS user:
-     ---------------------------
-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 22:57:10.000000000 +0100
-@@ -104,7 +104,7 @@
- #    $Self->{DatabaseDSN} = "DBI:Oracle:sid=$Self->{Database};host=$Self->{DatabaseHost};port=1521;";
- #    $Self->{DatabaseDSN} = "DBI:Oracle:sid=vingador;host=vingador;port=1521;";
-     # if needed, oracle env settings
--#    $ENV{ORACLE_HOME} = '/opt/ora9/product/9.2';
-+#    $ENV{ORACLE_HOME} = '/usr/share/ora9/product/9.2';
- #    $ENV{ORACLE_HOME} = '/oracle/Ora92';
- #    $ENV{NLS_DATE_FORMAT} = 'YYYY-MM-DD HH24:MI:SS';
- #    $ENV{NLS_LANG} = "german_germany.utf8";
-@@ -252,7 +252,7 @@
- #    $Self->{'LogModule::SysLog::Charset'} = 'utf-8';
- 
-     # param for LogModule Kernel::System::Log::File (required!)
--    $Self->{'LogModule::LogFile'} = '/tmp/otrs.log';
-+    $Self->{'LogModule::LogFile'} = '/var/log/otrs.log';
- 
-     # param if the date (yyyy-mm) should be added as suffix to
-     # logfile [0|1]
-@@ -742,7 +742,7 @@
-     # directories                                         #
-     # --------------------------------------------------- #
-     # root directory
--    $Self->{'Home'} = '/opt/otrs';
-+    $Self->{'Home'} = '/usr/share/otrs';
-     # tmp dir
-     $Self->{'TempDir'} = '<OTRS_CONFIG_Home>/var/tmp';
-     # html template dir
-@@ -780,7 +780,7 @@
-     # --------------------------------------------------- #
-     $Self->{'PGP'} = 0;
-     $Self->{'PGP::Bin'} = '/usr/bin/gpg';
--    $Self->{'PGP::Options'} = '--homedir /opt/otrs/.gnupg/ --batch --no-tty --yes';
-+    $Self->{'PGP::Options'} = '--homedir /usr/share/otrs/.gnupg/ --batch --no-tty --yes';
- #    $Self->{'PGP::Options'} = '--batch --no-tty --yes';
- #    $Self->{'PGP::Key::Password'}->{'D2DF79FA'} = 1234;
- #    $Self->{'PGP::Key::Password'}->{'488A0B8F'} = 1234;
-diff -ruN otrs-2.2.5.orig/Kernel/Config/Files/Framework.xml otrs-2.2.5/Kernel/Config/Files/Framework.xml
---- otrs-2.2.5.orig/Kernel/Config/Files/Framework.xml	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/Kernel/Config/Files/Framework.xml	2008-02-03 22:57:10.000000000 +0100
-@@ -2821,7 +2821,7 @@
-         <Group>Framework</Group>
-         <SubGroup>Crypt::PGP</SubGroup>
-         <Setting>
--            <String Regex="">--homedir /opt/otrs/.gnupg/ --batch --no-tty --yes</String>
-+            <String Regex="">--homedir /usr/share/otrs/.gnupg/ --batch --no-tty --yes</String>
-         </Setting>
-     </ConfigItem>
-     <ConfigItem Name="PGP::Key::Password" Required="1" Valid="1">
-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 22:57:06.000000000 +0100
-@@ -59,7 +59,7 @@
-     # ---------------------------------------------------- #
-     # fs root directory
-     # ---------------------------------------------------- #
--    $Self->{Home} = '/opt/otrs';
-+    $Self->{Home} = '/usr/share/otrs';
- 
-     # ---------------------------------------------------- #
-     # insert your own config settings "here"               #
-diff -ruN otrs-2.2.5.orig/Kernel/Modules/Installer.pm otrs-2.2.5/Kernel/Modules/Installer.pm
---- otrs-2.2.5.orig/Kernel/Modules/Installer.pm	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/Kernel/Modules/Installer.pm	2008-02-03 22:57:08.000000000 +0100
-@@ -639,7 +639,7 @@
-             );
-         }
-         else {
--#           my $SetPermission = $ENV{SCRIPT_FILENAME} || '/opt/otrs/bin/SetPermissions.sh';
-+#           my $SetPermission = $ENV{SCRIPT_FILENAME} || '/usr/share/otrs/bin/SetPermissions.sh';
- #           $SetPermission =~ s/(.+?)\/cgi-bin\/installer.pl/$1\/SetPermissions.sh/g;
- #           my $BaseDir = $SetPermission;
- #           $BaseDir =~ s/(.*\/)bin\/SetPermissions.sh/$1/;
-diff -ruN otrs-2.2.5.orig/.mailfilter.dist otrs-2.2.5/.mailfilter.dist
---- otrs-2.2.5.orig/.mailfilter.dist	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/.mailfilter.dist	2008-02-03 22:57:12.000000000 +0100
-@@ -9,7 +9,7 @@
- # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
- # --
- 
--#SYS_HOME=/opt/otrs
-+#SYS_HOME=/usr/share/otrs
- SYS_HOME=$HOME
- 
- import DEFAULT
-diff -ruN otrs-2.2.5.orig/.procmailrc.dist otrs-2.2.5/.procmailrc.dist
---- otrs-2.2.5.orig/.procmailrc.dist	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/.procmailrc.dist	2008-02-03 22:57:10.000000000 +0100
-@@ -9,7 +9,7 @@
- # did not receive this file, see http://www.gnu.org/licenses/gpl.txt.
- # --
- 
--#SYS_HOME=/opt/otrs/
-+#SYS_HOME=/usr/share/otrs/
- SYS_HOME=$HOME
- 
- SHELL=/bin/sh
-diff -ruN otrs-2.2.5.orig/README otrs-2.2.5/README
---- otrs-2.2.5.orig/README	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/README	2008-02-03 22:57:10.000000000 +0100
-@@ -140,7 +140,7 @@
- 
- Directories & Files:
- ====================
--$HOME (e. g. /opt/otrs/)
-+$HOME (e. g. /usr/share/otrs/)
- |
- |  (all executables)
- |--/bin/             (all system programs)
-diff -ruN otrs-2.2.5.orig/README.webserver otrs-2.2.5/README.webserver
---- otrs-2.2.5.orig/README.webserver	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/README.webserver	2008-02-03 22:57:10.000000000 +0100
-@@ -27,7 +27,7 @@
- 
-   Add it to /etc/sysconfig/apache with HTTPD_CONF_INCLUDE_FILES
-   [...]
--  HTTPD_CONF_INCLUDE_FILES=/opt/otrs/scripts/suse-httpd.include.conf
-+  HTTPD_CONF_INCLUDE_FILES=/usr/share/otrs/scripts/suse-httpd.include.conf
-   [...]
- 
-   Start SuSEconfig and restart the webserver (rcapache restart).
-@@ -50,9 +50,9 @@
- 
-     Use "$HOME/bin/SetPermissions.sh <OTRS_HOME> <OTRS_USER> <WEBSERVER_USER> [OTRS_GROUP] [WEB_GROUP]"
-     e. g.
--     Webserver with otrs user: "SetPermissions.sh /opt/otrs otrs otrs"
--     Webserver with wwwrun user (e. g. SuSE): "SetPermissions.sh /opt/otrs otrs wwwrun"
--     Webserver with apache user (e. g. Redhat): "SetPermissions.sh /opt/otrs otrs apache"
-+     Webserver with otrs user: "SetPermissions.sh /usr/share/otrs otrs otrs"
-+     Webserver with wwwrun user (e. g. SuSE): "SetPermissions.sh /usr/share/otrs otrs wwwrun"
-+     Webserver with apache user (e. g. Redhat): "SetPermissions.sh /usr/share/otrs otrs apache"
- 
- b)
-  *)
-@@ -60,8 +60,8 @@
-   ============================
-   Add this to the cgi-bin stuff section in httpd.conf
-   [...]
--  Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
--  ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/"
-+  Alias /otrs-web/ "/usr/share/otrs/var/httpd/htdocs/"
-+  ScriptAlias /otrs/ "/usr/share/otrs/bin/cgi-bin/"
-   [...]
- 
-  *)
-@@ -70,11 +70,11 @@
-   Add this to the mod_perl stuff section in httpd.conf
-   [...]
-     # 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 (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)
-@@ -96,11 +96,11 @@
-   Add this to the mod_perl stuff section in httpd.conf
-   [...]
-     # 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
--    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
-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 22:57:13.000000000 +0100
-@@ -4,20 +4,20 @@
- # --
- 
- # 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/"
- 
- # 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 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>
- 
- # 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 22:57:13.000000000 +0100
-@@ -4,21 +4,21 @@
- # --
- 
- # 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/"
- 
- # 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
- 
--    # 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/">
-+<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-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 22:57:13.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/";
-+use lib "/usr/share/otrs/Kernel/cpan-lib";
- 
- # pull in things we will use in most requests so it is read and compiled
- # exactly once
-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 22:57:13.000000000 +0100
-@@ -4,14 +4,14 @@
- # --
- 
- # 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/"
- 
- # if mod_perl is used
- <IfModule mod_perl.c>
- 
-     # 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 22:57:12.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
- 
-diff -ruN otrs-2.2.5.orig/scripts/auto_build/files.txt otrs-2.2.5/scripts/auto_build/files.txt
---- otrs-2.2.5.orig/scripts/auto_build/files.txt	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/scripts/auto_build/files.txt	2008-02-03 22:57:13.000000000 +0100
-@@ -1,58 +1,58 @@
- 
--%config(noreplace) /opt/otrs/Kernel/Config.pm
--%config(noreplace) /opt/otrs/Kernel/Config/GenericAgent.pm
--%config(noreplace) /opt/otrs/var/log/TicketCounter.log
--%config(noreplace) /opt/otrs/.procmailrc
--%config(noreplace) /opt/otrs/.fetchmailrc
--%config(noreplace) /opt/otrs/.mailfilter
--%config(noreplace) /opt/otrs/Kernel/Output/HTML/Standard/*.dtl
--%config(noreplace) /opt/otrs/Kernel/Output/HTML/Lite/*.dtl
--%config(noreplace) /opt/otrs/Kernel/Language/*.pm
--%config(noreplace) /opt/otrs/var/cron/*
--%config(noreplace) /opt/otrs/var/logo-otrs.png
-+%config(noreplace) /usr/share/otrs/Kernel/Config.pm
-+%config(noreplace) /usr/share/otrs/Kernel/Config/GenericAgent.pm
-+%config(noreplace) /usr/share/otrs/var/log/TicketCounter.log
-+%config(noreplace) /usr/share/otrs/.procmailrc
-+%config(noreplace) /usr/share/otrs/.fetchmailrc
-+%config(noreplace) /usr/share/otrs/.mailfilter
-+%config(noreplace) /usr/share/otrs/Kernel/Output/HTML/Standard/*.dtl
-+%config(noreplace) /usr/share/otrs/Kernel/Output/HTML/Lite/*.dtl
-+%config(noreplace) /usr/share/otrs/Kernel/Language/*.pm
-+%config(noreplace) /usr/share/otrs/var/cron/*
-+%config(noreplace) /usr/share/otrs/var/logo-otrs.png
- 
--%dir /opt/otrs/
--/opt/otrs/RELEASE
--/opt/otrs/ARCHIVE
--/opt/otrs/.procmailrc.dist
--/opt/otrs/.fetchmailrc.dist
--/opt/otrs/.mailfilter.dist
--%dir /opt/otrs/Kernel/
--%dir /opt/otrs/Kernel/Config/
--/opt/otrs/Kernel/Config.pm.dist
--/opt/otrs/Kernel/Config/Files/
--/opt/otrs/Kernel/Config/GenericAgent.pm.dist
--/opt/otrs/Kernel/Config/GenericAgent.pm.examples
--/opt/otrs/Kernel/Config/Defaults.pm
--/opt/otrs/Kernel/Language.pm
--%dir /opt/otrs/Kernel/Language/
--/opt/otrs/Kernel/Modules*
--%dir /opt/otrs/Kernel/Output/
--%dir /opt/otrs/Kernel/Output/HTML/
--%dir /opt/otrs/Kernel/Output/HTML/Standard/
--%dir /opt/otrs/Kernel/Output/HTML/Lite/
--/opt/otrs/Kernel/Output/HTML/*.pm
--/opt/otrs/Kernel/System*
--/opt/otrs/bin*
--/opt/otrs/scripts*
--%dir /opt/otrs/var/
--%dir /opt/otrs/var/article/
--/opt/otrs/var/httpd/
--%dir /opt/otrs/var/log/
--%dir /opt/otrs/var/sessions/
--%dir /opt/otrs/var/spool/
--%dir /opt/otrs/var/cron/
--%dir /opt/otrs/var/tmp/
--%dir /opt/otrs/var/pics/stats/
-+%dir /usr/share/otrs/
-+/usr/share/otrs/RELEASE
-+/usr/share/otrs/ARCHIVE
-+/usr/share/otrs/.procmailrc.dist
-+/usr/share/otrs/.fetchmailrc.dist
-+/usr/share/otrs/.mailfilter.dist
-+%dir /usr/share/otrs/Kernel/
-+%dir /usr/share/otrs/Kernel/Config/
-+/usr/share/otrs/Kernel/Config.pm.dist
-+/usr/share/otrs/Kernel/Config/Files/
-+/usr/share/otrs/Kernel/Config/GenericAgent.pm.dist
-+/usr/share/otrs/Kernel/Config/GenericAgent.pm.examples
-+/usr/share/otrs/Kernel/Config/Defaults.pm
-+/usr/share/otrs/Kernel/Language.pm
-+%dir /usr/share/otrs/Kernel/Language/
-+/usr/share/otrs/Kernel/Modules*
-+%dir /usr/share/otrs/Kernel/Output/
-+%dir /usr/share/otrs/Kernel/Output/HTML/
-+%dir /usr/share/otrs/Kernel/Output/HTML/Standard/
-+%dir /usr/share/otrs/Kernel/Output/HTML/Lite/
-+/usr/share/otrs/Kernel/Output/HTML/*.pm
-+/usr/share/otrs/Kernel/System*
-+/usr/share/otrs/bin*
-+/usr/share/otrs/scripts*
-+%dir /usr/share/otrs/var/
-+%dir /usr/share/otrs/var/article/
-+/usr/share/otrs/var/httpd/
-+%dir /usr/share/otrs/var/log/
-+%dir /usr/share/otrs/var/sessions/
-+%dir /usr/share/otrs/var/spool/
-+%dir /usr/share/otrs/var/cron/
-+%dir /usr/share/otrs/var/tmp/
-+%dir /usr/share/otrs/var/pics/stats/
- 
--/opt/otrs/Kernel/cpan-lib*
-+/usr/share/otrs/Kernel/cpan-lib*
- 
--%doc /opt/otrs/INSTAL*
--%doc /opt/otrs/UPGRADING
--%doc /opt/otrs/TODO
--%doc /opt/otrs/COPYING
--%doc /opt/otrs/CHANGES
--%doc /opt/otrs/READM*
--%doc /opt/otrs/doc*
--%doc /opt/otrs/CREDITS
-+%doc /usr/share/otrs/INSTAL*
-+%doc /usr/share/otrs/UPGRADING
-+%doc /usr/share/otrs/TODO
-+%doc /usr/share/otrs/COPYING
-+%doc /usr/share/otrs/CHANGES
-+%doc /usr/share/otrs/READM*
-+%doc /usr/share/otrs/doc*
-+%doc /usr/share/otrs/CREDITS
- 
-diff -ruN otrs-2.2.5.orig/scripts/fedora-otrs-4.spec otrs-2.2.5/scripts/fedora-otrs-4.spec
---- otrs-2.2.5.orig/scripts/fedora-otrs-4.spec	2008-02-03 21:40:07.000000000 +0100
-+++ otrs-2.2.5/scripts/fedora-otrs-4.spec	2008-02-03 22:57:12.000000000 +0100
-@@ -45,7 +45,7 @@
- # delete old RPM_BUILD_ROOT
- rm -rf $RPM_BUILD_ROOT
- # set DESTROOT
--export DESTROOT="/opt/otrs/"
-+export DESTROOT="/usr/share/otrs/"
- # create RPM_BUILD_ROOT DESTROOT
- mkdir -p $RPM_BUILD_ROOT/$DESTROOT/
- # copy files
-@@ -66,12 +66,12 @@
- useradd $OTRSUSER || :
- useradd apache || :
- groupadd apache || :
--$RPM_BUILD_ROOT/opt/otrs/bin/SetPermissions.sh $RPM_BUILD_ROOT/opt/otrs $OTRSUSER apache apache apache
-+$RPM_BUILD_ROOT/usr/share/otrs/bin/SetPermissions.sh $RPM_BUILD_ROOT/usr/share/otrs $OTRSUSER apache apache apache
- 
- %pre
- # remember about the installed version
--if test -e /opt/otrs/RELEASE; then
--    cat /opt/otrs/RELEASE|grep VERSION|sed 's/VERSION = //'|sed 's/ /-/g' > /tmp/otrs-old.tmp
-+if test -e /usr/share/otrs/RELEASE; then
-+    cat /usr/share/otrs/RELEASE|grep VERSION|sed 's/VERSION = //'|sed 's/ /-/g' > /tmp/otrs-old.tmp
- fi
- # useradd
- export OTRSUSER=otrs
-@@ -79,9 +79,9 @@
- if cat /etc/passwd | grep $OTRSUSER > /dev/null ; then
-     echo "$OTRSUSER exists."
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/otrs-paths.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list