diff options
author | Lennart Weller <lhw@ring0.de> | 2017-07-27 10:09:20 +0000 |
---|---|---|
committer | Lennart Weller <lhw@ring0.de> | 2017-07-27 10:09:20 +0000 |
commit | f0b58d014dd0f090f9a3a99451dfdf6c41a44786 (patch) | |
tree | a0c266fa0da0f27638c9388cc7563fc8fb6db1da /debian/patches | |
parent | Updated version 1.7.0+dfsg from 'upstream/1.7.0+dfsg' (diff) | |
download | netdata-f0b58d014dd0f090f9a3a99451dfdf6c41a44786.tar.xz netdata-f0b58d014dd0f090f9a3a99451dfdf6c41a44786.zip |
update to 1.7.0
Diffstat (limited to 'debian/patches')
5 files changed, 22 insertions, 14 deletions
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 index a58527afb..238424dd9 100644 --- a/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch +++ b/debian/patches/0001-linked-js-css-fonts-removed-from-make.patch @@ -7,9 +7,11 @@ Subject: linked js/css/fonts removed from make 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 -@@ -55,45 +55,3 @@ +@@ -59,45 +59,3 @@ dist_pythonmodules_DATA = \ python_modules/msg.py \ python_modules/lm_sensors.py \ $(NULL) @@ -55,6 +57,8 @@ Subject: linked js/css/fonts removed from make - 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 @@ @@ -68,7 +72,7 @@ Subject: linked js/css/fonts removed from make dashboard.html \ dashboard.js \ dashboard_info.js \ -@@ -26,15 +22,6 @@ +@@ -27,15 +23,6 @@ dist_web_DATA = \ version.txt \ $(NULL) @@ -84,7 +88,7 @@ Subject: linked js/css/fonts removed from make weblibdir=$(webdir)/lib dist_weblib_DATA = \ lib/bootstrap-3.3.7.min.js \ -@@ -63,23 +50,11 @@ +@@ -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 \ @@ -108,7 +112,7 @@ Subject: linked js/css/fonts removed from make $(NULL) webimagesdir=$(webdir)/images -@@ -106,16 +81,6 @@ +@@ -107,16 +82,6 @@ dist_webimages_DATA = \ images/seo-performance-multi-size.icns \ $(NULL) 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 15ed336ac..8ecff89bb 100644 --- a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch +++ b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch @@ -6,9 +6,11 @@ Subject: remove file serve restrictions for symlinks src/web_client.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) +diff --git a/src/web_client.c b/src/web_client.c +index 7da0807..4e1e8fb 100644 --- a/src/web_client.c +++ b/src/web_client.c -@@ -327,8 +327,8 @@ +@@ -294,8 +294,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 @@ -19,7 +21,7 @@ Subject: remove file serve restrictions for symlinks 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: "); -@@ -337,8 +337,8 @@ +@@ -304,8 +304,8 @@ int mysendfile(struct web_client *w, char *filename) { } // check if the file is owned by expected user @@ -30,7 +32,7 @@ Subject: remove file serve restrictions for symlinks 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); -@@ -346,20 +346,20 @@ +@@ -313,20 +313,20 @@ int mysendfile(struct web_client *w, char *filename) { } // check if the file is owned by expected group @@ -55,7 +57,7 @@ Subject: remove file serve restrictions for symlinks 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: "); -@@ -413,17 +413,17 @@ +@@ -380,17 +380,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; diff --git a/debian/patches/0003-hide-update-button.patch b/debian/patches/0003-hide-update-button.patch index adc1aaf31..a3d9258f0 100644 --- a/debian/patches/0003-hide-update-button.patch +++ b/debian/patches/0003-hide-update-button.patch @@ -6,9 +6,11 @@ Subject: hide update button web/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/web/index.html b/web/index.html +index be944e3..7bbae2f 100644 --- a/web/index.html +++ b/web/index.html -@@ -2959,7 +2959,7 @@ +@@ -3025,7 +3025,7 @@ <ul class="nav navbar-nav"> <li><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal" title="alarms"><i class="fa fa-bell"></i> <span class="hidden-sm">Alarms </span><span id="alarms_count_badge" class="badge"></span></a></li> <li><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal" title="dashboard settings"><i class="fa fa-sliders"></i> <span class="hidden-sm">Settings</span></a></li> diff --git a/debian/patches/0004-use-system-python-yaml-library.patch b/debian/patches/0004-use-system-python-yaml-library.patch index 8e4ab5e8c..378685289 100644 --- a/debian/patches/0004-use-system-python-yaml-library.patch +++ b/debian/patches/0004-use-system-python-yaml-library.patch @@ -3,12 +3,14 @@ Date: Sat, 28 Jan 2017 18:34:35 +0100 Subject: use system python-yaml library --- - plugins.d/python.d.plugin | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) + 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 -@@ -55,15 +55,8 @@ +@@ -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') diff --git a/debian/patches/0006-fix-exim-path.patch b/debian/patches/0006-fix-exim-path.patch index 60ea63900..c92baddb6 100644 --- a/debian/patches/0006-fix-exim-path.patch +++ b/debian/patches/0006-fix-exim-path.patch @@ -16,5 +16,3 @@ index 07d72c5..dd2663d 100644 local: - command: 'exim -bpc' + command: '/usr/sbin/exim4 -bpc' --- -2.11.0 |