summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-16 07:50:26 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-16 09:08:24 +0000
commit6c3a3390c34e85a899db4f9cd157682f7e12aca2 (patch)
treed4492a847827d1f3c1d1e33f76670bc7fa048357
parentAdding upstream version 3.4.0. (diff)
downloadmatomo-6c3a3390c34e85a899db4f9cd157682f7e12aca2.zip
matomo-6c3a3390c34e85a899db4f9cd157682f7e12aca2.tar.xz
Releasing progress-inux version 3.4.0-0+dschinn1.progress-linux/3.4.0-0+dschinn1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog5
-rw-r--r--debian/compat1
-rw-r--r--debian/control34
-rw-r--r--debian/copyright30
-rw-r--r--debian/matomo.README.Debian14
-rwxr-xr-xdebian/matomo.cron.hourly10
-rwxr-xr-xdebian/matomo.postinst59
-rwxr-xr-xdebian/matomo.postrm22
-rw-r--r--debian/patches/progress-linux/0001-file-integrity-check.patch30
-rw-r--r--debian/patches/progress-linux/0002-update-check.patch21
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules22
-rw-r--r--debian/source/format1
-rw-r--r--debian/source/local-options1
-rw-r--r--piwik/plugins/Diagnostics/config/config.php1
15 files changed, 252 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..3360e5d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+matomo (3.4.0-0+dschinn1) dschinn-backports-extras; urgency=low
+
+ * Initial upload to dschinn-backports-extras
+
+ -- David Kunz <david.kunz@progress-linux.org> Thu, 03 May 2018 10:27:32 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b4de394
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..4f81e66
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,34 @@
+Source: matomo
+Section: non-free/web
+Priority: optional
+Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
+XSBC-Uploaders:
+ Daniel Baumann <daniel.baumann@progress-linux.org>,
+ David Kunz <david.kunz@progress-linux.org>,
+Bugs: mailto:maintainers@lists.progress-linux.org
+Build-Depends:
+ debhelper (>= 11),
+Standards-Version: 4.1.4
+Homepage: https://matomo.org
+Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-extras/packages/matomo
+Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-extras/packages/matomo
+
+Package: matomo
+Architecture: all
+Depends:
+ httpd | apache2,
+ php,
+ php-gd,
+ php-mbstring,
+ php-mysql,
+ php-xml,
+ ${misc:Depends},
+Recommends:
+ mariadb-server,
+Suggests:
+ geoip-database,
+ php-geoip,
+Description: web analytics platform
+ Matomo is a web analytics application that runs on a webserver. It tracks
+ online visits to one or more websites and displays reports on these visits for
+ analysis.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..3c8016a
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,30 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Matomo
+Upstream-Contact: Matomo Team <hello@matomo.org>
+Source: https://builds.matomo.org
+
+Files: *
+Copyright: 2014-2018 Matthieu Aubry <matt@matomo.org>
+License: GPL-3+
+
+Files: debian/*
+Copyright: 2018 Daniel Baumann <daniel.baumann@progress-linux.org>
+ 2018 David Kunz <david.kunz@progress-linux.org>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The full text of the GNU General Public License version 3
+ can be found in the file /usr/share/common-licenses/GPL-3.
diff --git a/debian/matomo.README.Debian b/debian/matomo.README.Debian
new file mode 100644
index 0000000..7c3b539
--- /dev/null
+++ b/debian/matomo.README.Debian
@@ -0,0 +1,14 @@
+matomo for Debian
+-----------------
+
+ * plugin packages (matomo-plugin-*) install to /usr/lib/matomo/plugins, all
+ files are owned root:root.
+
+ * matomo shows an error message in the webfrontend when trying to install a
+ plugin in the marketplace that was previously already installed through a
+ package.
+
+ * to get rid of the error message, remove the following file:
+ /var/lib/matomo/tmp/cache/tracker/piwikcache_marketplace.api.*.plugins.${PLUGIN}.info.*.php
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org> Tue, 15 May 2018 12:56:19 +0200
diff --git a/debian/matomo.cron.hourly b/debian/matomo.cron.hourly
new file mode 100755
index 0000000..a93a568
--- /dev/null
+++ b/debian/matomo.cron.hourly
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -e /usr/share/matomo/console ] || [ ! -e /usr/bin/php7.0 ]
+then
+ exit 0
+fi
+
+/usr/bin/php7.0 /usr/share/matomo/console core:archive --quiet --force-all-websites --force-all-periods=7200
diff --git a/debian/matomo.postinst b/debian/matomo.postinst
new file mode 100755
index 0000000..edab9ad
--- /dev/null
+++ b/debian/matomo.postinst
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ configure)
+ for DIRECTORY in /var/lib/matomo /var/lib/matomo/plugins /var/lib/matomo/tmp
+ do
+ if [ ! -e "${DIRECTORY}" ]
+ then
+ mkdir -p "${DIRECTORY}"
+ chown -R www-data:www-data "${DIRECTORY}"
+ fi
+ done
+
+ if [ ! -e /var/lib/matomo/piwik.js ]
+ then
+ cp /usr/lib/matomo/piwik.js /var/lib/matomo/piwik.js
+ chown www-data:www-data /var/lib/matomo/piwik.js
+ fi
+
+ if [ ! -e /var/lib/matomo/config ]
+ then
+ cp -a /usr/lib/matomo/config /var/lib/matomo/config
+ chown -R www-data:www-data /var/lib/matomo/config
+ fi
+
+ for PLUGIN in $(ls /usr/lib/matomo/plugins)
+ do
+ if dpkg-statoverride --list "/var/lib/matomo/plugins/${PLUGIN}" > /dev/null 2>&1
+ then
+ continue
+ fi
+
+ if [ -L "/var/lib/matomo/plugins/${PLUGIN}" ]
+ then
+ rm -f "/var/lib/matomo/plugins/${PLUGIN}"
+ fi
+
+ if [ ! -e "/var/lib/matomo/plugins/${PLUGIN}" ]
+ then
+ ln -s "/usr/lib/matomo/plugins/${PLUGIN}" "/var/lib/matomo/plugins/${PLUGIN}"
+ fi
+ done
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/matomo.postrm b/debian/matomo.postrm
new file mode 100755
index 0000000..a5e7ca0
--- /dev/null
+++ b/debian/matomo.postrm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+ remove|purge)
+ rm -rf /var/lib/matomo
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/patches/progress-linux/0001-file-integrity-check.patch b/debian/patches/progress-linux/0001-file-integrity-check.patch
new file mode 100644
index 0000000..6b5de24
--- /dev/null
+++ b/debian/patches/progress-linux/0001-file-integrity-check.patch
@@ -0,0 +1,30 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Disabling file integrity check.
+
+diff -Naurp matomo.orig/piwik/plugins/CoreUpdater/Controller.php matomo/piwik/plugins/CoreUpdater/Controller.php
+--- matomo.orig/piwik/plugins/CoreUpdater/Controller.php
++++ matomo/piwik/plugins/CoreUpdater/Controller.php
+@@ -14,7 +14,6 @@ use Piwik\Common;
+ use Piwik\Config;
+ use Piwik\DbHelper;
+ use Piwik\Filechecks;
+-use Piwik\FileIntegrity;
+ use Piwik\Filesystem;
+ use Piwik\Http;
+ use Piwik\Option;
+@@ -313,15 +312,6 @@ class Controller extends \Piwik\Plugin\C
+ }
+ }
+
+- // check file integrity
+- list($success, $messages) = FileIntegrity::getFileIntegrityInformation();
+-
+- if (!$success) {
+- $this->warningMessages[] = Piwik::translate('General_FileIntegrityWarning');
+- }
+- if (count($messages) > 0) {
+- $this->warningMessages = array_merge($this->warningMessages, $messages);
+- }
+ Filesystem::deleteAllCacheOnUpdate();
+
+ sort($dimensionsToUpdate);
diff --git a/debian/patches/progress-linux/0002-update-check.patch b/debian/patches/progress-linux/0002-update-check.patch
new file mode 100644
index 0000000..0d20732
--- /dev/null
+++ b/debian/patches/progress-linux/0002-update-check.patch
@@ -0,0 +1,21 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Disabling update check.
+
+diff -Naurp matomo.orig/piwik/plugins/CoreHome/templates/_headerMessage.twig matomo/piwik/plugins/CoreHome/templates/_headerMessage.twig
+--- matomo.orig/piwik/plugins/CoreHome/templates/_headerMessage.twig
++++ matomo/piwik/plugins/CoreHome/templates/_headerMessage.twig
+@@ -3,6 +3,8 @@
+ {% set test_piwikUrl='https://demo.matomo.org/' %}
+ {% set isPiwikDemo %}{{ piwikUrl == 'http://demo.matomo.org/' or piwikUrl == 'https://demo.matomo.org/' }}{% endset %}
+
++{% if isPiwikDemo %}
++
+ {% set updateCheck %}
+ <span id="updateCheckLinkContainer">
+ <span class="icon icon-fixed icon-reload"></span>
+@@ -50,3 +52,5 @@
+ {% else %}
+ <span class="icon icon-arrowup"></span>
+ {% endif %}
++
++{% endif %}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..01ba228
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+progress-linux/0001-file-integrity-check.patch
+progress-linux/0002-update-check.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..d3da95a
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+%:
+ dh ${@}
+
+override_dh_auto_install:
+ mkdir -p debian/matomo/usr/share
+ cp -a piwik debian/matomo/usr/share/matomo
+
+ # moving files for read-write access
+ mkdir -p debian/matomo/usr/lib/matomo
+
+ mv debian/matomo/usr/share/matomo/config debian/matomo/usr/lib/matomo
+ ln -s /var/lib/matomo/config debian/matomo/usr/share/matomo/config
+
+ mv debian/matomo/usr/share/matomo/plugins debian/matomo/usr/lib/matomo
+ ln -s /var/lib/matomo/plugins debian/matomo/usr/share/matomo/plugins
+
+ mv debian/matomo/usr/share/matomo/piwik.js debian/matomo/usr/lib/matomo
+ ln -s /var/lib/matomo/piwik.js debian/matomo/usr/share/matomo/piwik.js
+
+ ln -s /var/lib/matomo/tmp debian/matomo/usr/share/matomo/tmp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes
diff --git a/piwik/plugins/Diagnostics/config/config.php b/piwik/plugins/Diagnostics/config/config.php
index 566b476..6fb69b4 100644
--- a/piwik/plugins/Diagnostics/config/config.php
+++ b/piwik/plugins/Diagnostics/config/config.php
@@ -12,7 +12,6 @@ return array(
),
// Diagnostics for recommended features
'diagnostics.optional' => array(
- DI\get('Piwik\Plugins\Diagnostics\Diagnostic\FileIntegrityCheck'),
DI\get('Piwik\Plugins\Diagnostics\Diagnostic\TrackerCheck'),
DI\get('Piwik\Plugins\Diagnostics\Diagnostic\MemoryLimitCheck'),
DI\get('Piwik\Plugins\Diagnostics\Diagnostic\TimezoneCheck'),