Up to 3.9.0

diff --git a/autoload.patch b/autoload.patch
index c6163c76c20a862257337e57e79c42be08765b78..bade48ac88de1361526a2fa76d890bdaac8d437f 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,5 +1,5 @@
---- eventum-3.8.8/vendor/composer/autoload_classmap.php        2020-03-27 18:52:17.843325338 +0200
-+++ eventum-3.8.8/vendor/composer/autoload_classmap.php        2020-03-27 18:48:18.927015020 +0200
+--- eventum-3.9.0/vendor/composer/autoload_classmap.php~       2020-07-02 00:40:49.265543161 +0300
++++ eventum-3.9.0/vendor/composer/autoload_classmap.php        2020-07-02 00:41:19.715094975 +0300
 @@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -196,15 +196,18 @@
      'Sphinx_Fulltext_Search' => $baseDir . '/lib/eventum/search/class.sphinx_fulltext_search.php',
      'SqlFormatter' => $vendorDir . '/jdorn/sql-formatter/lib/SqlFormatter.php',
      'Stats' => $baseDir . '/lib/eventum/class.stats.php',
-@@ -310,10 +137,13 @@
+@@ -135,8 +135,6 @@
+     'Support' => $baseDir . '/lib/eventum/class.support.php',
+     'SupportLevelNotFoundException' => $baseDir . '/lib/eventum/crm/class.support_level.php',
      'Support_Level' => $baseDir . '/lib/eventum/crm/class.support_level.php',
 -    'TPC_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
 -    'TP_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
      'Template_Helper' => $baseDir . '/lib/eventum/class.template_helper.php',
      'Time_Tracking' => $baseDir . '/lib/eventum/class.time_tracking.php',
      'User' => $baseDir . '/lib/eventum/class.user.php',
-     'UserSeeder' => $baseDir . '/db/seeds/UserSeeder.php',
+@@ -144,4 +142,9 @@
      'Validation' => $baseDir . '/lib/eventum/class.validation.php',
+     'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
      'Workflow' => $baseDir . '/lib/eventum/class.workflow.php',
 +
 +    // external deps
@@ -212,8 +215,8 @@
 +    'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
 +    'SphinxClient' => $phpDir . '/sphinxapi.php',
  );
---- eventum-3.8.6/vendor/composer/autoload_files.php~  2019-11-24 18:16:45.598780557 +0200
-+++ eventum-3.8.6/vendor/composer/autoload_files.php   2019-11-24 18:19:26.599693077 +0200
+--- eventum-3.9.0/vendor/composer/autoload_files.php~  2020-07-02 00:42:27.240767700 +0300
++++ eventum-3.9.0/vendor/composer/autoload_files.php   2020-07-02 00:47:15.896518354 +0300
 @@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -222,12 +225,13 @@
  
  return array(
      '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
-@@ -12,7 +12,6 @@
+@@ -15,8 +15,7 @@
      '028fdea3165c4ba1ecccc83b7fec69fc' => $vendorDir . '/cakephp/collection/functions.php',
      '948ad5488880985ff1c06721a4e447fe' => $vendorDir . '/cakephp/utility/bootstrap.php',
      '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
 -    'b2b3f01361f3aaeab67fde08ae76446f' => $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php',
 -    'd3114450b53a83020e2822546c24e1ad' => $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php',
+     '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
      'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php',
 +    'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php',
  );

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 8a716923f221bded5d40b7a7626c83ace9ae4ca5..0a4ce5a8857823e0eb6a7627b4ee3b2a2901d3a2 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -32,24 +32,14 @@
          $error = $this->checkPermissions($setupFile, "File '" . $setupFile . "'");
          if (!empty($error)) {
              $errors[] = $error;
---- eventum-3.5.0/src/Console/Command/MonitorCommand.php~      2018-05-20 17:33:34.000000000 +0300
-+++ eventum-3.5.0/src/Console/Command/MonitorCommand.php       2018-05-21 01:42:21.463354763 +0300
-@@ -47,17 +47,17 @@
+--- eventum-3.9.0/src/Console/Command/MonitorCommand.php~      2019-10-21 22:17:43.000000000 +0300
++++ eventum-3.9.0/src/Console/Command/MonitorCommand.php       2020-07-02 00:40:16.042698823 +0300
+@@ -68,9 +68,9 @@
          $required_files = [
-             $configPath . '/config.php' => [
-                 'check_owner' => true,
--                'owner' => 'apache',
-+                'owner' => 'root',
-                 'check_group' => true,
--                'group' => 'apache',
-+                'group' => 'http',
-                 'check_permission' => true,
-                 'permission' => 640,
-             ],
              $configPath . '/setup.php' => [
                  'check_owner' => true,
 -                'owner' => 'apache',
-+                'owner' => 'root',
++                'owner' => 'http',
                  'check_group' => true,
 -                'group' => 'apache',
 +                'group' => 'http',

diff --git a/eventum.spec b/eventum.spec
index 0df4f6fb7d2cdd64b630da763794b2ad80251d8c..509730de8bcfce0770fa73249afca95c58911e74 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -5,16 +5,16 @@
 %define                rel             1
 #define                subver  37
 #define                githash 2276dac77
-%define                php_min_version 7.1.3
+%define                php_min_version 7.2.5
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
 Name:          eventum
-Version:       3.8.17
+Version:       3.9.0
 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: 5b2749abb9493dd319199cf3182de809
+# Source0-md5: 37f709400ae2bbbe25404d372e60542d
 #Source0:      https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
@@ -303,7 +303,6 @@ rm config/config.php
 %patch108 -p1
 
 rm htdocs/.htaccess.dist
-rm config/config.dist.php
 
 # cleanup libs taken from system, everything else gets bundled
 rm -r vendor/fonts/liberation
@@ -395,7 +394,7 @@ for a in \
 done
 
 # run database update if configured
-test -s %{_webappdir}/config.php && \
+test -s %{_webappdir}/setup.php && \
 sudo -H -u http -- %{_appdir}/bin/upgrade.php || :
 
 # nuke Smarty templates cache after upgrade
@@ -418,13 +417,13 @@ if [ "$1" = "0" ]; then
 fi
 
 %post setup
-chmod 660 %{_webappdir}/{config,private_key,secret_key}.php
-chown root:http %{_webappdir}/{config,private_key,secret_key}.php
+chmod 660 %{_webappdir}/{setup,private_key,secret_key}.php
+chown root:http %{_webappdir}/{setup,private_key,secret_key}.php
 
 %postun setup
-if [ "$1" = "0" ] && [ -f %{_webappdir}/config.php ]; then
-       chmod 640 %{_webappdir}/{config,private_key,secret_key}.php
-       chown root:http %{_webappdir}/{config,private_key,secret_key}.php
+if [ "$1" = "0" ] && [ -f %{_webappdir}/setup.php ]; then
+       chmod 640 %{_webappdir}/{setup,private_key,secret_key}.php
+       chown root:http %{_webappdir}/{setup,private_key,secret_key}.php
 fi
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base
@@ -452,7 +451,6 @@ fi
 %attr(751,root,http) %dir %{_webappdir}/custom_field
 %attr(751,root,http) %dir %{_webappdir}/partner
 %attr(751,root,http) %dir %{_webappdir}/templates
-%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