From 1712e3057b0028f3f0a25a513aa114e6c31a3139 Mon Sep 17 00:00:00 2001 From: Federico Ceratto Date: Sat, 17 Dec 2016 17:04:57 +0000 Subject: Refresh patches --- ...001-linked-js-css-fonts-removed-from-make.patch | 46 ++++++++++------------ ...move-file-serve-restrictions-for-symlinks.patch | 8 ++-- debian/patches/0003-hide-update-button.patch | 18 ++++----- .../0004-readd-shebang-to-chart-scripts.patch | 42 +------------------- 4 files changed, 33 insertions(+), 81 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 0bdfad7ec..917f39b81 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 @@ -6,11 +6,9 @@ Subject: linked js/css/fonts removed from make web/Makefile.am | 27 --------------------------- 1 file changed, 27 deletions(-) -diff --git a/web/Makefile.am b/web/Makefile.am -index 0432f8a..8078e67 100644 --- a/web/Makefile.am +++ b/web/Makefile.am -@@ -21,59 +21,32 @@ dist_web_DATA = \ +@@ -23,27 +23,14 @@ version.txt \ $(NULL) @@ -25,33 +23,29 @@ index 0432f8a..8078e67 100644 - weblibdir=$(webdir)/lib dist_weblib_DATA = \ - lib/dygraph-combined.js \ - lib/dygraph-smooth-plotter.js \ -- lib/jquery-1.12.0.min.js \ - lib/jquery.peity.min.js \ - lib/jquery.sparkline.min.js \ - lib/morris.min.js \ -- lib/raphael-min.js \ - lib/jquery.easypiechart.min.js \ - lib/jquery.nanoscroller.min.js \ -- lib/bootstrap.min.js \ - lib/ElementQueries.js \ - lib/ResizeSensor.js \ - lib/bootstrap-toggle.min.js \ - lib/c3.min.js \ -- lib/d3.min.js \ - lib/gauge.min.js \ - $(NULL) - +- lib/bootstrap-3.3.7.min.js \ + lib/bootstrap-table-1.11.0.min.js \ + lib/bootstrap-table-export-1.11.0.min.js \ + lib/bootstrap-toggle-2.2.2.min.js \ +- lib/c3-0.4.11.min.js \ +- lib/d3-3.5.17.min.js \ + lib/dygraph-combined-dd74404.js \ + lib/dygraph-smooth-plotter-dd74404.js \ + lib/gauge-d5260c3.min.js \ +- lib/jquery-2.2.4.min.js \ + lib/jquery.easypiechart-97b5824.min.js \ + lib/jquery.nanoscroller-0.8.7.min.js \ + lib/jquery.peity-3.2.0.min.js \ +@@ -56,27 +43,13 @@ webcssdir=$(webdir)/css dist_webcss_DATA = \ - css/morris.css \ -- css/bootstrap.min.css \ -- css/bootstrap-theme.min.css \ + css/morris-0.5.1.css \ +- css/bootstrap-3.3.7.min.css \ +- css/bootstrap-theme-3.3.7.min.css \ css/bootstrap.slate.min.css \ + css/bootstrap-toggle-2.2.2.min.css \ - css/font-awesome.min.css \ - css/bootstrap-toggle.min.css \ - css/c3.min.css \ + css/c3-0.4.11.min.css \ $(NULL) webfontsdir=$(webdir)/fonts 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 ecf97b65a..9b607044e 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 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -diff --git a/src/web_client.c b/src/web_client.c -index 4036d4c..a7cc424 100644 --- a/src/web_client.c +++ b/src/web_client.c -@@ -325,33 +325,33 @@ int mysendfile(struct web_client *w, char *filename) +@@ -325,33 +325,33 @@ snprintfz(webfilename, FILENAME_MAX, "%s/%s", web_dir, filename); // check if the file exists @@ -52,7 +50,7 @@ index 4036d4c..a7cc424 100644 error("%llu: File '%s' is not a regular file. Access Denied.", w->id, webfilename); buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename); return 403; -@@ -399,14 +399,14 @@ int mysendfile(struct web_client *w, char *filename) +@@ -399,14 +399,14 @@ else if(strstr(filename, ".icns") != NULL) w->response.data->contenttype = CT_IMAGE_ICNS; else w->response.data->contenttype = CT_APPLICATION_OCTET_STREAM; @@ -67,6 +65,6 @@ index 4036d4c..a7cc424 100644 - w->response.data->date = stat.st_mtim.tv_sec; + w->response.rlen = wstat.st_size; + w->response.data->date = wstat.st_mtim.tv_sec; + buffer_cacheable(w->response.data); return 200; - } diff --git a/debian/patches/0003-hide-update-button.patch b/debian/patches/0003-hide-update-button.patch index 5395dc47f..979c878ea 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 3e6c221..0026f94 100644 --- a/web/index.html +++ b/web/index.html -@@ -579,7 +579,7 @@ - - - -- -+ - +@@ -2527,7 +2527,7 @@ +
  •  
    • +
  •  
    • +
  •  
    • +- ++ + +