up to 3.5.6-67-g26f3e1f3

diff --git a/autoload.patch b/autoload.patch
index 34a9b7b777f438082ff2d3994fe1f71ca667c6ff..4ef12e04ce4df26b8f33a4c6791e0e19857a3fe0 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,5 +1,5 @@
---- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_classmap.php~  2019-01-23 00:18:07.562769763 +0200
-+++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_classmap.php   2019-01-23 00:19:46.887983481 +0200
+--- eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_classmap.php~  2019-01-28 00:43:31.648570821 +0200
++++ eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_classmap.php   2019-01-28 00:44:17.377912139 +0200
 @@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -8,7 +8,7 @@
  
  return array(
      'APIAuthToken' => $baseDir . '/lib/eventum/auth/APIAuthToken.php',
-@@ -48,19 +48,13 @@
+@@ -55,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',
@@ -16,11 +16,8 @@
      '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',
--    'Net_POP3' => $vendorDir . '/pear-pear.php.net/Net_POP3/Net/POP3.php',
--    'Net_Socket' => $vendorDir . '/pear-pear.php.net/Net_Socket/Net/Socket.php',
--    'Net_URL' => $vendorDir . '/pear-pear.php.net/Net_URL/Net/URL.php',
+@@ -63,8 +62,6 @@
      'News' => $baseDir . '/lib/eventum/class.news.php',
-     'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
      'Note' => $baseDir . '/lib/eventum/class.note.php',
      'Notification' => $baseDir . '/lib/eventum/class.notification.php',
 -    'PHPlot' => $vendorDir . '/phplot/phplot/phplot.php',
@@ -77,29 +74,27 @@
 +    'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
 +    'SphinxClient' => $phpDir . '/sphinxapi.php',
  );
---- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_files.php~     2019-01-22 23:56:16.000000000 +0200
-+++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_files.php      2019-01-23 00:22:07.852588625 +0200
-@@ -4,15 +4,13 @@
+--- eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_files.php~     2019-01-23 21:54:50.000000000 +0200
++++ eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_files.php      2019-01-28 00:45:48.376600745 +0200
+@@ -4,13 +4,12 @@
  
  $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
 +$phpDir = PHP_DATADIR . '/php';
  
  return array(
--    '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
      '72142d7b40a3a0b14e91825290b5ad82' => $vendorDir . '/cakephp/core/functions.php',
      '028fdea3165c4ba1ecccc83b7fec69fc' => $vendorDir . '/cakephp/collection/functions.php',
      '948ad5488880985ff1c06721a4e447fe' => $vendorDir . '/cakephp/utility/bootstrap.php',
 -    'f084d01b0a599f67676cffef638aa95b' => $vendorDir . '/smarty/smarty/libs/bootstrap.php',
-     'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
 -    'b2b3f01361f3aaeab67fde08ae76446f' => $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php',
 -    'd3114450b53a83020e2822546c24e1ad' => $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php',
      'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php',
 +    'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php',
  );
---- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_namespaces.php~        2019-01-22 23:56:16.000000000 +0200
-+++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_namespaces.php 2019-01-23 00:25:11.149906012 +0200
-@@ -3,16 +3,20 @@
+--- eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_namespaces.php~        2019-01-23 21:54:50.000000000 +0200
++++ eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_namespaces.php 2019-01-28 00:48:22.404384090 +0200
+@@ -3,14 +3,17 @@
  // autoload_namespaces.php @generated by Composer
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -111,22 +106,17 @@
      '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'),
      'Enrise\\' => array($vendorDir . '/enrise/urihelper/src'),
      'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
      'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
--    'Auth' => array($vendorDir . '/pear/auth_sasl'),
 -    '' => array($vendorDir . '/pear/pear-core-minimal/src'),
 +    // PEAR deps
-+    'Auth' => array($pearDir),
-+    'Mail' => array($pearDir),
 +    'Math' => array($pearDir),
-+    'Net' => array($pearDir),
 +    'PEAR' => array($pearDir),
 +    'Text' => array($pearDir),
  );
---- eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_psr4.php~      2019-01-22 23:56:16.000000000 +0200
-+++ eventum-3.5.6-75-g293a8feb/vendor/composer/autoload_psr4.php       2019-01-23 00:30:36.488478338 +0200
+--- eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_psr4.php~      2019-01-28 00:48:54.920583094 +0200
++++ eventum-3.5.6-67-g26f3e1f3/vendor/composer/autoload_psr4.php       2019-01-28 00:49:18.200249716 +0200
 @@ -10,13 +10,6 @@
      'glen\\FilenameNormalizer\\Test\\' => array($vendorDir . '/glen/filename-normalizer/tests'),
      'glen\\FilenameNormalizer\\' => array($vendorDir . '/glen/filename-normalizer/src'),
@@ -138,9 +128,9 @@
 -    'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
 -    'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
 -    'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
-     'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
-     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
      'Symfony\\Contracts\\' => array($vendorDir . '/symfony/contracts'),
+     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+     'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
 @@ -32,15 +25,11 @@
      'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
      'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 7f3b3d8536b6d5c9b943b3bdc0acb93123db749f..c563eafbf187d4481e3bdd16e47804ef9c5c44b0 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -11,9 +11,9 @@
  define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
 -define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock');
 +define('APP_LOCKS_PATH', '/var/run/eventum');
---- eventum-3.5.0/src/Controller/Setup/SetupController.php~    2018-05-20 17:33:34.000000000 +0300
-+++ eventum-3.5.0/src/Controller/Setup/SetupController.php     2018-05-21 01:40:24.095066355 +0300
-@@ -210,10 +210,6 @@
+--- 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();
  

diff --git a/eventum.spec b/eventum.spec
index c630c08edba75294477a78efaa1cdf2a6ca83a96..9dd9755858c8f3ef0d81a9b4e66fad03b3ad8c6f 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,8 +3,8 @@
 %bcond_with    order   # with experimental order patch
 
 %define                rel             1
-%define                subver  75
-%define                githash 293a8feb
+%define                subver  67
+%define                githash 26f3e1f3
 %define                php_min_version 5.6.0
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
@@ -15,7 +15,7 @@ License:      GPL v2+
 Group:         Applications/WWW
 #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: e3059184b6eafb87b4504722f64fb93f
+# Source0-md5: 85dfe8f431b58010ad7af20fd43bba57
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -367,8 +367,6 @@ vendor symfony/options-resolver
 vendor symfony/serializer
 vendor symfony/yaml
 vendor symfony/ldap
-vendor paragonie/random_compat
-vendor symfony/polyfill-intl-normalizer
 vendor symfony/security-core
 vendor symfony/security-csrf
 vendor glen/filename-normalizer