Merge ~bryce/ubuntu/+source/apache2:sru-lp1927742-noble into ubuntu/+source/apache2:ubuntu/noble-devel

[Bryce Harrington]

Adds a fix for a KDE issue with apache2's webdav. This carries the work by Michal, which while his approach was accurate I found through testing was missing the actual fix being installed. I've corrected that and verified the testing using both curl and dolphin as clients against each of the 4 series being targeted as webdav servers.

Bug: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1927742
PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1927742/

I've just kicked off a fresh set of DEP8 runs against the PPA, but as the DEP8 tests don't cover this case I don't expect them to be of much interest.

[Bryce Harrington (bryce)]

  - apache2/2.4.58-1ubuntu2~noble1
    + ✅ apache2 on noble for amd64 @ 29.01.24 21:00:15 Log️ 🗒️
    + ✅ apache2 on noble for arm64 @ 29.01.24 21:24:00 Log️ 🗒️
    + ✅ apache2 on noble for armhf @ 29.01.24 20:43:57 Log️ 🗒️
    + ✅ apache2 on noble for ppc64el @ 29.01.24 20:59:55 Log️ 🗒️
    + ✅ apache2 on noble for s390x @ 29.01.24 21:09:26 Log️ 🗒️

[Andreas Hasenack (ahasenack)]

+1

I took the liberty of "fixing" the curl test case in the bug:

a. curl -I -X DELETE -A 'prefix dolphin' http://davtest-<codename>.lxd/example/test

to

a. curl -I -X DELETE -A 'prefix dolphin/' http://davtest-<codename>.lxd/example/test

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, ahasenack
Uploaders: bryce, ahasenack
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Thanks, uploaded for noble:

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/apache2
Vcs-Git-Commit: 551e81cc3f955f6a36b780d1c1cfdbb6a14d3467
Vcs-Git-Ref: refs/heads/sru-lp1927742-noble
$ dput ubuntu ../apache2_2.4.58-1ubuntu2_source.changes
gpg: ../apache2_2.4.58-1ubuntu2_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../apache2_2.4.58-1ubuntu2.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.58-1ubuntu2.dsc: done.
  Uploading apache2_2.4.58-1ubuntu2.debian.tar.xz: done.
  Uploading apache2_2.4.58-1ubuntu2_source.buildinfo: done.
  Uploading apache2_2.4.58-1ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index fe2f3bc..69fae98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apache2 (2.4.58-1ubuntu2) noble; urgency=medium
+
+  * d/c/m/setenvif.conf, d/p/fix-dolphin-to-delete-webdav-dirs.patch: Add
+    dolphin and Konqueror/5 careful redirection so that directories can be
+    deleted via webdav.
+    (LP: #1927742)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 24 Jan 2024 14:00:03 -0800
+
 apache2 (2.4.58-1ubuntu1) noble; urgency=medium
 
   * Merge with Debian unstable (LP: #2040357). Remaining changes:
diff --git a/debian/config-dir/mods-available/setenvif.conf b/debian/config-dir/mods-available/setenvif.conf
index 8bba04c..8b96bb9 100644
--- a/debian/config-dir/mods-available/setenvif.conf
+++ b/debian/config-dir/mods-available/setenvif.conf
@@ -24,3 +24,5 @@ BrowserMatch "^gvfs/1" redirect-carefully
 BrowserMatch "^XML Spy" redirect-carefully
 BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 BrowserMatch " Konqueror/4" redirect-carefully
+BrowserMatch " Konqueror/5" redirect-carefully
+BrowserMatch " dolphin/" redirect-carefully
diff --git a/debian/patches/fix-dolphin-to-delete-webdav-dirs.patch b/debian/patches/fix-dolphin-to-delete-webdav-dirs.patch
 new file mode 100644
index 0000000..1fac833
--- /dev/null
+++ b/debian/patches/fix-dolphin-to-delete-webdav-dirs.patch
@@ -0,0 +1,16 @@
+Description: Recognize dolphin and Konqueror/5 browsers for webdav.
+ Without these settings, these browsers will be sent redirects on
+ URLs for directories specified without a trailing '/'.  That can
+ prevent webdav DELETE operations from working.
+Author: Michal Maloszewski <[e-mail]>
+Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=67039
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1927742
+Last-Update: 2024-01-16
+--- a/docs/conf/extra/httpd-dav.conf.in
++++ b/docs/conf/extra/httpd-dav.conf.in
+@@ -48,3 +48,5 @@
+ BrowserMatch "^XML Spy" redirect-carefully
+ BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+ BrowserMatch " Konqueror/4" redirect-carefully
++BrowserMatch " Konqueror/5" redirect-carefully
++BrowserMatch " dolphin/" redirect-carefully
diff --git a/debian/patches/series b/debian/patches/series
index d2c00e2..ae14d4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-dolphin-to-delete-webdav-dirs.patch
 fhs_compliance.patch
 no_LD_LIBRARY_PATH.patch
 suexec-CVE-2007-1742.patch