Hello community, here is the log from the commit of package otrs for openSUSE:Factory checked in at 2017-08-24 18:34:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/otrs (Old) and /work/SRC/openSUSE:Factory/.otrs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "otrs" Thu Aug 24 18:34:27 2017 rev:53 rq:507953 version:4.0.24 Changes: -------- --- /work/SRC/openSUSE:Factory/otrs/otrs.changes 2016-11-11 14:34:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.otrs.new/otrs.changes 2017-08-24 18:34:39.575329718 +0200 @@ -1,0 +2,34 @@ +Mon Jun 12 15:48:12 UTC 2017 - [email protected] + +- Update to 4.0.24 + * for mor info see https://www.otrs.com/release-notes-otrs-4-patch-level-24/ +- update UPGRADING.SUSE, otrs.README.??, ZZZAuto.pm +- rework/rebase patches + * otrs-httpd_conf.patch + * otrs-perm_test.patch +- add systemd service files and helper + * otrs.service, otrs.service.helper.sh + * otrs-scheduler.service +- rework permissions + * add otrs.permissions file for var/tmp, cause 'otrs' and 'wwwrun' + are writing there + +------------------------------------------------------------------- +Wed Jun 7 13:17:55 UTC 2017 - [email protected] + +- fix for boo#1043086 + * Incorrect Access Control in OTRS +- Update to 3.3.17 2017-06-06 + * Improved SecureMode detection in Installer. + see OSA-2017-03 (CVE-2017-9324) + * Bug#12753 - Function "SystemDataGroupGet" has problems with empty + values in oracle. + * Bug#9941 - Articles with multi-byte characters that claim to be + UTF-8 will not display in the browser. + * Bug#7961 - customer search should not return results for internal + articles. + see OSA-2017-02 + * Bug#12391 - Base64 encoded image does not display in article. + * Bug#12461 - Chrome can not display attached PDF files since 5.0.14. + +------------------------------------------------------------------- Old: ---- itsm-3.3.14.tar.bz2 otrs-3.3.16.tar.bz2 New: ---- itsm-4.0.24.tar.bz2 otrs-4.0.24.tar.bz2 otrs-scheduler.service otrs.permissions otrs.service otrs.service.helper.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ otrs.spec ++++++ ++++ 724 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/otrs/otrs.spec ++++ and /work/SRC/openSUSE:Factory/.otrs.new/otrs.spec ++++++ UPGRADING.SUSE ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:50.949727263 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:50.965725010 +0200 @@ -1,36 +1,20 @@ -Upgrading OTRS from 3.2 to 3.3 -============================== +Upgrading OTRS from 3.3 to 4 +============================ -These instructions are for people upgrading OTRS from *3.2* to *3.3*, -and applies both for RPM and source code (tarball) upgrades. +These instructions are for people upgrading OTRS from *3.3* to *4* or from a 4 +to a later patchlevel release 4 and applies both for RPM and source code (tarball) upgrades. -Please note that OTRS 3.3 requires at least perl version *5.10.0*. Make sure -before you plan your upgrade that your server runs this version. You can check -the version with the command `perl -v` on the command line. The only known -Linux distribution that uses perl 5.8 and is still supported by its vendor is -Red Hat Enterprise Linux (RHEL) 5 and its community supported derivative -CentOS 5. -If you're on any of these platforms and you plan to upgrade to OTRS 3.3 you -should also plan migrating your operating system to a version with a supported perl, such as RHEL 6 or CentOS 6. - -If you are running a lower version of OTRS you have to follow the upgrade path -to 3.2 first (1.1->1.2->1.3->2.0->2.1->2.2->2.3->2.4->3.0->3.1->3.2->3.3 ...)! -You need to perform a full upgrade to every version in between, including -database changes and the upgrading perl script. - -Please note that if you upgrade from OTRS 2.2 or earlier, you have to -take an extra step; please read http://bugs.otrs.org/show_bug.cgi?id=6798 - -Within a single minor version you can skip patch level releases if you want to -upgrade. For instance you can upgrade directly from OTRS 3.3.1 to version -3.3.4. If you need to do such a "patch level upgrade", you should skip steps -9 and 13-16. - -Please note that if you perform a patch level upgrade from OTRS 3.3.6 or earlier, -you need to activate a new cron job that controls the scheduler process. -Please copy the file `/opt/otrs/var/cron/scheduler_watchdog.dist` to -`/opt/otrs/var/cron/scheduler_watchdog` and update your crontab with -`/opt/otrs/bin/Cron.sh start` (as "otrs" user, not root). +If you are running a lower version of OTRS you have to follow the upgrade path to 3.3 first +(1.1->1.2->1.3->2.0->2.1->2.2->2.3->2.4->3.0->3.1->3.2->3.3)! You need to perform a full +upgrade to every version in between, including database changes and the upgrading perl script. + +Please note that if you upgrade from OTRS 2.2 or earlier, you have to take an extra step. + +Within a single minor version you can skip patch level releases if you want to upgrade. +For instance you can upgrade directly from OTRS 4 patchlevel 2 to version 4 patchlevel 6. +If you need to do such a "patch level upgrade", you should skip steps 6, 11, 13 and 14. + +It is highly recommended to perform a test update on a separate testing machine first. 1. Stop all relevant services @@ -38,14 +22,12 @@ e. g. (depends on used services): - shell> rccron stop - shell> rcpostfix stop - shell> rcotrs-scheduler stop shell> rcotrs stop + shell> rcotrs-scheduler stop shell> rcapache2 stop -2. Backup everything below $OTRS_HOME (default: OTRS_HOME=/srv/otrs) --------------------------------------------------------------------- +2. Backup everything below @OTRS_ROOT@ (default: OTRS_ROOT=@OTRS_ROOT@) +--------------------------------------------------------------------- - Kernel/Config.pm - Kernel/Config/GenericAgent.pm @@ -58,16 +40,10 @@ --------------------------------------------------- -4. Setup new system (optional) ------------------------------- - -If possible try this install on a separate machine for testing first. - - -5. Install the new release (RPM) ---------------------------------------- +4. Install the new release (RPM) +-------------------------------- - shell> rpm -Uvh otrs-3.3.x.-?.noarch.rpm + shell> rpm -Uvh otrs-4.0.*noarch.rpm The RPM-update will keep the old configuration files. @@ -85,20 +61,16 @@ Then modify Kernel/Config.pm to adapt your settings (e.g. DB connection) -6. Own themes -------------- - -Note: The OTRS themes between 3.2 and 3.3 are NOT compatible, so don't use your old themes! - -Themes are located under `$OTRS_HOME/Kernel/Output/HTML/*/*.dtl` (default: `OTRS_HOME=/srv/otrs`) +5. Check needed Perl modules +---------------------------- -Please also note that dtl-Files must be in utf-8 from OTRS 3.3 on. + shell> @OTRS_ROOT@/bin/otrs.CheckModules.pl -7. Apply the database changes +6. Apply the database changes ----------------------------- - shell> cd /srv/otrs/ + shell> cd @OTRS_ROOT@ ### SCHEMA UPDATE @@ -119,32 +91,33 @@ `otrs.CheckDB.pl` script, so please run it to check for possible issues. shell> bin/otrs.CheckDB.pl - - shell> cat scripts/DBUpdate-to-3.3.mysql.sql | mysql -p -f -u root otrs + shell> cat scripts/DBUpdate-to-4.mysql.sql | mysql -p -f -u root otrs PostgreSQL 8.2+: - shell> cat scripts/DBUpdate-to-3.3.postgresql.sql | psql --set ON_ERROR_STOP=on --single-transaction otrs otrs + shell> cat scripts/DBUpdate-to-4.postgresql.sql | psql --set ON_ERROR_STOP=on --single-transaction otrs otrs -PostgreSQL, older versions: - shell> cat scripts/DBUpdate-to-3.3.postgresql_before_8_2.sql | psql --set ON_ERROR_STOP=on --single-transaction otrs otrs +### DATABASE MIGRATION SCRIPT + Run the migration script (as user `otrs`, NOT as `root`): - NOTE: If you use PostgreSQL 8.1 or earlier, you need to activate the new legacy driver - for these older versions. Do this by adding a new line to your Kernel/Config.pm like this: + shell> scripts/DBUpdate-to-4.pl - $Self->{DatabasePostgresqlBefore82} = 1; + Do not continue the upgrading process if this script did not work properly for you. + Otherwise data loss may occur. -### DATABASE MIGRATION SCRIPT +7. Own themes +------------- - Run the migration script (as user `otrs`, NOT as `root`): +Note: The OTRS themes of 3.3 are NOT compatible with OTRS 4, so don't use your old themes! - shell> scripts/DBUpdate-to-3.3.pl +Themes are located under `@OTRS_ROOT@/Kernel/Output/HTML/*/*.tt` (default: `OTRS_ROOT=@OTRS_ROOT@`) - Do not continue the upgrading process if this script did not work properly for you. - Otherwise data loss may occur. +Please note that OTRS 4 comes with a new templating engine based on Template::Toolkit. +All customized templates must be converted from DTL to the new format. Please see the +development manual for detailed instructions. 8. Refresh the configuration cache and delete caches @@ -164,8 +137,6 @@ shell> rcapache start shell> rcotrs start shell> rcotrs-scheduler start - shell> rcpostfix start - shell> rccron start Now you can log into your system. @@ -173,68 +144,25 @@ 10. Check installed packages ---------------------------- -In the package manager, check if all packages are still marked as -correctly installed or if any require reinstallation or even a package upgrade. +Note: The OTRS packages of 3.3 are NOT compatible with OTRS 4, so you have to perform a package upgrade! The following packages are automatically uninstalled after the upgrade process (if they where installed before): -- OTRSPostMasterFilterExtensions -- OTRSFreeTextFromCustomerUser -- OTRSExternalTicketNumberRecognition -- OTRSDashboardQueueOverview -- OTRSImportantArticles -- OTRSImportantArticlesITSM -- OTRSDashboardTicketCalendar -- OTRSMultiServiceSelect -- OTRSMultiQueueSelect -- OTRSDynamicFieldMultiLevelSelection -- OTRSEventBasedTicketActions -- OTRSTicketAclEditor -- OTRSCustomerProcessSelection -- OTRSACLExtensions -- OTRSGenericStandardTemplates -- OTRSExtendedDynamicDateFieldSearch -- OTRSDashboardTicketOverviewFilters - -11. Check config settings of OTRSFreeTextFromCustomerUser -------------------------------------------------------- - -Note: This only applies if you used the package OTRSFreeTextFromCustomerUser previously. - -If you used this module previously, you need to reconfigure it. -The module is automatically uninstalled by the upgrading script as it is -now a part of the OTRS framework. - -If you want to keep using it, please enable the setting -"Ticket::EventModulePost###930-DynamicFieldFromCustomerUser" to -activate this feature and configure the mapping in the setting -"DynamicFieldFromCustomerUser::Mapping". - - -12. Import your ACLs to the new ACL editor (optional) -------------------------------------------------------- - -In OTRS 3.3, there is a graphical editor for ACLs in the administration interface. You will need to -import your existing ACLs (e.g. in Config.pm or additional files) to the editor by using -bin/otrs.ImportACLsFromConfig.pl in order to make them available in the editor. Please make sure to -delete any ACLs from Config.pm (or other files) after successfully finishing the import procedure. Also -you will need to use the deploy button in the ACL administration frontend in order to re-deploy the imported -ACLs to your system. - - -13. Update your web server configuration ----------------------------------------- - -Note: this applies only if you use the Apache web server, -and do not use the configuration file directly from the OTRS installation directory -(e. g. with a symlink from the Apache configuration directory). +- OTRSGenericInterfaceREST +- OTRSMyServices +- OTRSStatsRestrictionByDateTimeDF +- Support + +11. Check GenericAgent jobs +--------------------------- -Please update the the Apache configuration file for OTRS as there have been several -changes (see [scripts/apache2-httpd.include.conf](scripts/apache2-httpd.include.conf)). +If you have any GenericAgent jobs (or even any custom developments) that automatically +set ProcessID or ActivityID dynamic fields, you need to update these to set the fields +to the new long EntityIDs that were generated by DBUpdate-to-4.pl. -16. Update and activate cronjobs +12. Update and activate cronjobs -------------------------------- There are several OTRS default cronjobs in $OTRS_HOME/var/cron/*.dist. @@ -247,14 +175,28 @@ Please check the copied files and re-apply any customizations that you might have made. -To schedule these cronjobs on your system, you can use the script Cron.sh. -Make sure to execute it as the OTRS system user! - - shell> /srv/otrs/bin/Cron.sh start - Note: From OTRS 3.3.7 OTRS Scheduler uses a cronjob to start-up and keep alive. Please make sure that scheduler_watchdog cronjob is activated. -17. Well done! +13: Update Customer database configuration +------------------------------------------ + +If you're using an external customer database and this database does NOT provide the OTRS +specific fields create_time, create_by, change_time and change_by, please set ForeignDB => 1 +for $Self->{CustomerUser} and $Self->{CustomerCompany} (see Kernel/Config/Defaults.pm). + + +14: Rebuild Ticket index +------------------------ + +Please run + + shell> bin/otrs.RebuildTicketIndex.pl + +to regenerate the ticket index. This can be done in the background to calculate the ticket +numbers for the queue view screens. You can already use your system. + + +15: Well done! -------------- ++++++ ZZZAuto.pm ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.033715431 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.045713741 +0200 @@ -9,8 +9,10 @@ $Self->{'DefaultLanguage'} = 'de'; $Self->{'LogModule'} = 'Kernel::System::Log::File'; $Self->{'Package::RepositoryList'} = { - 'file://@OTRS_ROOT@/otrs/itsm/packages33/' => '[--OTRS::ITSM 3.3 local repo]', - 'http://ftp.otrs.org/pub/otrs/itsm/packages33/' => '[--OTRS::ITSM 3.3 Master--] http://ftp.otrs.org/' + 'file://@OTRS_ROOT@/itsm/packages33/' => '[--OTRS::ITSM 3.3 local repo]', + 'http://ftp.otrs.org/pub/otrs/itsm/packages33/' => '[--OTRS::ITSM 3.3 Master--] http://ftp.otrs.org/', + 'file://@OTRS_ROOT@/itsm/packages4/' => '[--OTRS::ITSM 4 local repo]', + 'http://ftp.otrs.org/pub/otrs/itsm/packages4/' => '[--OTRS::ITSM 4 Master--] http://ftp.otrs.org/' }; $Self->{'Package::RepositoryAccessRegExp'} = '127\\.0\\.0\\.1'; } ++++++ itsm-3.3.14.tar.bz2 -> itsm-4.0.24.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/otrs/itsm-3.3.14.tar.bz2 /work/SRC/openSUSE:Factory/.otrs.new/itsm-4.0.24.tar.bz2 differ: char 11, line 1 ++++++ itsm.README.de ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.153698528 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.153698528 +0200 @@ -6,7 +6,7 @@ Hierbei sollten sie folgendes beachten: - mit der Installation dieses Pakets wird die Datei - @OTRS_ROOT@/otrs/Kernel/Config/Files/ZZZAuto.pm hinzugefügt, welches ein lokales + @OTRS_ROOT@/Kernel/Config/Files/ZZZAuto.pm hinzugefügt, welches ein lokales Repository zur Installation von OTRS::ITSM Modulen zur Verfügung stellt. Somit muß das OTRS System nicht zwingend eine Verbindung zum Internet haben. @@ -21,7 +21,7 @@ o aktivieren Sie "Package::RepositoryAccessRegExp:" und belassen Sie den (Default: 127\.0\.0\.1) Wert o fügen Sie bei "Package::RepositoryList:" ein neues Repository hinzu - Schlüssel: file://@OTRS_ROOT@/otrs/itsm/packages31/ + Schlüssel: file://@OTRS_ROOT@/itsm/packages4/ Inhalt: [--OTRS::ITSM local repo] -> klicken Sie auf Aktualisieren ++++++ itsm.README.en ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.193692892 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.193692892 +0200 @@ -5,7 +5,7 @@ You should take care of the following info - with installing this package, there will be - @OTRS_ROOT/otrs/Kernel/Config/Files/ZZZAuto.pm added, which provides a local repo + @OTRS_ROOT@/Kernel/Config/Files/ZZZAuto.pm added, which provides a local repo for installing all needed ITSM modules. So your OTRS System does not need to have internet access. @@ -19,7 +19,7 @@ o activate "Package::RepositoryAccessRegExp:" and leave (Default: 127\.0\.0\.1) value as is. o on "Package::RepositoryList:" add a new repo - Key: file://@OTRS_ROOT/otrs/itsm/packages31/ + Key: file://@OTRS_ROOT@/itsm/packages4/ Value: [--OTRS::ITSM local repo] -> click refresh ++++++ otrs-3.3.16.tar.bz2 -> otrs-4.0.24.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/otrs/otrs-3.3.16.tar.bz2 /work/SRC/openSUSE:Factory/.otrs.new/otrs-4.0.24.tar.bz2 differ: char 11, line 1 ++++++ otrs-httpd_conf.patch ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.297678244 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.297678244 +0200 @@ -2,73 +2,112 @@ =================================================================== --- scripts/apache2-httpd.include.conf.orig +++ scripts/apache2-httpd.include.conf -@@ -2,8 +2,8 @@ +@@ -2,13 +2,13 @@ # added for OTRS (http://otrs.org/) # -- -ScriptAlias /otrs/ "/opt/otrs/bin/cgi-bin/" -Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/" -+ScriptAlias /otrs/ "@OTRS_ROOT@/otrs/bin/cgi-bin/" -+Alias /otrs-web/ "@OTRS_ROOT@/otrs/var/httpd/htdocs/" ++ScriptAlias /otrs/ "@OTRS_ROOT@/bin/cgi-bin/" ++Alias /otrs-web/ "@OTRS_ROOT@/var/httpd/htdocs/" - # activate this if you are using an Oracle database - #SetEnv ORACLE_HOME /path/to/your/oracle/ -@@ -14,7 +14,7 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht <IfModule mod_perl.c> # Setup environment and preload modules - Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl -+ Perlrequire @OTRS_ROOT@/otrs/scripts/apache2-perl-startup.pl ++ Perlrequire @OTRS_ROOT@/scripts/apache2-perl-startup.pl # Reload Perl modules when changed on disk PerlModule Apache2::Reload -@@ -36,7 +36,13 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht - Allow from all - </IfVersion> - <IfVersion >= 2.4> +@@ -16,7 +16,8 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht + + # general mod_perl2 options + <Location /otrs> +-# ErrorDocument 403 /otrs/customer.pl ++ ++# ErrorDocument 403 /otrs/customer.pl + ErrorDocument 403 /otrs/index.pl + SetHandler perl-script + PerlResponseHandler ModPerl::Registry +@@ -24,19 +25,21 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht + PerlOptions +ParseHeaders + PerlOptions +SetupEnv + +- <IfModule mod_version.c> +- <IfVersion < 2.4> +- Order allow,deny +- Allow from all +- </IfVersion> +- <IfVersion >= 2.4> - Require all granted -+ <IfModule !mod_access_compat.c> -+ Require all granted -+ </IfModule> -+ <IfModule mod_access_compat.c> -+ Order allow,deny -+ Allow from all -+ </IfModule> - </IfVersion> - </IfModule> - <IfModule !mod_version.c> -@@ -52,7 +58,7 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht +- </IfVersion> +- </IfModule> +- <IfModule !mod_version.c> ++ <IfVersion < 2.4> + Order allow,deny + Allow from all +- </IfModule> ++ </IfVersion> ++ ++ <IfVersion >= 2.4> ++ <IfModule !mod_access_compat.c> ++ Require all granted ++ </IfModule> ++ <IfModule mod_access_compat.c> ++ Order allow,deny ++ Allow from all ++ </IfModule> ++ </IfVersion> ++ + </Location> + + # mod_perl2 options for GenericInterface +@@ -46,23 +49,25 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht </IfModule> -<Directory "/opt/otrs/bin/cgi-bin/"> -+<Directory "@OTRS_ROOT@/otrs/bin/cgi-bin/"> ++<Directory "@OTRS_ROOT@/bin/cgi-bin/"> ++ AllowOverride None Options +ExecCGI -Includes -@@ -62,7 +68,13 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht - Allow from all - </IfVersion> - <IfVersion >= 2.4> +- <IfModule mod_version.c> +- <IfVersion < 2.4> +- Order allow,deny +- Allow from all +- </IfVersion> +- <IfVersion >= 2.4> - Require all granted -+ <IfModule !mod_access_compat.c> -+ Require all granted -+ </IfModule> -+ <IfModule mod_access_compat.c> -+ Order allow,deny -+ Allow from all -+ </IfModule> - </IfVersion> - </IfModule> - <IfModule !mod_version.c> -@@ -75,7 +87,35 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht - </IfModule> +- </IfVersion> +- </IfModule> +- <IfModule !mod_version.c> ++ <IfVersion < 2.4> + Order allow,deny + Allow from all +- </IfModule> ++ </IfVersion> ++ ++ <IfVersion >= 2.4> ++ <IfModule !mod_access_compat.c> ++ Require all granted ++ </IfModule> ++ <IfModule mod_access_compat.c> ++ Order allow,deny ++ Allow from all ++ </IfModule> ++ </IfVersion> + + <IfModule mod_filter.c> + <IfModule mod_deflate.c> +@@ -72,22 +77,52 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht + </Directory> -<Directory "/opt/otrs/var/httpd/htdocs/"> -+<Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/js/thirdparty/ckeditor-4.3/"> ++<Directory "@OTRS_ROOT@/var/httpd/htdocs/js/thirdparty/ckeditor-4.4.8/"> + # -+ # Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. ++ # Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. + # For licensing, see LICENSE.html or http://ckeditor.com/license + # + @@ -93,34 +132,47 @@ + AddType text/xml .xml +</Directory> + -+<Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/"> ++<Directory "@OTRS_ROOT@/var/httpd/htdocs/"> ++ + Options +FollowSymlinks AllowOverride None - <IfModule mod_version.c> -@@ -84,8 +124,14 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht - Allow from all - </IfVersion> - <IfVersion >= 2.4> +- <IfModule mod_version.c> +- <IfVersion < 2.4> +- Order allow,deny +- Allow from all +- </IfVersion> +- <IfVersion >= 2.4> - Require all granted - </IfVersion> -+ <IfModule !mod_access_compat.c> -+ Require all granted -+ </IfModule> -+ <IfModule mod_access_compat.c> -+ Order allow,deny -+ Allow from all -+ </IfModule> -+ </IfVersion> - </IfModule> - <IfModule !mod_version.c> +- </IfModule> +- <IfModule !mod_version.c> ++ <IfVersion < 2.4> Order allow,deny -@@ -107,28 +153,28 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht + Allow from all +- </IfModule> ++ </IfVersion> ++ ++ <IfVersion >= 2.4> ++ <IfModule !mod_access_compat.c> ++ Require all granted ++ </IfModule> ++ <IfModule mod_access_compat.c> ++ Order allow,deny ++ Allow from all ++ </IfModule> ++ </IfVersion> + + <IfModule mod_filter.c> + <IfModule mod_deflate.c> +@@ -105,33 +140,35 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht + </Directory> <IfModule mod_headers.c> ++ # Cache css-cache for 30 days - <Directory "/opt/otrs/var/httpd/htdocs/skins/*/*/css-cache"> -+ <Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/skins/*/*/css-cache"> ++ <Directory "@OTRS_ROOT@/var/httpd/htdocs/skins/*/*/css-cache"> <FilesMatch "\.(css|CSS)$"> Header set Cache-Control "max-age=2592000 must-revalidate" </FilesMatch> @@ -128,7 +180,7 @@ # Cache css thirdparty for 4 hours, including icon fonts - <Directory "/opt/otrs/var/httpd/htdocs/skins/*/*/css/thirdparty"> -+ <Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/skins/*/*/css/thirdparty"> ++ <Directory "@OTRS_ROOT@/var/httpd/htdocs/skins/*/*/css/thirdparty"> <FilesMatch "\.(css|CSS|woff|svg)$"> Header set Cache-Control "max-age=14400 must-revalidate" </FilesMatch> @@ -136,7 +188,7 @@ # Cache js-cache for 30 days - <Directory "/opt/otrs/var/httpd/htdocs/js/js-cache"> -+ <Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/js/js-cache"> ++ <Directory "@OTRS_ROOT@/var/httpd/htdocs/js/js-cache"> <FilesMatch "\.(js|JS)$"> Header set Cache-Control "max-age=2592000 must-revalidate" </FilesMatch> @@ -144,7 +196,12 @@ # Cache js thirdparty for 4 hours - <Directory "/opt/otrs/var/httpd/htdocs/js/thirdparty/"> -+ <Directory "@OTRS_ROOT@/otrs/var/httpd/htdocs/js/thirdparty/"> ++ <Directory "@OTRS_ROOT@/var/httpd/htdocs/js/thirdparty/"> <FilesMatch "\.(js|JS)$"> Header set Cache-Control "max-age=14400 must-revalidate" </FilesMatch> + </Directory> ++ + </IfModule> + + # Limit the number of requests per child to avoid excessive memory usage ++++++ otrs-perm_test.patch ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.317675425 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.321674863 +0200 @@ -2,12 +2,12 @@ =================================================================== --- Kernel/System/Package.pm.orig +++ Kernel/System/Package.pm -@@ -3267,7 +3267,7 @@ sub _FileSystemCheck { - } +@@ -3651,7 +3651,7 @@ sub _FileSystemCheck { # create test files in following directories -- for (qw(/bin/ /Kernel/ /Kernel/System/ /Kernel/Output/ /Kernel/Output/HTML/ /Kernel/Modules/)) { -+ for (qw(/Kernel/ /Kernel/System/ /Kernel/Output/ /Kernel/Output/HTML/ /Kernel/Modules/)) { - my $Location = "$Home/$_/check_permissons.$$"; - my $Content = 'test'; - + for my $Filepath ( +- qw(/bin/ /Kernel/ /Kernel/System/ /Kernel/Output/ /Kernel/Output/HTML/ /Kernel/Modules/) ++ qw(/Kernel/ /Kernel/System/ /Kernel/Output/ /Kernel/Output/HTML/ /Kernel/Modules/) + ) + { + my $Location = $Home . $Filepath . "check_permissions.$$"; ++++++ otrs-scheduler.service ++++++ # Copyright (c) 2017 Scorpio IT, Deidesheim, Germany [Unit] Description=OTRS Scheduler Documentation=https://otrs.github.io/doc/manual/admin/stable/en/html/ After=apache2.service mysql.service [Service] Type=oneshot RemainAfterExit=yes EnvironmentFile=/etc/sysconfig/otrs User=otrs ExecStart=@OTRS_ROOT@/bin/otrs.Scheduler.pl -a start ExecReload=@OTRS_ROOT@/bin/otrs.Scheduler.pl -a reload ExecStop=@OTRS_ROOT@/bin/otrs.Scheduler.pl -a stop [Install] WantedBy=multi-user.target ++++++ otrs.README.de ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.461655141 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.461655141 +0200 @@ -5,7 +5,7 @@ Prüfen Sie bitte den "max_allow_packets" Wert in Ihrer MySQL config (my.cnf). Dieser sollte auf jeden Fall > 1MB sein. -Ich empfehle einen Wert von 8MB oder 16MB. +Ich empfehle einen Wert von 20MB. 1) Starten Sie Apache und MySQL mittels ++++++ otrs.README.en ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.525646127 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.525646127 +0200 @@ -5,7 +5,7 @@ Please check settings of "max_allow_packets" in your MySQL config (my.cnf). The value should be > 1MB in any case. -I recommend a value of 8MB or 16MB. +I recommend a value of 20MB. 1) Start Apache and MySQL with ++++++ otrs.permissions ++++++ ### DBUpdate-to-y.pl is going to write there #@OTRS_ROOT@/Kernel/Config/Files wwwrun:www 2775 #@OTRS_ROOT@/var/log otrs:www 2775 @OTRS_ROOT@/var/tmp wwwrun:www 2770 ++++++ otrs.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.633630914 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.637630350 +0200 @@ -1,7 +1,15 @@ addFilter('files-duplicate /srv/otrs/Kernel/Config.pm.dist') addFilter('files-duplicate /srv/otrs/Kernel/Config/GenericAgent.pm.dist') +addFilter('files-duplicate /srv/otrs/Kernel/Output/HTML/Standard/AgentTicketNote.tt') +addFilter('files-duplicate /srv/otrs/Kernel/Output/HTML/Standard/AgentTicketFreeText.tt') +addFilter('files-duplicate /srv/otrs/Kernel/Output/HTML/Standard/AgentTicketResponsible.tt') +addFilter('files-duplicate /srv/otrs/Kernel/Output/HTML/Standard/AgentTicketOwner.tt') +addFilter('files-duplicate /srv/otrs/Kernel/Output/HTML/Standard/AgentTicketPending.tt') +addFilter('files-duplicate /srv/otrs/Kernel/Output/HTML/Standard/AgentTicketPriority.tt') +addFilter('files-duplicate /srv/otrs/Kernel/Output/HTML/Standard/AgentTicketClose.tt') addFilter('hidden-file-or-dir') addFilter('macro-in-comment') +addFilter('no-manual-page-for-binary') addFilter('non-etc-or-var-file-marked-as-conffile') addFilter('non-executable-script') addFilter('zero-length') ++++++ otrs.service ++++++ # Copyright (c) 2017 Scorpio IT, Deidesheim, Germany [Unit] # Open-source Ticket Request System, Copyright (C) 2001-2012 OTRS AG Description=OTRS Documentation=https://otrs.github.io/doc/manual/admin/stable/en/html/ After=crond.service apache2.service mysql.service otrs-scheduler.service [Service] Type=oneshot RemainAfterExit=yes EnvironmentFile=/etc/sysconfig/otrs ExecStartPre=/usr/bin/chmod 755 @OTRS_ROOT@/bin/otrs.PostMaster.pl ExecStartPre=/usr/bin/otrs.service.helper.sh ExecStart=/usr/bin/crontab -u otrs @OTRS_ROOT@/var/tmp/cron ExecStop=/usr/bin/chmod 644 @OTRS_ROOT@/bin/otrs.PostMaster.pl ExecStopPost=/usr/bin/crontab -u otrs -r [Install] WantedBy=multi-user.target ++++++ otrs.service.helper.sh ++++++ #!/bin/bash # # Copyright (c) 2017 Scorpio IT, Deidesheim, Germany # All rights reserved # # Author: Christian Wittmer <[email protected]> # export LANG=POSIX PATH="/bin:/usr/bin:/sbin:/usr/sbin" # Check for existence of needed config file and read it OTRS_SYSCONFIG=/etc/sysconfig/otrs test -r $OTRS_SYSCONFIG || { echo "$OTRS_SYSCONFIG does not exist"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $OTRS_SYSCONFIG # -- # prepare cron stuff # -- if test $OTRS_CRON_RUNNING -gt 0; then if [[ -d $OTRS_CRON_DIR ]]; then cd $OTRS_CRON_DIR /bin/ls * | /usr/bin/grep -v '.dist' | /usr/bin/grep -v '.save' | /usr/bin/grep -v 'CVS' | /usr/bin/grep -v '.rpm' | \ /usr/bin/xargs cat > $OTRS_CRON_TMP_FILE fi fi ++++++ sysconfig.otrs ++++++ --- /var/tmp/diff_new_pack.8kBwu1/_old 2017-08-24 18:34:51.773611192 +0200 +++ /var/tmp/diff_new_pack.8kBwu1/_new 2017-08-24 18:34:51.781610066 +0200 @@ -22,11 +22,11 @@ OTRS_GROUP="otrs" ## Type: string -## Default: /srv/otrs +## Default: @OTRS_ROOT@ # # OTRS home (root) directory # -OTRS_ROOT="/srv/otrs" +OTRS_ROOT="@OTRS_ROOT@" ## Type: string(0,1) ## Default: 1
