X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eventum-paths.patch;h=5b8290e1f2024727d52bb5c8b609ac0c033032a5;hb=2f00afbc0f050007c3475ad885fccc73166e40c0;hp=cd67eab07603aaf7269524f3ba2608475a1c6275;hpb=a856f9035ff99f654fac9b6a6f85582f61de8ffb;p=packages%2Feventum.git diff --git a/eventum-paths.patch b/eventum-paths.patch index cd67eab..5b8290e 100644 --- a/eventum-paths.patch +++ b/eventum-paths.patch @@ -1,188 +1,77 @@ ---- eventum/misc/cli/config.inc.php 2007-01-30 20:32:58.965186306 +0200 -+++ eventum/misc/cli/config.inc.php 2007-01-30 20:57:01.887651515 +0200 -@@ -32,9 +32,8 @@ - set_time_limit(0); - - // definitions of path related variables --define('APP_PATH', dirname(__FILE__) . '/'); --define('APP_INC_PATH', APP_PATH . 'include/'); --define('APP_PEAR_PATH', APP_INC_PATH . 'pear/'); -+define('APP_INC_PATH', '/usr/share/eventum/cli/'); -+define('APP_PEAR_PATH', '/usr/share/pear/'); - define('APP_BENCHMARK', false); - - set_include_path(get_include_path() . PATH_SEPARATOR . APP_PEAR_PATH); ---- eventum/include/class.template.php~ 2007-01-30 18:52:59.020179406 +0200 -+++ eventum/include/class.template.php 2007-01-30 18:53:24.620759076 +0200 -@@ -61,6 +61,7 @@ - $this->smarty = new Smarty; - $this->smarty->template_dir = APP_TPL_PATH; - $this->smarty->compile_dir = APP_TPL_COMPILE_PATH; -+ $this->smarty->plugins_dir = array('/usr/share/eventum/include/smarty', 'plugins'); - $this->smarty->config_dir = ''; - $this->smarty->register_modifier("activateLinks", array('Link_Filter', 'activateLinks')); - $this->smarty->register_modifier("formatCustomValue", array('Custom_Field', 'formatValue')); ---- ./include/class.monitor.php~ 2005-02-22 21:50:49.000000000 +0200 -+++ ./include/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)) { ---- ./include/class.misc.php 2005-10-26 17:17:17.000000000 +0300 -+++ /tmp/class.misc.php 2005-10-26 17:30:12.000000000 +0300 -@@ -607,7 +607,7 @@ - */ - function highlightQuotedReply($text) - { -- require_once(APP_SMARTY_PATH . "plugins/modifier.highlight_quoted.php"); -+ require_once(APP_INC_PATH. "smarty/modifier.highlight_quoted.php"); - return smarty_modifier_highlight_quoted($text); - } - ---- eventum/init.php 2007-01-30 19:05:56.897776515 +0200 -+++ eventum/init.php 2007-01-30 20:12:31.017572265 +0200 -@@ -27,5 +27,5 @@ - // +----------------------------------------------------------------------+ - --if (!file_exists(dirname(__FILE__) . '/config/config.php')) { -+if (!file_exists('/etc/webapps/eventum/config.php')) { - Header('Location: setup/'); - exit; -@@ -43,31 +43,31 @@ - define('APP_VERSION', '2.0-alpha'); - - // define base path --define('APP_PATH', realpath(dirname(__FILE__)) . '/'); --define('APP_CONFIG_PATH', APP_PATH . 'config/'); -+define('APP_PATH', '/usr/share/eventum/htdocs/'); -+define('APP_CONFIG_PATH', '/etc/webapps/eventum/'); - - // include local site config - require_once APP_CONFIG_PATH . 'config.php'; - - // define other paths - if (!defined('APP_INC_PATH')) { -- define('APP_INC_PATH', APP_PATH . 'include/'); -+ define('APP_INC_PATH', '/usr/share/eventum/include/'); - } - - if (!defined('APP_PEAR_PATH')) { -- define('APP_PEAR_PATH', APP_INC_PATH . 'pear/'); -+ define('APP_PEAR_PATH', '/usr/share/pear/'); - } - - if (!defined('APP_TPL_PATH')) { -- define('APP_TPL_PATH', APP_PATH . 'templates/'); -+ define('APP_TPL_PATH', '/usr/share/eventum/templates/'); - } - - 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_SMARTY_PATH')) { -- define('APP_SMARTY_PATH', APP_INC_PATH . 'Smarty/'); -+ define('APP_SMARTY_PATH', '/usr/share/php/Smarty/'); - } - - if (!defined('APP_JPGRAPH_PATH')) { -@@ -75,7 +75,7 @@ - } - - if (!defined('APP_LOCKS_PATH')) { -- define('APP_LOCKS_PATH', APP_PATH . 'locks/'); -+ define('APP_LOCKS_PATH', '/var/run/eventum/'); - } - - if (!defined('APP_SETUP_FILE')) { -@@ -83,7 +83,7 @@ - } - - if (!defined('APP_LOG_PATH')) { -- define('APP_LOG_PATH', APP_PATH . 'logs/'); -+ define('APP_LOG_PATH', '/var/log/eventum/'); - } - - if (!defined('APP_ERROR_LOG')) { ---- eventum/setup/index.php~ 2007-01-30 20:04:32.306824546 +0200 -+++ eventum/setup/index.php 2007-01-30 20:14:43.880555938 +0200 -@@ -38,17 +38,17 @@ - set_time_limit(0); - define('APP_CHARSET', 'UTF-8'); - define('APP_DEFAULT_LOCALE', 'en_US'); --define('APP_PATH', realpath(dirname(__FILE__) . '/..') . '/'); -+define('APP_PATH', realpath(dirname(__FILE__) . '/../..') . '/'); - define('APP_INC_PATH', APP_PATH . 'include/'); - define('APP_PEAR_PATH', APP_INC_PATH . 'pear/'); --define('APP_SMARTY_PATH', APP_INC_PATH . '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('APP_TPL_PATH', APP_PATH . 'templates/'); --define('APP_TPL_COMPILE_PATH', APP_PATH . 'templates_c'); --define('APP_LOG_PATH', APP_PATH . 'logs/'); +--- eventum-3.0.3-287-ge48a790/init.php~ 2015-10-26 21:42:14.000000000 +0200 ++++ eventum-3.0.3-287-ge48a790/init.php 2015-10-26 21:46:47.983157509 +0200 +@@ -76,9 +76,9 @@ + $define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php'); + $define('APP_INC_PATH', APP_PATH . '/lib/eventum'); + $define('APP_TPL_PATH', APP_PATH . '/templates'); +-$define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache'); +-$define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock'); +-$define('APP_LOG_PATH', APP_VAR_PATH . '/log'); ++$define('APP_TPL_COMPILE_PATH', '/var/cache/eventum'); ++$define('APP_LOCKS_PATH', '/var/run/eventum'); ++$define('APP_LOG_PATH', '/var/log/eventum'); + $define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); + $define('APP_CLI_LOG', APP_LOG_PATH . '/cli.log'); + $define('APP_IRC_LOG', APP_LOG_PATH . '/irc_bot.log'); +--- eventum-3.0.3-287-ge48a790/htdocs/setup/index.php~ 2015-10-26 21:45:35.367554219 +0200 ++++ eventum-3.0.3-287-ge48a790/htdocs/setup/index.php 2015-10-26 21:47:31.775849576 +0200 +@@ -47,10 +47,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_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', '/var/run/eventum/'); - - define('APP_BENCHMARK', false); - -@@ -192,10 +192,6 @@ - if (ini_get('file_uploads') != "1") { ++define('APP_LOG_PATH', '/var/log/eventum'); + define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log'); +-define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock'); ++define('APP_LOCKS_PATH', '/var/run/eventum'); + define('APP_LOCAL_PATH', APP_CONFIG_PATH); + + header('Content-Type: text/html; charset=' . APP_CHARSET); +@@ -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_LOCKS_PATH, "Directory '" . APP_LOCKS_PATH . "'", TRUE); + $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-3.0.3-314-gedea8e4/config/sphinx.conf.php~ 2015-10-27 18:02:36.000000000 +0200 ++++ eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php 2015-10-29 11:53:26.068169385 +0200 +@@ -1,7 +1,7 @@ + #!/usr/bin/php +