From 543d32c38eeba6f16fb17c5d8dda9318247b537c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 1 Jan 2019 16:59:25 +0100 Subject: Renumbering patches. Signed-off-by: Daniel Baumann --- .../patches/0005-debian-remove-infographic.patch | 14 ------- debian/patches/0005-debian-use-sh.patch | 21 ++++++++++ .../patches/0006-debian-remove-contrib-files.patch | 49 ---------------------- .../patches/0006-debian-remove-infographic.patch | 14 +++++++ .../patches/0007-debian-remove-contrib-files.patch | 49 ++++++++++++++++++++++ debian/patches/0007-debian-use-sh.patch | 21 ---------- debian/patches/series | 6 +-- 7 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 debian/patches/0005-debian-remove-infographic.patch create mode 100644 debian/patches/0005-debian-use-sh.patch delete mode 100644 debian/patches/0006-debian-remove-contrib-files.patch create mode 100644 debian/patches/0006-debian-remove-infographic.patch create mode 100644 debian/patches/0007-debian-remove-contrib-files.patch delete mode 100644 debian/patches/0007-debian-use-sh.patch (limited to 'debian') diff --git a/debian/patches/0005-debian-remove-infographic.patch b/debian/patches/0005-debian-remove-infographic.patch deleted file mode 100644 index 0571c9632..000000000 --- a/debian/patches/0005-debian-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 -@@ -57,7 +57,6 @@ dist_web_DATA = \ - index.html \ - main.css \ - main.js \ -- infographic.html \ - robots.txt \ - refresh-badges.js \ - sitemap.xml \ diff --git a/debian/patches/0005-debian-use-sh.patch b/debian/patches/0005-debian-use-sh.patch new file mode 100644 index 000000000..2be92d2d3 --- /dev/null +++ b/debian/patches/0005-debian-use-sh.patch @@ -0,0 +1,21 @@ +Author: Daniel Baumann +Description: Fix shebang hack to not depend on bash. + +diff -Naurp netdata.orig/collectors/node.d.plugin/node.d.plugin netdata/collectors/node.d.plugin/node.d.plugin +--- netdata.orig/collectors/node.d.plugin/node.d.plugin ++++ netdata/collectors/node.d.plugin/node.d.plugin +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" + + // shebang hack from: +diff -Naurp netdata.orig/collectors/node.d.plugin/node.d.plugin.in netdata/collectors/node.d.plugin/node.d.plugin.in +--- netdata.orig/collectors/node.d.plugin/node.d.plugin.in ++++ netdata/collectors/node.d.plugin/node.d.plugin.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" + + // shebang hack from: diff --git a/debian/patches/0006-debian-remove-contrib-files.patch b/debian/patches/0006-debian-remove-contrib-files.patch deleted file mode 100644 index eca2319a7..000000000 --- a/debian/patches/0006-debian-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 \ -@@ -107,15 +103,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/alert-128-orange.png \ -@@ -159,15 +146,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/0006-debian-remove-infographic.patch b/debian/patches/0006-debian-remove-infographic.patch new file mode 100644 index 000000000..0571c9632 --- /dev/null +++ b/debian/patches/0006-debian-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 +@@ -57,7 +57,6 @@ dist_web_DATA = \ + index.html \ + main.css \ + main.js \ +- infographic.html \ + robots.txt \ + refresh-badges.js \ + sitemap.xml \ diff --git a/debian/patches/0007-debian-remove-contrib-files.patch b/debian/patches/0007-debian-remove-contrib-files.patch new file mode 100644 index 000000000..eca2319a7 --- /dev/null +++ b/debian/patches/0007-debian-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 \ +@@ -107,15 +103,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/alert-128-orange.png \ +@@ -159,15 +146,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/0007-debian-use-sh.patch b/debian/patches/0007-debian-use-sh.patch deleted file mode 100644 index 2be92d2d3..000000000 --- a/debian/patches/0007-debian-use-sh.patch +++ /dev/null @@ -1,21 +0,0 @@ -Author: Daniel Baumann -Description: Fix shebang hack to not depend on bash. - -diff -Naurp netdata.orig/collectors/node.d.plugin/node.d.plugin netdata/collectors/node.d.plugin/node.d.plugin ---- netdata.orig/collectors/node.d.plugin/node.d.plugin -+++ netdata/collectors/node.d.plugin/node.d.plugin -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" - - // shebang hack from: -diff -Naurp netdata.orig/collectors/node.d.plugin/node.d.plugin.in netdata/collectors/node.d.plugin/node.d.plugin.in ---- netdata.orig/collectors/node.d.plugin/node.d.plugin.in -+++ netdata/collectors/node.d.plugin/node.d.plugin.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" - - // shebang hack from: diff --git a/debian/patches/series b/debian/patches/series index 86855ad02..adb9b6c0f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,9 +2,9 @@ 0002-debian-use-system-python.patch 0003-debian-use-system-exim4.patch 0004-debian-use-python3.patch -0005-debian-remove-infographic.patch -0006-debian-remove-contrib-files.patch -0007-debian-use-sh.patch +0005-debian-use-sh.patch +0006-debian-remove-infographic.patch +0007-debian-remove-contrib-files.patch 0011-netdata-support-symlinks.patch 0021-gui-remove-update-button.patch 0022-gui-remove-social-media-buttons.patch -- cgit v1.2.3