From 8e1d0fbe23792f502a2df1bf14a138edc94a7e177b7284db083b9e8827c09c46 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Tue, 24 Nov 2020 17:16:32 +0000 Subject: [PATCH 01/11] Accepting request 850578 from home:ecsos:server - Update to 4.0.0 Too many changes to list here. See instead: https://github.com/matomo-org/matomo/releases/tag/4.0.0 - Fix boo#1162178: Add matomo-package_update.patch to not show warning message when auto_update_enable es disable through package installation. OBS-URL: https://build.opensuse.org/request/show/850578 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=81 --- matomo-3.14.1.tar.gz | 3 --- matomo-4.0.0.tar.gz | 3 +++ matomo-README.SUSE | 4 ++++ matomo-package_update.patch | 15 +++++++++++++++ matomo.changes | 11 +++++++++++ matomo.spec | 15 +++++++++++---- 6 files changed, 44 insertions(+), 7 deletions(-) delete mode 100644 matomo-3.14.1.tar.gz create mode 100644 matomo-4.0.0.tar.gz create mode 100644 matomo-package_update.patch diff --git a/matomo-3.14.1.tar.gz b/matomo-3.14.1.tar.gz deleted file mode 100644 index ad85088..0000000 --- a/matomo-3.14.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63a3a36ee15893665232c24e2918786dffa8f73fe7026807381f8570d2d9e63e -size 16134429 diff --git a/matomo-4.0.0.tar.gz b/matomo-4.0.0.tar.gz new file mode 100644 index 0000000..6f28aef --- /dev/null +++ b/matomo-4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9db8a6c05db425319499bd34ba396e1669b5325e4c3415b0db63714bbe76cfa2 +size 14787629 diff --git a/matomo-README.SUSE b/matomo-README.SUSE index 3d4676f..6fecce6 100644 --- a/matomo-README.SUSE +++ b/matomo-README.SUSE @@ -59,3 +59,7 @@ For cron you must uncomment the line in /etc/cron.d/matomo-archive For systemd.timer you must start and enable matomo-archive.timer: ~# /usr/bin/systemctl enable --now matomo-archive.timer +g) Enable infile + - GRANT FILE ON *.* TO ''@'localhost' + - usermod -a -G www mysql + - systemctl restart mysql apache2 diff --git a/matomo-package_update.patch b/matomo-package_update.patch new file mode 100644 index 0000000..145ae2a --- /dev/null +++ b/matomo-package_update.patch @@ -0,0 +1,15 @@ +diff -Pdpru matomo.orig/plugins/CoreUpdater/Commands/Update.php matomo/plugins/CoreUpdater/Commands/Update.php +--- matomo.orig/plugins/CoreUpdater/Commands/Update.php 2020-11-23 20:20:18.000000000 +0100 ++++ matomo/plugins/CoreUpdater/Commands/Update.php 2020-11-24 14:16:58.087597130 +0100 +@@ -70,7 +70,11 @@ class Update extends ConsoleCommand + $this->writeSuccessMessage($output, array(Piwik::translate('CoreUpdater_DbUpgradeNotExecuted'))); + } + ++ // Only show if autoupdate is enabled. Don't show if update through distribution package update. ++ $enableAutoUpdate = (bool) Config::getInstance()->General['enable_auto_update']; ++ if ($enableAutoUpdate === true){ + $this->writeAlertMessageWhenCommandExecutedWithUnexpectedUser($output); ++ } + + + } catch(NoUpdatesFoundException $e) { diff --git a/matomo.changes b/matomo.changes index bb8ebe2..6d891f4 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 24 11:58:12 UTC 2020 - ecsos + +- Update to 4.0.0 + Too many changes to list here. See instead: + https://github.com/matomo-org/matomo/releases/tag/4.0.0 + +- Fix boo#1162178: + Add matomo-package_update.patch to not show warning message when + auto_update_enable es disable through package installation. + ------------------------------------------------------------------- Mon Oct 5 05:56:59 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index c6c91a0..a4462ef 100644 --- a/matomo.spec +++ b/matomo.spec @@ -32,7 +32,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 3.14.1 +Version: 4.0.0 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later @@ -48,6 +48,8 @@ Source12: %{name}-archive.timer Source13: %{name}.my.cnf Source14: %{name}-tmpfile.conf Source99: %{name}.rpmlintrc +# PATCH-FIX-OPENSUSE: Don't show wrong message with wrong owner of %%{ap_serverroot}/%%{name} when disable enable_auto_update through package installation. +Patch1: %{name}-package_update.patch BuildArch: noarch %if 0%{?suse_version} >= 1500 Requires(pre): user(%ap_usr) @@ -63,8 +65,10 @@ BuildRequires: mariadb BuildRequires: unzip BuildRequires: pkgconfig(systemd) Requires: apache2 +Requires: nodejs +Requires: python3 Requires: logrotate -Requires: mod_php_any >= 5.5.9 +Requires: mod_php_any >= 7.2.5 Requires: php-ctype Requires: php-curl Requires: php-dom @@ -97,6 +101,7 @@ strategy and online experience of visitors may be optimized. %prep %setup -q -n %{name} +%patch1 -p1 install -m644 %{SOURCE4} README.SUSE # remove unwanted files find . -type f "(" -name .htaccess -o -name .travis.sh -o -name .gitkeep ")" -delete @@ -104,6 +109,7 @@ find . -type f "(" -name .htaccess -o -name .travis.sh -o -name .gitkeep ")" -de 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' {} + +find . -type f -name "*.sh" -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|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. @@ -118,7 +124,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' 'config/global.ini.php' 'core/CliMulti/Output.php' +for file in console 'vendor/leafo/lessphp/plessc' 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' do size=$(ls -l $file | awk '{ print $5 }') checksum=$(md5sum $file | awk '{ print $1 }') @@ -228,7 +234,7 @@ fi %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/log-analytics/import_logs.py %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/clean-xhprof.sh %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/build-xhprof.sh -#%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/plugins/TestRunner/scripts/on_instance_launch.sh +#%%attr(0770,%%{ap_usr},%%{ap_grp}) %%{ap_serverroot}/%%{name}/plugins/TestRunner/scripts/on_instance_launch.sh %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/package.sh %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/lessify %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/plessc @@ -236,6 +242,7 @@ fi %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php %attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh +%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh %{ap_serverroot}/%{name}/* %changelog From b7d266bc8bfd25d0f3574eeac45dea2bc624d2f6fe4d7cc2fb48a47a29dfae7e Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 27 Nov 2020 12:21:17 +0000 Subject: [PATCH 02/11] Accepting request 851306 from home:ecsos:server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 4.0.1 * matomo-org/matomo - #16778 SEO Plugin broken - #16788 CLI Archive might not stop - #16786 No custom dimensions in Matomo 4.0.0 - #16798 Error upgrading db while upgrading to 4.0.0-b1 (session update fails) - #16804 Matomo 4.0.0 warns about “ExampleTheme requires Piwik <4.0.0-b1” * matomo-org/device-detector - #6443 Detect browsers: Slimjet, 7Star, MxNitro - #6444 Detect new brands: Starlight, GEOFOX, Verico, Tinmo, Matrix and Detect devices for existing brands: Asus, Sharp, Coolpad, Sony, OPPO, Lenovo, Philips, Vivo, Xiaomi, Manta Multimedia, NEC, Vernee, Karbonn, Krüger&Matz, RugGear, DEXP, Digma, MiXzo, Atom, Yu, Acer, Irbis, teXet, Telefunken, Onda, IconBIT, Polaroid, Doogee, Allview, BB Mobile, Touchmate, ArmPhone, Memup, Kazam, ZTE, Odys, Jinga, Ginzzu, iLife, Mobicel, Blu, Blaupunkt #6448 Detect Crazy Browser OBS-URL: https://build.opensuse.org/request/show/851306 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=82 --- matomo-4.0.0.tar.gz | 3 --- matomo-4.0.1.tar.gz | 3 +++ matomo.changes | 24 ++++++++++++++++++++++++ matomo.spec | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 matomo-4.0.0.tar.gz create mode 100644 matomo-4.0.1.tar.gz diff --git a/matomo-4.0.0.tar.gz b/matomo-4.0.0.tar.gz deleted file mode 100644 index 6f28aef..0000000 --- a/matomo-4.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9db8a6c05db425319499bd34ba396e1669b5325e4c3415b0db63714bbe76cfa2 -size 14787629 diff --git a/matomo-4.0.1.tar.gz b/matomo-4.0.1.tar.gz new file mode 100644 index 0000000..72553f5 --- /dev/null +++ b/matomo-4.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:774673ab7330f181eb1fdcedd4a29f1908b793ef19f5c5065c8f968b7f769906 +size 14786740 diff --git a/matomo.changes b/matomo.changes index 6d891f4..6a61204 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Nov 27 06:35:41 UTC 2020 - ecsos + +- Update to 4.0.1 + * matomo-org/matomo + - #16778 SEO Plugin broken + - #16788 CLI Archive might not stop + - #16786 No custom dimensions in Matomo 4.0.0 + - #16798 Error upgrading db while upgrading to 4.0.0-b1 + (session update fails) + - #16804 Matomo 4.0.0 warns about “ExampleTheme requires + Piwik <4.0.0-b1” + * matomo-org/device-detector + - #6443 Detect browsers: Slimjet, 7Star, MxNitro + - #6444 Detect new brands: Starlight, GEOFOX, Verico, Tinmo, + Matrix and Detect devices for existing brands: Asus, Sharp, + Coolpad, Sony, OPPO, Lenovo, Philips, Vivo, Xiaomi, + Manta Multimedia, NEC, Vernee, Karbonn, Krüger&Matz, RugGear, + DEXP, Digma, MiXzo, Atom, Yu, Acer, Irbis, teXet, Telefunken, + Onda, IconBIT, Polaroid, Doogee, Allview, BB Mobile, + Touchmate, ArmPhone, Memup, Kazam, ZTE, Odys, Jinga, Ginzzu, + iLife, Mobicel, Blu, Blaupunkt + #6448 Detect Crazy Browser + ------------------------------------------------------------------- Tue Nov 24 11:58:12 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index a4462ef..d39b939 100644 --- a/matomo.spec +++ b/matomo.spec @@ -32,7 +32,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.0.0 +Version: 4.0.1 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later From 9dce3b90e2f3ce9aa949511107246fa98e811a483e2a2c24fa64dbd0c0a92a5d Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Sat, 28 Nov 2020 09:23:40 +0000 Subject: [PATCH 03/11] Accepting request 851458 from home:ecsos:server - Update to 4.0.2 No changelog from upstream but you can see changes since 4.0.1 here: https://github.com/matomo-org/matomo/compare/4.0.1...4.0.2 OBS-URL: https://build.opensuse.org/request/show/851458 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=83 --- matomo-4.0.1.tar.gz | 3 --- matomo-4.0.2.tar.gz | 3 +++ matomo.changes | 7 +++++++ matomo.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 matomo-4.0.1.tar.gz create mode 100644 matomo-4.0.2.tar.gz diff --git a/matomo-4.0.1.tar.gz b/matomo-4.0.1.tar.gz deleted file mode 100644 index 72553f5..0000000 --- a/matomo-4.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:774673ab7330f181eb1fdcedd4a29f1908b793ef19f5c5065c8f968b7f769906 -size 14786740 diff --git a/matomo-4.0.2.tar.gz b/matomo-4.0.2.tar.gz new file mode 100644 index 0000000..ea6f9ab --- /dev/null +++ b/matomo-4.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b906133d785e62066dff6ee52aae3a5a3787ea2e706bb3440ad880ddb88264b5 +size 14787163 diff --git a/matomo.changes b/matomo.changes index 6a61204..d4a7b4f 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 28 09:15:51 UTC 2020 - ecsos + +- Update to 4.0.2 + No changelog from upstream but you can see changes since 4.0.1 + here: https://github.com/matomo-org/matomo/compare/4.0.1...4.0.2 + ------------------------------------------------------------------- Fri Nov 27 06:35:41 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index d39b939..32f7e72 100644 --- a/matomo.spec +++ b/matomo.spec @@ -32,7 +32,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.0.1 +Version: 4.0.2 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later From 85014c9d51a1533688b7c1de22ea0b934b4c2a76850f6d9ae5864b5fd80f3eec Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Wed, 2 Dec 2020 11:40:50 +0000 Subject: [PATCH 04/11] Accepting request 852594 from home:ecsos:server - Use apache-rpm-macros. OBS-URL: https://build.opensuse.org/request/show/852594 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=84 --- matomo-archive.cron | 4 +- matomo-archive.service | 2 +- matomo.changes | 5 ++ matomo.spec | 114 +++++++++++++++++++---------------------- 4 files changed, 60 insertions(+), 65 deletions(-) diff --git a/matomo-archive.cron b/matomo-archive.cron index ac64307..825e2e0 100644 --- a/matomo-archive.cron +++ b/matomo-archive.cron @@ -3,7 +3,7 @@ # # without CLI -#-5 * * * * wwwrun /usr/bin/php @ap_serverroot@/matomo/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log +#-5 * * * * wwwrun /usr/bin/php @apache_serverroot@/matomo/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log # with CLI --5 * * * * wwwrun /usr/bin/php @ap_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log +-5 * * * * wwwrun /usr/bin/php @apache_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log diff --git a/matomo-archive.service b/matomo-archive.service index 7414812..8676605 100644 --- a/matomo-archive.service +++ b/matomo-archive.service @@ -5,6 +5,6 @@ Description=Auto-Archiving of matomo Reports Type=oneshot User=wwwrun Group=www -ExecStart=/bin/bash -ce "/usr/bin/php @ap_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1" +ExecStart=/bin/bash -ce "/usr/bin/php @apache_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1" #StandardOutput=file:/var/log/matomo/matomo-archive.log #StandardError=file:/var/log/matomo/matomo-archive.log diff --git a/matomo.changes b/matomo.changes index d4a7b4f..21111a8 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 2 10:46:45 UTC 2020 - ecsos + +- Use apache-rpm-macros. + ------------------------------------------------------------------- Sat Nov 28 09:15:51 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index 32f7e72..a681c5a 100644 --- a/matomo.spec +++ b/matomo.spec @@ -18,17 +18,6 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines -%define apxs %{_sbindir}/apxs2 -%define ap_sysconfdir %(%{apxs} -q SYSCONFDIR) -%define ap_serverroot %(%{apxs} -q PREFIX) - -%if 0%{?suse_version} -%define ap_usr wwwrun -%define ap_grp www -%else -%define ap_usr nobody -%define ap_grp nogroup -%endif %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo @@ -48,16 +37,17 @@ Source12: %{name}-archive.timer Source13: %{name}.my.cnf Source14: %{name}-tmpfile.conf Source99: %{name}.rpmlintrc -# PATCH-FIX-OPENSUSE: Don't show wrong message with wrong owner of %%{ap_serverroot}/%%{name} when disable enable_auto_update through package installation. +# PATCH-FIX-OPENSUSE: Don't show wrong message with wrong owner of %%{apache_serverroot}/%%{name} when disable enable_auto_update through package installation. Patch1: %{name}-package_update.patch BuildArch: noarch %if 0%{?suse_version} >= 1500 -Requires(pre): user(%ap_usr) -Requires(pre): group(%ap_grp) +Requires(pre): user(wwwrun) +Requires(pre): group(www) %else Requires(pre): aaa_base %endif BuildRequires: apache2-devel +BuildRequires: apache-rpm-macros BuildRequires: cron BuildRequires: fdupes BuildRequires: logrotate @@ -137,8 +127,8 @@ done %install # make directories -install -d -m0755 %{buildroot}/%{ap_serverroot}/%{name} -install -d -m0755 %{buildroot}/%{ap_serverroot}/%{name}/tmp +install -d -m0755 %{buildroot}/%{apache_serverroot}/%{name} +install -d -m0755 %{buildroot}/%{apache_serverroot}/%{name}/tmp install -d -m0755 %{buildroot}/%{_sysconfdir}/%{name} install -d -m0755 %{buildroot}/%{_defaultdocdir}/%{name} # copy src from build to buildroot @@ -147,20 +137,20 @@ mv LEGALNOTICE %{buildroot}/%{_defaultdocdir}/%{name} mv LICENSE %{buildroot}/%{_defaultdocdir}/%{name} mv "misc/How to install Matomo.html" %{buildroot}/%{_defaultdocdir}/%{name} mv *md %{buildroot}/%{_defaultdocdir}/%{name} -cp -dR * %{buildroot}/%{ap_serverroot}/%{name} +cp -dR * %{buildroot}/%{apache_serverroot}/%{name} # install matomo.conf to apache conf.d -mkdir -p %{buildroot}/%{ap_sysconfdir}/conf.d -sed -e 's|__matomo_web__|%{ap_serverroot}/%{name}|g' \ +mkdir -p %{buildroot}/%{apache_sysconfdir}/conf.d +sed -e 's|__matomo_web__|%{apache_serverroot}/%{name}|g' \ -e 's|__matomo_conf__|%{_sysconfdir}/%{name}|g' \ -e 's|__matomo_log__|/var/log/%{name}|g' \ - %{SOURCE2} > %{buildroot}/%{ap_sysconfdir}/conf.d/%{name}.conf + %{SOURCE2} > %{buildroot}/%{apache_sysconfdir}/conf.d/%{name}.conf # install logrotate install -D -m0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # move config to etc/matomo and make symlink -mv %{buildroot}/%{ap_serverroot}/%{name}/config/* \ +mv %{buildroot}/%{apache_serverroot}/%{name}/config/* \ %{buildroot}/%{_sysconfdir}/%{name} -rm -d %{buildroot}/%{ap_serverroot}/%{name}/config -ln -s %{_sysconfdir}/%{name} %{buildroot}/%{ap_serverroot}/%{name}/config +rm -d %{buildroot}/%{apache_serverroot}/%{name}/config +ln -s %{_sysconfdir}/%{name} %{buildroot}/%{apache_serverroot}/%{name}/config # install cronscript and systemd-timer install -d -m 0755 %{buildroot}/%{_sysconfdir}/cron.d install -d -m 0755 %{buildroot}/var/log/%{name} @@ -168,8 +158,8 @@ install -D -m 0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/cron.d/%{name}-archiv install -D -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-archive.service install -D -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-archive.timer install -D -m 0644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/%{name}.conf -sed -i -e 's|@ap_serverroot@|%{ap_serverroot}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive -sed -i -e 's|@ap_serverroot@|%{ap_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service +sed -i -e 's|@apache_serverroot@|%{apache_serverroot}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive +sed -i -e 's|@apache_serverroot@|%{apache_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service # install changes for mariadb install -D -m0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/my.cnf.d/%{name}.my.cnf @@ -181,17 +171,17 @@ install -D -m0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/my.cnf.d/%{name}.my.cn %post # BSC#1154324 -# # # chown -R %{ap_usr}:%{ap_grp} %{ap_serverroot}/%{name} +# # # chown -R %{apache_user}:%{apache_group} %{apache_serverroot}/%{name} %service_add_post matomo-archive.timer matomo-archive.service apache2.service %tmpfiles_create %{_tmpfilesdir}/%{name}.conf if [ $1 -gt 1 ]; then # Update matomo if this is an upgrade $1 == 2 echo "matomo: Update matomo:core..." - su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console core:update --yes" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'" || : + su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'" || : + su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'" || : + su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console core:update --yes" || : + su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'" || : + su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'" || : : fi @@ -205,44 +195,44 @@ fi %defattr(-,root,root,-) %dir %{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name}/* -%config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf +%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/cron.d/%{name}-archive %config(noreplace) %{_sysconfdir}/my.cnf.d/%{name}.my.cnf %{_unitdir}/%{name}-archive.service %{_unitdir}/%{name}-archive.timer %{_tmpfilesdir}/%{name}.conf -%dir %attr(0750,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name} -%dir %attr(0750,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/environment -%attr(0640,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/*.php -%attr(0640,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/environment/*.php -%ghost %attr(0750,%{ap_usr},%{ap_grp}) /run/%{name}_sessions +%dir %attr(0750,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name} +%dir %attr(0750,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/environment +%attr(0640,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/*.php +%attr(0640,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/environment/*.php +%ghost %attr(0750,%{apache_user},%{apache_group}) /run/%{name}_sessions %defattr(644,root,root,755) -%dir %{ap_serverroot}/%{name} -%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/js -%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc -%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/plugins -%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/tmp -%dir %attr(0750,%{ap_usr},%{ap_grp}) /var/log/%{name} -%config(noreplace) %attr(600,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/*php +%dir %{apache_serverroot}/%{name} +%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/js +%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc +%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/plugins +%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/tmp +%dir %attr(0750,%{apache_user},%{apache_group}) /var/log/%{name} +%config(noreplace) %attr(600,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/*php %{_sysconfdir}/%{name}/environment/*php -%attr(0644,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/matomo.js -%attr(0644,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/piwik.js -%attr(0644,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/js/piwik.min.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 -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/clean-xhprof.sh -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/build-xhprof.sh -#%%attr(0770,%%{ap_usr},%%{ap_grp}) %%{ap_serverroot}/%%{name}/plugins/TestRunner/scripts/on_instance_launch.sh -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/package.sh -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/lessify -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/plessc -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/pear/archive_tar/sync-php4 -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh -%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh -%{ap_serverroot}/%{name}/* +%attr(0644,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/matomo.js +%attr(0644,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/piwik.js +%attr(0644,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/js/piwik.min.js +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/console +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/cron/archive.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/log-analytics/import_logs.py +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/clean-xhprof.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/build-xhprof.sh +#%%attr(0770,%%{apache_user},%%{apache_group}) %%{apache_serverroot}/%%{name}/plugins/TestRunner/scripts/on_instance_launch.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/leafo/lessphp/package.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/leafo/lessphp/lessify +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/leafo/lessphp/plessc +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/pear/archive_tar/sync-php4 +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh +%{apache_serverroot}/%{name}/* %changelog From ba553761c43c5b88f3e146f4679cf56d157371f2e8c9540c6dde41b08044bccd Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 4 Dec 2020 07:36:18 +0000 Subject: [PATCH 05/11] Accepting request 853045 from home:ecsos:server - Update to 4.0.4 - No changelog from upstream. OBS-URL: https://build.opensuse.org/request/show/853045 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=85 --- matomo-4.0.2.tar.gz | 3 --- matomo-4.0.4.tar.gz | 3 +++ matomo.changes | 6 ++++++ matomo.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 matomo-4.0.2.tar.gz create mode 100644 matomo-4.0.4.tar.gz diff --git a/matomo-4.0.2.tar.gz b/matomo-4.0.2.tar.gz deleted file mode 100644 index ea6f9ab..0000000 --- a/matomo-4.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b906133d785e62066dff6ee52aae3a5a3787ea2e706bb3440ad880ddb88264b5 -size 14787163 diff --git a/matomo-4.0.4.tar.gz b/matomo-4.0.4.tar.gz new file mode 100644 index 0000000..dd39497 --- /dev/null +++ b/matomo-4.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d59147312c703210ca02922e0d5e8d2abd88d5d6603f103353cd9840b54618c +size 14792213 diff --git a/matomo.changes b/matomo.changes index 21111a8..f48a1a6 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 4 06:54:37 UTC 2020 - ecsos + +- Update to 4.0.4 + - No changelog from upstream. + ------------------------------------------------------------------- Wed Dec 2 10:46:45 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index a681c5a..da994d9 100644 --- a/matomo.spec +++ b/matomo.spec @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.0.2 +Version: 4.0.4 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later From 1e6c73f8b055f28483d87c331aa6ee8c4d9f7a5f95857d338ef22804c0b5c700 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Wed, 9 Dec 2020 07:21:52 +0000 Subject: [PATCH 06/11] Accepting request 854191 from home:ecsos:server - Update to 4.0.5 - Avoid inserting duplicates in invalidation table to reduce IO. - Limit to given sites to not select too much. - fix build - tweaks to duplicate checking query - more pr feedback - fix cron archive test OBS-URL: https://build.opensuse.org/request/show/854191 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=86 --- matomo-4.0.4.tar.gz | 3 --- matomo-4.0.5.tar.gz | 3 +++ matomo.changes | 11 +++++++++++ matomo.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 matomo-4.0.4.tar.gz create mode 100644 matomo-4.0.5.tar.gz diff --git a/matomo-4.0.4.tar.gz b/matomo-4.0.4.tar.gz deleted file mode 100644 index dd39497..0000000 --- a/matomo-4.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d59147312c703210ca02922e0d5e8d2abd88d5d6603f103353cd9840b54618c -size 14792213 diff --git a/matomo-4.0.5.tar.gz b/matomo-4.0.5.tar.gz new file mode 100644 index 0000000..58195b0 --- /dev/null +++ b/matomo-4.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bf1983fc70322f28efb983196ede47b0cffb79ef657cc4861f244365b76fd31 +size 14798907 diff --git a/matomo.changes b/matomo.changes index f48a1a6..dbb652e 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 9 06:34:40 UTC 2020 - ecsos + +- Update to 4.0.5 + - Avoid inserting duplicates in invalidation table to reduce IO. + - Limit to given sites to not select too much. + - fix build + - tweaks to duplicate checking query + - more pr feedback + - fix cron archive test + ------------------------------------------------------------------- Fri Dec 4 06:54:37 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index da994d9..60c8c65 100644 --- a/matomo.spec +++ b/matomo.spec @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.0.4 +Version: 4.0.5 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later From f490eea24a9d2a5a666f1ea08536d4f3f046218460fd767c97211890bab455e0 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Mon, 14 Dec 2020 10:42:45 +0000 Subject: [PATCH 07/11] Accepting request 855711 from home:ecsos:server - Put apache configuration files in separate subpackages. - Update cron, service, lograte files with apache macros. OBS-URL: https://build.opensuse.org/request/show/855711 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=87 --- matomo-archive.cron | 4 ++-- matomo-archive.service | 6 +++--- matomo.changes | 6 ++++++ matomo.logrotate | 2 +- matomo.spec | 39 +++++++++++++++++++++++++++------------ 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/matomo-archive.cron b/matomo-archive.cron index 825e2e0..d69d9e4 100644 --- a/matomo-archive.cron +++ b/matomo-archive.cron @@ -3,7 +3,7 @@ # # without CLI -#-5 * * * * wwwrun /usr/bin/php @apache_serverroot@/matomo/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log +#-5 * * * * @APACHE_USER@ /usr/bin/php @APACHE_SERVERROOT@/matomo/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log # with CLI --5 * * * * wwwrun /usr/bin/php @apache_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log +-5 * * * * @APACHE_USER@ /usr/bin/php @APACHE_SERVERROOT@/matomo/console core:archive --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log diff --git a/matomo-archive.service b/matomo-archive.service index 8676605..f4870fc 100644 --- a/matomo-archive.service +++ b/matomo-archive.service @@ -3,8 +3,8 @@ Description=Auto-Archiving of matomo Reports [Service] Type=oneshot -User=wwwrun -Group=www -ExecStart=/bin/bash -ce "/usr/bin/php @apache_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1" +User=@APACHE_USER@ +Group=@APACHE_GROUP@ +ExecStart=/bin/bash -ce "/usr/bin/php @APACHE_SERVERROOT@/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1" #StandardOutput=file:/var/log/matomo/matomo-archive.log #StandardError=file:/var/log/matomo/matomo-archive.log diff --git a/matomo.changes b/matomo.changes index dbb652e..33f4d03 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 14 10:02:54 UTC 2020 - ecsos + +- Put apache configuration files in separate subpackages. +- Update cron, service, lograte files with apache macros. + ------------------------------------------------------------------- Wed Dec 9 06:34:40 UTC 2020 - ecsos diff --git a/matomo.logrotate b/matomo.logrotate index 5d90364..b9a5df8 100644 --- a/matomo.logrotate +++ b/matomo.logrotate @@ -1,6 +1,6 @@ /var/log/matomo/matomo-archive.log { -su wwwrun www +su @APACHE_USER@ @APACHE_GROUP@ rotate 30 daily missingok diff --git a/matomo.spec b/matomo.spec index 60c8c65..74a99db 100644 --- a/matomo.spec +++ b/matomo.spec @@ -46,7 +46,6 @@ Requires(pre): group(www) %else Requires(pre): aaa_base %endif -BuildRequires: apache2-devel BuildRequires: apache-rpm-macros BuildRequires: cron BuildRequires: fdupes @@ -54,11 +53,9 @@ BuildRequires: logrotate BuildRequires: mariadb BuildRequires: unzip BuildRequires: pkgconfig(systemd) -Requires: apache2 Requires: nodejs Requires: python3 Requires: logrotate -Requires: mod_php_any >= 7.2.5 Requires: php-ctype Requires: php-curl Requires: php-dom @@ -79,7 +76,6 @@ Requires(pre): php %{?systemd_requires} Recommends: php-geoip Recommends: php-openssl -Recommends: apache2-mod_geoip Recommends: mariadb Recommends: cron Conflicts: piwik @@ -89,6 +85,18 @@ Matomo, formerly Piwik, is a web analytics platform that gives insights into a website's visitors and marketing campaigns, so the strategy and online experience of visitors may be optimized. +%package apache +Summary: Apache configuration for %{name} +Group: Productivity/Networking/Web/Utilities +BuildRequires: apache2 +Requires: apache2 +Requires: mod_php_any >= 7.2.5 +Recommends: apache2-mod_geoip +Supplements: packageand(apache2:%name) + +%description apache +This subpackage contains the Apache configuration files + %prep %setup -q -n %{name} %patch1 -p1 @@ -146,6 +154,8 @@ sed -e 's|__matomo_web__|%{apache_serverroot}/%{name}|g' \ %{SOURCE2} > %{buildroot}/%{apache_sysconfdir}/conf.d/%{name}.conf # install logrotate install -D -m0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +sed -i -e 's|@APACHE_USER@|%{apache_user}|g' %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} +sed -i -e 's|@APACHE_GROUP@|%{apache_group}|g' %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # move config to etc/matomo and make symlink mv %{buildroot}/%{apache_serverroot}/%{name}/config/* \ %{buildroot}/%{_sysconfdir}/%{name} @@ -158,8 +168,11 @@ install -D -m 0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/cron.d/%{name}-archiv install -D -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-archive.service install -D -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-archive.timer install -D -m 0644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/%{name}.conf -sed -i -e 's|@apache_serverroot@|%{apache_serverroot}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive -sed -i -e 's|@apache_serverroot@|%{apache_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service +sed -i -e 's|@APACHE_USER@|%{apache_user}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive +sed -i -e 's|@APACHE_SERVERROOT@|%{apache_serverroot}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive +sed -i -e 's|@APACHE_USER@|%{apache_user}|g' %{buildroot}%{_unitdir}/%{name}-archive.service +sed -i -e 's|@APACHE_GROUP@|%{apache_group}|g' %{buildroot}%{_unitdir}/%{name}-archive.service +sed -i -e 's|@APACHE_SERVERROOT@|%{apache_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service # install changes for mariadb install -D -m0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/my.cnf.d/%{name}.my.cnf @@ -177,11 +190,11 @@ install -D -m0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/my.cnf.d/%{name}.my.cn if [ $1 -gt 1 ]; then # Update matomo if this is an upgrade $1 == 2 echo "matomo: Update matomo:core..." - su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console core:update --yes" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'" || : - su wwwrun -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'" || : + su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'" || : + su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'" || : + su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console core:update --yes" || : + su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'" || : + su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'" || : : fi @@ -195,7 +208,6 @@ fi %defattr(-,root,root,-) %dir %{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name}/* -%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/cron.d/%{name}-archive %config(noreplace) %{_sysconfdir}/my.cnf.d/%{name}.my.cnf @@ -235,4 +247,7 @@ fi %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh %{apache_serverroot}/%{name}/* +%files apache +%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf + %changelog From 5d14c04b5d7b96348f839a9d6ba0dd50f4736c47d020e209245e768531a79047 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Tue, 22 Dec 2020 09:15:51 +0000 Subject: [PATCH 08/11] Accepting request 858078 from home:ecsos:server - Update to 4.1.0 - No changelog from upstream at this time. OBS-URL: https://build.opensuse.org/request/show/858078 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=88 --- matomo-4.0.5.tar.gz | 3 --- matomo-4.1.0.tar.gz | 3 +++ matomo.changes | 6 ++++++ matomo.spec | 13 ++++++------- 4 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 matomo-4.0.5.tar.gz create mode 100644 matomo-4.1.0.tar.gz diff --git a/matomo-4.0.5.tar.gz b/matomo-4.0.5.tar.gz deleted file mode 100644 index 58195b0..0000000 --- a/matomo-4.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bf1983fc70322f28efb983196ede47b0cffb79ef657cc4861f244365b76fd31 -size 14798907 diff --git a/matomo-4.1.0.tar.gz b/matomo-4.1.0.tar.gz new file mode 100644 index 0000000..33e7977 --- /dev/null +++ b/matomo-4.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07dbcc1bde8af5e4ce3249190739ab668e90b2c5df012d5d8002713a5ea5c5c1 +size 14720086 diff --git a/matomo.changes b/matomo.changes index 33f4d03..c440c62 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 22 08:24:09 UTC 2020 - ecsos + +- Update to 4.1.0 + - No changelog from upstream at this time. + ------------------------------------------------------------------- Mon Dec 14 10:02:54 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index 74a99db..9d3fa07 100644 --- a/matomo.spec +++ b/matomo.spec @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.0.5 +Version: 4.1.0 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later @@ -122,13 +122,15 @@ 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' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' +for file in console 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' 'vendor/wikimedia/less.php/bin/lessc' do size=$(ls -l $file | awk '{ print $5 }') checksum=$(md5sum $file | awk '{ print $1 }') file2=$(echo "$file" | sed 's/\//\\\//g') sed -i "/\W\"$file2\"\W/c \"$file\" => array(\"$size\", \"$checksum\")," config/manifest.inc.php done +# matomo integrity check don't want this file +rm vendor/bin/lessc %build # nothing to build @@ -236,15 +238,12 @@ fi %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/log-analytics/import_logs.py %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/clean-xhprof.sh %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/build-xhprof.sh -#%%attr(0770,%%{apache_user},%%{apache_group}) %%{apache_serverroot}/%%{name}/plugins/TestRunner/scripts/on_instance_launch.sh -%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/leafo/lessphp/package.sh -%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/leafo/lessphp/lessify -%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/leafo/lessphp/plessc %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/pear/archive_tar/sync-php4 %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php %attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh -%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh +%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/wikimedia/less.php/bin/lessc %{apache_serverroot}/%{name}/* %files apache From 441c6e5307b4186ea737ebe3bde4d9c590a02f257990b343eb8f083b443208a3 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 15 Jan 2021 07:02:54 +0000 Subject: [PATCH 09/11] Accepting request 863235 from home:ecsos:server - Update to 4.1.1 To many changes, so look at: https://github.com/matomo-org/matomo/releases/tag/4.1.1 OBS-URL: https://build.opensuse.org/request/show/863235 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=89 --- matomo-4.1.0.tar.gz | 3 --- matomo-4.1.1.tar.gz | 3 +++ matomo.changes | 7 +++++++ matomo.spec | 4 +--- 4 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 matomo-4.1.0.tar.gz create mode 100644 matomo-4.1.1.tar.gz diff --git a/matomo-4.1.0.tar.gz b/matomo-4.1.0.tar.gz deleted file mode 100644 index 33e7977..0000000 --- a/matomo-4.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07dbcc1bde8af5e4ce3249190739ab668e90b2c5df012d5d8002713a5ea5c5c1 -size 14720086 diff --git a/matomo-4.1.1.tar.gz b/matomo-4.1.1.tar.gz new file mode 100644 index 0000000..95c93cc --- /dev/null +++ b/matomo-4.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af772e33d889c7446e3eaca1f5fc57b07d48707f4da85f872f70a0e1fdf8d298 +size 14739359 diff --git a/matomo.changes b/matomo.changes index c440c62..787943a 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 15 06:42:06 UTC 2021 - ecsos + +- Update to 4.1.1 + To many changes, so look at: + https://github.com/matomo-org/matomo/releases/tag/4.1.1 + ------------------------------------------------------------------- Tue Dec 22 08:24:09 UTC 2020 - ecsos diff --git a/matomo.spec b/matomo.spec index 9d3fa07..e2d75bf 100644 --- a/matomo.spec +++ b/matomo.spec @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.1.0 +Version: 4.1.1 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later @@ -129,8 +129,6 @@ do file2=$(echo "$file" | sed 's/\//\\\//g') sed -i "/\W\"$file2\"\W/c \"$file\" => array(\"$size\", \"$checksum\")," config/manifest.inc.php done -# matomo integrity check don't want this file -rm vendor/bin/lessc %build # nothing to build From c73706b4ddefad06caa797d501821f2e034fde01d77f0a8e2cca19b497c5711c Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Mon, 22 Feb 2021 10:46:01 +0000 Subject: [PATCH 10/11] Accepting request 874284 from home:ecsos:server - Update to 4.2.0 To many changes, so look at: https://github.com/matomo-org/matomo/releases/tag/4.2.0 OBS-URL: https://build.opensuse.org/request/show/874284 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=90 --- matomo-4.1.1.tar.gz | 3 --- matomo-4.2.0.tar.gz | 3 +++ matomo.changes | 7 +++++++ matomo.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 matomo-4.1.1.tar.gz create mode 100644 matomo-4.2.0.tar.gz diff --git a/matomo-4.1.1.tar.gz b/matomo-4.1.1.tar.gz deleted file mode 100644 index 95c93cc..0000000 --- a/matomo-4.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af772e33d889c7446e3eaca1f5fc57b07d48707f4da85f872f70a0e1fdf8d298 -size 14739359 diff --git a/matomo-4.2.0.tar.gz b/matomo-4.2.0.tar.gz new file mode 100644 index 0000000..a1c0e25 --- /dev/null +++ b/matomo-4.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e64f9d11434e7f4507ec1135587d164d24fc8a25a05eaf7545c479766fb13e4 +size 14811334 diff --git a/matomo.changes b/matomo.changes index 787943a..00d3b8c 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 22 10:22:36 UTC 2021 - ecsos + +- Update to 4.2.0 + To many changes, so look at: + https://github.com/matomo-org/matomo/releases/tag/4.2.0 + ------------------------------------------------------------------- Fri Jan 15 06:42:06 UTC 2021 - ecsos diff --git a/matomo.spec b/matomo.spec index e2d75bf..f7b9dc9 100644 --- a/matomo.spec +++ b/matomo.spec @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.1.1 +Version: 4.2.0 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later From cee7ce6293a147aeea0194c862c266ef5b40777cd4233eef6cbca4dba4d6d4cb Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Mon, 1 Mar 2021 10:18:28 +0000 Subject: [PATCH 11/11] Accepting request 875940 from home:ecsos:server - Update to 4.2.1 To many changes, so look at: https://github.com/matomo-org/matomo/releases/tag/4.2.1 OBS-URL: https://build.opensuse.org/request/show/875940 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=91 --- matomo-4.2.0.tar.gz | 3 --- matomo-4.2.1.tar.gz | 3 +++ matomo.changes | 7 +++++++ matomo.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 matomo-4.2.0.tar.gz create mode 100644 matomo-4.2.1.tar.gz diff --git a/matomo-4.2.0.tar.gz b/matomo-4.2.0.tar.gz deleted file mode 100644 index a1c0e25..0000000 --- a/matomo-4.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e64f9d11434e7f4507ec1135587d164d24fc8a25a05eaf7545c479766fb13e4 -size 14811334 diff --git a/matomo-4.2.1.tar.gz b/matomo-4.2.1.tar.gz new file mode 100644 index 0000000..9a02a31 --- /dev/null +++ b/matomo-4.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3ea7572c5b42f2636da89b9c15dd7ae16da1d06dab0cea2ed93304a960277ac +size 14839954 diff --git a/matomo.changes b/matomo.changes index 00d3b8c..5e6c827 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 1 08:24:34 UTC 2021 - ecsos + +- Update to 4.2.1 + To many changes, so look at: + https://github.com/matomo-org/matomo/releases/tag/4.2.1 + ------------------------------------------------------------------- Mon Feb 22 10:22:36 UTC 2021 - ecsos diff --git a/matomo.spec b/matomo.spec index f7b9dc9..05ff834 100644 --- a/matomo.spec +++ b/matomo.spec @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.2.0 +Version: 4.2.1 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later