From 1031a445dd6f19a1bf5d10fffa649f321f6d0fcc Mon Sep 17 00:00:00 2001 From: Lennart Weller Date: Mon, 18 Sep 2017 13:16:22 +0200 Subject: updated patches. added extra python dependency --- debian/changelog | 2 +- debian/control | 3 +- debian/copyright | 3 +- debian/netdata.maintscript | 4 +- ...001-linked-js-css-fonts-removed-from-make.patch | 131 -------------- .../0001-python-libraries-removed-from-make.patch | 196 ++++++++++++++++++++ ...move-file-serve-restrictions-for-symlinks.patch | 16 +- debian/patches/0003-hide-update-button.patch | 6 +- .../0004-Debianize-path-to-exim4-binary.patch | 18 ++ .../0004-use-system-python-yaml-library.patch | 29 --- ...ve-infographic-for-privacy-breach-reasons.patch | 198 +++++++++++++++++++++ debian/patches/0006-fix-exim-path.patch | 18 -- ...ve-infographic-for-privacy-breach-reasons.patch | 198 --------------------- .../0006-use-system-python-yaml-library.patch | 29 +++ debian/patches/series | 8 +- 15 files changed, 462 insertions(+), 397 deletions(-) delete mode 100644 debian/patches/0001-linked-js-css-fonts-removed-from-make.patch create mode 100644 debian/patches/0001-python-libraries-removed-from-make.patch create mode 100644 debian/patches/0004-Debianize-path-to-exim4-binary.patch delete mode 100644 debian/patches/0004-use-system-python-yaml-library.patch create mode 100644 debian/patches/0005-remove-infographic-for-privacy-breach-reasons.patch delete mode 100644 debian/patches/0006-fix-exim-path.patch delete mode 100644 debian/patches/0006-remove-infographic-for-privacy-breach-reasons.patch create mode 100644 debian/patches/0006-use-system-python-yaml-library.patch diff --git a/debian/changelog b/debian/changelog index 93ae793ec..dc3e647cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -netdata (187.0+dfsg-1) UNRELEASED; urgency=medium +netdata (1.8.0+dfsg-1) UNRELEASED; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index b242dade8..fd83343cb 100644 --- a/debian/control +++ b/debian/control @@ -22,11 +22,12 @@ Depends: adduser, lsb-base (>= 3.1-23.2), netdata-data (=${source:Version}), python, + python-urllib3, python-yaml, ${misc:Depends}, ${misc:Pre-Depends}, ${shlibs:Depends} -Recommends: nodejs, fping, curl +Recommends: curl, fping, nodejs Description: real-time charts for system monitoring Netdata is a daemon that collects data in realtime (per second) and presents a web site to view and analyze them. The presentation diff --git a/debian/copyright b/debian/copyright index 34a9ed5fb..3613f8eec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -30,8 +30,7 @@ Copyright: 2004 Free Software Foundation Inc. License: LGPL-3+ Files: - node.d/node_modules/ber/* - node.d/node_modules/asn1.js + node.d/node_modules/lib/ber/* Copyright: 2011 Mark Cavage License: Expat diff --git a/debian/netdata.maintscript b/debian/netdata.maintscript index 9ef6a69ed..521755a0d 100644 --- a/debian/netdata.maintscript +++ b/debian/netdata.maintscript @@ -1,2 +1,2 @@ -rm_conffile /etc/netdata/python.d/nginx_log.conf 1.7.0+dfsg-2~ netdata -rm_conffile /etc/netdata/python.d/gunicorn_log.conf 1.7.0+dfsg-2~ netdata +rm_conffile /etc/netdata/python.d/nginx_log.conf 1.8.0+dfsg-1~ netdata +rm_conffile /etc/netdata/python.d/gunicorn_log.conf 1.8.0+dfsg-1~ netdata diff --git a/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch b/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch deleted file mode 100644 index 238424dd9..000000000 --- a/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Lennart Weller -Date: Sat, 28 Jan 2017 17:57:59 +0100 -Subject: linked js/css/fonts removed from make - ---- - python.d/Makefile.am | 42 ------------------------------------------ - web/Makefile.am | 35 ----------------------------------- - 2 files changed, 77 deletions(-) - -diff --git a/python.d/Makefile.am b/python.d/Makefile.am -index 43f25cf..2931a48 100644 ---- a/python.d/Makefile.am -+++ b/python.d/Makefile.am -@@ -59,45 +59,3 @@ dist_pythonmodules_DATA = \ - python_modules/msg.py \ - python_modules/lm_sensors.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) -diff --git a/web/Makefile.am b/web/Makefile.am -index b587f5a..9f33500 100644 ---- a/web/Makefile.am -+++ b/web/Makefile.am -@@ -4,10 +4,6 @@ - MAINTAINERCLEANFILES= $(srcdir)/Makefile.in - - dist_web_DATA = \ -- demo.html \ -- demo2.html \ -- demosites.html \ -- demosites2.html \ - dashboard.html \ - dashboard.js \ - dashboard_info.js \ -@@ -27,15 +23,6 @@ dist_web_DATA = \ - version.txt \ - $(NULL) - --webolddir=$(webdir)/old --dist_webold_DATA = \ -- old/datasource.html \ -- old/index.html \ -- old/index.js \ -- old/netdata.js \ -- old/theme.css \ -- $(NULL) -- - weblibdir=$(webdir)/lib - dist_weblib_DATA = \ - lib/bootstrap-3.3.7.min.js \ -@@ -64,23 +51,11 @@ dist_webcss_DATA = \ - css/bootstrap-theme-3.3.7.min.css \ - css/bootstrap-slate-flat-3.3.7.css \ - css/bootstrap-toggle-2.2.2.min.css \ -- css/font-awesome.min.css \ - css/c3-0.4.11.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 \ -- fonts/FontAwesome.otf \ -- fonts/fontawesome-webfont.eot \ -- fonts/fontawesome-webfont.svg \ -- fonts/fontawesome-webfont.ttf \ -- fonts/fontawesome-webfont.woff \ -- fonts/fontawesome-webfont.woff2 \ - $(NULL) - - webimagesdir=$(webdir)/images -@@ -107,16 +82,6 @@ dist_webimages_DATA = \ - images/seo-performance-multi-size.icns \ - $(NULL) - -- --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/0001-python-libraries-removed-from-make.patch b/debian/patches/0001-python-libraries-removed-from-make.patch new file mode 100644 index 000000000..cb13ac23a --- /dev/null +++ b/debian/patches/0001-python-libraries-removed-from-make.patch @@ -0,0 +1,196 @@ +From: Lennart Weller +Date: Mon, 18 Sep 2017 13:05:36 +0200 +Subject: python libraries removed from make + +--- + python.d/Makefile.am | 107 --------------------------------------------------- + web/Makefile.am | 35 ----------------- + 2 files changed, 142 deletions(-) + +diff --git a/python.d/Makefile.am b/python.d/Makefile.am +index 84c2aea..2996a53 100644 +--- a/python.d/Makefile.am ++++ b/python.d/Makefile.am +@@ -60,110 +60,3 @@ dist_pythonmodules_DATA = \ + python_modules/msg.py \ + python_modules/lm_sensors.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 --git a/web/Makefile.am b/web/Makefile.am +index b587f5a..9f33500 100644 +--- a/web/Makefile.am ++++ b/web/Makefile.am +@@ -4,10 +4,6 @@ + MAINTAINERCLEANFILES= $(srcdir)/Makefile.in + + dist_web_DATA = \ +- demo.html \ +- demo2.html \ +- demosites.html \ +- demosites2.html \ + dashboard.html \ + dashboard.js \ + dashboard_info.js \ +@@ -27,15 +23,6 @@ dist_web_DATA = \ + version.txt \ + $(NULL) + +-webolddir=$(webdir)/old +-dist_webold_DATA = \ +- old/datasource.html \ +- old/index.html \ +- old/index.js \ +- old/netdata.js \ +- old/theme.css \ +- $(NULL) +- + weblibdir=$(webdir)/lib + dist_weblib_DATA = \ + lib/bootstrap-3.3.7.min.js \ +@@ -64,23 +51,11 @@ dist_webcss_DATA = \ + css/bootstrap-theme-3.3.7.min.css \ + css/bootstrap-slate-flat-3.3.7.css \ + css/bootstrap-toggle-2.2.2.min.css \ +- css/font-awesome.min.css \ + css/c3-0.4.11.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 \ +- fonts/FontAwesome.otf \ +- fonts/fontawesome-webfont.eot \ +- fonts/fontawesome-webfont.svg \ +- fonts/fontawesome-webfont.ttf \ +- fonts/fontawesome-webfont.woff \ +- fonts/fontawesome-webfont.woff2 \ + $(NULL) + + webimagesdir=$(webdir)/images +@@ -107,16 +82,6 @@ dist_webimages_DATA = \ + images/seo-performance-multi-size.icns \ + $(NULL) + +- +-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-remove-file-serve-restrictions-for-symlinks.patch b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch index 8ecff89bb..b1a40b40b 100644 --- a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch +++ b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch @@ -1,5 +1,5 @@ From: Lennart Weller -Date: Tue, 24 Jan 2017 16:48:19 +0100 +Date: Mon, 18 Sep 2017 13:09:35 +0200 Subject: remove file serve restrictions for symlinks --- @@ -7,10 +7,10 @@ Subject: remove file serve restrictions for symlinks 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/web_client.c b/src/web_client.c -index 7da0807..4e1e8fb 100644 +index 6ec3e11..6d30205 100644 --- a/src/web_client.c +++ b/src/web_client.c -@@ -294,8 +294,8 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -303,8 +303,8 @@ int mysendfile(struct web_client *w, char *filename) { snprintfz(webfilename, FILENAME_MAX, "%s/%s", netdata_configured_web_dir, filename); // check if the file exists @@ -21,7 +21,7 @@ index 7da0807..4e1e8fb 100644 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: "); -@@ -304,8 +304,8 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -313,8 +313,8 @@ int mysendfile(struct web_client *w, char *filename) { } // check if the file is owned by expected user @@ -32,7 +32,7 @@ index 7da0807..4e1e8fb 100644 w->response.data->contenttype = CT_TEXT_HTML; buffer_strcat(w->response.data, "Access to file is not permitted: "); buffer_strcat_htmlescape(w->response.data, webfilename); -@@ -313,20 +313,20 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -322,20 +322,20 @@ int mysendfile(struct web_client *w, char *filename) { } // check if the file is owned by expected group @@ -57,7 +57,7 @@ index 7da0807..4e1e8fb 100644 error("%llu: File '%s' is not a regular file. Access Denied.", w->id, webfilename); w->response.data->contenttype = CT_TEXT_HTML; buffer_strcat(w->response.data, "Access to file is not permitted: "); -@@ -380,17 +380,17 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -389,17 +389,17 @@ int mysendfile(struct web_client *w, char *filename) { else if(strstr(filename, ".icns") != NULL) w->response.data->contenttype = CT_IMAGE_ICNS; else w->response.data->contenttype = CT_APPLICATION_OCTET_STREAM; @@ -65,8 +65,8 @@ index 7da0807..4e1e8fb 100644 + debug(D_WEB_CLIENT_ACCESS, "%llu: Sending file '%s' (%ld bytes, ifd %d, ofd %d).", w->id, webfilename, wstat.st_size, w->ifd, w->ofd); w->mode = WEB_CLIENT_MODE_FILECOPY; - w->wait_receive = 1; - w->wait_send = 0; + web_client_enable_wait_receive(w); + web_client_disable_wait_send(w); buffer_flush(w->response.data); - w->response.rlen = stat.st_size; + w->response.rlen = wstat.st_size; diff --git a/debian/patches/0003-hide-update-button.patch b/debian/patches/0003-hide-update-button.patch index a3d9258f0..33697ea67 100644 --- a/debian/patches/0003-hide-update-button.patch +++ b/debian/patches/0003-hide-update-button.patch @@ -1,5 +1,5 @@ From: Federico Ceratto -Date: Tue, 24 Jan 2017 16:48:45 +0100 +Date: Mon, 18 Sep 2017 13:10:09 +0200 Subject: hide update button --- @@ -7,10 +7,10 @@ Subject: hide update button 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/index.html b/web/index.html -index be944e3..7bbae2f 100644 +index cd8239d..57d6a75 100644 --- a/web/index.html +++ b/web/index.html -@@ -3025,7 +3025,7 @@ +@@ -3033,7 +3033,7 @@
  •  
  •  
    • diff --git a/debian/patches/0004-Debianize-path-to-exim4-binary.patch b/debian/patches/0004-Debianize-path-to-exim4-binary.patch new file mode 100644 index 000000000..34556a4f0 --- /dev/null +++ b/debian/patches/0004-Debianize-path-to-exim4-binary.patch @@ -0,0 +1,18 @@ +From: Sven Hartge +Date: Mon, 18 Sep 2017 13:11:05 +0200 +Subject: Debianize path to exim4 binary + +--- + conf.d/python.d/exim.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/conf.d/python.d/exim.conf b/conf.d/python.d/exim.conf +index 07d72c5..dd2663d 100644 +--- a/conf.d/python.d/exim.conf ++++ b/conf.d/python.d/exim.conf +@@ -83,4 +83,4 @@ update_every: 10 + # AUTO-DETECTION JOBS + + local: +- command: 'exim -bpc' ++ command: '/usr/sbin/exim4 -bpc' diff --git a/debian/patches/0004-use-system-python-yaml-library.patch b/debian/patches/0004-use-system-python-yaml-library.patch deleted file mode 100644 index 378685289..000000000 --- a/debian/patches/0004-use-system-python-yaml-library.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Lennart Weller -Date: Sat, 28 Jan 2017 18:34:35 +0100 -Subject: use system python-yaml library - ---- - plugins.d/python.d.plugin | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin -index 03c156f..af200d0 100755 ---- a/plugins.d/python.d.plugin -+++ b/plugins.d/python.d.plugin -@@ -58,15 +58,8 @@ except (AssertionError, ImportError): - msg.info('Using python v2') - except ImportError: - msg.fatal('Cannot start. No importlib.machinery on python3 or lack of imp on python2') --# try: --# import yaml --# except ImportError: --# msg.fatal('Cannot find yaml library') - try: -- if PY_VERSION == 3: -- import pyyaml3 as yaml -- else: -- import pyyaml2 as yaml -+ import yaml - except ImportError: - msg.fatal('Cannot find yaml library') - diff --git a/debian/patches/0005-remove-infographic-for-privacy-breach-reasons.patch b/debian/patches/0005-remove-infographic-for-privacy-breach-reasons.patch new file mode 100644 index 000000000..a580aee58 --- /dev/null +++ b/debian/patches/0005-remove-infographic-for-privacy-breach-reasons.patch @@ -0,0 +1,198 @@ +From: Lennart Weller +Date: Mon, 18 Sep 2017 13:11:30 +0200 +Subject: remove infographic for privacy breach reasons + +--- + web/Makefile.am | 1 - + web/infographic.html | 170 --------------------------------------------------- + 2 files changed, 171 deletions(-) + delete mode 100644 web/infographic.html + +diff --git a/web/Makefile.am b/web/Makefile.am +index 9f33500..aa74364 100644 +--- a/web/Makefile.am ++++ b/web/Makefile.am +@@ -13,7 +13,6 @@ dist_web_DATA = \ + favicon.ico \ + goto-host-from-alarm.html \ + index.html \ +- infographic.html \ + netdata-swagger.yaml \ + netdata-swagger.json \ + robots.txt \ +diff --git a/web/infographic.html b/web/infographic.html +deleted file mode 100644 +index 0bb5718..0000000 +--- a/web/infographic.html ++++ /dev/null +@@ -1,170 +0,0 @@ +- +- +- +- +- NetData: Get control of your Linux Servers. Simple. Effective. Awesome. +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-
    +-
    +-

    +- Interactive infographic of netdata features and functions +-

    +-

    +- Hover and click on the infographic, to open the related wiki page. +-
    +- +- The links and the docs are still a work in progress. +- The interactive infographic is a feature of draw.io. +- +-

    +-
    +- +-
    +-

    +- New to netdata? Have a look at a netdata demo. You will love it! +-

    +-

    +- +- +- +-

    +-
    +-
    +-
    +-
    +-
    +-
    +- +- +- +- +- +- +- +- +- +-
    +- +- +- +- +- +- diff --git a/debian/patches/0006-fix-exim-path.patch b/debian/patches/0006-fix-exim-path.patch deleted file mode 100644 index c92baddb6..000000000 --- a/debian/patches/0006-fix-exim-path.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Sven Hartge -Date: Sun, 26 Feb 2017 23:57:41 +0100 -Subject: Debianize path to exim4 binary - ---- - conf.d/python.d/exim.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/conf.d/python.d/exim.conf b/conf.d/python.d/exim.conf -index 07d72c5..dd2663d 100644 ---- a/conf.d/python.d/exim.conf -+++ b/conf.d/python.d/exim.conf -@@ -83,4 +83,4 @@ update_every: 10 - # AUTO-DETECTION JOBS - - local: -- command: 'exim -bpc' -+ command: '/usr/sbin/exim4 -bpc' diff --git a/debian/patches/0006-remove-infographic-for-privacy-breach-reasons.patch b/debian/patches/0006-remove-infographic-for-privacy-breach-reasons.patch deleted file mode 100644 index 466411834..000000000 --- a/debian/patches/0006-remove-infographic-for-privacy-breach-reasons.patch +++ /dev/null @@ -1,198 +0,0 @@ -From: Lennart Weller -Date: Thu, 27 Jul 2017 12:38:32 +0200 -Subject: remove infographic for privacy breach reasons - ---- - web/Makefile.am | 1 - - web/infographic.html | 170 --------------------------------------------------- - 2 files changed, 171 deletions(-) - delete mode 100644 web/infographic.html - -diff --git a/web/Makefile.am b/web/Makefile.am -index 9f33500..aa74364 100644 ---- a/web/Makefile.am -+++ b/web/Makefile.am -@@ -13,7 +13,6 @@ dist_web_DATA = \ - favicon.ico \ - goto-host-from-alarm.html \ - index.html \ -- infographic.html \ - netdata-swagger.yaml \ - netdata-swagger.json \ - robots.txt \ -diff --git a/web/infographic.html b/web/infographic.html -deleted file mode 100644 -index 0bb5718..0000000 ---- a/web/infographic.html -+++ /dev/null -@@ -1,170 +0,0 @@ -- -- -- -- -- NetData: Get control of your Linux Servers. Simple. Effective. Awesome. -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
    --
    --

    -- Interactive infographic of netdata features and functions --

    --

    -- Hover and click on the infographic, to open the related wiki page. --
    -- -- The links and the docs are still a work in progress. -- The interactive infographic is a feature of draw.io. -- --

    --
    -- --
    --

    -- New to netdata? Have a look at a netdata demo. You will love it! --

    --

    -- -- -- --

    --
    --
    --
    --
    --
    --
    -- -- -- -- -- -- -- -- -- --
    -- -- -- -- -- -- diff --git a/debian/patches/0006-use-system-python-yaml-library.patch b/debian/patches/0006-use-system-python-yaml-library.patch new file mode 100644 index 000000000..ab08fc56d --- /dev/null +++ b/debian/patches/0006-use-system-python-yaml-library.patch @@ -0,0 +1,29 @@ +From: Lennart Weller +Date: Mon, 18 Sep 2017 13:19:18 +0200 +Subject: use system python-yaml library + +--- + plugins.d/python.d.plugin | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin +index 03c156f..af200d0 100755 +--- a/plugins.d/python.d.plugin ++++ b/plugins.d/python.d.plugin +@@ -58,15 +58,8 @@ except (AssertionError, ImportError): + msg.info('Using python v2') + except ImportError: + msg.fatal('Cannot start. No importlib.machinery on python3 or lack of imp on python2') +-# try: +-# import yaml +-# except ImportError: +-# msg.fatal('Cannot find yaml library') + try: +- if PY_VERSION == 3: +- import pyyaml3 as yaml +- else: +- import pyyaml2 as yaml ++ import yaml + except ImportError: + msg.fatal('Cannot find yaml library') + diff --git a/debian/patches/series b/debian/patches/series index 430e3c228..835ace226 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ -0001-linked-js-css-fonts-removed-from-make.patch +0001-python-libraries-removed-from-make.patch 0002-remove-file-serve-restrictions-for-symlinks.patch 0003-hide-update-button.patch -0004-use-system-python-yaml-library.patch -0006-fix-exim-path.patch -0006-remove-infographic-for-privacy-breach-reasons.patch +0004-Debianize-path-to-exim4-binary.patch +0005-remove-infographic-for-privacy-breach-reasons.patch +0006-use-system-python-yaml-library.patch -- cgit v1.2.3