X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-paths.patch;h=c563eafbf187d4481e3bdd16e47804ef9c5c44b0;hb=3eb6472348697e95d810f1addd2b411ad6fe898f;hp=1951487b13513981d49bccdb4a3044c74db09705;hpb=098cbb72f59deccac6368713806256cfb6f1b07d;p=packages%2Feventum.git

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 1951487..c563eaf 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,139 +1,72 @@
---- ./lib/eventum/class.monitor.php~	2005-02-22 21:50:49.000000000 +0200
-+++ ./lib/eventum/class.monitor.php	2005-02-22 23:04:50.000000000 +0200
-@@ -157,6 +165,7 @@
-                 'permission'       => 100,
-             ),
-         );
-+        $required_directories = array();
-         foreach ($required_directories as $dir_path => $options) {
-             // check if directory exists
-             if (!file_exists($dir_path)) {
---- ./cli/eventum	2009-06-27 19:46:44.401524716 +0300
-+++ ./cli/eventum	2009-06-27 19:45:22.781438493 +0300
-@@ -12,9 +12,8 @@
- // @(#) $Id$
+--- eventum-3.3.4-365-g65c5538f/globals.php~	2018-03-13 10:49:12.000000000 +0200
++++ eventum-3.3.4-365-g65c5538f/globals.php	2018-03-13 23:22:58.153814696 +0200
+@@ -22,7 +22,7 @@
  
- // definitions of path related variables
--define('APP_PATH', dirname(__FILE__) . '/');
--define('APP_INC_PATH', APP_PATH . '/lib/eventum');
--define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
-+define('APP_PATH', '/usr/share/eventum');
-+define('APP_INC_PATH', APP_PATH . '/cli');
- 
- if (defined('APP_PEAR_PATH')) {
-     set_include_path(APP_PEAR_PATH . PATH_SEPARATOR . get_include_path());
---- eventum-2.2/init.php~	2009-10-12 22:40:04.000000000 +0300
-+++ eventum-2.2/init.php	2009-10-12 22:40:41.619219457 +0300
-@@ -27,7 +27,7 @@
- // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
- // +----------------------------------------------------------------------+
- 
--if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) {
-+if (!file_exists('/etc/webapps/eventum/config/config.php') || !filesize('/etc/webapps/eventum/config/config.php')) {
-     Header('Location: setup/');
-     exit(0);
- }
-@@ -46,7 +46,7 @@
- 
- // define base path
- define('APP_PATH', realpath(dirname(__FILE__)));
--define('APP_CONFIG_PATH', APP_PATH . '/config');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- 
- // include local site config. may override any default
- require_once APP_CONFIG_PATH . '/config.php';
-@@ -61,19 +61,15 @@
- }
- 
- if (!defined('APP_TPL_COMPILE_PATH')) {
--    define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
-+    define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
- }
- 
- if (!defined('APP_INC_PATH')) {
-     define('APP_INC_PATH', APP_PATH . '/lib/eventum');
- }
- 
--if (!defined('APP_PEAR_PATH')) {
--    define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
--}
--
- if (!defined('APP_SMARTY_PATH')) {
--    define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
-+    define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
- }
- 
- if (!defined('APP_JPGRAPH_PATH')) {
-@@ -81,7 +77,7 @@
- }
- 
- if (!defined('APP_LOCKS_PATH')) {
--    define('APP_LOCKS_PATH', APP_PATH . '/locks');
-+    define('APP_LOCKS_PATH', '/var/run/eventum/');
- }
- 
- if (!defined('APP_SQL_PATCHES_PATH')) {
-@@ -89,7 +85,7 @@
- }
- 
- if (!defined('APP_LOG_PATH')) {
--    define('APP_LOG_PATH', APP_PATH . '/logs');
-+    define('APP_LOG_PATH', '/var/log/eventum');
- }
- 
- if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
---- eventum-2.2/htdocs/setup/index.php~	2009-10-12 22:41:28.000000000 +0300
-+++ eventum-2.2/htdocs/setup/index.php	2009-10-12 22:43:06.524225893 +0300
-@@ -42,14 +42,14 @@
- define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
- define('APP_INC_PATH', APP_PATH . '/lib/eventum');
- define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
--define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
--define('APP_CONFIG_PATH', APP_PATH . '/config');
-+define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
+ // define other paths
  define('APP_TPL_PATH', APP_PATH . '/templates');
--define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
--define('APP_LOG_PATH', APP_PATH . '/logs');
+-define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache');
+-define('APP_LOG_PATH', APP_VAR_PATH . '/log');
 +define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
 +define('APP_LOG_PATH', '/var/log/eventum');
  define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
--define('APP_LOCKS_PATH', APP_PATH . '/locks');
+-define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock');
 +define('APP_LOCKS_PATH', '/var/run/eventum');
- 
- header('Content-Type: text/html; charset=' . APP_CHARSET);
- 
-@@ -241,10 +241,6 @@
-         $warnings[] = "The Multibyte String Functions extension is not enabled in your PHP installation. For localization to work properly " .
-             "you need to install this extension. If you do not install this extension localization will be disabled.";
-     }
--    $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
--    if (!empty($error)) {
--        $errors[] = $error;
--    }
-     $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'");
-     if (!empty($error)) {
-         $errors[] = $error;
-@@ -329,10 +325,6 @@
-     $setup_file_path = APP_SETUP_FILE;
- 
-     clearstatcache();
--    // check if config directory is writable
--    if (!is_writable(APP_CONFIG_PATH)) {
--        return "The file '" . APP_CONFIG_PATH . "' directory needs to be writable by the web server user. Please correct this problem and try again.";
--    }
-     // need to create a random private key variable
-     $private_key = '<?php
- $private_key = "' . md5(microtime()) . '";
---- eventum-2.2/irc/eventum-irc-bot~	2009-07-23 14:03:41.422211655 +0300
-+++ eventum-2.2/irc/eventum-irc-bot	2009-07-23 13:54:22.000000000 +0300
-@@ -32,7 +32,7 @@
- 
- ini_set('memory_limit', '1024M');
- 
--require_once dirname(__FILE__) . '/../init.php';
+--- eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php~	2019-01-23 01:50:42.000000000 +0200
++++ eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php	2019-01-24 22:18:56.047816296 +0200
+@@ -64,10 +64,6 @@
+         $configPath = Setup::getConfigPath();
+         $setupFile = Setup::getSetupFile();
+ 
+-        $error = $this->checkPermissions($configPath, "Directory '" . $configPath . "'", true);
+-        if (!empty($error)) {
+-            $errors[] = $error;
+-        }
+         $error = $this->checkPermissions($setupFile, "File '" . $setupFile . "'");
+         if (!empty($error)) {
+             $errors[] = $error;
+--- eventum-3.5.0/src/Console/Command/MonitorCommand.php~	2018-05-20 17:33:34.000000000 +0300
++++ eventum-3.5.0/src/Console/Command/MonitorCommand.php	2018-05-21 01:42:21.463354763 +0300
+@@ -47,17 +47,17 @@
+         $required_files = [
+             $configPath . '/config.php' => [
+                 'check_owner' => true,
+-                'owner' => 'apache',
++                'owner' => 'root',
+                 'check_group' => true,
+-                'group' => 'apache',
++                'group' => 'http',
+                 'check_permission' => true,
+                 'permission' => 640,
+             ],
+             $configPath . '/setup.php' => [
+                 'check_owner' => true,
+-                'owner' => 'apache',
++                'owner' => 'root',
+                 'check_group' => true,
+-                'group' => 'apache',
++                'group' => 'http',
+                 'check_permission' => true,
+                 'permission' => 660,
+                 'check_filesize' => true,
+--- eventum-3.1.5/config/sphinx.conf.php~	2016-11-13 12:05:37.000000000 +0200
++++ eventum-3.1.5/config/sphinx.conf.php	2016-11-23 03:10:05.855040510 +0200
+@@ -1,7 +1,7 @@
+ #!/usr/bin/php
+ <?php
+ 
+-require_once __DIR__ . '/../init.php';
 +require_once '/usr/share/eventum/init.php';
  
- if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) {
-     fwrite(STDERR, "ERROR: No config specified. Please see setup/irc_config.php for config information.\n\n");
+ if (!defined('SPHINX_LOG_PATH')) {
+     define('SPHINX_LOG_PATH', '/var/log/sphinx/');
+--- eventum-3.3.1/src/Attachment/StorageManager.php~	2017-10-08 15:53:56.000000000 +0300
++++ eventum-3.3.1/src/Attachment/StorageManager.php	2017-10-09 23:22:00.162142738 +0300
+@@ -32,7 +32,7 @@
+      *
+      * @var string
+      */
+-    const STORAGE_PATH = APP_PATH . '/var/storage/';
++    const STORAGE_PATH = '/var/lib/eventum/storage/';
+ 
+     /**
+      * @var MountManager