summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-10-17 09:36:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-10-17 09:37:24 +0000
commitea0a37349fdac3149b723c3113140dfb65c71444 (patch)
treedc74b9831bff45b64cfd43d2b1e4fe9158aaf927
parentMerging upstream version 1.43.0. (diff)
downloadnetdata-ea0a37349fdac3149b723c3113140dfb65c71444.tar.xz
netdata-ea0a37349fdac3149b723c3113140dfb65c71444.zip
Removing allow-symlinks.patch, not needed anymore (Closes: #1043415).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/upstream/0001-allow-symlinks.patch15
2 files changed, 0 insertions, 16 deletions
diff --git a/debian/patches/series b/debian/patches/series
index 18446b6d4..cc487ebf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@ debian/0002-use-system-exim4.patch
debian/0003-use-python3.patch
debian/0004-use-bash.patch
debian/0005-send-email.patch
-upstream/0001-allow-symlinks.patch
upstream/0002-fix-FTCBFS.patch
diff --git a/debian/patches/upstream/0001-allow-symlinks.patch b/debian/patches/upstream/0001-allow-symlinks.patch
deleted file mode 100644
index 06bbd9356..000000000
--- a/debian/patches/upstream/0001-allow-symlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Lennart Weller <lhw@ring0.de>
-Description: Remove file serve restrictions for symlinks.
-
-diff -Naurp netdata.orig/web/server/web_client.c netdata/web/server/web_client.c
---- netdata.orig/web/server/web_client.c
-+++ netdata/web/server/web_client.c
-@@ -513,7 +513,7 @@ static int mysendfile(struct web_client
- bool is_dir = false;
- char web_filename[FILENAME_MAX + 1];
- struct stat statbuf;
-- if(!find_filename_to_serve(filename, web_filename, FILENAME_MAX, &statbuf, w, &is_dir)) {
-+ if (stat(web_filename, &statbuf) != 0) {
- w->response.data->content_type = CT_TEXT_HTML;
- buffer_strcat(w->response.data, "File does not exist, or is not accessible: ");
- buffer_strcat_htmlescape(w->response.data, web_filename);