From 5ff5cab277e9d13b574320f3af768c712403db1a84e60415ade705295944f317 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Wed, 30 Oct 2019 11:40:17 +0000
Subject: [PATCH] Accepting request 744029 from
 home:lemmy04:branches:network:utilities

- piwik.js needs to be writable, too
- more permission fixes
  * matomo.js needs to be owned by the apache user so that plugins can
    rewrite it if required
  * new md5sum for global.ini.php
- disabled the auto updater, doesn't work with this set of permissions
- Update to 3.12.0
  * new comarison feature for date ranges and visitor segments
  * several significant performance improvements, usability improvements and fixes to security issues
  * full changelog is at https://matomo.org/changelog/matomo-3-12-0/

OBS-URL: https://build.opensuse.org/request/show/744029
OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=38
---
 matomo-3.11.0.tar.gz |  3 ---
 matomo-3.12.0.tar.gz |  3 +++
 matomo.changes       | 27 +++++++++++++++++++++++++++
 matomo.spec          | 12 ++++++++++--
 4 files changed, 40 insertions(+), 5 deletions(-)
 delete mode 100644 matomo-3.11.0.tar.gz
 create mode 100644 matomo-3.12.0.tar.gz

diff --git a/matomo-3.11.0.tar.gz b/matomo-3.11.0.tar.gz
deleted file mode 100644
index d45a3cc..0000000
--- a/matomo-3.11.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:189056c5b5308595694d332a9feb19f42b26fbf51c8c8a53756d44fd7fad76b9
-size 16860544
diff --git a/matomo-3.12.0.tar.gz b/matomo-3.12.0.tar.gz
new file mode 100644
index 0000000..7630ad7
--- /dev/null
+++ b/matomo-3.12.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6549c829de9bdc8c095ee02fd41f263a9d364d25d8bb0b61664a6b36fcca48c4
+size 15562734
diff --git a/matomo.changes b/matomo.changes
index 483cbe4..6e98c0e 100644
--- a/matomo.changes
+++ b/matomo.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Oct 30 09:37:33 UTC 2019 - Mathias Homann <Mathias.Homann@opensuse.org>
+
+- piwik.js needs to be writable, too
+
+-------------------------------------------------------------------
+Wed Oct 30 09:34:03 UTC 2019 - Mathias Homann <Mathias.Homann@opensuse.org>
+
+- more permission fixes
+  * matomo.js needs to be owned by the apache user so that plugins can
+    rewrite it if required
+  * new md5sum for global.ini.php
+
+-------------------------------------------------------------------
+Wed Oct 30 07:59:19 UTC 2019 - Mathias Homann <Mathias.Homann@opensuse.org>
+
+- disabled the auto updater, doesn't work with this set of permissions
+
+
+-------------------------------------------------------------------
+Wed Oct 30 07:45:02 UTC 2019 - Mathias Homann <Mathias.Homann@opensuse.org>
+
+- Update to 3.12.0
+  * new comarison feature for date ranges and visitor segments
+  * several significant performance improvements, usability improvements and fixes to security issues
+  * full changelog is at https://matomo.org/changelog/matomo-3-12-0/
+
 -------------------------------------------------------------------
 Mon Oct 21 18:39:50 UTC 2019 - Mathias Homann <Mathias.Homann@opensuse.org>
 
diff --git a/matomo.spec b/matomo.spec
index d0f5950..f9b390c 100644
--- a/matomo.spec
+++ b/matomo.spec
@@ -31,7 +31,7 @@
 %endif
 
 Name:           matomo
-Version:        3.11.0
+Version:        3.12.0
 Release:        0
 Summary:        Web analytics platform
 License:        GPL-3.0-or-later
@@ -94,6 +94,12 @@ find . -type f "(" -name .htaccess -o -name .travis.sh ")" -delete
 find . -type f "(" -name "*.c" -o -name "*.h" -o -name "*.js.orig" ")" -delete
 # env-script-interpreter
 find . -type f -exec sed -i -e 's|\/usr\/bin\/env php|\/usr\/bin\/php|g' {} +
+
+#
+# disable the auto updater, it can't work properly with the new, more secure permissions and is a bad idea on a RPM based setup anyways.
+#
+sed -i '/enable_auto_update/s/1$/0/' config/global.ini.php
+
 #
 # Fix integrity check triggered from fix of rpmlint errors.
 # Drop moved files
@@ -102,7 +108,7 @@ do
   sed -i "/\W\"${i}\"\W/d" config/manifest.inc.php
 done
 # Insert new hashes for chanded files
-for file in console 'vendor/leafo/lessphp/plessc' 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php'
+for file in console 'vendor/leafo/lessphp/plessc' 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php'
 do
   size=$(ls -l $file | awk '{ print $5 }')
   checksum=$(md5sum $file  | awk '{ print $1 }')
@@ -196,6 +202,8 @@ fi
 %dir %attr(0750,%{ap_usr},%{ap_grp}) /var/log/%{name}
 %config(noreplace)  %attr(600,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/*php
 %{_sysconfdir}/%{name}/environment/*php
+%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/matomo.js
+%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/piwik.js
 %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/console
 %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/cron/archive.sh
 %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/log-analytics/import_logs.py