Merge pull request #29498 from yesbox/netdata_1.7.0

netdata: 1.5.0 -> 1.7.0
This commit is contained in:
Franz Pletz 2017-09-17 18:47:36 +02:00 committed by GitHub
commit 672ff7112e
2 changed files with 6 additions and 6 deletions

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }:
stdenv.mkDerivation rec{
version = "1.5.0";
version = "1.7.0";
name = "netdata-${version}";
src = fetchFromGitHub {
rev = "v${version}";
owner = "firehol";
repo = "netdata";
sha256 = "1nsv0s11ai1kvig9xr4cz2f2lalvilpbfjpd8fdfqk9fak690zhz";
sha256 = "1fv01jnbgwbafsxavlji90zdqizn8m4nfg9ivc4sbi05j036bg6n";
};
buildInputs = [ autoreconfHook zlib pkgconfig libuuid ];

View File

@ -1,7 +1,7 @@
--- a/src/web_client.c.orig
+++ b/src/web_client.c
@@ -331,7 +331,7 @@
buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", webfilename);
@@ -302,7 +302,7 @@
buffer_strcat_htmlescape(w->response.data, webfilename);
return 404;
}
-
@ -9,8 +9,8 @@
// check if the file is owned by expected user
if(stat.st_uid != web_files_uid()) {
error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid());
@@ -345,7 +345,7 @@
buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
@@ -320,7 +320,7 @@
buffer_strcat_htmlescape(w->response.data, webfilename);
return 403;
}
-