From 1b919afbb02e656c03760117d13d858279e9dadc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 12 Aug 2019 20:02:32 +0200 Subject: Renumbering patches. Signed-off-by: Daniel Baumann --- .../patches/debian/0005-remove-infographic.patch | 14 --- debian/patches/debian/0005-use-bash.patch | 13 +++ .../patches/debian/0006-remove-contrib-files.patch | 49 ---------- .../patches/debian/0006-remove-infographic.patch | 14 +++ .../patches/debian/0007-remove-contrib-files.patch | 49 ++++++++++ .../patches/debian/0007-remove-update-button.patch | 16 ---- .../debian/0008-remove-social-media-buttons.patch | 18 ---- .../patches/debian/0008-remove-update-button.patch | 16 ++++ .../debian/0009-remove-googleanalytics.patch | 100 --------------------- .../debian/0009-remove-social-media-buttons.patch | 18 ++++ .../debian/0010-remove-googleanalytics.patch | 100 +++++++++++++++++++++ debian/patches/debian/0010-remove-login.patch | 17 ---- debian/patches/debian/0011-remove-login.patch | 17 ++++ debian/patches/debian/0011-remove-signin.patch | 22 ----- debian/patches/debian/0012-remove-signin.patch | 22 +++++ debian/patches/debian/0012-use-bash.patch | 13 --- debian/patches/series | 16 ++-- 17 files changed, 257 insertions(+), 257 deletions(-) delete mode 100644 debian/patches/debian/0005-remove-infographic.patch create mode 100644 debian/patches/debian/0005-use-bash.patch delete mode 100644 debian/patches/debian/0006-remove-contrib-files.patch create mode 100644 debian/patches/debian/0006-remove-infographic.patch create mode 100644 debian/patches/debian/0007-remove-contrib-files.patch delete mode 100644 debian/patches/debian/0007-remove-update-button.patch delete mode 100644 debian/patches/debian/0008-remove-social-media-buttons.patch create mode 100644 debian/patches/debian/0008-remove-update-button.patch delete mode 100644 debian/patches/debian/0009-remove-googleanalytics.patch create mode 100644 debian/patches/debian/0009-remove-social-media-buttons.patch create mode 100644 debian/patches/debian/0010-remove-googleanalytics.patch delete mode 100644 debian/patches/debian/0010-remove-login.patch create mode 100644 debian/patches/debian/0011-remove-login.patch delete mode 100644 debian/patches/debian/0011-remove-signin.patch create mode 100644 debian/patches/debian/0012-remove-signin.patch delete mode 100644 debian/patches/debian/0012-use-bash.patch (limited to 'debian/patches') diff --git a/debian/patches/debian/0005-remove-infographic.patch b/debian/patches/debian/0005-remove-infographic.patch deleted file mode 100644 index 4b4df45ed..000000000 --- a/debian/patches/debian/0005-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 -+++ netdata/web/gui/Makefile.am -@@ -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/0005-use-bash.patch b/debian/patches/debian/0005-use-bash.patch new file mode 100644 index 000000000..53b7fc5b3 --- /dev/null +++ b/debian/patches/debian/0005-use-bash.patch @@ -0,0 +1,13 @@ +Author: Daniel Baumann +Description: Using bash instead of sh for edit-config. + It reads /etc/profile which often contains bash specific configuration. + +diff -Naurp netdata.orig/system/edit-config.in netdata/system/edit-config.in +--- netdata.orig/system/edit-config.in ++++ netdata/system/edit-config.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/bin/bash + + [ -f /etc/profile ] && . /etc/profile + diff --git a/debian/patches/debian/0006-remove-contrib-files.patch b/debian/patches/debian/0006-remove-contrib-files.patch deleted file mode 100644 index f145aa0cf..000000000 --- a/debian/patches/debian/0006-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 \ -@@ -103,15 +99,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 \ -@@ -156,15 +143,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/0006-remove-infographic.patch b/debian/patches/debian/0006-remove-infographic.patch new file mode 100644 index 000000000..4b4df45ed --- /dev/null +++ b/debian/patches/debian/0006-remove-infographic.patch @@ -0,0 +1,14 @@ +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 ++++ netdata/web/gui/Makefile.am +@@ -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 new file mode 100644 index 000000000..f145aa0cf --- /dev/null +++ b/debian/patches/debian/0007-remove-contrib-files.patch @@ -0,0 +1,49 @@ +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 \ +@@ -103,15 +99,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 \ +@@ -156,15 +143,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/0007-remove-update-button.patch b/debian/patches/debian/0007-remove-update-button.patch deleted file mode 100644 index c17a4cd60..000000000 --- a/debian/patches/debian/0007-remove-update-button.patch +++ /dev/null @@ -1,16 +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 -@@ -126,7 +126,9 @@ -
  •  
    • -
  •  
    • -
  •  
    • -+ - - - diff --git a/debian/patches/debian/0008-remove-social-media-buttons.patch b/debian/patches/debian/0008-remove-social-media-buttons.patch deleted file mode 100644 index 9b5f05e30..000000000 --- a/debian/patches/debian/0008-remove-social-media-buttons.patch +++ /dev/null @@ -1,18 +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 -@@ -136,9 +136,11 @@ - -+ -
  •  
    • -
  •  
    • -
  •  
    • diff --git a/debian/patches/debian/0008-remove-update-button.patch b/debian/patches/debian/0008-remove-update-button.patch new file mode 100644 index 000000000..c17a4cd60 --- /dev/null +++ b/debian/patches/debian/0008-remove-update-button.patch @@ -0,0 +1,16 @@ +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 +@@ -126,7 +126,9 @@ +
  •  
    • +
  •  
    • +
  •  
    • ++ + + + diff --git a/debian/patches/debian/0009-remove-googleanalytics.patch b/debian/patches/debian/0009-remove-googleanalytics.patch deleted file mode 100644 index eb90e5ca6..000000000 --- a/debian/patches/debian/0009-remove-googleanalytics.patch +++ /dev/null @@ -1,100 +0,0 @@ -Author: Lennart Weller -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 @@ - - - -- - - -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 -@@ -4368,25 +4368,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/0009-remove-social-media-buttons.patch b/debian/patches/debian/0009-remove-social-media-buttons.patch new file mode 100644 index 000000000..9b5f05e30 --- /dev/null +++ b/debian/patches/debian/0009-remove-social-media-buttons.patch @@ -0,0 +1,18 @@ +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 +@@ -136,9 +136,11 @@ + ++ +
  •  
    • +
  •  
    • +
  •  
    • diff --git a/debian/patches/debian/0010-remove-googleanalytics.patch b/debian/patches/debian/0010-remove-googleanalytics.patch new file mode 100644 index 000000000..eb90e5ca6 --- /dev/null +++ b/debian/patches/debian/0010-remove-googleanalytics.patch @@ -0,0 +1,100 @@ +Author: Lennart Weller +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 @@ + + + +- + + +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 +@@ -4368,25 +4368,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/0010-remove-login.patch b/debian/patches/debian/0010-remove-login.patch deleted file mode 100644 index 686b0f76c..000000000 --- a/debian/patches/debian/0010-remove-login.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Federico Ceratto -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 -@@ -4788,9 +4788,7 @@ function renderAccountUI() { - container.setAttribute("data-original-title", "sign in"); - container.setAttribute("data-placement", "bottom"); - container.innerHTML = ( -- `` -+ `` - ) - } - } diff --git a/debian/patches/debian/0011-remove-login.patch b/debian/patches/debian/0011-remove-login.patch new file mode 100644 index 000000000..686b0f76c --- /dev/null +++ b/debian/patches/debian/0011-remove-login.patch @@ -0,0 +1,17 @@ +Author: Federico Ceratto +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 +@@ -4788,9 +4788,7 @@ function renderAccountUI() { + container.setAttribute("data-original-title", "sign in"); + container.setAttribute("data-placement", "bottom"); + container.innerHTML = ( +- `` ++ `` + ) + } + } diff --git a/debian/patches/debian/0011-remove-signin.patch b/debian/patches/debian/0011-remove-signin.patch deleted file mode 100644 index ff402371a..000000000 --- a/debian/patches/debian/0011-remove-signin.patch +++ /dev/null @@ -1,22 +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 -@@ -114,6 +114,7 @@ -
    - - -+ - -