[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#931084: marked as done (unblock: netdata/1.12.2-2)

Your message dated Thu, 27 Jun 2019 11:03:20 +0200
with message-id <ed167fca-09e2-b8b5-9b79-24d314846777@debian.org>
and subject line Re: Bug#931084: unblock: netdata/1.12.2-2
has caused the Debian Bug report #931084,
regarding unblock: netdata/1.12.2-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
931084: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931084
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package netdata.

First, I'm sorry.. I'm terribly late with this and there's no excuse for
that.

Second, I seem to have miscalculated the
'last-possible-point-in-time-to-upload-to-unstable-and-migrate-to-testing-before-full-freeze'
by one hour on 2019-02-27. so netdata 1.12.2-2 which was supposed to be
the one for buster just didn't make it in time into testing before the
freeze on 2019-03-12. If I didn't make that mistake, netdata 1.12-2-2
would have migrated on its own.

Now, netdata 1.12.0-1..1.12.2-2 fixes two important things:

a) the web frontend as well as the documentation has been fixed to not
   spy on its users (via googleanalytics).

b) opt-out to send telemetry to upstream

Preferably, netdata 1.12.2-2 could be allowed to migrate to testing. If
that's not possible, both should be fixed through stable updates for
buster r1 which I'd like to avoid the extra-work for everyone.

Would you mind allow netdata to migrate at this point?

(debdiff of debian/ is attached)

Regards,
Daniel

diff -Naurp debian_1.12.0-1/changelog debian_1.12.2-2/changelog
--- debian_1.12.0-1/changelog	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/changelog	2019-06-25 20:28:01.646098056 +0200
@@ -1,3 +1,47 @@
+netdata (1.12.2-2) unstable; urgency=medium
+
+  [ Federico Ceratto ]
+  * Add patch to remove Sign In button
+
+  [ Daniel Baumann ]
+  * When disabling the 'Sign In' button on the right side, only turn it
+    off in the javascript and keep the html unmodified.
+  * Sorting patch series.
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Sat, 02 Mar 2019 16:46:44 +0100
+
+netdata (1.12.2-1) unstable; urgency=medium
+
+  * Merging upstream version 1.12.2.
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Thu, 28 Feb 2019 22:18:45 +0100
+
+netdata (1.12.1-2) unstable; urgency=medium
+
+  * Downgrading nodejs depends in netdata-plugins-nodejs to recommends as
+    not all architectures have nodejs at the moment.
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Wed, 27 Feb 2019 22:09:05 +0100
+
+netdata (1.12.1-1) unstable; urgency=medium
+
+  [ Lennart Weller ]
+  * Add patch to remove Google Analytics from generated docs
+
+  [ Daniel Baumann ]
+  * Rediffing remove-googleanalytics.patch.
+  * Opting out by default from sending anonymous statistics (Closes: #923114).
+  * Merging upstream version 1.12.1.
+  * Refreshing remove-googleanalytics.patch for new upstream version.
+  * Updating lintian overrides.
+  * Removing currently usless depends on bash as it's still an essential
+    package.
+  * Adding missing GPL-3-only license stanza in copyright file.
+  * Debranding license references in copyright.
+  * Updating TODO file.
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Sun, 24 Feb 2019 21:32:56 +0100
+
 netdata (1.12.0-1) unstable; urgency=medium
 
   * Merging upstream version 1.12.0.
diff -Naurp debian_1.12.0-1/control debian_1.12.2-2/control
--- debian_1.12.0-1/control	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/control	2019-06-25 20:28:01.646098056 +0200
@@ -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 -Naurp debian_1.12.0-1/copyright debian_1.12.2-2/copyright
--- debian_1.12.0-1/copyright	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/copyright	2019-06-25 20:28:01.650098186 +0200
@@ -183,7 +183,7 @@ Files:
  collectors/python.d.plugin/python_modules/third_party/boinc_client.py
 Copyright: 2013 Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
            2017 Austin S. Hemmelgarn
-License: GPL-3.0
+License: GPL-3
 
 Files:
  collectors/python.d.plugin/python_modules/third_party/mcrcon.py
@@ -224,8 +224,8 @@ License: LGPL-3+
  You should have received a copy of the GNU Lesser General Public
  License along with this library;  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 3 can be found in /usr/share/common-licenses/LGPL-3.
+ The complete text of the GNU Lesser General Public License version 3
+ can be found in /usr/share/common-licenses/LGPL-3.
 
 License: LGPL-2.1
  This program is free software; you can redistribute it and/or modify
@@ -242,9 +242,23 @@ License: LGPL-2.1
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  .
- On Debian GNU/Linux systems, the complete text of the GNU Library
- General Public License, version 2, can be found in
- /usr/share/common-licenses/LGPL-2.
+ The complete text of the GNU Library 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/>.
+ .
+ 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
@@ -259,8 +273,8 @@ License: GPL-3+
  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.
+ The complete text of the GNU General Public License version 3
+ can be found in /usr/share/common-licenses/GPL-3.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person
@@ -361,8 +375,8 @@ License: Apache-2.0
  .
  Comment:
  .
- On Debian systems, the complete text of the Apache License 2.0 can be found in
- `/usr/share/common-licenses/Apache-2.0'.
+ The complete text of the Apache License 2.0
+ can be found in /usr/share/common-licenses/Apache-2.0.
 
 License: CC0
  Creative Commons Legal Code
diff -Naurp debian_1.12.0-1/netdata-core.lintian-overrides debian_1.12.2-2/netdata-core.lintian-overrides
--- debian_1.12.0-1/netdata-core.lintian-overrides	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/netdata-core.lintian-overrides	2019-06-25 20:28:01.650098186 +0200
@@ -1,6 +1,9 @@
 # See Debian policy 10.9. apps.plugin has extra capabilities, so don't let
 # normal users run it.
-netdata-core: non-standard-executable-perm usr/lib/*/netdata/plugins.d/apps.plugin 0754 != 0755
+netdata-core: non-standard-executable-perm usr/lib/netdata/plugins.d/apps.plugin 0754 != 0755
+
+# user created during install
+netdata-core: maintainer-script-should-not-use-recursive-chown-or-chmod
 
 # freeipmi plugin
-netdata-core: setuid-binary usr/lib/x86_64-linux-gnu/netdata/plugins.d/freeipmi.plugin 4754 root/root
+netdata-core: setuid-binary usr/lib/netdata/plugins.d/freeipmi.plugin 4754 root/root
diff -Naurp debian_1.12.0-1/netdata-core-no-sse.lintian-overrides debian_1.12.2-2/netdata-core-no-sse.lintian-overrides
--- debian_1.12.0-1/netdata-core-no-sse.lintian-overrides	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/netdata-core-no-sse.lintian-overrides	2019-06-25 20:28:01.650098186 +0200
@@ -1,6 +1,9 @@
 # See Debian policy 10.9. apps.plugin has extra capabilities, so don't let
 # normal users run it.
-netdata-core-no-sse: non-standard-executable-perm usr/lib/*/netdata/plugins.d/apps.plugin 0754 != 0755
+netdata-core-no-sse: non-standard-executable-perm usr/lib/netdata/plugins.d/apps.plugin 0754 != 0755
+
+# user created during install
+netdata-core-no-sse: maintainer-script-should-not-use-recursive-chown-or-chmod
 
 # freeipmi plugin
-netdata-core-no-sse: setuid-binary usr/lib/x86_64-linux-gnu/netdata/plugins.d/freeipmi.plugin 4754 root/root
+netdata-core-no-sse: setuid-binary usr/lib/netdata/plugins.d/freeipmi.plugin 4754 root/root
diff -Naurp debian_1.12.0-1/netdata.TODO debian_1.12.2-2/netdata.TODO
--- debian_1.12.0-1/netdata.TODO	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/netdata.TODO	2019-06-25 20:28:01.650098186 +0200
@@ -6,6 +6,8 @@
   - split out arch-all stuff from core/core-no-sse to netdata-common or so
     (check if worthwile; micropackaging vs. lazy)
   - add netdata-doc if htmldoc is buildable again
+  - enable "expensive" plugins (--enable-plugin-nfacct --enable-plugin-cups --with-libcap)
+    and move them to plugins-extra.
 
 * migrate from user 'netdata' to '_netdata'.
 
diff -Naurp debian_1.12.0-1/patches/debian/0009-remove-googleanalytics.patch debian_1.12.2-2/patches/debian/0009-remove-googleanalytics.patch
--- debian_1.12.0-1/patches/debian/0009-remove-googleanalytics.patch	1970-01-01 01:00:00.000000000 +0100
+++ debian_1.12.2-2/patches/debian/0009-remove-googleanalytics.patch	2019-06-25 20:28:01.650098186 +0200
@@ -0,0 +1,100 @@
+Author: Lennart Weller <lhw@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,7 +51,6 @@
+     </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>
+ <script>
+   let currentLang = getLanguage();
+ 
+diff -Naurp netdata.orig/web/gui/demosites2.html netdata/web/gui/demosites2.html
+--- netdata.orig/web/gui/demosites2.html
++++ netdata/web/gui/demosites2.html
+@@ -1096,17 +1096,4 @@
+     </div>
+ </div>
+ </body>
+-<script>
+-    // google analytics when this is used for the home page of the demo sites
+-    // you don't need this if you customize this dashboard for your needs
+-    setTimeout(function() {
+-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+-        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+-
+-        ga('create', 'UA-64295674-3', 'auto');
+-        ga('send', 'pageview');
+-    }, 2000);
+-</script>
+ </html>
+diff -Naurp netdata.orig/web/gui/demosites.html netdata/web/gui/demosites.html
+--- netdata.orig/web/gui/demosites.html
++++ netdata/web/gui/demosites.html
+@@ -1417,14 +1417,6 @@ p {
+         }(c)))
+     }
+ 
+-    function o() {
+-        !function (t, e, a, n, o, i) {
+-            t.GoogleAnalyticsObject = n, t[n] || (t[n] = function () {
+-                (t[n].q = t[n].q || []).push(arguments)
+-            }), t[n].l = +new Date, o = e.createElement(a), i = e.getElementsByTagName(a)[0], o.src = "//www.google-analytics.com/analytics.js", i.parentNode.insertBefore(o, i)
+-        }(t, r, "script", "ga"), ga("create", "UA-64295674-3", "auto"), ga("send", "pageview", "/site"+window.location.pathname), t.document.addEventListener("click", n)
+-    }
+-
+     function i() {
+         !function (t, e, a) {
+             var n, o = t.getElementsByTagName(e)[0];
+diff -Naurp netdata.orig/web/gui/infographic.html netdata/web/gui/infographic.html
+--- netdata.orig/web/gui/infographic.html
++++ netdata/web/gui/infographic.html
+@@ -126,14 +126,6 @@
+         }(c)))
+     }
+ 
+-    function o() {
+-        !function (t, e, a, n, o, i) {
+-            t.GoogleAnalyticsObject = n, t[n] || (t[n] = function () {
+-                (t[n].q = t[n].q || []).push(arguments)
+-            }), t[n].l = +new Date, o = e.createElement(a), i = e.getElementsByTagName(a)[0], o.src = "//www.google-analytics.com/analytics.js", i.parentNode.insertBefore(o, i)
+-        }(t, r, "script", "ga"), ga("create", "UA-64295674-3", "auto"), ga("send", "pageview"), t.document.addEventListener("click", n)
+-    }
+-
+     function i() {
+         !function (t, e, a) {
+             var n, o = t.getElementsByTagName(e)[0];
+diff -Naurp netdata.orig/web/gui/main.js netdata/web/gui/main.js
+--- netdata.orig/web/gui/main.js
++++ netdata/web/gui/main.js
+@@ -4354,25 +4354,6 @@ function finalizePage() {
+                 $('#welcomeModal').modal();
+             }, 1000);
+         }
+-
+-        // google analytics when this is used for the home page of the demo sites
+-        // this does not run on user's installations
+-        setTimeout(function () {
+-            (function (i, s, o, g, r, a, m) {
+-                i['GoogleAnalyticsObject'] = r;
+-                i[r] = i[r] || function () {
+-                    (i[r].q = i[r].q || []).push(arguments)
+-                }, i[r].l = 1 * new Date();
+-                a = s.createElement(o),
+-                    m = s.getElementsByTagName(o)[0];
+-                a.async = 1;
+-                a.src = g;
+-                m.parentNode.insertBefore(a, m)
+-            })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+-
+-            ga('create', 'UA-64295674-3', 'auto');
+-            ga('send', 'pageview', '/demosite/' + window.location.host);
+-        }, 2000);
+     } else {
+         notifyForUpdate();
+     }
diff -Naurp debian_1.12.0-1/patches/debian/0010-remove-login.patch debian_1.12.2-2/patches/debian/0010-remove-login.patch
--- debian_1.12.0-1/patches/debian/0010-remove-login.patch	1970-01-01 01:00:00.000000000 +0100
+++ debian_1.12.2-2/patches/debian/0010-remove-login.patch	2019-06-25 20:28:01.650098186 +0200
@@ -0,0 +1,17 @@
+Author: Federico Ceratto <federico@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>&nbsp;<span class="hidden-sm hidden-md">Sign In</span>
+-            </a>`
++            ``
+         )
+     }
+ }
diff -Naurp debian_1.12.0-1/patches/series debian_1.12.2-2/patches/series
--- debian_1.12.0-1/patches/series	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/patches/series	2019-06-25 20:28:01.650098186 +0200
@@ -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 -Naurp debian_1.12.0-1/rules debian_1.12.2-2/rules
--- debian_1.12.0-1/rules	2019-06-25 20:27:42.597478366 +0200
+++ debian_1.12.2-2/rules	2019-06-25 20:28:01.650098186 +0200
@@ -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 n
 
 	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; \

--- End Message ---
--- Begin Message --- 
Hi Daniel,

On 25-06-2019 20:31, Daniel Baumann wrote:
> Preferably, netdata 1.12.2-2 could be allowed to migrate to testing. If
> that's not possible, both should be fixed through stable updates for
> buster r1 which I'd like to avoid the extra-work for everyone.
> 
> Would you mind allow netdata to migrate at this point?

Yes. This is way, way, way too late. Targeted fixes were OK until last
Tuesday. Please take the r1 route.

Paul

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
Reply to: