diff options
11 files changed, 24 insertions, 69 deletions
diff --git a/debian/patches/0001-debian-use-system-packaging.patch b/debian/patches/0001-debian-use-system-packaging.patch deleted file mode 100644 index f07e92825..000000000 --- a/debian/patches/0001-debian-use-system-packaging.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: Daniel Baumann <daniel.baumann@progress-linux.org> -Description: Ignore upstream debian packaging. - -diff -Naurp netdata.orig/contrib/Makefile.am netdata/contrib/Makefile.am ---- netdata.orig/contrib/Makefile.am -+++ netdata/contrib/Makefile.am -@@ -4,28 +4,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil - - dist_noinst_DATA = \ - README.md \ -- debian/copyright \ -- debian/netdata.conf \ -- debian/source/format \ -- debian/control.wheezy \ -- debian/compat \ -- debian/netdata.install \ -- debian/netdata.lintian-overrides \ -- debian/rules \ -- debian/netdata.docs \ -- debian/netdata.default \ -- debian/control \ -- debian/netdata.postinst.in \ -- debian/netdata.service \ -- debian/changelog \ -- debian/netdata.postrm \ - rhel/build-netdata-rpm.sh \ - $(NULL) - --dist_noinst_SCRIPTS = \ -- debian/netdata.init \ -- $(NULL) -- - debian/changelog: - echo "netdata ($(PACKAGE_VERSION)) UNRELEASED; urgency=medium" | \ - tr '_' '~' > $@ diff --git a/debian/patches/0002-debian-use-system-python.patch b/debian/patches/0001-debian-use-system-python.patch index 4e329bb7b..f29b6c7be 100644 --- a/debian/patches/0002-debian-use-system-python.patch +++ b/debian/patches/0001-debian-use-system-python.patch @@ -4,7 +4,7 @@ Description: Ignore embedded python modules. diff -Naurp netdata.orig/collectors/python.d.plugin/Makefile.am netdata/collectors/python.d.plugin/Makefile.am --- netdata.orig/collectors/python.d.plugin/Makefile.am +++ netdata/collectors/python.d.plugin/Makefile.am -@@ -139,109 +139,3 @@ dist_third_party_DATA = \ +@@ -138,109 +138,3 @@ dist_third_party_DATA = \ python_modules/third_party/boinc_client.py \ python_modules/third_party/monotonic.py \ $(NULL) diff --git a/debian/patches/0003-debian-use-system-exim4.patch b/debian/patches/0002-debian-use-system-exim4.patch index bcb0a1b7a..0e2361839 100644 --- a/debian/patches/0003-debian-use-system-exim4.patch +++ b/debian/patches/0002-debian-use-system-exim4.patch @@ -4,7 +4,7 @@ Description: Debian has exim in /usr/sbin which is not in the default path. diff -Naurp netdata.orig/collectors/python.d.plugin/exim/exim.conf netdata/collectors/python.d.plugin/exim/exim.conf --- netdata.orig/collectors/python.d.plugin/exim/exim.conf +++ netdata/collectors/python.d.plugin/exim/exim.conf -@@ -90,4 +90,4 @@ update_every: 10 +@@ -88,4 +88,4 @@ update_every: 10 # AUTO-DETECTION JOBS local: diff --git a/debian/patches/0004-debian-use-python3.patch b/debian/patches/0003-debian-use-python3.patch index cc800d257..7359393f2 100644 --- a/debian/patches/0004-debian-use-python3.patch +++ b/debian/patches/0003-debian-use-python3.patch @@ -1,9 +1,9 @@ Author: Sander Klein <debian-bugs@roedie.nl> Description: Debian uses by default python 2 instead of python3. -diff -Naurp netdata.orig/collectors/python.d.plugin/python.d.plugin netdata/collectors/python.d.plugin/python.d.plugin ---- netdata.orig/collectors/python.d.plugin/python.d.plugin -+++ netdata/collectors/python.d.plugin/python.d.plugin +diff -Naurp netdata.orig/collectors/python.d.plugin/python.d.plugin.in netdata/collectors/python.d.plugin/python.d.plugin.in +--- netdata.orig/collectors/python.d.plugin/python.d.plugin.in ++++ netdata/collectors/python.d.plugin/python.d.plugin.in @@ -1,6 +1,4 @@ -#!/usr/bin/env bash -'''':; exec "$(command -v python || command -v python3 || command -v python2 || diff --git a/debian/patches/0005-debian-use-sh.patch b/debian/patches/0004-debian-use-sh.patch index 2be92d2d3..6c8e93bfb 100644 --- a/debian/patches/0005-debian-use-sh.patch +++ b/debian/patches/0004-debian-use-sh.patch @@ -1,15 +1,6 @@ Author: Daniel Baumann <daniel.baumann@progress-linux.org> 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 diff --git a/debian/patches/0006-debian-remove-infographic.patch b/debian/patches/0005-debian-remove-infographic.patch index 0571c9632..16b0d0831 100644 --- a/debian/patches/0006-debian-remove-infographic.patch +++ b/debian/patches/0005-debian-remove-infographic.patch @@ -4,7 +4,7 @@ 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 = \ +@@ -61,7 +61,6 @@ dist_web_DATA = \ index.html \ main.css \ main.js \ diff --git a/debian/patches/0007-debian-remove-contrib-files.patch b/debian/patches/0006-debian-remove-contrib-files.patch index eca2319a7..f145aa0cf 100644 --- a/debian/patches/0007-debian-remove-contrib-files.patch +++ b/debian/patches/0006-debian-remove-contrib-files.patch @@ -15,7 +15,7 @@ diff -Naurp netdata.orig/web/gui/Makefile.am netdata/web/gui/Makefile.am dashboard.html \ dashboard.js \ dashboard_info.js \ -@@ -107,15 +103,6 @@ dist_webcss_DATA = \ +@@ -103,15 +99,6 @@ dist_webcss_DATA = \ css/c3-0.4.18.min.css \ $(NULL) @@ -30,8 +30,8 @@ diff -Naurp netdata.orig/web/gui/Makefile.am netdata/web/gui/Makefile.am - webimagesdir=$(webdir)/images dist_webimages_DATA = \ - images/alert-128-orange.png \ -@@ -159,15 +146,6 @@ dashboard.js: $(DASHBOARD_JS_FILES) + 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 $@ diff --git a/debian/patches/0011-netdata-support-symlinks.patch b/debian/patches/0011-netdata-support-symlinks.patch index 081021155..bfc589b29 100644 --- a/debian/patches/0011-netdata-support-symlinks.patch +++ b/debian/patches/0011-netdata-support-symlinks.patch @@ -4,7 +4,7 @@ Description: Remove file serve restrictions for symlinks. diff -Naurp netdata.orig/web/server/web_client.c netdata/web/server/web_client.c --- netdata.orig/web/server/web_client.c +++ netdata/web/server/web_client.c -@@ -372,7 +372,7 @@ int mysendfile(struct web_client *w, cha +@@ -376,7 +376,7 @@ int mysendfile(struct web_client *w, cha int done = 0; while(!done) { // check if the file exists diff --git a/debian/patches/0021-gui-remove-update-button.patch b/debian/patches/0021-gui-remove-update-button.patch index f64e9f69f..b5d44e8ab 100644 --- a/debian/patches/0021-gui-remove-update-button.patch +++ b/debian/patches/0021-gui-remove-update-button.patch @@ -4,13 +4,13 @@ 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 -@@ -95,7 +95,9 @@ +@@ -133,7 +133,9 @@ <ul class="nav navbar-nav"> <li id="alarmsButton" title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i> <span class="hidden-sm hidden-md">Alarms </span><span id="alarms_count_badge" class="badge"></span></a></li> <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i> <span class="hidden-sm hidden-md">Settings</span></a></li> + <!-- <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li> + --> - <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-sm hidden-md"><a href="https://github.com/netdata/netdata/wiki" class="btn" target="_blank"><i class="fab fa-github"></i></a></li> - <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li> - <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li> + <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li> + <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li> + <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li> diff --git a/debian/patches/0022-gui-remove-social-media-buttons.patch b/debian/patches/0022-gui-remove-social-media-buttons.patch index ad0711814..9b5f05e30 100644 --- a/debian/patches/0022-gui-remove-social-media-buttons.patch +++ b/debian/patches/0022-gui-remove-social-media-buttons.patch @@ -4,14 +4,14 @@ 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 -@@ -98,9 +98,11 @@ +@@ -136,9 +136,11 @@ <!-- <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li> --> + <!-- - <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-sm hidden-md"><a href="https://github.com/netdata/netdata/wiki" class="btn" target="_blank"><i class="fab fa-github"></i></a></li> - <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li> - <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li> + <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li> + <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li> + <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li> + --> <li title="import / load a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="loadButton"><a href="#" class="btn" data-toggle="modal" data-target="#loadSnapshotModal"><i class="fas fa-download"></i> <span class="hidden-sm hidden-md hidden-lg">Import</span></a></li> <li title="export / save a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="saveButton"><a href="#" class="btn" data-toggle="modal" data-target="#saveSnapshotModal"><i class="fas fa-upload"></i> <span class="hidden-sm hidden-md hidden-lg">Export</span></a></li> diff --git a/debian/patches/series b/debian/patches/series index adb9b6c0f..58c004323 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,9 @@ -0001-debian-use-system-packaging.patch -0002-debian-use-system-python.patch -0003-debian-use-system-exim4.patch -0004-debian-use-python3.patch -0005-debian-use-sh.patch -0006-debian-remove-infographic.patch -0007-debian-remove-contrib-files.patch +0001-debian-use-system-python.patch +0002-debian-use-system-exim4.patch +0003-debian-use-python3.patch +0004-debian-use-sh.patch +0005-debian-remove-infographic.patch +0006-debian-remove-contrib-files.patch 0011-netdata-support-symlinks.patch 0021-gui-remove-update-button.patch 0022-gui-remove-social-media-buttons.patch |