summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Weller <lhw@ring0.de>2017-01-24 15:50:25 +0000
committerLennart Weller <lhw@ring0.de>2017-01-24 15:50:25 +0000
commit68c9e74fa4990bc8a5e562cfc1ec08564e5013d2 (patch)
tree2e61b8707a2117fb19b4aae1cb6f8f9ddc6f6b62
parentpreliminary update for 1.5.0 (diff)
downloadnetdata-68c9e74fa4990bc8a5e562cfc1ec08564e5013d2.tar.xz
netdata-68c9e74fa4990bc8a5e562cfc1ec08564e5013d2.zip
update the patches for 1.5.0
-rw-r--r--debian/patches/0001-linked-js-css-fonts-removed-from-make.patch34
-rw-r--r--debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch37
-rw-r--r--debian/patches/0003-hide-update-button.patch22
-rw-r--r--debian/patches/0004-readd-shebang-to-chart-scripts.patch165
-rw-r--r--debian/patches/0005-remove-lib-versions.patch37
-rw-r--r--debian/patches/series1
6 files changed, 152 insertions, 144 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 917f39b8..f50dc3f1 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
@@ -1,14 +1,16 @@
From: Lennart Weller <lhw@ring0.de>
-Date: Wed, 25 May 2016 13:15:40 +0200
+Date: Tue, 24 Jan 2017 16:48:02 +0100
Subject: linked js/css/fonts removed from make
---
- web/Makefile.am | 27 ---------------------------
- 1 file changed, 27 deletions(-)
+ web/Makefile.am | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+diff --git a/web/Makefile.am b/web/Makefile.am
+index 396cf0b..d94d87e 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
-@@ -23,27 +23,14 @@
+@@ -25,15 +25,6 @@ dist_web_DATA = \
version.txt \
$(NULL)
@@ -23,26 +25,10 @@ Subject: linked js/css/fonts removed from make
-
weblibdir=$(webdir)/lib
dist_weblib_DATA = \
-- 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-0.5.1.css \
-- css/bootstrap-3.3.7.min.css \
-- css/bootstrap-theme-3.3.7.min.css \
- css/bootstrap.slate.min.css \
+ lib/bootstrap-3.3.7.min.js \
+@@ -62,23 +53,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 \
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 9b607044..7a4d7af2 100644
--- a/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch
+++ b/debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch
@@ -1,14 +1,16 @@
From: Lennart Weller <lhw@ring0.de>
-Date: Mon, 5 Sep 2016 14:53:06 +0200
+Date: Tue, 24 Jan 2017 16:48:19 +0100
Subject: remove file serve restrictions for symlinks
---
- src/web_client.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
+ 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 4b6ccf6..59c695e 100644
--- a/src/web_client.c
+++ b/src/web_client.c
-@@ -325,33 +325,33 @@
+@@ -327,8 +327,8 @@ int mysendfile(struct web_client *w, char *filename)
snprintfz(webfilename, FILENAME_MAX, "%s/%s", web_dir, filename);
// check if the file exists
@@ -17,8 +19,9 @@ Subject: remove file serve restrictions for symlinks
+ struct stat wstat;
+ if(stat(webfilename, &wstat) != 0) {
debug(D_WEB_CLIENT_ACCESS, "%llu: File '%s' is not found.", w->id, webfilename);
- buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", webfilename);
- return 404;
+ buffer_strcat(w->response.data, "File does not exist, or is not accessible: ");
+ buffer_strcat_htmlescape(w->response.data, webfilename);
+@@ -336,27 +336,27 @@ int mysendfile(struct web_client *w, char *filename)
}
// check if the file is owned by expected user
@@ -26,7 +29,8 @@ Subject: remove file serve restrictions for symlinks
- error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid());
+ if(wstat.st_uid != web_files_uid()) {
+ error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, wstat.st_uid, web_files_uid());
- buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
+ buffer_strcat(w->response.data, "Access to file is not permitted: ");
+ buffer_strcat_htmlescape(w->response.data, webfilename);
return 403;
}
@@ -34,8 +38,9 @@ Subject: remove file serve restrictions for symlinks
- if(stat.st_gid != web_files_gid()) {
- error("%llu: File '%s' is owned by group %u (expected group %u). Access Denied.", w->id, webfilename, stat.st_gid, web_files_gid());
+ if(wstat.st_gid != web_files_gid()) {
-+ error("%llu: File '%s' is owned by group %d (expected group %d). Access Denied.", w->id, webfilename, wstat.st_gid, web_files_gid());
- buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
++ error("%llu: File '%s' is owned by group %u (expected group %u). Access Denied.", w->id, webfilename, wstat.st_gid, web_files_gid());
+ buffer_strcat(w->response.data, "Access to file is not permitted: ");
+ buffer_strcat_htmlescape(w->response.data, webfilename);
return 403;
}
@@ -48,9 +53,9 @@ Subject: remove file serve restrictions for symlinks
- if((stat.st_mode & S_IFMT) != S_IFREG) {
+ if((wstat.st_mode & S_IFMT) != S_IFREG) {
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 @@
+ buffer_strcat(w->response.data, "Access to file is not permitted: ");
+ buffer_strcat_htmlescape(w->response.data, webfilename);
+@@ -407,17 +407,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;
@@ -62,9 +67,13 @@ Subject: remove file serve restrictions for symlinks
w->wait_send = 0;
buffer_flush(w->response.data);
- w->response.rlen = stat.st_size;
-- w->response.data->date = stat.st_mtim.tv_sec;
+ w->response.rlen = wstat.st_size;
+ #ifdef __APPLE__
+- w->response.data->date = stat.st_mtimespec.tv_sec;
++ w->response.data->date = wstat.st_mtimespec.tv_sec;
+ #else
+- w->response.data->date = stat.st_mtim.tv_sec;
+ w->response.data->date = wstat.st_mtim.tv_sec;
+ #endif /* __APPLE__ */
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 979c878e..f93a914e 100644
--- a/debian/patches/0003-hide-update-button.patch
+++ b/debian/patches/0003-hide-update-button.patch
@@ -1,19 +1,21 @@
-From: Lennart Weller <lhw@ring0.de>
-Date: Mon, 5 Sep 2016 10:52:35 +0200
+From: Federico Ceratto <federico.ceratto@gmail.com>
+Date: Tue, 24 Jan 2017 16:48:45 +0100
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 d8e1282..f8f7418 100644
--- a/web/index.html
+++ b/web/index.html
-@@ -2527,7 +2527,7 @@
- <li><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal" title="alarms"><i class="fa fa-bell"></i></span>&nbsp;<span class="hidden-sm">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></a></li>
+@@ -2696,7 +2696,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>&nbsp;<span class="hidden-sm">Alarms&nbsp;</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>&nbsp;<span class="hidden-sm">Settings</span></a></li>
- <li><a href="https://github.com/firehol/netdata/wiki" class="btn" target="_blank" title="netdata community"><i class="fa fa-github"></i>&nbsp;<span class="hidden-sm hidden-md">Community</span></a></li>
-- <li class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i><span id="update_badge" class="badge"></span>&nbsp;<span class="hidden-sm hidden-md">Update</span></a></li>
-+ <li class="hidden-sm" id="updateButton" style="display:none;"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i><span id="update_badge" class="badge"></span>&nbsp;<span class="hidden-sm hidden-md">Update</span></a></li>
- <li class="hidden-sm"><a href="#" class="btn" data-toggle="modal" data-target="#helpModal" title="dashboard help"><i class="fa fa-question-circle"></i>&nbsp;<span class="hidden-sm hidden-md">Help</span></a></li>
- <!--
- <li class="dropdown hidden-md hidden-lg hidden-xs">
+- <li class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
++ <li class="hidden-sm" id="updateButton" style="display:none;"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal" title="check for update"><i class="fa fa-cloud-download"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li>
+ <li><a href="https://github.com/firehol/netdata/wiki" class="btn" target="_blank" title="netdata on github"><i class="fa fa-github"></i></a></li>
+ <li><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank" title="netdata on twitter"><i class="fa fa-twitter" aria-hidden="true"></i></a></li>
+ <li><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank" title="netdata on facebook"><i class="fa fa-facebook-official" aria-hidden="true"></i></a></li>
diff --git a/debian/patches/0004-readd-shebang-to-chart-scripts.patch b/debian/patches/0004-readd-shebang-to-chart-scripts.patch
index 54b1c969..ef40c2df 100644
--- a/debian/patches/0004-readd-shebang-to-chart-scripts.patch
+++ b/debian/patches/0004-readd-shebang-to-chart-scripts.patch
@@ -1,10 +1,11 @@
From: Lennart Weller <lhw@ring0.de>
-Date: Mon, 5 Sep 2016 11:33:48 +0200
+Date: Tue, 24 Jan 2017 16:49:02 +0100
Subject: re-add shebang to chart scripts
---
charts.d/ap.chart.sh | 2 +-
charts.d/apache.chart.sh | 2 +-
+ charts.d/apcupsd.chart.sh | 2 +-
charts.d/cpu_apps.chart.sh | 2 +-
charts.d/cpufreq.chart.sh | 2 +-
charts.d/example.chart.sh | 2 +-
@@ -22,157 +23,205 @@ Subject: re-add shebang to chart scripts
charts.d/squid.chart.sh | 2 +-
charts.d/tomcat.chart.sh | 2 +-
plugins.d/loopsleepms.sh.inc | 2 +-
- 19 files changed, 19 insertions(+), 19 deletions(-)
+ 20 files changed, 20 insertions(+), 20 deletions(-)
+diff --git a/charts.d/ap.chart.sh b/charts.d/ap.chart.sh
+index 0e85c48..6e30e69 100755
--- a/charts.d/ap.chart.sh
+++ b/charts.d/ap.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # _update_every is a special variable - it holds the number of seconds
- # between the calls of the _update() function
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/apache.chart.sh b/charts.d/apache.chart.sh
+index b503e74..294af76 100755
--- a/charts.d/apache.chart.sh
+++ b/charts.d/apache.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # the URL to download apache status info
- apache_url="http://127.0.0.1:80/server-status?auto"
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/apcupsd.chart.sh b/charts.d/apcupsd.chart.sh
+index 46a8610..97dd66d 100755
+--- a/charts.d/apcupsd.chart.sh
++++ b/charts.d/apcupsd.chart.sh
+@@ -1,4 +1,4 @@
+-# no need for shebang - this file is loaded from charts.d.plugin
++#/bin/bash
+
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/cpu_apps.chart.sh b/charts.d/cpu_apps.chart.sh
+index 8e07583..868a7ff 100755
--- a/charts.d/cpu_apps.chart.sh
+++ b/charts.d/cpu_apps.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # THIS PLUGIN IS OBSOLETE
- # USE apps.plugin INSTEAD
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/cpufreq.chart.sh b/charts.d/cpufreq.chart.sh
+index b21504a..40dd9d2 100755
--- a/charts.d/cpufreq.chart.sh
+++ b/charts.d/cpufreq.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # if this chart is called X.chart.sh, then all functions and global variables
- # must start with X_
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/example.chart.sh b/charts.d/example.chart.sh
+index 86fde49..e01f313 100755
--- a/charts.d/example.chart.sh
+++ b/charts.d/example.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # if this chart is called X.chart.sh, then all functions and global variables
- # must start with X_
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/exim.chart.sh b/charts.d/exim.chart.sh
+index 4c70f2c..273b814 100644
--- a/charts.d/exim.chart.sh
+++ b/charts.d/exim.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
-
- exim_command=
++#/bin/bash
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/hddtemp.chart.sh b/charts.d/hddtemp.chart.sh
+index 15895c5..81bf76e 100755
--- a/charts.d/hddtemp.chart.sh
+++ b/charts.d/hddtemp.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # if this chart is called X.chart.sh, then all functions and global variables
- # must start with X_
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/load_average.chart.sh b/charts.d/load_average.chart.sh
+index 70d3aec..14ba723 100755
--- a/charts.d/load_average.chart.sh
+++ b/charts.d/load_average.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- load_average_update_every=5
- load_priority=100
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/mem_apps.chart.sh b/charts.d/mem_apps.chart.sh
+index 3bc65fe..4632ae7 100755
--- a/charts.d/mem_apps.chart.sh
+++ b/charts.d/mem_apps.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
-
- mem_apps_apps=
++#/bin/bash
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/mysql.chart.sh b/charts.d/mysql.chart.sh
+index 1363d01..cf378f7 100755
--- a/charts.d/mysql.chart.sh
+++ b/charts.d/mysql.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # http://dev.mysql.com/doc/refman/5.0/en/server-status-variables.html
- #
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh
+index 0ae7d63..2f50a25 100755
--- a/charts.d/nginx.chart.sh
+++ b/charts.d/nginx.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # if this chart is called X.chart.sh, then all functions and global variables
- # must start with X_
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/nut.chart.sh b/charts.d/nut.chart.sh
+index e0b1b4c..c33f1ad 100755
--- a/charts.d/nut.chart.sh
+++ b/charts.d/nut.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # a space separated list of UPS names
- # if empty, the list returned by 'upsc -l' will be used
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
+index 2a0249d..e5ca172 100755
--- a/charts.d/opensips.chart.sh
+++ b/charts.d/opensips.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- opensips_opts="fifo get_statistics all"
- opensips_cmd=
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/phpfpm.chart.sh b/charts.d/phpfpm.chart.sh
+index a5ee0ad..5a62e2a 100755
--- a/charts.d/phpfpm.chart.sh
+++ b/charts.d/phpfpm.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # if this chart is called X.chart.sh, then all functions and global variables
- # must start with X_
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/postfix.chart.sh b/charts.d/postfix.chart.sh
+index 85604fc..2fa864e 100755
--- a/charts.d/postfix.chart.sh
+++ b/charts.d/postfix.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # the postqueue command
- # if empty, it will use the one found in the system path
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/sensors.chart.sh b/charts.d/sensors.chart.sh
+index 125c925..91f3287 100755
--- a/charts.d/sensors.chart.sh
+++ b/charts.d/sensors.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # sensors docs
- # https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/squid.chart.sh b/charts.d/squid.chart.sh
+index 2c19c35..2e2795b 100755
--- a/charts.d/squid.chart.sh
+++ b/charts.d/squid.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- squid_host=
- squid_port=
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/charts.d/tomcat.chart.sh b/charts.d/tomcat.chart.sh
+index 44a92c8..491f188 100755
--- a/charts.d/tomcat.chart.sh
+++ b/charts.d/tomcat.chart.sh
@@ -1,4 +1,4 @@
-# no need for shebang - this file is loaded from charts.d.plugin
-+#!/bin/bash
++#/bin/bash
- # Description: Tomcat netdata charts.d plugin
- # Author: Jorge Romero
+ # netdata
+ # real-time performance and health monitoring, done right!
+diff --git a/plugins.d/loopsleepms.sh.inc b/plugins.d/loopsleepms.sh.inc
+index ef3db19..416df94 100644
--- a/plugins.d/loopsleepms.sh.inc
+++ b/plugins.d/loopsleepms.sh.inc
@@ -1,4 +1,4 @@
-# no need for shebang - this file is included from other scripts
-+#!/bin/bash
++#/bin/bash
- LOOPSLEEP_DATE="$(which date)"
+ LOOPSLEEP_DATE="$(which date 2>/dev/null || command -v date 2>/dev/null)"
if [ -z "$LOOPSLEEP_DATE" ]
diff --git a/debian/patches/0005-remove-lib-versions.patch b/debian/patches/0005-remove-lib-versions.patch
deleted file mode 100644
index baba489d..00000000
--- a/debian/patches/0005-remove-lib-versions.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/web/dashboard.js
-+++ b/web/dashboard.js
-@@ -108,14 +108,14 @@
- // default URLs for all the external files we need
- // make them RELATIVE so that the whole thing can also be
- // installed under a web server
-- NETDATA.jQuery = NETDATA.serverDefault + 'lib/jquery-2.2.4.min.js';
-+ NETDATA.jQuery = NETDATA.serverDefault + 'lib/jquery.min.js';
- NETDATA.peity_js = NETDATA.serverDefault + 'lib/jquery.peity-3.2.0.min.js';
- NETDATA.sparkline_js = NETDATA.serverDefault + 'lib/jquery.sparkline-2.1.2.min.js';
- NETDATA.easypiechart_js = NETDATA.serverDefault + 'lib/jquery.easypiechart-97b5824.min.js';
- NETDATA.gauge_js = NETDATA.serverDefault + 'lib/gauge-d5260c3.min.js';
- NETDATA.dygraph_js = NETDATA.serverDefault + 'lib/dygraph-combined-dd74404.js';
- NETDATA.dygraph_smooth_js = NETDATA.serverDefault + 'lib/dygraph-smooth-plotter-dd74404.js';
-- NETDATA.raphael_js = NETDATA.serverDefault + 'lib/raphael-2.2.4-min.js';
-+ NETDATA.raphael_js = NETDATA.serverDefault + 'lib/raphael-min.js';
- NETDATA.c3_js = NETDATA.serverDefault + 'lib/c3-0.4.11.min.js';
- NETDATA.c3_css = NETDATA.serverDefault + 'css/c3-0.4.11.min.css';
- NETDATA.d3_js = NETDATA.serverDefault + 'lib/d3-3.5.17.min.js';
-@@ -125,7 +125,7 @@
-
- NETDATA.themes = {
- white: {
-- bootstrap_css: NETDATA.serverDefault + 'css/bootstrap-3.3.7.min.css',
-+ bootstrap_css: NETDATA.serverDefault + 'css/bootstrap.min.css',
- dashboard_css: NETDATA.serverDefault + 'dashboard.css?v20161002-1',
- background: '#FFFFFF',
- foreground: '#000000',
-@@ -5577,7 +5577,7 @@
-
- NETDATA.requiredJs = [
- {
-- url: NETDATA.serverDefault + 'lib/bootstrap-3.3.7.min.js',
-+ url: NETDATA.serverDefault + 'lib/bootstrap.min.js',
- async: false,
- isAlreadyLoaded: function() {
- // check if bootstrap is loaded
diff --git a/debian/patches/series b/debian/patches/series
index 8ed8a277..f082ea8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
0002-remove-file-serve-restrictions-for-symlinks.patch
0003-hide-update-button.patch
0004-readd-shebang-to-chart-scripts.patch
-0005-remove-lib-versions.patch