From 292f89ac89d2a3e5106f935b718504a8b0b74769 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 May 2021 14:43:14 +0200 Subject: Temporarily removing web patches for now, they need to be redone later. Signed-off-by: Daniel Baumann --- .../patches/debian/0006-remove-infographic.patch | 14 ---- .../patches/debian/0007-remove-contrib-files.patch | 49 ------------ .../patches/debian/0008-remove-update-button.patch | 14 ---- .../debian/0009-remove-social-media-buttons.patch | 16 ---- .../debian/0010-remove-googleanalytics.patch | 89 ---------------------- debian/patches/debian/0011-remove-signin.patch | 24 ------ .../patches/debian/0012-remove-googlefonts.patch | 14 ---- .../debian/0013-remove-googletagmanager.patch | 38 --------- debian/patches/series | 8 -- 9 files changed, 266 deletions(-) delete mode 100644 debian/patches/debian/0006-remove-infographic.patch delete mode 100644 debian/patches/debian/0007-remove-contrib-files.patch delete mode 100644 debian/patches/debian/0008-remove-update-button.patch delete mode 100644 debian/patches/debian/0009-remove-social-media-buttons.patch delete mode 100644 debian/patches/debian/0010-remove-googleanalytics.patch delete mode 100644 debian/patches/debian/0011-remove-signin.patch delete mode 100644 debian/patches/debian/0012-remove-googlefonts.patch delete mode 100644 debian/patches/debian/0013-remove-googletagmanager.patch diff --git a/debian/patches/debian/0006-remove-infographic.patch b/debian/patches/debian/0006-remove-infographic.patch deleted file mode 100644 index 5a8a8af0..00000000 --- a/debian/patches/debian/0006-remove-infographic.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lennart Weller -Description: Remove infographic for privacy breach reasons. - -diff -Naurp netdata.orig/web/gui/Makefile.am netdata/web/gui/Makefile.am ---- netdata.orig/web/gui/Makefile.am 2019-11-28 05:53:29.205928576 +0100 -+++ netdata/web/gui/Makefile.am 2019-11-28 06:00:04.581935523 +0100 -@@ -62,7 +62,6 @@ dist_web_DATA = \ - main.css \ - main.js \ - console.html \ -- infographic.html \ - robots.txt \ - refresh-badges.js \ - sitemap.xml \ diff --git a/debian/patches/debian/0007-remove-contrib-files.patch b/debian/patches/debian/0007-remove-contrib-files.patch deleted file mode 100644 index 9c5e99b1..00000000 --- a/debian/patches/debian/0007-remove-contrib-files.patch +++ /dev/null @@ -1,49 +0,0 @@ -Author: Lennart Weller -Description: Remove unused contrib files. - -diff -Naurp netdata.orig/web/gui/Makefile.am netdata/web/gui/Makefile.am ---- netdata.orig/web/gui/Makefile.am -+++ netdata/web/gui/Makefile.am -@@ -46,10 +46,6 @@ dist_noinst_DATA = \ - $(NULL) - - dist_web_DATA = \ -- demo.html \ -- demo2.html \ -- demosites.html \ -- demosites2.html \ - dashboard.html \ - dashboard.js \ - dashboard_info.js \ -@@ -110,15 +106,6 @@ dist_webcss_DATA = \ - css/c3-0.4.18.min.css \ - $(NULL) - --webfontsdir=$(webdir)/fonts --dist_webfonts_DATA = \ -- fonts/glyphicons-halflings-regular.eot \ -- fonts/glyphicons-halflings-regular.svg \ -- fonts/glyphicons-halflings-regular.ttf \ -- fonts/glyphicons-halflings-regular.woff \ -- fonts/glyphicons-halflings-regular.woff2 \ -- $(NULL) -- - webimagesdir=$(webdir)/images - dist_webimages_DATA = \ - images/netdata-logomark.svg \ -@@ -163,15 +150,6 @@ dashboard.js: $(DASHBOARD_JS_FILES) - if test -f $@; then rm -f $@; fi - cat $(DASHBOARD_JS_FILES) > $@.tmp && mv $@.tmp $@ - --webwellknowndir=$(webdir)/.well-known --dist_webwellknown_DATA = \ -- $(NULL) -- --webdntdir=$(webdir)/.well-known/dnt --dist_webdnt_DATA = \ -- .well-known/dnt/cookies \ -- $(NULL) -- - version.txt: - if test -d "$(top_srcdir)/.git"; then \ - git --git-dir="$(top_srcdir)/.git" log -n 1 --format=%H; \ diff --git a/debian/patches/debian/0008-remove-update-button.patch b/debian/patches/debian/0008-remove-update-button.patch deleted file mode 100644 index 393f48a5..00000000 --- a/debian/patches/debian/0008-remove-update-button.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Federico Ceratto -Description: Remove update button in web gui. - -diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html ---- netdata.orig/web/gui/index.html -+++ netdata/web/gui/index.html -@@ -93,7 +93,6 @@ -
  •  
    • -
  •  
    • -
  •  
    • -- - - - diff --git a/debian/patches/debian/0009-remove-social-media-buttons.patch b/debian/patches/debian/0009-remove-social-media-buttons.patch deleted file mode 100644 index 49b58919..00000000 --- a/debian/patches/debian/0009-remove-social-media-buttons.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Daniel Baumann -Description: Remove social media buttons in web gui. - -diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html ---- netdata.orig/web/gui/index.html -+++ netdata/web/gui/index.html -@@ -93,9 +93,6 @@ -
  •  
    • -
  •  
    • -
  •  
    • -- -- -- -
  •  
    • -
  •  
    • -
  •  
    • diff --git a/debian/patches/debian/0010-remove-googleanalytics.patch b/debian/patches/debian/0010-remove-googleanalytics.patch deleted file mode 100644 index 3bc8a4af..00000000 --- a/debian/patches/debian/0010-remove-googleanalytics.patch +++ /dev/null @@ -1,89 +0,0 @@ -Author: Lennart Weller -Subject: Remove googleanalytics - -diff -Naurp netdata.orig/web/gui/demosites2.html netdata/web/gui/demosites2.html ---- netdata.orig/web/gui/demosites2.html 2021-02-03 14:09:31.000000000 +0100 -+++ netdata/web/gui/demosites2.html 2021-02-07 13:00:35.014255664 +0100 -@@ -1096,17 +1096,4 @@ - - - -- - -diff -Naurp netdata.orig/web/gui/demosites.html netdata/web/gui/demosites.html ---- netdata.orig/web/gui/demosites.html 2021-02-03 14:09:31.000000000 +0100 -+++ netdata/web/gui/demosites.html 2021-02-07 12:59:33.954375891 +0100 -@@ -1385,14 +1385,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 2021-02-03 14:09:31.000000000 +0100 -+++ netdata/web/gui/infographic.html 2021-02-07 13:00:20.950283510 +0100 -@@ -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 2021-02-07 12:48:55.307522425 +0100 -+++ netdata/web/gui/main.js 2021-02-07 13:00:13.098299018 +0100 -@@ -4460,25 +4460,6 @@ function finalizePage() { - if (isdemo()) { - // do not to give errors on netdata demo servers for 60 seconds - NETDATA.options.current.retries_on_data_failures = 60; -- -- // 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 --git a/debian/patches/debian/0011-remove-signin.patch b/debian/patches/debian/0011-remove-signin.patch deleted file mode 100644 index a3c68ca7..00000000 --- a/debian/patches/debian/0011-remove-signin.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Daniel Baumann -Description: Removing 'Sign In' infobar on the bottom of the screen (Closes: #930504). - -diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html ---- netdata.orig/web/gui/index.html -+++ netdata/web/gui/index.html -@@ -106,17 +106,6 @@ -
    - - -- -- -