From 97ba90b0bbd7fcf6703c412fe8cdcc0f837b9328 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 29 Dec 2018 15:29:48 +0100 Subject: Splitting some patches and grouping them thematically together. Signed-off-by: Daniel Baumann --- .../patches/0001-debian-use-system-packaging.patch | 35 ++ .../0001-python-libraries-removed-from-make.patch | 177 ------- debian/patches/0002-debian-use-system-python.patch | 131 +++++ ...move-file-serve-restrictions-for-symlinks.patch | 15 - debian/patches/0003-debian-use-system-exim4.patch | 12 + .../patches/0003-hide-social-media-buttons.patch | 15 - debian/patches/0003-hide-update-button.patch | 16 - debian/patches/0004-debian-use-python3.patch | 14 + .../0004-debianize-path-to-exim4-binary.patch | 12 - .../patches/0005-debian-remove-infographic.patch | 14 + ...ve-infographic-for-privacy-breach-reasons.patch | 14 - .../patches/0006-debian-remove-contrib-files.patch | 49 ++ debian/patches/0006-force-usage-of-python3.patch | 17 - ...07-skip-debian-files-in-upstream-makefile.patch | 35 -- debian/patches/0008-compile-on-kfreebsd.patch | 527 --------------------- debian/patches/0011-netdata-support-symlinks.patch | 15 + debian/patches/0012-netdata-support-kfreebsd.patch | 527 +++++++++++++++++++++ debian/patches/0021-gui-remove-update-button.patch | 16 + .../0022-gui-remove-social-media-buttons.patch | 18 + debian/patches/series | 19 +- 20 files changed, 841 insertions(+), 837 deletions(-) create mode 100644 debian/patches/0001-debian-use-system-packaging.patch delete mode 100644 debian/patches/0001-python-libraries-removed-from-make.patch create mode 100644 debian/patches/0002-debian-use-system-python.patch delete mode 100644 debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch create mode 100644 debian/patches/0003-debian-use-system-exim4.patch delete mode 100644 debian/patches/0003-hide-social-media-buttons.patch delete mode 100644 debian/patches/0003-hide-update-button.patch create mode 100644 debian/patches/0004-debian-use-python3.patch delete mode 100644 debian/patches/0004-debianize-path-to-exim4-binary.patch create mode 100644 debian/patches/0005-debian-remove-infographic.patch delete mode 100644 debian/patches/0005-remove-infographic-for-privacy-breach-reasons.patch create mode 100644 debian/patches/0006-debian-remove-contrib-files.patch delete mode 100644 debian/patches/0006-force-usage-of-python3.patch delete mode 100644 debian/patches/0007-skip-debian-files-in-upstream-makefile.patch delete mode 100644 debian/patches/0008-compile-on-kfreebsd.patch create mode 100644 debian/patches/0011-netdata-support-symlinks.patch create mode 100644 debian/patches/0012-netdata-support-kfreebsd.patch create mode 100644 debian/patches/0021-gui-remove-update-button.patch create mode 100644 debian/patches/0022-gui-remove-social-media-buttons.patch diff --git a/debian/patches/0001-debian-use-system-packaging.patch b/debian/patches/0001-debian-use-system-packaging.patch new file mode 100644 index 000000000..f07e92825 --- /dev/null +++ b/debian/patches/0001-debian-use-system-packaging.patch @@ -0,0 +1,35 @@ +Author: Daniel Baumann +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/0001-python-libraries-removed-from-make.patch b/debian/patches/0001-python-libraries-removed-from-make.patch deleted file mode 100644 index 1389414d4..000000000 --- a/debian/patches/0001-python-libraries-removed-from-make.patch +++ /dev/null @@ -1,177 +0,0 @@ -Author: Lennart Weller -Description: python libraries removed from make. remove unused contrib files - -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 = \ - python_modules/third_party/boinc_client.py \ - python_modules/third_party/monotonic.py \ - $(NULL) -- --pythonyaml2dir=$(pythonmodulesdir)/pyyaml2 --dist_pythonyaml2_DATA = \ -- python_modules/pyyaml2/__init__.py \ -- python_modules/pyyaml2/composer.py \ -- python_modules/pyyaml2/constructor.py \ -- python_modules/pyyaml2/cyaml.py \ -- python_modules/pyyaml2/dumper.py \ -- python_modules/pyyaml2/emitter.py \ -- python_modules/pyyaml2/error.py \ -- python_modules/pyyaml2/events.py \ -- python_modules/pyyaml2/loader.py \ -- python_modules/pyyaml2/nodes.py \ -- python_modules/pyyaml2/parser.py \ -- python_modules/pyyaml2/reader.py \ -- python_modules/pyyaml2/representer.py \ -- python_modules/pyyaml2/resolver.py \ -- python_modules/pyyaml2/scanner.py \ -- python_modules/pyyaml2/serializer.py \ -- python_modules/pyyaml2/tokens.py \ -- $(NULL) -- --pythonyaml3dir=$(pythonmodulesdir)/pyyaml3 --dist_pythonyaml3_DATA = \ -- python_modules/pyyaml3/__init__.py \ -- python_modules/pyyaml3/composer.py \ -- python_modules/pyyaml3/constructor.py \ -- python_modules/pyyaml3/cyaml.py \ -- python_modules/pyyaml3/dumper.py \ -- python_modules/pyyaml3/emitter.py \ -- python_modules/pyyaml3/error.py \ -- python_modules/pyyaml3/events.py \ -- python_modules/pyyaml3/loader.py \ -- python_modules/pyyaml3/nodes.py \ -- python_modules/pyyaml3/parser.py \ -- python_modules/pyyaml3/reader.py \ -- python_modules/pyyaml3/representer.py \ -- python_modules/pyyaml3/resolver.py \ -- python_modules/pyyaml3/scanner.py \ -- python_modules/pyyaml3/serializer.py \ -- python_modules/pyyaml3/tokens.py \ -- $(NULL) -- --python_urllib3dir=$(pythonmodulesdir)/urllib3 --dist_python_urllib3_DATA = \ -- python_modules/urllib3/__init__.py \ -- python_modules/urllib3/_collections.py \ -- python_modules/urllib3/connection.py \ -- python_modules/urllib3/connectionpool.py \ -- python_modules/urllib3/exceptions.py \ -- python_modules/urllib3/fields.py \ -- python_modules/urllib3/filepost.py \ -- python_modules/urllib3/response.py \ -- python_modules/urllib3/poolmanager.py \ -- python_modules/urllib3/request.py \ -- $(NULL) -- --python_urllib3_utildir=$(python_urllib3dir)/util --dist_python_urllib3_util_DATA = \ -- python_modules/urllib3/util/__init__.py \ -- python_modules/urllib3/util/connection.py \ -- python_modules/urllib3/util/request.py \ -- python_modules/urllib3/util/response.py \ -- python_modules/urllib3/util/retry.py \ -- python_modules/urllib3/util/selectors.py \ -- python_modules/urllib3/util/ssl_.py \ -- python_modules/urllib3/util/timeout.py \ -- python_modules/urllib3/util/url.py \ -- python_modules/urllib3/util/wait.py \ -- $(NULL) -- --python_urllib3_packagesdir=$(python_urllib3dir)/packages --dist_python_urllib3_packages_DATA = \ -- python_modules/urllib3/packages/__init__.py \ -- python_modules/urllib3/packages/ordered_dict.py \ -- python_modules/urllib3/packages/six.py \ -- $(NULL) -- --python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports --dist_python_urllib3_backports_DATA = \ -- python_modules/urllib3/packages/backports/__init__.py \ -- python_modules/urllib3/packages/backports/makefile.py \ -- $(NULL) -- --python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname --dist_python_urllib3_ssl_match_hostname_DATA = \ -- python_modules/urllib3/packages/ssl_match_hostname/__init__.py \ -- python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \ -- $(NULL) -- --python_urllib3_contribdir=$(python_urllib3dir)/contrib --dist_python_urllib3_contrib_DATA = \ -- python_modules/urllib3/contrib/__init__.py \ -- python_modules/urllib3/contrib/appengine.py \ -- python_modules/urllib3/contrib/ntlmpool.py \ -- python_modules/urllib3/contrib/pyopenssl.py \ -- python_modules/urllib3/contrib/securetransport.py \ -- python_modules/urllib3/contrib/socks.py \ -- $(NULL) -- --python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport --dist_python_urllib3_securetransport_DATA = \ -- python_modules/urllib3/contrib/_securetransport/__init__.py \ -- python_modules/urllib3/contrib/_securetransport/bindings.py \ -- python_modules/urllib3/contrib/_securetransport/low_level.py \ -- $(NULL) -diff -Naurp netdata.orig/collectors/python.d.plugin/python_modules/bases/loaders.py netdata/collectors/python.d.plugin/python_modules/bases/loaders.py ---- netdata.orig/collectors/python.d.plugin/python_modules/bases/loaders.py -+++ netdata/collectors/python.d.plugin/python_modules/bases/loaders.py -@@ -11,9 +11,9 @@ PY_VERSION = version_info[:2] - - try: - if PY_VERSION > (3, 1): -- from pyyaml3 import SafeLoader as YamlSafeLoader -+ from yaml import SafeLoader as YamlSafeLoader - else: -- from pyyaml2 import SafeLoader as YamlSafeLoader -+ from yaml import SafeLoader as YamlSafeLoader - except ImportError: - from yaml import SafeLoader as YamlSafeLoader - -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/0002-debian-use-system-python.patch b/debian/patches/0002-debian-use-system-python.patch new file mode 100644 index 000000000..4e329bb7b --- /dev/null +++ b/debian/patches/0002-debian-use-system-python.patch @@ -0,0 +1,131 @@ +Author: Lennart Weller +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 = \ + python_modules/third_party/boinc_client.py \ + python_modules/third_party/monotonic.py \ + $(NULL) +- +-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2 +-dist_pythonyaml2_DATA = \ +- python_modules/pyyaml2/__init__.py \ +- python_modules/pyyaml2/composer.py \ +- python_modules/pyyaml2/constructor.py \ +- python_modules/pyyaml2/cyaml.py \ +- python_modules/pyyaml2/dumper.py \ +- python_modules/pyyaml2/emitter.py \ +- python_modules/pyyaml2/error.py \ +- python_modules/pyyaml2/events.py \ +- python_modules/pyyaml2/loader.py \ +- python_modules/pyyaml2/nodes.py \ +- python_modules/pyyaml2/parser.py \ +- python_modules/pyyaml2/reader.py \ +- python_modules/pyyaml2/representer.py \ +- python_modules/pyyaml2/resolver.py \ +- python_modules/pyyaml2/scanner.py \ +- python_modules/pyyaml2/serializer.py \ +- python_modules/pyyaml2/tokens.py \ +- $(NULL) +- +-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3 +-dist_pythonyaml3_DATA = \ +- python_modules/pyyaml3/__init__.py \ +- python_modules/pyyaml3/composer.py \ +- python_modules/pyyaml3/constructor.py \ +- python_modules/pyyaml3/cyaml.py \ +- python_modules/pyyaml3/dumper.py \ +- python_modules/pyyaml3/emitter.py \ +- python_modules/pyyaml3/error.py \ +- python_modules/pyyaml3/events.py \ +- python_modules/pyyaml3/loader.py \ +- python_modules/pyyaml3/nodes.py \ +- python_modules/pyyaml3/parser.py \ +- python_modules/pyyaml3/reader.py \ +- python_modules/pyyaml3/representer.py \ +- python_modules/pyyaml3/resolver.py \ +- python_modules/pyyaml3/scanner.py \ +- python_modules/pyyaml3/serializer.py \ +- python_modules/pyyaml3/tokens.py \ +- $(NULL) +- +-python_urllib3dir=$(pythonmodulesdir)/urllib3 +-dist_python_urllib3_DATA = \ +- python_modules/urllib3/__init__.py \ +- python_modules/urllib3/_collections.py \ +- python_modules/urllib3/connection.py \ +- python_modules/urllib3/connectionpool.py \ +- python_modules/urllib3/exceptions.py \ +- python_modules/urllib3/fields.py \ +- python_modules/urllib3/filepost.py \ +- python_modules/urllib3/response.py \ +- python_modules/urllib3/poolmanager.py \ +- python_modules/urllib3/request.py \ +- $(NULL) +- +-python_urllib3_utildir=$(python_urllib3dir)/util +-dist_python_urllib3_util_DATA = \ +- python_modules/urllib3/util/__init__.py \ +- python_modules/urllib3/util/connection.py \ +- python_modules/urllib3/util/request.py \ +- python_modules/urllib3/util/response.py \ +- python_modules/urllib3/util/retry.py \ +- python_modules/urllib3/util/selectors.py \ +- python_modules/urllib3/util/ssl_.py \ +- python_modules/urllib3/util/timeout.py \ +- python_modules/urllib3/util/url.py \ +- python_modules/urllib3/util/wait.py \ +- $(NULL) +- +-python_urllib3_packagesdir=$(python_urllib3dir)/packages +-dist_python_urllib3_packages_DATA = \ +- python_modules/urllib3/packages/__init__.py \ +- python_modules/urllib3/packages/ordered_dict.py \ +- python_modules/urllib3/packages/six.py \ +- $(NULL) +- +-python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports +-dist_python_urllib3_backports_DATA = \ +- python_modules/urllib3/packages/backports/__init__.py \ +- python_modules/urllib3/packages/backports/makefile.py \ +- $(NULL) +- +-python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname +-dist_python_urllib3_ssl_match_hostname_DATA = \ +- python_modules/urllib3/packages/ssl_match_hostname/__init__.py \ +- python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \ +- $(NULL) +- +-python_urllib3_contribdir=$(python_urllib3dir)/contrib +-dist_python_urllib3_contrib_DATA = \ +- python_modules/urllib3/contrib/__init__.py \ +- python_modules/urllib3/contrib/appengine.py \ +- python_modules/urllib3/contrib/ntlmpool.py \ +- python_modules/urllib3/contrib/pyopenssl.py \ +- python_modules/urllib3/contrib/securetransport.py \ +- python_modules/urllib3/contrib/socks.py \ +- $(NULL) +- +-python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport +-dist_python_urllib3_securetransport_DATA = \ +- python_modules/urllib3/contrib/_securetransport/__init__.py \ +- python_modules/urllib3/contrib/_securetransport/bindings.py \ +- python_modules/urllib3/contrib/_securetransport/low_level.py \ +- $(NULL) +diff -Naurp netdata.orig/collectors/python.d.plugin/python_modules/bases/loaders.py netdata/collectors/python.d.plugin/python_modules/bases/loaders.py +--- netdata.orig/collectors/python.d.plugin/python_modules/bases/loaders.py ++++ netdata/collectors/python.d.plugin/python_modules/bases/loaders.py +@@ -11,9 +11,9 @@ PY_VERSION = version_info[:2] + + try: + if PY_VERSION > (3, 1): +- from pyyaml3 import SafeLoader as YamlSafeLoader ++ from yaml import SafeLoader as YamlSafeLoader + else: +- from pyyaml2 import SafeLoader as YamlSafeLoader ++ from yaml import SafeLoader as YamlSafeLoader + except ImportError: + from yaml import SafeLoader as YamlSafeLoader + diff --git a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch deleted file mode 100644 index b0b7d7433..000000000 --- a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Lennart Weller -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 - int done = 0; - while(!done) { - // check if the file exists -- if (lstat(webfilename, &statbuf) != 0) { -+ if (stat(webfilename, &statbuf) != 0) { - debug(D_WEB_CLIENT_ACCESS, "%llu: File '%s' is not found.", w->id, webfilename); - w->response.data->contenttype = CT_TEXT_HTML; - buffer_strcat(w->response.data, "File does not exist, or is not accessible: "); diff --git a/debian/patches/0003-debian-use-system-exim4.patch b/debian/patches/0003-debian-use-system-exim4.patch new file mode 100644 index 000000000..bcb0a1b7a --- /dev/null +++ b/debian/patches/0003-debian-use-system-exim4.patch @@ -0,0 +1,12 @@ +Author: Sven Hartge +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 + # AUTO-DETECTION JOBS + + local: +- command: 'exim -bpc' ++ command: '/usr/sbin/exim -bpc' diff --git a/debian/patches/0003-hide-social-media-buttons.patch b/debian/patches/0003-hide-social-media-buttons.patch deleted file mode 100644 index 33fca6246..000000000 --- a/debian/patches/0003-hide-social-media-buttons.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 @@ - -+ -
  •  
    • -
  •  
    • -
  •  
    • diff --git a/debian/patches/0003-hide-update-button.patch b/debian/patches/0003-hide-update-button.patch deleted file mode 100644 index bbb4c0273..000000000 --- a/debian/patches/0003-hide-update-button.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Federico Ceratto -Description: hide update button - -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 @@ -
      -
    •  
      • -
    •  
      • -+ - - - diff --git a/debian/patches/0004-debian-use-python3.patch b/debian/patches/0004-debian-use-python3.patch new file mode 100644 index 000000000..cc800d257 --- /dev/null +++ b/debian/patches/0004-debian-use-python3.patch @@ -0,0 +1,14 @@ +Author: Sander Klein +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 +@@ -1,6 +1,4 @@ +-#!/usr/bin/env bash +-'''':; exec "$(command -v python || command -v python3 || command -v python2 || +-echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # ''' ++#!/usr/bin/python3 + + # -*- coding: utf-8 -*- + # Description: diff --git a/debian/patches/0004-debianize-path-to-exim4-binary.patch b/debian/patches/0004-debianize-path-to-exim4-binary.patch deleted file mode 100644 index 954c5c7cc..000000000 --- a/debian/patches/0004-debianize-path-to-exim4-binary.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Sven Hartge -Description: Debianize path to exim4 binary - -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 - # AUTO-DETECTION JOBS - - local: -- command: 'exim -bpc' -+ command: '/usr/sbin/exim -bpc' diff --git a/debian/patches/0005-debian-remove-infographic.patch b/debian/patches/0005-debian-remove-infographic.patch new file mode 100644 index 000000000..0571c9632 --- /dev/null +++ b/debian/patches/0005-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/0005-remove-infographic-for-privacy-breach-reasons.patch b/debian/patches/0005-remove-infographic-for-privacy-breach-reasons.patch deleted file mode 100644 index e9e68c1a3..000000000 --- a/debian/patches/0005-remove-infographic-for-privacy-breach-reasons.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/0006-debian-remove-contrib-files.patch b/debian/patches/0006-debian-remove-contrib-files.patch new file mode 100644 index 000000000..eca2319a7 --- /dev/null +++ b/debian/patches/0006-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/0006-force-usage-of-python3.patch b/debian/patches/0006-force-usage-of-python3.patch deleted file mode 100644 index 04222e795..000000000 --- a/debian/patches/0006-force-usage-of-python3.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Sander Klein -Description: Force usage of python3 - Debian uses Python2 by default. The netdata package installs the - Python3 dependencies. So, in order to work correctly it must use - 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 -@@ -1,6 +1,4 @@ --#!/usr/bin/env bash --'''':; exec "$(command -v python || command -v python3 || command -v python2 || --echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # ''' -+#!/usr/bin/python3 - - # -*- coding: utf-8 -*- - # Description: diff --git a/debian/patches/0007-skip-debian-files-in-upstream-makefile.patch b/debian/patches/0007-skip-debian-files-in-upstream-makefile.patch deleted file mode 100644 index 5040d2007..000000000 --- a/debian/patches/0007-skip-debian-files-in-upstream-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: Daniel Baumann -Description: Skip debian files in upstream's makefile. - -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/0008-compile-on-kfreebsd.patch b/debian/patches/0008-compile-on-kfreebsd.patch deleted file mode 100644 index 9e6945ccb..000000000 --- a/debian/patches/0008-compile-on-kfreebsd.patch +++ /dev/null @@ -1,527 +0,0 @@ -Author: Lennart Weller , Daniel Baumann -Description: compile on kfreebsd/hurd - -diff -Naurp netdata.orig/collectors/apps.plugin/apps_plugin.c netdata/collectors/apps.plugin/apps_plugin.c ---- netdata.orig/collectors/apps.plugin/apps_plugin.c -+++ netdata/collectors/apps.plugin/apps_plugin.c -@@ -62,7 +62,7 @@ static inline void debug_log_dummy(void) - - // ---------------------------------------------------------------------------- - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include - #endif - -@@ -78,7 +78,7 @@ static inline void debug_log_dummy(void) - // set this to 1 - // when set to 0, apps.plugin builds a sort list of processes, in order - // to process children processes, before parent processes --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #define ALL_PIDS_ARE_READ_INSTANTLY 1 - #else - #define ALL_PIDS_ARE_READ_INSTANTLY 0 -@@ -114,7 +114,7 @@ static inline void debug_log_dummy(void) - static int - update_every = 1, - enable_guest_charts = 0, --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - enable_file_charts = 0, - #else - enable_file_charts = 1, -@@ -279,7 +279,7 @@ size_t - struct pid_fd { - int fd; - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - ino_t inode; - char *filename; - uint32_t link_hash; -@@ -362,7 +362,7 @@ struct pid_stat { - kernel_uint_t status_rssfile; - kernel_uint_t status_rssshmem; - kernel_uint_t status_vmswap; --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - ARL_BASE *status_arl; - #endif - -@@ -760,7 +760,7 @@ static inline void del_pid_entry(pid_t p - if(p->prev) p->prev->next = p->next; - - // free the filename --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - { - size_t i; - for(i = 0; i < p->fds_size; i++) -@@ -773,7 +773,7 @@ static inline void del_pid_entry(pid_t p - freez(p->fds_dirname); - freez(p->stat_filename); - freez(p->status_filename); --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - arl_free(p->status_arl); - #endif - freez(p->io_filename); -@@ -796,7 +796,7 @@ static inline int managed_log(struct pid - p->log_thrown |= log; - switch(log) { - case PID_LOG_IO: -- #ifdef __FreeBSD__ -+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - error("Cannot fetch process %d I/O info (command '%s')", p->pid, p->comm); - #else - error("Cannot process %s/proc/%d/io (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); -@@ -804,7 +804,7 @@ static inline int managed_log(struct pid - break; - - case PID_LOG_STATUS: -- #ifdef __FreeBSD__ -+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - error("Cannot fetch process %d status info (command '%s')", p->pid, p->comm); - #else - error("Cannot process %s/proc/%d/status (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); -@@ -812,7 +812,7 @@ static inline int managed_log(struct pid - break; - - case PID_LOG_CMDLINE: -- #ifdef __FreeBSD__ -+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - error("Cannot fetch process %d command line (command '%s')", p->pid, p->comm); - #else - error("Cannot process %s/proc/%d/cmdline (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); -@@ -820,7 +820,7 @@ static inline int managed_log(struct pid - break; - - case PID_LOG_FDS: -- #ifdef __FreeBSD__ -+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - error("Cannot fetch process %d files (command '%s')", p->pid, p->comm); - #else - error("Cannot process entries in %s/proc/%d/fd (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); -@@ -886,7 +886,7 @@ static inline void assign_target_to_pid( - static inline int read_proc_pid_cmdline(struct pid_stat *p) { - static char cmdline[MAX_CMDLINE + 1]; - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - size_t i, bytes = MAX_CMDLINE; - int mib[4]; - -@@ -949,7 +949,7 @@ cleanup: - - // ---------------------------------------------------------------------------- - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - struct arl_callback_ptr { - struct pid_stat *p; - procfile *ff; -@@ -1023,7 +1023,7 @@ void arl_callback_status_rssshmem(const - - aptr->p->status_rssshmem = str2kernel_uint_t(procfile_lineword(aptr->ff, aptr->line, 1)); - } --#endif // !__FreeBSD__ -+#endif // !__FreeBSD__, !__FreeBSD_kernel__ - - static inline int read_proc_pid_status(struct pid_stat *p, void *ptr) { - p->status_vmsize = 0; -@@ -1033,7 +1033,7 @@ static inline int read_proc_pid_status(s - p->status_rssshmem = 0; - p->status_vmswap = 0; - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - struct kinfo_proc *proc_info = (struct kinfo_proc *)ptr; - - p->uid = proc_info->ki_uid; -@@ -1102,7 +1102,7 @@ static inline int read_proc_pid_status(s - static inline int read_proc_pid_stat(struct pid_stat *p, void *ptr) { - (void)ptr; - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - struct kinfo_proc *proc_info = (struct kinfo_proc *)ptr; - - if (unlikely(proc_info->ki_tdflags & TDF_IDLETD)) -@@ -1133,7 +1133,7 @@ static inline int read_proc_pid_stat(str - p->stat_collected_usec = now_monotonic_usec(); - calls_counter++; - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - char *comm = proc_info->ki_comm; - p->ppid = proc_info->ki_ppid; - #else -@@ -1165,7 +1165,7 @@ static inline int read_proc_pid_stat(str - assign_target_to_pid(p); - } - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - pid_incremental_rate(stat, p->minflt, (kernel_uint_t)proc_info->ki_rusage.ru_minflt); - pid_incremental_rate(stat, p->cminflt, (kernel_uint_t)proc_info->ki_rusage_ch.ru_minflt); - pid_incremental_rate(stat, p->majflt, (kernel_uint_t)proc_info->ki_rusage.ru_majflt); -@@ -1265,7 +1265,7 @@ cleanup: - - static inline int read_proc_pid_io(struct pid_stat *p, void *ptr) { - (void)ptr; --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - struct kinfo_proc *proc_info = (struct kinfo_proc *)ptr; - #else - static procfile *ff = NULL; -@@ -1289,7 +1289,7 @@ static inline int read_proc_pid_io(struc - p->last_io_collected_usec = p->io_collected_usec; - p->io_collected_usec = now_monotonic_usec(); - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - pid_incremental_rate(io, p->io_storage_bytes_read, proc_info->ki_rusage.ru_inblock); - pid_incremental_rate(io, p->io_storage_bytes_written, proc_info->ki_rusage.ru_oublock); - #else -@@ -1314,7 +1314,7 @@ static inline int read_proc_pid_io(struc - - return 1; - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - cleanup: - p->io_logical_bytes_read = 0; - p->io_logical_bytes_written = 0; -@@ -1611,7 +1611,7 @@ static inline int file_descriptor_find_o - static inline void clear_pid_fd(struct pid_fd *pfd) { - pfd->fd = 0; - -- #ifndef __FreeBSD__ -+ #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - pfd->link_hash = 0; - pfd->inode = 0; - pfd->cache_iterations_counter = 0; -@@ -1647,7 +1647,7 @@ static inline void init_pid_fds(struct p - size_t i = first; - - while(pfd < pfdend) { --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - pfd->filename = NULL; - #endif - clear_pid_fd(pfd); -@@ -1658,7 +1658,7 @@ static inline void init_pid_fds(struct p - - static inline int read_pid_file_descriptors(struct pid_stat *p, void *ptr) { - (void)ptr; --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - int mib[4]; - size_t size; - struct kinfo_file *fds; -@@ -2281,7 +2281,7 @@ static inline int collect_data_for_pid(p - static int collect_data_for_all_processes(void) { - struct pid_stat *p = NULL; - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - int i, procnum; - - static size_t procbase_size = 0; -@@ -2361,7 +2361,7 @@ static int collect_data_for_all_processe - #endif - } - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - for (i = 0 ; i < procnum ; ++i) { - pid_t pid = procbase[i].ki_pid; - collect_data_for_pid(pid, &procbase[i]); -@@ -3188,7 +3188,7 @@ static void send_collected_data_to_netda - } - send_END(); - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - send_BEGIN(type, "swap", dt); - for (w = root; w ; w = w->next) { - if(unlikely(w->exposed)) -@@ -3211,7 +3211,7 @@ static void send_collected_data_to_netda - } - send_END(); - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - send_BEGIN(type, "lreads", dt); - for (w = root; w ; w = w->next) { - if(unlikely(w->exposed)) -@@ -3340,7 +3340,7 @@ static void send_charts_updates_to_netda - } - } - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - fprintf(stdout, "CHART %s.swap '' '%s Swap Memory' 'MB' swap %s.swap stacked 20011 %d\n", type, title, type, update_every); - for (w = root; w ; w = w->next) { - if(unlikely(w->exposed)) -@@ -3360,7 +3360,7 @@ static void send_charts_updates_to_netda - fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, RATES_DETAIL); - } - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - fprintf(stdout, "CHART %s.preads '' '%s Disk Reads' 'blocks/s' disk %s.preads stacked 20002 %d\n", type, title, type, update_every); - for (w = root; w ; w = w->next) { - if(unlikely(w->exposed)) -@@ -3478,7 +3478,7 @@ static void parse_args(int argc, char ** - continue; - } - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - if(strcmp("fds-cache-secs", argv[i]) == 0) { - if(argc <= i + 1) { - fprintf(stderr, "Parameter 'fds-cache-secs' requires a number as argument.\n"); -@@ -3560,7 +3560,7 @@ static void parse_args(int argc, char ** - " without-files enable / disable reporting files, sockets, pipes\n" - " (default is enabled)\n" - "\n" --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - " fds-cache-secs N cache the files of processed for N seconds\n" - " caching is adaptive per file (when a file\n" - " is found, it starts at 0 and while the file\n" -@@ -3572,7 +3572,7 @@ static void parse_args(int argc, char ** - " version or -v or -V print program version and exit\n" - "\n" - , VERSION --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - , max_fds_cache_seconds - #endif - ); -diff -Naurp netdata.orig/collectors/freebsd.plugin/freebsd_getifaddrs.c netdata/collectors/freebsd.plugin/freebsd_getifaddrs.c ---- netdata.orig/collectors/freebsd.plugin/freebsd_getifaddrs.c -+++ netdata/collectors/freebsd.plugin/freebsd_getifaddrs.c -@@ -539,7 +539,7 @@ int do_getifaddrs(int update_every, usec - - if (ifm->do_drops == CONFIG_BOOLEAN_YES || (ifm->do_drops == CONFIG_BOOLEAN_AUTO && - (IFA_DATA(iqdrops) -- #if __FreeBSD__ >= 11 -+ #if __FreeBSD_version >= 1100000 - || IFA_DATA(oqdrops) - #endif - ))) { -@@ -561,14 +561,14 @@ int do_getifaddrs(int update_every, usec - rrdset_flag_set(ifm->st_drops, RRDSET_FLAG_DETAIL); - - ifm->rd_drops_in = rrddim_add(ifm->st_drops, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); --#if __FreeBSD__ >= 11 -+#if __FreeBSD_version >= 1100000 - ifm->rd_drops_out = rrddim_add(ifm->st_drops, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL); - #endif - } else - rrdset_next(ifm->st_drops); - - rrddim_set_by_pointer(ifm->st_drops, ifm->rd_drops_in, IFA_DATA(iqdrops)); --#if __FreeBSD__ >= 11 -+#if __FreeBSD_version >= 1100000 - rrddim_set_by_pointer(ifm->st_drops, ifm->rd_drops_out, IFA_DATA(oqdrops)); - #endif - rrdset_done(ifm->st_drops); -diff -Naurp netdata.orig/collectors/freebsd.plugin/freebsd_ipfw.c netdata/collectors/freebsd.plugin/freebsd_ipfw.c ---- netdata.orig/collectors/freebsd.plugin/freebsd_ipfw.c -+++ netdata/collectors/freebsd.plugin/freebsd_ipfw.c -@@ -17,7 +17,7 @@ - - int do_ipfw(int update_every, usec_t dt) { - (void)dt; --#if __FreeBSD__ >= 11 -+#if __FreeBSD_version >= 1100000 - - static int do_static = -1, do_dynamic = -1, do_mem = -1; - -diff -Naurp netdata.orig/collectors/freebsd.plugin/freebsd_sysctl.c netdata/collectors/freebsd.plugin/freebsd_sysctl.c ---- netdata.orig/collectors/freebsd.plugin/freebsd_sysctl.c -+++ netdata/collectors/freebsd.plugin/freebsd_sysctl.c -@@ -1876,7 +1876,7 @@ int do_net_inet_tcp_stats(int update_eve - } else - rrdset_next(st); - --#if __FreeBSD__ >= 11 -+#if __FreeBSD_version >= 11 - rrddim_set_by_pointer(st, rd_in_errs, tcpstat.tcps_rcvbadoff + tcpstat.tcps_rcvreassfull + - tcpstat.tcps_rcvshort); - #else -diff -Naurp netdata.orig/collectors/proc.plugin/zfs_common.c netdata/collectors/proc.plugin/zfs_common.c ---- netdata.orig/collectors/proc.plugin/zfs_common.c -+++ netdata/collectors/proc.plugin/zfs_common.c -@@ -454,11 +454,11 @@ void generate_charts_arc_summary(const c - - { - static RRDSET *st_memory = NULL; --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - static RRDDIM *rd_direct = NULL; - #endif - static RRDDIM *rd_throttled = NULL; --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - static RRDDIM *rd_indirect = NULL; - #endif - -@@ -478,22 +478,22 @@ void generate_charts_arc_summary(const c - , RRDSET_TYPE_LINE - ); - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - rd_direct = rrddim_add(st_memory, "direct", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); - #endif - rd_throttled = rrddim_add(st_memory, "throttled", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - rd_indirect = rrddim_add(st_memory, "indirect", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); - #endif - } - else - rrdset_next(st_memory); - --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - rrddim_set_by_pointer(st_memory, rd_direct, arcstats.memory_direct_count); - #endif - rrddim_set_by_pointer(st_memory, rd_throttled, arcstats.memory_throttle_count); --#ifndef __FreeBSD__ -+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) - rrddim_set_by_pointer(st_memory, rd_indirect, arcstats.memory_indirect_count); - #endif - rrdset_done(st_memory); -diff -Naurp netdata.orig/daemon/global_statistics.c netdata/daemon/global_statistics.c ---- netdata.orig/daemon/global_statistics.c -+++ netdata/daemon/global_statistics.c -@@ -192,7 +192,7 @@ void global_statistics_charts(void) { - static RRDDIM *rd_cpu_thread_user = NULL, - *rd_cpu_thread_system = NULL; - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - if (unlikely(!st_cpu_thread)) { - st_cpu_thread = rrdset_create_localhost( - "netdata" -diff -Naurp netdata.orig/libnetdata/libnetdata.c netdata/libnetdata/libnetdata.c ---- netdata.orig/libnetdata/libnetdata.c -+++ netdata/libnetdata/libnetdata.c -@@ -5,10 +5,10 @@ - #ifdef __APPLE__ - #define INHERIT_NONE 0 - #endif /* __APPLE__ */ --#if defined(__FreeBSD__) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) - # define O_NOATIME 0 - # define MADV_DONTFORK INHERIT_NONE --#endif /* __FreeBSD__ || __APPLE__*/ -+#endif /* __FreeBSD__ || __FreeBSD_kernel__ || __APPLE__*/ - - struct rlimit rlimit_nofile = { .rlim_cur = 1024, .rlim_max = 1024 }; - int enable_ksm = 1; -@@ -1179,7 +1179,7 @@ int recursively_delete_dir(const char *p - - static int is_virtual_filesystem(const char *path, char **reason) { - --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - (void)path; - (void)reason; - #else -diff -Naurp netdata.orig/libnetdata/libnetdata.h netdata/libnetdata/libnetdata.h ---- netdata.orig/libnetdata/libnetdata.h -+++ netdata/libnetdata/libnetdata.h -@@ -30,22 +30,22 @@ - - #else /* !defined(ENABLE_JEMALLOC) && !defined(ENABLE_TCMALLOC) */ - --#if !(defined(__FreeBSD__) || defined(__APPLE__)) -+#if ( !(defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) ) || defined(__APPLE__)) - #include --#endif /* __FreeBSD__ || __APPLE__ */ -+#endif /* __FreeBSD__, __FreeBSD_kernel__ || __APPLE__ */ - - #endif /* !defined(ENABLE_JEMALLOC) && !defined(ENABLE_TCMALLOC) */ - - // ---------------------------------------------------------------------------- - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #include - #define NETDATA_OS_TYPE "freebsd" - #elif defined(__APPLE__) - #define NETDATA_OS_TYPE "macos" - #else - #define NETDATA_OS_TYPE "linux" --#endif /* __FreeBSD__, __APPLE__*/ -+#endif /* __FreeBSD__, __FreeBSD_kernel__, __APPLE__*/ - - #include - #include -diff -Naurp netdata.orig/libnetdata/os.c netdata/libnetdata/os.c ---- netdata.orig/libnetdata/os.c -+++ netdata/libnetdata/os.c -@@ -20,7 +20,7 @@ long get_system_cpus(void) { - } - - return processors; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - int32_t tmp_processors; - - if (unlikely(GETSYSCTL_BY_NAME("hw.ncpu", tmp_processors))) { -@@ -62,7 +62,7 @@ long get_system_cpus(void) { - debug(D_SYSTEM, "System has %d processors.", processors); - return processors; - --#endif /* __APPLE__, __FreeBSD__ */ -+#endif /* __APPLE__, __FreeBSD__, __FreeBSD_kernel__ */ - } - - pid_t pid_max = 32768; -@@ -72,7 +72,7 @@ pid_t get_system_pid_max(void) { - // we use the number defined in bsd/sys/proc_internal.h in XNU sources - pid_max = 99999; - return pid_max; --#elif __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - int32_t tmp_pid_max; - - if (unlikely(GETSYSCTL_BY_NAME("kern.pid_max", tmp_pid_max))) { -@@ -106,7 +106,7 @@ pid_t get_system_pid_max(void) { - pid_max = (pid_t) max; - return pid_max; - --#endif /* __APPLE__, __FreeBSD__ */ -+#endif /* __APPLE__, __FreeBSD__, __FreeBSD_kernel__ */ - } - - unsigned int system_hz; -diff -Naurp netdata.orig/libnetdata/threads/threads.c netdata/libnetdata/threads/threads.c ---- netdata.orig/libnetdata/threads/threads.c -+++ netdata/libnetdata/threads/threads.c -@@ -26,7 +26,7 @@ const char *netdata_thread_tag(void) { - // compatibility library functions - - pid_t gettid(void) { --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - - return (pid_t)pthread_getthreadid_np(); - -@@ -44,7 +44,7 @@ pid_t gettid(void) { - - return (pid_t)syscall(SYS_gettid); - --#endif /* __FreeBSD__, __APPLE__*/ -+#endif /* __FreeBSD__, __FreeBSD_kernel__, __APPLE__*/ - } - - // ---------------------------------------------------------------------------- diff --git a/debian/patches/0011-netdata-support-symlinks.patch b/debian/patches/0011-netdata-support-symlinks.patch new file mode 100644 index 000000000..081021155 --- /dev/null +++ b/debian/patches/0011-netdata-support-symlinks.patch @@ -0,0 +1,15 @@ +Author: Lennart Weller +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 + int done = 0; + while(!done) { + // check if the file exists +- if (lstat(webfilename, &statbuf) != 0) { ++ if (stat(webfilename, &statbuf) != 0) { + debug(D_WEB_CLIENT_ACCESS, "%llu: File '%s' is not found.", w->id, webfilename); + w->response.data->contenttype = CT_TEXT_HTML; + buffer_strcat(w->response.data, "File does not exist, or is not accessible: "); diff --git a/debian/patches/0012-netdata-support-kfreebsd.patch b/debian/patches/0012-netdata-support-kfreebsd.patch new file mode 100644 index 000000000..8c2449530 --- /dev/null +++ b/debian/patches/0012-netdata-support-kfreebsd.patch @@ -0,0 +1,527 @@ +Author: Lennart Weller , Daniel Baumann +Description: Build on kfreebsd. + +diff -Naurp netdata.orig/collectors/apps.plugin/apps_plugin.c netdata/collectors/apps.plugin/apps_plugin.c +--- netdata.orig/collectors/apps.plugin/apps_plugin.c ++++ netdata/collectors/apps.plugin/apps_plugin.c +@@ -62,7 +62,7 @@ static inline void debug_log_dummy(void) + + // ---------------------------------------------------------------------------- + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #include + #endif + +@@ -78,7 +78,7 @@ static inline void debug_log_dummy(void) + // set this to 1 + // when set to 0, apps.plugin builds a sort list of processes, in order + // to process children processes, before parent processes +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #define ALL_PIDS_ARE_READ_INSTANTLY 1 + #else + #define ALL_PIDS_ARE_READ_INSTANTLY 0 +@@ -114,7 +114,7 @@ static inline void debug_log_dummy(void) + static int + update_every = 1, + enable_guest_charts = 0, +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + enable_file_charts = 0, + #else + enable_file_charts = 1, +@@ -279,7 +279,7 @@ size_t + struct pid_fd { + int fd; + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + ino_t inode; + char *filename; + uint32_t link_hash; +@@ -362,7 +362,7 @@ struct pid_stat { + kernel_uint_t status_rssfile; + kernel_uint_t status_rssshmem; + kernel_uint_t status_vmswap; +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + ARL_BASE *status_arl; + #endif + +@@ -760,7 +760,7 @@ static inline void del_pid_entry(pid_t p + if(p->prev) p->prev->next = p->next; + + // free the filename +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + { + size_t i; + for(i = 0; i < p->fds_size; i++) +@@ -773,7 +773,7 @@ static inline void del_pid_entry(pid_t p + freez(p->fds_dirname); + freez(p->stat_filename); + freez(p->status_filename); +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + arl_free(p->status_arl); + #endif + freez(p->io_filename); +@@ -796,7 +796,7 @@ static inline int managed_log(struct pid + p->log_thrown |= log; + switch(log) { + case PID_LOG_IO: +- #ifdef __FreeBSD__ ++ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + error("Cannot fetch process %d I/O info (command '%s')", p->pid, p->comm); + #else + error("Cannot process %s/proc/%d/io (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); +@@ -804,7 +804,7 @@ static inline int managed_log(struct pid + break; + + case PID_LOG_STATUS: +- #ifdef __FreeBSD__ ++ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + error("Cannot fetch process %d status info (command '%s')", p->pid, p->comm); + #else + error("Cannot process %s/proc/%d/status (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); +@@ -812,7 +812,7 @@ static inline int managed_log(struct pid + break; + + case PID_LOG_CMDLINE: +- #ifdef __FreeBSD__ ++ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + error("Cannot fetch process %d command line (command '%s')", p->pid, p->comm); + #else + error("Cannot process %s/proc/%d/cmdline (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); +@@ -820,7 +820,7 @@ static inline int managed_log(struct pid + break; + + case PID_LOG_FDS: +- #ifdef __FreeBSD__ ++ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + error("Cannot fetch process %d files (command '%s')", p->pid, p->comm); + #else + error("Cannot process entries in %s/proc/%d/fd (command '%s')", netdata_configured_host_prefix, p->pid, p->comm); +@@ -886,7 +886,7 @@ static inline void assign_target_to_pid( + static inline int read_proc_pid_cmdline(struct pid_stat *p) { + static char cmdline[MAX_CMDLINE + 1]; + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + size_t i, bytes = MAX_CMDLINE; + int mib[4]; + +@@ -949,7 +949,7 @@ cleanup: + + // ---------------------------------------------------------------------------- + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + struct arl_callback_ptr { + struct pid_stat *p; + procfile *ff; +@@ -1023,7 +1023,7 @@ void arl_callback_status_rssshmem(const + + aptr->p->status_rssshmem = str2kernel_uint_t(procfile_lineword(aptr->ff, aptr->line, 1)); + } +-#endif // !__FreeBSD__ ++#endif // !__FreeBSD__, !__FreeBSD_kernel__ + + static inline int read_proc_pid_status(struct pid_stat *p, void *ptr) { + p->status_vmsize = 0; +@@ -1033,7 +1033,7 @@ static inline int read_proc_pid_status(s + p->status_rssshmem = 0; + p->status_vmswap = 0; + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + struct kinfo_proc *proc_info = (struct kinfo_proc *)ptr; + + p->uid = proc_info->ki_uid; +@@ -1102,7 +1102,7 @@ static inline int read_proc_pid_status(s + static inline int read_proc_pid_stat(struct pid_stat *p, void *ptr) { + (void)ptr; + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + struct kinfo_proc *proc_info = (struct kinfo_proc *)ptr; + + if (unlikely(proc_info->ki_tdflags & TDF_IDLETD)) +@@ -1133,7 +1133,7 @@ static inline int read_proc_pid_stat(str + p->stat_collected_usec = now_monotonic_usec(); + calls_counter++; + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + char *comm = proc_info->ki_comm; + p->ppid = proc_info->ki_ppid; + #else +@@ -1165,7 +1165,7 @@ static inline int read_proc_pid_stat(str + assign_target_to_pid(p); + } + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + pid_incremental_rate(stat, p->minflt, (kernel_uint_t)proc_info->ki_rusage.ru_minflt); + pid_incremental_rate(stat, p->cminflt, (kernel_uint_t)proc_info->ki_rusage_ch.ru_minflt); + pid_incremental_rate(stat, p->majflt, (kernel_uint_t)proc_info->ki_rusage.ru_majflt); +@@ -1265,7 +1265,7 @@ cleanup: + + static inline int read_proc_pid_io(struct pid_stat *p, void *ptr) { + (void)ptr; +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + struct kinfo_proc *proc_info = (struct kinfo_proc *)ptr; + #else + static procfile *ff = NULL; +@@ -1289,7 +1289,7 @@ static inline int read_proc_pid_io(struc + p->last_io_collected_usec = p->io_collected_usec; + p->io_collected_usec = now_monotonic_usec(); + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + pid_incremental_rate(io, p->io_storage_bytes_read, proc_info->ki_rusage.ru_inblock); + pid_incremental_rate(io, p->io_storage_bytes_written, proc_info->ki_rusage.ru_oublock); + #else +@@ -1314,7 +1314,7 @@ static inline int read_proc_pid_io(struc + + return 1; + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + cleanup: + p->io_logical_bytes_read = 0; + p->io_logical_bytes_written = 0; +@@ -1611,7 +1611,7 @@ static inline int file_descriptor_find_o + static inline void clear_pid_fd(struct pid_fd *pfd) { + pfd->fd = 0; + +- #ifndef __FreeBSD__ ++ #if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + pfd->link_hash = 0; + pfd->inode = 0; + pfd->cache_iterations_counter = 0; +@@ -1647,7 +1647,7 @@ static inline void init_pid_fds(struct p + size_t i = first; + + while(pfd < pfdend) { +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + pfd->filename = NULL; + #endif + clear_pid_fd(pfd); +@@ -1658,7 +1658,7 @@ static inline void init_pid_fds(struct p + + static inline int read_pid_file_descriptors(struct pid_stat *p, void *ptr) { + (void)ptr; +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + int mib[4]; + size_t size; + struct kinfo_file *fds; +@@ -2281,7 +2281,7 @@ static inline int collect_data_for_pid(p + static int collect_data_for_all_processes(void) { + struct pid_stat *p = NULL; + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + int i, procnum; + + static size_t procbase_size = 0; +@@ -2361,7 +2361,7 @@ static int collect_data_for_all_processe + #endif + } + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + for (i = 0 ; i < procnum ; ++i) { + pid_t pid = procbase[i].ki_pid; + collect_data_for_pid(pid, &procbase[i]); +@@ -3188,7 +3188,7 @@ static void send_collected_data_to_netda + } + send_END(); + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + send_BEGIN(type, "swap", dt); + for (w = root; w ; w = w->next) { + if(unlikely(w->exposed)) +@@ -3211,7 +3211,7 @@ static void send_collected_data_to_netda + } + send_END(); + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + send_BEGIN(type, "lreads", dt); + for (w = root; w ; w = w->next) { + if(unlikely(w->exposed)) +@@ -3340,7 +3340,7 @@ static void send_charts_updates_to_netda + } + } + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + fprintf(stdout, "CHART %s.swap '' '%s Swap Memory' 'MB' swap %s.swap stacked 20011 %d\n", type, title, type, update_every); + for (w = root; w ; w = w->next) { + if(unlikely(w->exposed)) +@@ -3360,7 +3360,7 @@ static void send_charts_updates_to_netda + fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, RATES_DETAIL); + } + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + fprintf(stdout, "CHART %s.preads '' '%s Disk Reads' 'blocks/s' disk %s.preads stacked 20002 %d\n", type, title, type, update_every); + for (w = root; w ; w = w->next) { + if(unlikely(w->exposed)) +@@ -3478,7 +3478,7 @@ static void parse_args(int argc, char ** + continue; + } + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + if(strcmp("fds-cache-secs", argv[i]) == 0) { + if(argc <= i + 1) { + fprintf(stderr, "Parameter 'fds-cache-secs' requires a number as argument.\n"); +@@ -3560,7 +3560,7 @@ static void parse_args(int argc, char ** + " without-files enable / disable reporting files, sockets, pipes\n" + " (default is enabled)\n" + "\n" +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + " fds-cache-secs N cache the files of processed for N seconds\n" + " caching is adaptive per file (when a file\n" + " is found, it starts at 0 and while the file\n" +@@ -3572,7 +3572,7 @@ static void parse_args(int argc, char ** + " version or -v or -V print program version and exit\n" + "\n" + , VERSION +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + , max_fds_cache_seconds + #endif + ); +diff -Naurp netdata.orig/collectors/freebsd.plugin/freebsd_getifaddrs.c netdata/collectors/freebsd.plugin/freebsd_getifaddrs.c +--- netdata.orig/collectors/freebsd.plugin/freebsd_getifaddrs.c ++++ netdata/collectors/freebsd.plugin/freebsd_getifaddrs.c +@@ -539,7 +539,7 @@ int do_getifaddrs(int update_every, usec + + if (ifm->do_drops == CONFIG_BOOLEAN_YES || (ifm->do_drops == CONFIG_BOOLEAN_AUTO && + (IFA_DATA(iqdrops) +- #if __FreeBSD__ >= 11 ++ #if __FreeBSD_version >= 1100000 + || IFA_DATA(oqdrops) + #endif + ))) { +@@ -561,14 +561,14 @@ int do_getifaddrs(int update_every, usec + rrdset_flag_set(ifm->st_drops, RRDSET_FLAG_DETAIL); + + ifm->rd_drops_in = rrddim_add(ifm->st_drops, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); +-#if __FreeBSD__ >= 11 ++#if __FreeBSD_version >= 1100000 + ifm->rd_drops_out = rrddim_add(ifm->st_drops, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL); + #endif + } else + rrdset_next(ifm->st_drops); + + rrddim_set_by_pointer(ifm->st_drops, ifm->rd_drops_in, IFA_DATA(iqdrops)); +-#if __FreeBSD__ >= 11 ++#if __FreeBSD_version >= 1100000 + rrddim_set_by_pointer(ifm->st_drops, ifm->rd_drops_out, IFA_DATA(oqdrops)); + #endif + rrdset_done(ifm->st_drops); +diff -Naurp netdata.orig/collectors/freebsd.plugin/freebsd_ipfw.c netdata/collectors/freebsd.plugin/freebsd_ipfw.c +--- netdata.orig/collectors/freebsd.plugin/freebsd_ipfw.c ++++ netdata/collectors/freebsd.plugin/freebsd_ipfw.c +@@ -17,7 +17,7 @@ + + int do_ipfw(int update_every, usec_t dt) { + (void)dt; +-#if __FreeBSD__ >= 11 ++#if __FreeBSD_version >= 1100000 + + static int do_static = -1, do_dynamic = -1, do_mem = -1; + +diff -Naurp netdata.orig/collectors/freebsd.plugin/freebsd_sysctl.c netdata/collectors/freebsd.plugin/freebsd_sysctl.c +--- netdata.orig/collectors/freebsd.plugin/freebsd_sysctl.c ++++ netdata/collectors/freebsd.plugin/freebsd_sysctl.c +@@ -1876,7 +1876,7 @@ int do_net_inet_tcp_stats(int update_eve + } else + rrdset_next(st); + +-#if __FreeBSD__ >= 11 ++#if __FreeBSD_version >= 11 + rrddim_set_by_pointer(st, rd_in_errs, tcpstat.tcps_rcvbadoff + tcpstat.tcps_rcvreassfull + + tcpstat.tcps_rcvshort); + #else +diff -Naurp netdata.orig/collectors/proc.plugin/zfs_common.c netdata/collectors/proc.plugin/zfs_common.c +--- netdata.orig/collectors/proc.plugin/zfs_common.c ++++ netdata/collectors/proc.plugin/zfs_common.c +@@ -454,11 +454,11 @@ void generate_charts_arc_summary(const c + + { + static RRDSET *st_memory = NULL; +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + static RRDDIM *rd_direct = NULL; + #endif + static RRDDIM *rd_throttled = NULL; +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + static RRDDIM *rd_indirect = NULL; + #endif + +@@ -478,22 +478,22 @@ void generate_charts_arc_summary(const c + , RRDSET_TYPE_LINE + ); + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + rd_direct = rrddim_add(st_memory, "direct", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); + #endif + rd_throttled = rrddim_add(st_memory, "throttled", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + rd_indirect = rrddim_add(st_memory, "indirect", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL); + #endif + } + else + rrdset_next(st_memory); + +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + rrddim_set_by_pointer(st_memory, rd_direct, arcstats.memory_direct_count); + #endif + rrddim_set_by_pointer(st_memory, rd_throttled, arcstats.memory_throttle_count); +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) + rrddim_set_by_pointer(st_memory, rd_indirect, arcstats.memory_indirect_count); + #endif + rrdset_done(st_memory); +diff -Naurp netdata.orig/daemon/global_statistics.c netdata/daemon/global_statistics.c +--- netdata.orig/daemon/global_statistics.c ++++ netdata/daemon/global_statistics.c +@@ -192,7 +192,7 @@ void global_statistics_charts(void) { + static RRDDIM *rd_cpu_thread_user = NULL, + *rd_cpu_thread_system = NULL; + +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + if (unlikely(!st_cpu_thread)) { + st_cpu_thread = rrdset_create_localhost( + "netdata" +diff -Naurp netdata.orig/libnetdata/libnetdata.c netdata/libnetdata/libnetdata.c +--- netdata.orig/libnetdata/libnetdata.c ++++ netdata/libnetdata/libnetdata.c +@@ -5,10 +5,10 @@ + #ifdef __APPLE__ + #define INHERIT_NONE 0 + #endif /* __APPLE__ */ +-#if defined(__FreeBSD__) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) + # define O_NOATIME 0 + # define MADV_DONTFORK INHERIT_NONE +-#endif /* __FreeBSD__ || __APPLE__*/ ++#endif /* __FreeBSD__ || __FreeBSD_kernel__ || __APPLE__*/ + + struct rlimit rlimit_nofile = { .rlim_cur = 1024, .rlim_max = 1024 }; + int enable_ksm = 1; +@@ -1179,7 +1179,7 @@ int recursively_delete_dir(const char *p + + static int is_virtual_filesystem(const char *path, char **reason) { + +-#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + (void)path; + (void)reason; + #else +diff -Naurp netdata.orig/libnetdata/libnetdata.h netdata/libnetdata/libnetdata.h +--- netdata.orig/libnetdata/libnetdata.h ++++ netdata/libnetdata/libnetdata.h +@@ -30,22 +30,22 @@ + + #else /* !defined(ENABLE_JEMALLOC) && !defined(ENABLE_TCMALLOC) */ + +-#if !(defined(__FreeBSD__) || defined(__APPLE__)) ++#if ( !(defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) ) || defined(__APPLE__)) + #include +-#endif /* __FreeBSD__ || __APPLE__ */ ++#endif /* __FreeBSD__, __FreeBSD_kernel__ || __APPLE__ */ + + #endif /* !defined(ENABLE_JEMALLOC) && !defined(ENABLE_TCMALLOC) */ + + // ---------------------------------------------------------------------------- + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #include + #define NETDATA_OS_TYPE "freebsd" + #elif defined(__APPLE__) + #define NETDATA_OS_TYPE "macos" + #else + #define NETDATA_OS_TYPE "linux" +-#endif /* __FreeBSD__, __APPLE__*/ ++#endif /* __FreeBSD__, __FreeBSD_kernel__, __APPLE__*/ + + #include + #include +diff -Naurp netdata.orig/libnetdata/os.c netdata/libnetdata/os.c +--- netdata.orig/libnetdata/os.c ++++ netdata/libnetdata/os.c +@@ -20,7 +20,7 @@ long get_system_cpus(void) { + } + + return processors; +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + int32_t tmp_processors; + + if (unlikely(GETSYSCTL_BY_NAME("hw.ncpu", tmp_processors))) { +@@ -62,7 +62,7 @@ long get_system_cpus(void) { + debug(D_SYSTEM, "System has %d processors.", processors); + return processors; + +-#endif /* __APPLE__, __FreeBSD__ */ ++#endif /* __APPLE__, __FreeBSD__, __FreeBSD_kernel__ */ + } + + pid_t pid_max = 32768; +@@ -72,7 +72,7 @@ pid_t get_system_pid_max(void) { + // we use the number defined in bsd/sys/proc_internal.h in XNU sources + pid_max = 99999; + return pid_max; +-#elif __FreeBSD__ ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + int32_t tmp_pid_max; + + if (unlikely(GETSYSCTL_BY_NAME("kern.pid_max", tmp_pid_max))) { +@@ -106,7 +106,7 @@ pid_t get_system_pid_max(void) { + pid_max = (pid_t) max; + return pid_max; + +-#endif /* __APPLE__, __FreeBSD__ */ ++#endif /* __APPLE__, __FreeBSD__, __FreeBSD_kernel__ */ + } + + unsigned int system_hz; +diff -Naurp netdata.orig/libnetdata/threads/threads.c netdata/libnetdata/threads/threads.c +--- netdata.orig/libnetdata/threads/threads.c ++++ netdata/libnetdata/threads/threads.c +@@ -26,7 +26,7 @@ const char *netdata_thread_tag(void) { + // compatibility library functions + + pid_t gettid(void) { +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + + return (pid_t)pthread_getthreadid_np(); + +@@ -44,7 +44,7 @@ pid_t gettid(void) { + + return (pid_t)syscall(SYS_gettid); + +-#endif /* __FreeBSD__, __APPLE__*/ ++#endif /* __FreeBSD__, __FreeBSD_kernel__, __APPLE__*/ + } + + // ---------------------------------------------------------------------------- diff --git a/debian/patches/0021-gui-remove-update-button.patch b/debian/patches/0021-gui-remove-update-button.patch new file mode 100644 index 000000000..f64e9f69f --- /dev/null +++ b/debian/patches/0021-gui-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 +@@ -95,7 +95,9 @@ +
        +
      •  
        • +
      •  
        • ++ + + + diff --git a/debian/patches/0022-gui-remove-social-media-buttons.patch b/debian/patches/0022-gui-remove-social-media-buttons.patch new file mode 100644 index 000000000..ad0711814 --- /dev/null +++ b/debian/patches/0022-gui-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 +@@ -98,9 +98,11 @@ + ++ +
      •  
        • +
      •  
        • +
      •  
        • diff --git a/debian/patches/series b/debian/patches/series index 39fa3eb8e..79fe35eac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,10 @@ -0001-python-libraries-removed-from-make.patch -0002-remove-file-serve-restrictions-for-symlinks.patch -0003-hide-update-button.patch -0003-hide-social-media-buttons.patch -0004-debianize-path-to-exim4-binary.patch -0005-remove-infographic-for-privacy-breach-reasons.patch -0006-force-usage-of-python3.patch -0007-skip-debian-files-in-upstream-makefile.patch -0008-compile-on-kfreebsd.patch +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-remove-infographic.patch +0006-debian-remove-contrib-files.patch +0011-netdata-support-symlinks.patch +0012-netdata-support-kfreebsd.patch +0021-gui-remove-update-button.patch +0022-gui-remove-social-media-buttons.patch -- cgit v1.2.3