X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-paths.patch;h=a860e6aac904d5874321c8f2e641472ca82375c4;hb=7f764a78848c25c42fa630d0abe16ca1bd5f6ae8;hp=2050115f742be6f245a41f446a8e6af7f15f5093;hpb=abac5638a5b020e8c7cbad9c371ea68f7d630725;p=packages%2Feventum.git diff --git a/eventum-paths.patch b/eventum-paths.patch index 2050115..a860e6a 100644 --- a/eventum-paths.patch +++ b/eventum-paths.patch @@ -1,29 +1,5 @@ ---- ./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$ - - // 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 +--- eventum-3.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 ++++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 @@ -27,7 +27,7 @@ // | Authors: Elan Ruusamäe | // +----------------------------------------------------------------------+ @@ -33,16 +9,18 @@ Header('Location: setup/'); exit(0); } -@@ -46,7 +46,7 @@ - +@@ -47,7 +47,7 @@ // define base path define('APP_PATH', realpath(dirname(__FILE__))); --define('APP_CONFIG_PATH', APP_PATH . '/config'); -+define('APP_CONFIG_PATH', '/etc/webapps/eventum'); + if (!defined('APP_CONFIG_PATH')) { +- 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 @@ +--- eventum-3.0.0/init.php~ 2015-02-02 20:02:01.825332859 +0200 ++++ eventum-3.0.0/init.php 2015-02-02 20:03:12.610911011 +0200 +@@ -78,7 +78,7 @@ } if (!defined('APP_TPL_COMPILE_PATH')) { @@ -51,19 +29,6 @@ } 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 @@ } @@ -82,16 +47,10 @@ } if (!defined('APP_ROUTED_MAILS_SAVEDIR')) { ---- eventum-2.2/htdocs/setup/index.php~ 2010-07-28 12:09:26.000000000 +0300 -+++ eventum-2.2/htdocs/setup/index.php 2010-07-28 12:09:48.715993083 +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'); +--- eventum-3.0.0/htdocs/setup/index.php~ 2015-02-02 20:03:49.507010317 +0200 ++++ eventum-3.0.0/htdocs/setup/index.php 2015-02-02 20:05:00.139257552 +0200 +@@ -44,10 +44,10 @@ + define('APP_CONFIG_PATH', APP_PATH . '/config'); define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php'); define('APP_TPL_PATH', APP_PATH . '/templates'); -define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c'); @@ -101,33 +60,22 @@ define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); -define('APP_LOCKS_PATH', APP_PATH . '/locks'); +define('APP_LOCKS_PATH', '/var/run/eventum'); + define('APP_LOCAL_PATH', APP_CONFIG_PATH); header('Content-Type: text/html; charset=' . APP_CHARSET); - -@@ -252,10 +252,6 @@ - "You need to install this extension for optimal operation. If you do not install this extension some unicode data will be corrupted."; +@@ -254,10 +254,6 @@ + $errors[] = "The 'file_uploads' directive needs to be enabled in your PHP.INI file in order for Eventum to work properly."; } -- $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE); +- $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 = ' array( + 'check_owner' => true, +- 'owner' => 'apache', ++ 'owner' => 'root', + 'check_group' => true, +- 'group' => 'apache', ++ 'group' => 'http', + 'check_permission' => true, + 'permission' => 640, + ), + APP_CONFIG_PATH . '/setup.php' => array( + 'check_owner' => true, +- 'owner' => 'apache', ++ 'owner' => 'root', + 'check_group' => true, +- 'group' => 'apache', ++ 'group' => 'http', + 'check_permission' => true, + 'permission' => 660, + 'check_filesize' => true, +--- eventum-2.3.3/config/sphinx.conf.php~ 2012-06-27 14:59:39.000000000 +0300 ++++ eventum-2.3.3/config/sphinx.conf.php 2012-06-27 15:04:52.928810689 +0300 +@@ -26,7 +26,7 @@ + // | Authors: Bryan Alsdorf | + // | Authors: Elan Ruusamäe | + // +----------------------------------------------------------------------+ +-require_once dirname(__FILE__) . "/../init.php"; ++require_once '/usr/share/eventum/init.php'; + + if (!defined('SPHINX_LOG_PATH')) { + define('SPHINX_LOG_PATH', '/var/log/sphinx/');