From 4eecd612b3275719f0101e890057d84fa7c4db9f Mon Sep 17 00:00:00 2001 From: Federico Ceratto Date: Wed, 20 Dec 2017 00:05:53 +0000 Subject: Refresh patches --- .../0001-python-libraries-removed-from-make.patch | 38 +++------------------- ...move-file-serve-restrictions-for-symlinks.patch | 10 +++--- debian/patches/0003-hide-update-button.patch | 18 +++++----- .../0004-Debianize-path-to-exim4-binary.patch | 4 +-- .../0006-use-system-python-yaml-library.patch | 29 ----------------- debian/patches/series | 1 - 6 files changed, 18 insertions(+), 82 deletions(-) delete mode 100644 debian/patches/0006-use-system-python-yaml-library.patch diff --git a/debian/patches/0001-python-libraries-removed-from-make.patch b/debian/patches/0001-python-libraries-removed-from-make.patch index cb13ac23a..abb39296d 100644 --- a/debian/patches/0001-python-libraries-removed-from-make.patch +++ b/debian/patches/0001-python-libraries-removed-from-make.patch @@ -7,13 +7,11 @@ Subject: python libraries removed from make 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 \ +@@ -88,110 +88,3 @@ + python_modules/third_party/ordereddict.py \ + python_modules/third_party/lm_sensors.py \ $(NULL) - -pythonyaml2dir=$(pythonmodulesdir)/pyyaml2 @@ -122,8 +120,6 @@ index 84c2aea..2996a53 100644 - 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 @@ @@ -137,7 +133,7 @@ index b587f5a..9f33500 100644 dashboard.html \ dashboard.js \ dashboard_info.js \ -@@ -27,15 +23,6 @@ dist_web_DATA = \ +@@ -27,15 +23,6 @@ version.txt \ $(NULL) @@ -153,31 +149,7 @@ index b587f5a..9f33500 100644 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 = \ +@@ -105,16 +92,6 @@ 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 b1a40b40b..3832543bb 100644 --- a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch +++ b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch @@ -6,11 +6,9 @@ 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 6ec3e11..6d30205 100644 --- a/src/web_client.c +++ b/src/web_client.c -@@ -303,8 +303,8 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -382,8 +382,8 @@ snprintfz(webfilename, FILENAME_MAX, "%s/%s", netdata_configured_web_dir, filename); // check if the file exists @@ -21,7 +19,7 @@ index 6ec3e11..6d30205 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: "); -@@ -313,8 +313,8 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -392,8 +392,8 @@ } // check if the file is owned by expected user @@ -32,7 +30,7 @@ index 6ec3e11..6d30205 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); -@@ -322,20 +322,20 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -401,20 +401,20 @@ } // check if the file is owned by expected group @@ -57,7 +55,7 @@ index 6ec3e11..6d30205 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: "); -@@ -389,17 +389,17 @@ int mysendfile(struct web_client *w, char *filename) { +@@ -468,17 +468,17 @@ 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 33697ea67..19a034d0d 100644 --- a/debian/patches/0003-hide-update-button.patch +++ b/debian/patches/0003-hide-update-button.patch @@ -6,16 +6,14 @@ 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 cd8239d..57d6a75 100644 --- a/web/index.html +++ b/web/index.html -@@ -3033,7 +3033,7 @@ +@@ -4393,7 +4393,7 @@