Merge ~kousu/ubuntu/+source/netdata:ubuntu/mantic-fix-empty-netdata-web into ubuntu/+source/netdata:ubuntu/mantic-devel

Proposed by Nick
Status: Needs review
Proposed branch: ~kousu/ubuntu/+source/netdata:ubuntu/mantic-fix-empty-netdata-web
Merge into: ubuntu/+source/netdata:ubuntu/mantic-devel
Diff against target: 45 lines (+6/-16)
3 files modified
debian/changelog (+6/-0)
debian/patches/series (+0/-1)
dev/null (+0/-15)
Reviewer Review Type Date Requested Status
Lukas Märdian (community) Approve
Bryce Harrington (community) Needs Fixing
git-ubuntu import Pending
Review via email:

Commit message

Remove allow-symlinks.patch.

It is not needed since netdata added a more extensive helper
function, and the previous attempt to update it for that helper
broke netdata's web server.


To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

Hi Nick, thanks for proposing this fix to LP: #2042644.

Poking around, I see the original Debian change for this was to fix Deb #1043415:

The version number for this change should be 1.42.1-1ubuntu0.1 due to SRU policy. In Ubuntu we refer to the bugs like "(LP: #2042644)" rather than Closes, to distinguish between Launchpad bugs and bug reports in the Debian bug tracker.

Your packaging looks good other than those two items, so if you correct them and re-push to this MP it should be sponsorable.

Since this is targeting the fix to mantic, the bug report will also need the usual SRU Bug Template text filled in - see You've got a lot of that already in the bug report, but perhaps see if you can reformat to the SRU template style. Another patch pilot can assist in filling in the rest.

review: Needs Fixing
Revision history for this message
Nick (kousu) wrote :

Thank you for taking the time to throw me some guidance, Bryce. I've updated the MP with it. I put "(LP: #2042644)" in debian/changelog and the git log, I hope that's okay.

Do you have the rights to mark LP: #2042644 "Importance: critical"? The wiki says that's supposed to happen first.

Otherwise thank you for taking the time, and I'm very much looking forward to being able to unpin my custom build of netdata :)

Revision history for this message
Nick (kousu) wrote :

I'm wondering if there's any time available to give this a second pass and a sponsorship soon? Thanks!

Revision history for this message
Lukas Märdian (slyon) wrote :

Hello Nick, things have been moving slowly during holiday season. Sorry for that.

I confirmed the version number and changelog fixes suggested by Bryce. Also the SRU template has been filled.

I update the SRU bug status, to reflect the fact that this is already fixed in Debian and Noble.

Just a small nitpick note for your next upload: We're supposed to update the "Maintainer" field in debian/control whenever we introduce some delta to Ubuntu packages. We can use the "update-maintainer" script to do that for us, or implement the following diff manually:

(I'll quickly do that for you here, but please remember it for next time)

diff --git a/debian/control b/debian/control
index 4cd5e02d..6b29b28d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: netdata
 Section: net
 Priority: optional
-Maintainer: Daniel Baumann <email address hidden>
+Maintainer: Ubuntu Developers <email address hidden>
+XSBC-Original-Maintainer: Daniel Baumann <email address hidden>
  Lennart Weller <email address hidden>,
  Federico Ceratto <email address hidden>,

Otherwise, LGTM. Sponsoring with the 'update-maintainer' fix in place:
It's now up to the SRU team to review and accept this into Mantic.

review: Approve

Unmerged commits

5a4e058... by Nick Guenther <email address hidden>

Remove allow-symlinks.patch (LP: #2042644)

It is not needed since netdata added a more extensive helper
function, and the previous attempt to update it for that helper
broke netdata's web server.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 88a69b2..2f50d74 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+netdata (1.42.1-1ubuntu0.1) mantic; urgency=high
8+ * Backport removing allow-symlinks.patch, not needed anymore (LP: #2042644).
10+ -- Nick Guenther <> Fri, 03 Nov 2023 04:53:29 -0400
12 netdata (1.42.1-1) sid; urgency=medium
14 * Uploading to sid.
15diff --git a/debian/patches/series b/debian/patches/series
16index 18446b6..cc487eb 100644
17--- a/debian/patches/series
18+++ b/debian/patches/series
19@@ -3,5 +3,4 @@ debian/0002-use-system-exim4.patch
20 debian/0003-use-python3.patch
21 debian/0004-use-bash.patch
22 debian/0005-send-email.patch
24 upstream/0002-fix-FTCBFS.patch
25diff --git a/debian/patches/upstream/0001-allow-symlinks.patch b/debian/patches/upstream/0001-allow-symlinks.patch
26deleted file mode 100644
27index 06bbd93..0000000
28--- a/debian/patches/upstream/0001-allow-symlinks.patch
29+++ /dev/null
30@@ -1,15 +0,0 @@
31-Author: Lennart Weller <>
32-Description: Remove file serve restrictions for symlinks.
34-diff -Naurp netdata.orig/web/server/web_client.c netdata/web/server/web_client.c
35---- netdata.orig/web/server/web_client.c
36-+++ netdata/web/server/web_client.c
37-@@ -513,7 +513,7 @@ static int mysendfile(struct web_client
38- bool is_dir = false;
39- char web_filename[FILENAME_MAX + 1];
40- struct stat statbuf;
41-- if(!find_filename_to_serve(filename, web_filename, FILENAME_MAX, &statbuf, w, &is_dir)) {
42-+ if (stat(web_filename, &statbuf) != 0) {
43- w->>content_type = CT_TEXT_HTML;
44- buffer_strcat(w->, "File does not exist, or is not accessible: ");
45- buffer_strcat_htmlescape(w->, web_filename);


People subscribed via source and target branches

to all changes: