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

[Nick]

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.

Closes https://bugs.launchpad.net/ubuntu/+source/netdata/+bug/2042644

[Bryce Harrington (bryce)]

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:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043415
  https://git.progress-linux.org/users/daniel.baumann/debian/packages/netdata/commit/?h=debian&id=ea0a37349fdac3149b723c3113140dfb65c71444

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 https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template. 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

[Nick (kousu)]

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 :)

[Nick (kousu)]

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

[Lukas Märdian (slyon)]

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>
 Uploaders:
  Lennart Weller <email address hidden>,
  Federico Ceratto <email address hidden>,
```

Otherwise, LGTM. Sponsoring with the 'update-maintainer' fix in place: https://launchpad.net/ubuntu/mantic/+queue?queue_state=1&queue_text=netdata
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> on 2023-11-03

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.

diff --git a/debian/changelog b/debian/changelog
index 88a69b2..2f50d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+netdata (1.42.1-1ubuntu0.1) mantic; urgency=high
+
+  * Backport removing allow-symlinks.patch, not needed anymore (LP: #2042644).
+
+ -- Nick Guenther <[e-mail]>  Fri, 03 Nov 2023 04:53:29 -0400
+
 netdata (1.42.1-1) sid; urgency=medium
 
   * Uploading to sid.
diff --git a/debian/patches/series b/debian/patches/series
index 18446b6..cc487eb 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 06bbd93..0000000
--- a/debian/patches/upstream/0001-allow-symlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Lennart Weller <[e-mail]>
-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);