Package: release.debian.org Severity: normal Tags: buster User: release.debian....@packages.debian.org Usertags: pu
Hi, attached is the diff for netdata with cherry-picked patches from later Debian uploads to disable spying on users and a couple of other important things. Thanks, Daniel
diff --git a/debian/changelog b/debian/changelog index b2d9488..360d5e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +netdata (1.12.0-1+deb10u1) buster; urgency=medium + + [ Lennart Weller ] + * Add patch to remove Google Analytics from generated docs + + [ Daniel Baumann ] + * Removing currently usless depends on bash as it's still an essential + package. + * Adding missing GPL-3-only license stanza in copyright file. + * Opting out by default from sending anonymous statistics (phone home). + * Downgrading nodejs depends in netdata-plugins-nodejs to recommends as + not all architectures have nodejs at the moment. + + [ Federico Ceratto ] + * Add patch to remove Sign In button + + -- Daniel Baumann <daniel.baum...@progress-linux.org> Tue, 16 Jul 2019 15:41:56 +0200 + netdata (1.12.0-1) unstable; urgency=medium * Merging upstream version 1.12.0. diff --git a/debian/control b/debian/control index 15ab266..c93e7ff 100644 --- a/debian/control +++ b/debian/control @@ -97,7 +97,6 @@ Section: net Architecture: all Multi-Arch: foreign Depends: - bash, netdata-core (>= ${source:Version}) | netdata-core-no-sse (>= ${source:Version}), ${misc:Depends}, Suggests: @@ -120,8 +119,9 @@ Architecture: all Multi-Arch: foreign Depends: netdata-core (>= ${source:Version}) | netdata-core-no-sse (>= ${source:Version}), - nodejs, ${misc:Depends}, +Recommends: + nodejs, Provides: netdata-plugins, Enhances: diff --git a/debian/copyright b/debian/copyright index 8c73f0a..2abec45 100644 --- a/debian/copyright +++ b/debian/copyright @@ -183,7 +183,7 @@ Files: collectors/python.d.plugin/python_modules/third_party/boinc_client.py Copyright: 2013 Rodrigo Silva (MestreLion) <li...@rodrigosilva.com> 2017 Austin S. Hemmelgarn -License: GPL-3.0 +License: GPL-3 Files: collectors/python.d.plugin/python_modules/third_party/mcrcon.py @@ -246,6 +246,21 @@ License: LGPL-2.1 General Public License, version 2, can be found in /usr/share/common-licenses/LGPL-2. +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, version 3 of the License. + . + 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/>. + . + On Debian systems, the complete text of the GNU General Public + License version 3 can be found in /usr/share/common-licenses/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 diff --git a/debian/patches/debian/0009-remove-googleanalytics.patch b/debian/patches/debian/0009-remove-googleanalytics.patch new file mode 100644 index 0000000..aa6f0e9 --- /dev/null +++ b/debian/patches/debian/0009-remove-googleanalytics.patch @@ -0,0 +1,11 @@ +Author: Lennart Weller <l...@ring0.de> +Subject: Remove googleanalytics + +diff -Naurp netdata.orig/docs/generator/custom/themes/material/partials/footer.html netdata/docs/generator/custom/themes/material/partials/footer.html +--- netdata.orig/docs/generator/custom/themes/material/partials/footer.html ++++ netdata/docs/generator/custom/themes/material/partials/footer.html +@@ -51,4 +51,3 @@ + </div> + </div> + </footer> +-<script>!function(e,a,t,n,o,c,i){e.GoogleAnalyticsObject=o,e.ga=e.ga||function(){(e.ga.q=e.ga.q||[]).push(arguments)},e.ga.l=1*new Date,c=a.createElement(t),i=a.getElementsByTagName(t)[0],c.async=1,c.src="https://www.google-analytics.com/analytics.js",i.parentNode.insertBefore(c,i)}(window,document,"script",0,"ga"),ga("create","UA-64295674-3",""),ga("set","anonymizeIp",!0),ga("send","pageview","/doc"+window.location.pathname);var links=document.getElementsByTagName("a");if(Array.prototype.map.call(links,function(a){a.host!=document.location.host&&a.addEventListener("click",function(){var e=a.getAttribute("data-md-action")||"follow";ga("send","event","outbound",e,a.href)})}),document.forms.search){var query=document.forms.search.query;query.addEventListener("blur",function(){if(this.value){var e=document.location.pathname;ga("send","pageview",e+"?q="+this.value)}})}</script> diff --git a/debian/patches/debian/0010-remove-login.patch b/debian/patches/debian/0010-remove-login.patch new file mode 100644 index 0000000..74b5e06 --- /dev/null +++ b/debian/patches/debian/0010-remove-login.patch @@ -0,0 +1,17 @@ +Author: Federico Ceratto <feder...@debian.org> +Description: remove Sign In button from main HTML page + +diff -Naurp netdata.orig/web/gui/main.js netdata/web/gui/main.js +--- netdata.orig/web/gui/main.js ++++ netdata/web/gui/main.js +@@ -4758,9 +4758,7 @@ function renderAccountUI() { + container.setAttribute("data-original-title", "sign in"); + container.setAttribute("data-placement", "bottom"); + container.innerHTML = ( +- `<a href="#" class="btn" onclick="signInDidClick(event); return false"> +- <i class="fas fa-sign-in-alt"></i> <span class="hidden-sm hidden-md">Sign In</span> +- </a>` ++ `` + ) + } + } diff --git a/debian/patches/series b/debian/patches/series index 486dbbf..181a145 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,6 @@ debian/0005-remove-infographic.patch debian/0006-remove-contrib-files.patch debian/0007-remove-update-button.patch debian/0008-remove-social-media-buttons.patch +debian/0009-remove-googleanalytics.patch +debian/0010-remove-login.patch upstream/0001-allow-symlinks.patch diff --git a/debian/rules b/debian/rules index 8a3ba0d..3973658 100755 --- a/debian/rules +++ b/debian/rules @@ -77,6 +77,7 @@ override_dh_install-arch: # Copy architecture dependent plugins mkdir -p $(TOP)-core/etc/netdata cp debian/local/netdata.conf $(TOP)-core/etc/netdata + touch $(TOP)-core/etc/netdata/.opt-out-from-anonymous-statistics mkdir -p $(TOP)-core/usr/lib/netdata/plugins.d for plugin in cgroup-network apps.plugin freeipmi.plugin; \ @@ -91,6 +92,7 @@ ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) mkdir -p $(TOP)-core-no-sse/etc/netdata cp debian/local/netdata.conf $(TOP)-core-no-sse/etc/netdata + touch $(TOP)-core-no-sse/etc/netdata/.opt-out-from-anonymous-statistics mkdir -p $(TOP)-core-no-sse/usr/lib/netdata/plugins.d for plugin in cgroup-network apps.plugin freeipmi.plugin; \