up to 3.6.3-37-ga8d4c81db

diff --git a/autoload.patch b/autoload.patch
index 3758fa2315921d05475508ca5284165088d21f6e..1bf67db7426f265c63b4972087f27a3846d46780 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -8,14 +8,6 @@
  
  return array(
      'APIAuthToken' => $baseDir . '/lib/eventum/auth/APIAuthToken.php',
-@@ -54,7 +55,6 @@
-     'Link_Filter' => $baseDir . '/lib/eventum/class.link_filter.php',
-     'Mail_Helper' => $baseDir . '/lib/eventum/class.mail_helper.php',
-     'Mail_Queue' => $baseDir . '/lib/eventum/class.mail_queue.php',
--    'Math_Stats' => $vendorDir . '/pear-pear.php.net/Math_Stats/Math/Stats.php',
-     'Mime_Helper' => $baseDir . '/lib/eventum/class.mime_helper.php',
-     'Misc' => $baseDir . '/lib/eventum/class.misc.php',
-     'MySQL_Fulltext_Search' => $baseDir . '/lib/eventum/search/class.mysql_fulltext_search.php',
 @@ -62,8 +62,6 @@
      'News' => $baseDir . '/lib/eventum/class.news.php',
      'Note' => $baseDir . '/lib/eventum/class.note.php',
@@ -65,36 +57,17 @@
      'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php',
 +    'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php',
  );
---- eventum-3.6.1/vendor/composer/autoload_namespaces.php~     2019-02-28 23:25:15.000000000 +0200
-+++ eventum-3.6.1/vendor/composer/autoload_namespaces.php      2019-02-28 23:31:29.596053250 +0200
-@@ -3,16 +3,19 @@
- // autoload_namespaces.php @generated by Composer
+--- eventum-3.6.3-37-ga8d4c81db/vendor/composer/autoload_psr4.php~     2019-03-28 23:36:47.697875133 +0200
++++ eventum-3.6.3-37-ga8d4c81db/vendor/composer/autoload_psr4.php      2019-03-28 23:37:22.690724043 +0200
+@@ -4,18 +4,11 @@
  
  $vendorDir = dirname(dirname(__FILE__));
--$baseDir = dirname($vendorDir);
-+$pearDir = PEAR_INSTALL_DIR . '/';
+ $baseDir = dirname($vendorDir);
 +$phpDir = PHP_DATADIR . '/php';
  
  return array(
-     'SecurityLib' => array($vendorDir . '/ircmaxell/security-lib/lib'),
-     'RandomLib' => array($vendorDir . '/ircmaxell/random-lib/lib'),
--    'PEAR' => array($vendorDir . '/pear/pear_exception'),
-     'Horde_Text_Flowed' => array($vendorDir . '/horde/text-flowed/lib'),
-     'Horde' => array($vendorDir . '/horde/util/lib'),
-     'Enrise\\' => array($vendorDir . '/enrise/urihelper/src'),
-     'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
-     'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
--    '' => array($vendorDir . '/pear/pear-core-minimal/src'),
-+    // PEAR deps
-+    'Math' => array($pearDir),
-+    'PEAR' => array($pearDir),
-+    'Text' => array($pearDir),
- );
---- eventum-3.6.2-191-ga6336856a/vendor/composer/autoload_psr4.php~    2019-03-21 08:31:36.517612816 +0200
-+++ eventum-3.6.2-191-ga6336856a/vendor/composer/autoload_psr4.php     2019-03-21 08:32:51.503216402 +0200
-@@ -9,13 +9,6 @@
      'malkusch\\lock\\' => array($vendorDir . '/malkusch/lock/classes'),
-     'glen\\FilenameNormalizer\\Test\\' => array($vendorDir . '/glen/filename-normalizer/tests'),
+-    'glen\\FilenameNormalizer\\Test\\' => array($vendorDir . '/glen/filename-normalizer/tests'),
      'glen\\FilenameNormalizer\\' => array($vendorDir . '/glen/filename-normalizer/src'),
 -    'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
 -    'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'),
@@ -106,7 +79,7 @@
      'Webuni\\CommonMark\\TableExtension\\' => array($vendorDir . '/webuni/commonmark-table-extension/src'),
      'TrueBV\\' => array($vendorDir . '/true/punycode/src'),
      'Symfony\\Contracts\\' => array($vendorDir . '/symfony/contracts'),
-@@ -32,12 +25,9 @@
+@@ -25,12 +25,9 @@
      'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
      'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
      'Silly\\' => array($vendorDir . '/mnapoli/silly/src'),
@@ -118,8 +91,8 @@
 -    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
      'Lossendae\\CommonMark\\TaskLists\\' => array($vendorDir . '/lossendae/commonmark-task-lists/src'),
      'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
-     'League\\CommonMark\\Extras\\' => array($vendorDir . '/league/commonmark-extras/src'),
-@@ -46,7 +36,6 @@
+     'League\\CommonMark\\Ext\\InlinesOnly\\' => array($vendorDir . '/league/commonmark-ext-inlines-only/src'),
+@@ -55,7 +45,6 @@
      'League\\CommonMark\\Ext\\Autolink\\' => array($vendorDir . '/league/commonmark-ext-autolink/src'),
      'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
      'Invoker\\' => array($vendorDir . '/php-di/invoker/src'),
@@ -127,9 +100,7 @@
      'Eventum\\' => array($baseDir . '/src'),
      'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'),
      'Ds\\' => array($vendorDir . '/php-ds/php-ds/src'),
-@@ -59,4 +48,14 @@
-     'Cake\\Core\\' => array($vendorDir . '/cakephp/core'),
-     'Cake\\Collection\\' => array($vendorDir . '/cakephp/collection'),
+@@ -60,2 +50,12 @@
      'Cake\\Cache\\' => array($vendorDir . '/cakephp/cache'),
 +
 +    'Zend\\Validator\\' =>  array($phpDir . '/Zend/Validator'),
@@ -150,16 +121,12 @@
  // fonts directory for phplot
 -define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
 +define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
---- eventum-3.3.4-365-g65c5538f/vendor/composer/autoload_real.php~     2018-03-13 23:16:48.000000000 +0200
-+++ eventum-3.3.4-365-g65c5538f/vendor/composer/autoload_real.php      2018-03-13 23:35:23.062702617 +0200
-@@ -23,11 +23,7 @@
+--- eventum-3.6.3-29-g154295bd2/vendor/composer/autoload_real.php~     2019-03-26 09:59:16.000000000 +0200
++++ eventum-3.6.3-29-g154295bd2/vendor/composer/autoload_real.php      2019-03-26 13:18:14.402093309 +0200
+@@ -23,7 +23,7 @@
          self::$loader = $loader = new \Composer\Autoload\ClassLoader();
          spl_autoload_unregister(array('ComposerAutoloaderInitEventumCore', 'loadClassLoader'));
  
--        $includePaths = require __DIR__ . '/include_paths.php';
--        $includePaths[] = get_include_path();
--        set_include_path(implode(PATH_SEPARATOR, $includePaths));
--
 -        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
 +        $useStaticLoader = false; // autoload_static.php patching is annoying and not worth the effort
          if ($useStaticLoader) {

diff --git a/eventum.spec b/eventum.spec
index 901cf31a25030b26332a2ecc609830b58a1ef36a..0002d7cb0cf8860e059240b80c397dcdd7984ce5 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,8 +3,8 @@
 %bcond_with    order   # with experimental order patch
 
 %define                rel             1
-#define                subver  222
-#define                githash 837d91cbe
+%define                subver  37
+%define                githash a8d4c81db
 %define                php_min_version 7.1.3
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
@@ -13,9 +13,9 @@ Version:      3.6.3
 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.xz
-# Source0-md5: f1156ad1465d2a6a28f6a22c262b8331
-#Source0:      https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
+#Source0:      https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
+Source0:       https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
+# Source0-md5: 5eb1fe9db2f2c9e0dfcdaef2d1e99105
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -70,8 +70,6 @@ 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-Math_Stats
-Requires:      php-pear-PEAR-core
 Requires:      php-psr-Log >= 1.0.0-2
 Requires:      phplot >= 5.8.0
 Requires:      webapps
@@ -82,7 +80,6 @@ Requires:     webserver(php) >= 4.2.0
 Suggests:      localedb
 Suggests:      php(mcrypt)
 Suggests:      php(openssl)
-Suggests:      php-pear-Net_POP3
 Suggests:      webserver(setenv)
 Provides:      group(eventum)
 Provides:      user(eventum)
@@ -316,9 +313,6 @@ rm config/config.dist.php
 # cleanup libs taken from system, everything else gets bundled
 rm -r vendor/fonts/liberation
 rm -r vendor/monolog/monolog
-rm -r vendor/pear/pear-core-minimal
-rm -r vendor/pear/pear_exception
-rm -r vendor/pear-pear.php.net/Math_Stats
 rm -r vendor/php-gettext/php-gettext
 rm -r vendor/phplot/phplot
 rm -r vendor/psr/log
@@ -469,14 +463,14 @@ fi
 %attr(751,root,http) %dir %{_webappdir}/partner
 %attr(751,root,http) %dir %{_webappdir}/templates
 %attr(751,root,http) %dir %{_webappdir}/workflow
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/lighttpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/config.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/htpasswd
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/private_key.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/secret_key.php
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/lighttpd.conf
 %attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/setup.php
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/htpasswd
 
 %dir %attr(731,root,http) /var/log/%{name}
 %attr(620,root,http) %ghost /var/log/%{name}/*