diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/netdata.init | 10 | ||||
| -rw-r--r-- | debian/patches/0001-linked-js-css-fonts-removed-from-make.patch | 12 | ||||
| -rw-r--r-- | debian/patches/0002-remove-file-serve-restrictions-for-symlinks.patch | 10 | ||||
| -rw-r--r-- | debian/patches/0003-hide-update-button.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0004-use-system-python-yaml-library.patch | 8 | ||||
| -rw-r--r-- | debian/patches/0006-fix-exim-path.patch | 2 |
7 files changed, 32 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index 779b99d0..fc077df1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +netdata (1.7.0+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release (Closes: #868662) + + -- Lennart Weller <lhw@ring0.de> Thu, 27 Jul 2017 11:57:13 +0200 + netdata (1.6.0+dfsg-3) unstable; urgency=medium * Add fping Recommends and CAP_NET_RAW capability (Closes: #864370) diff --git a/debian/netdata.init b/debian/netdata.init index 332ff40b..731ba47f 100644 --- a/debian/netdata.init +++ b/debian/netdata.init @@ -23,16 +23,16 @@ . /lib/lsb/init-functions NAME=netdata +PIDFILE=/var/run/netdata.pid DAEMON=/usr/sbin/$NAME DAEMON_USER=$NAME -DAEMON_ARGS="" +DAEMON_ARGS="-P $PIDFILE" # Exit if executable is not installed [ -x "$DAEMON" ] || exit 0 PATH=/sbin:/bin:/usr/sbin:/usr/bin DESC="the netdata daemon" -PIDFILE=/var/run/netdata.pid CONF_FNAME=/etc/netdata/netdata.conf case "$1" in @@ -47,7 +47,7 @@ case "$1" in if start-stop-daemon --stop --signal 0 --quiet --pidfile $PIDFILE --exec $DAEMON; then log_action_end_msg 0 "already running" else - if start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DEFAULT_ARGS + if start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS then log_action_end_msg 0 else @@ -75,8 +75,6 @@ case "$1" in fi ;; reload) - echo "Not implemented" - exit 1 log_action_begin_msg "Reloading $DESC configuration" pid=`cat $PIDFILE 2>/dev/null` || true if test ! -f $PIDFILE -o -z "$pid"; then @@ -84,7 +82,7 @@ case "$1" in exit 1 fi - if start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --exec $DAEMON + if start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --exec $DAEMON then log_action_end_msg 0 elif kill -0 $pid 2>/dev/null; then 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 a58527af..238424dd 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 15ed336a..8ecff89b 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 adc1aaf3..a3d9258f 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 8e4ab5e8..37868528 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 60ea6390..c92baddb 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 |