up to 3.1.10-340-gfc2f2394

diff --git a/autoload.patch b/autoload.patch
index 66cf8ab7cb6a9fb81f50a6c34421a5429d0afe95..fdf59d8d899e6485a643381d3efcf8e10102f00b 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -135,9 +135,9 @@
      'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php',
 +    'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php',
  );
---- eventum-3.1.10/vendor/composer/autoload_namespaces.php~    2017-04-21 02:03:19.000000000 +0300
-+++ eventum-3.1.10/vendor/composer/autoload_namespaces.php     2017-04-21 02:13:17.089151648 +0300
-@@ -3,15 +3,16 @@
+--- eventum-3.1.10-340-gfc2f2394/vendor/composer/autoload_namespaces.php~      2017-05-16 18:19:02.000000000 +0300
++++ eventum-3.1.10-340-gfc2f2394/vendor/composer/autoload_namespaces.php       2017-05-17 19:57:34.487527478 +0300
+@@ -3,13 +3,15 @@
  // autoload_namespaces.php @generated by Composer
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -149,41 +149,24 @@
      'SecurityLib' => array($vendorDir . '/ircmaxell/security-lib/lib'),
      'RandomLib' => array($vendorDir . '/ircmaxell/random-lib/lib'),
 -    'PEAR' => array($vendorDir . '/pear/pear_exception'),
--    'Net' => array($vendorDir . '/pear/net_smtp', $vendorDir . '/pear/net_smartirc/Net'),
--    'Mail' => array($vendorDir . '/pear/mail'),
--    'DB' => array($vendorDir . '/pear/db'),
+-    'Net' => array($vendorDir . '/pear/net_smartirc/Net', $vendorDir . '/pear/net_smtp'),
 -    'Auth' => array($vendorDir . '/pear/auth_sasl'),
 -    '' => array($vendorDir . '/pear/pear-core-minimal/src'),
 +    'Auth' => array($pearDir),
-+    'DB' => array($pearDir),
 +    'Mail' => array($pearDir),
 +    'Net' => array($pearDir),
 +    'PEAR' => array($pearDir),
 +    'Text' => array($pearDir),
  );
---- eventum-3.1.10/vendor/composer/autoload_psr4.php~  2017-04-21 02:03:19.000000000 +0300
-+++ eventum-3.1.10/vendor/composer/autoload_psr4.php   2017-04-21 02:18:09.444821744 +0300
-@@ -6,23 +6,22 @@
- $baseDir = dirname($vendorDir);
+--- eventum-3.1.10-340-gfc2f2394/vendor/composer/autoload_psr4.php~    2017-05-16 18:19:02.000000000 +0300
++++ eventum-3.1.10-340-gfc2f2394/vendor/composer/autoload_psr4.php     2017-05-17 19:58:51.303058671 +0300
+@@ -7,27 +7,25 @@
  
  return array(
-+    'Zend\\Validator\\' =>  array($phpDir . '/Zend/Validator'),
-+    'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'),
-+    'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'),
-+    'Zend\\Mail\\' => array($phpDir . '/Zend/Mail'),
-+    'Zend\\Loader\\' => array($phpDir . '/Zend/Loader'),
-+    'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
-+    'Symfony\\Component\\Yaml\\' => array($phpDir . '/Symfony/Component/Yaml'),
-+    'Symfony\\Component\\Serializer\\' => array($phpDir . '/Symfony/Component/Serializer'),
-+    'Symfony\\Component\\OptionsResolver\\' =>  array($phpDir . '/Symfony/Component/OptionsResolver'),
-+    'Symfony\\Component\\HttpFoundation\\' => array($phpDir . '/Symfony/Component/HttpFoundation'),
-+    'Symfony\\Component\\Filesystem\\' => array($phpDir . '/Symfony/Component/Filesystem'),
-+    'Symfony\\Component\\Config\\' =>  array($phpDir . '/Symfony/Component/Config'),
-+    'Monolog\\' => array($phpDir . '/Monolog'),
-+    'Psr\\Log\\' => array($phpDir. '/Psr/Log'),
      'malkusch\\lock\\' => array($vendorDir . '/malkusch/lock/classes'),
 -    'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
 -    'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'),
+-    'Zend\\ServiceManager\\' => array($vendorDir . '/zendframework/zend-servicemanager/src'),
 -    'Zend\\Mime\\' => array($vendorDir . '/zendframework/zend-mime/src'),
 -    'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
 -    'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
@@ -193,14 +176,34 @@
 -    'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
 -    'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
 -    'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
+-    'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
+-    'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
 -    'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
 -    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
      'PhpXmlRpc\\' => array($vendorDir . '/phpxmlrpc/phpxmlrpc/src'),
+     'Phinx\\' => array($vendorDir . '/robmorgan/phinx/src/Phinx'),
 -    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
 -    'Eventum\\Test\\' => array($baseDir . '/tests'),
      'Eventum\\' => array($baseDir . '/src'),
      'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'),
      'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'),
++    'Zend\\Validator\\' =>  array($phpDir . '/Zend/Validator'),
++    'Zend\\ServiceManager\\' => array($phpDir . '/Zend/ServiceManager'),
++    'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'),
++    'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'),
++    'Zend\\Mail\\' => array($phpDir . '/Zend/Mail'),
++    'Zend\\Loader\\' => array($phpDir . '/Zend/Loader'),
++    'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
++    'Symfony\\Component\\Yaml\\' => array($phpDir . '/Symfony/Component/Yaml'),
++    'Symfony\\Component\\Serializer\\' => array($phpDir . '/Symfony/Component/Serializer'),
++    'Symfony\\Component\\OptionsResolver\\' =>  array($phpDir . '/Symfony/Component/OptionsResolver'),
++    'Symfony\\Component\\HttpFoundation\\' => array($phpDir . '/Symfony/Component/HttpFoundation'),
++    'Symfony\\Component\\Filesystem\\' => array($phpDir . '/Symfony/Component/Filesystem'),
++    'Symfony\\Component\\Config\\' =>  array($phpDir . '/Symfony/Component/Config'),
++    'Symfony\\Component\\Console\\' => array($phpDir . '/Symfony/Component/Console'),
++    'Monolog\\' => array($phpDir . '/Monolog'),
++    'Psr\\Log\\' => array($phpDir. '/Psr/Log'),
+ );
 --- eventum-3.0.3-13-gfefa325/autoload.php~    2015-10-13 21:36:40.000000000 +0300
 +++ eventum-3.0.3-13-gfefa325/autoload.php     2015-10-13 23:39:26.450266254 +0300
 @@ -48,4 +48,4 @@

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 05fa573e55cd4e415b654030ece5e2bd21606e57..472fd4adafe13031aa273269781aa009ebe55001 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,18 +1,16 @@
---- 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.1.10-340-gfc2f2394/globals.php~  2017-05-16 18:18:37.000000000 +0300
++++ eventum-3.1.10-340-gfc2f2394/globals.php   2017-05-17 19:54:53.436574941 +0300
+@@ -25,7 +25,7 @@
+ 
+ // define other paths
+ 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');
 --- 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 @@
@@ -29,17 +27,19 @@
  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.";
-     }
+--- eventum-3.1.10-340-gfc2f2394/src/Controller/Setup/SetupController.php~     2017-05-04 23:47:50.000000000 +0300
++++ eventum-3.1.10-340-gfc2f2394/src/Controller/Setup/SetupController.php      2017-05-17 19:55:50.362400076 +0300
+@@ -201,10 +201,6 @@
+                 = "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);
--    if (!empty($error)) {
--        $errors[] = $error;
--    }
-     $error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'");
-     if (!empty($error)) {
-         $errors[] = $error;
+-        $error = $this->checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", true);
+-        if (!empty($error)) {
+-            $errors[] = $error;
+-        }
+         $error = $this->checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE . "'");
+         if (!empty($error)) {
+             $errors[] = $error;
 --- eventum-3.0.8-100-g3543f89/src/Command/MonitorCommand.php~ 2016-01-31 18:24:19.000000000 +0200
 +++ eventum-3.0.8-100-g3543f89/src/Command/MonitorCommand.php  2016-02-01 00:16:28.751423105 +0200
 @@ -31,17 +31,17 @@

diff --git a/eventum.spec b/eventum.spec
index 28f78cb6463a29ae6867a83a31b42f6813805393..0cfab5a891cbb6fff1009bc3a6977dfe23fa65ea 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,8 +3,8 @@
 %bcond_with    order   # with experimental order patch
 
 %define                rel             1
-#define                subver  51
-#define                githash 61de085
+%define                subver  340
+%define                githash fc2f2394
 %define                php_min_version 5.5.0
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
@@ -14,9 +14,9 @@ Version:      3.1.10
 Release:       %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:       GPL v2+
 Group:         Applications/WWW
-Source0:       https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f8dc7b47544e289dc09657000a7e4af6
-#Source0:      %{name}-%{version}-%{subver}-g%{githash}.tar.gz
+#Source0:      https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source0:       https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.gz
+# Source0-md5: 89a78328f88d8b27aab1756ebc824b46
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -67,9 +67,9 @@ Requires:     php-ZendFramework-Config >= 2.4
 Requires:      php-ZendFramework-Loader >= 2.4
 Requires:      php-ZendFramework-Mail >= 2.4.9-2
 Requires:      php-ZendFramework-Mime >= 2.4
+Requires:      php-ZendFramework-ServiceManager >= 2.4
 Requires:      php-ZendFramework-Validator >= 2.4
 Requires:      php-monolog >= 1.17.2
-Requires:      php-pear-DB
 Requires:      php-pear-Mail
 Requires:      php-pear-Mail_Mime
 Requires:      php-pear-Mail_mimeDecode
@@ -81,6 +81,7 @@ Requires:     php-pear-PEAR-core
 Requires:      php-pear-Text_Diff
 Requires:      php-psr-Log >= 1.0.0-2
 Requires:      php-symfony2-Config >= 2.7.7
+Requires:      php-symfony2-Console >= 2.7.7
 Requires:      php-symfony2-Filesystem >= 2.7.7
 Requires:      php-symfony2-HttpFoundation >= 2.7.7
 Requires:      php-symfony2-OptionsResolver >= 2.7.7
@@ -590,7 +591,9 @@ done
 %attr(755,root,root) %{_appdir}/bin/upgrade.php
 
 %{_appdir}/autoload.php
+%{_appdir}/globals.php
 %{_appdir}/init.php
+%{_appdir}/phinx.php
 %dir %{_appdir}/htdocs
 %{_appdir}/htdocs/*.php
 %{_appdir}/htdocs/*.ico