Merge ~bryce/ubuntu/+source/apache2:sru-lp1927742-focal into ubuntu/+source/apache2:ubuntu/focal-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.41-4ubuntu3.16~focal1
    + ✅ apache2 on focal for amd64 @ 29.01.24 20:46:58 Log️ 🗒️
    + ✅ apache2 on focal for arm64 @ 29.01.24 21:44:02 Log️ 🗒️
    + ✅ apache2 on focal for armhf @ 29.01.24 21:16:09 Log️ 🗒️
    + ✅ apache2 on focal for ppc64el @ 29.01.24 20:57:14 Log️ 🗒️
    + ✅ apache2 on focal for s390x @ 29.01.24 20:57:17 Log️ 🗒️

[Andreas Hasenack (ahasenack)]

Is this missing the debian/config-dir/mods-available/setenvif.conf change?

review: Needs Information

[Bryce Harrington (bryce)]

Fixed now. Branch push mishap.

[Andreas Hasenack (ahasenack)]

+1

review: Approve

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

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

review: Approve

diff --git a/debian/changelog b/debian/changelog
index ac23128..9771f55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apache2 (2.4.41-4ubuntu3.16) focal; 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]>  Tue, 16 Jan 2024 19:00:27 -0800
+
 apache2 (2.4.41-4ubuntu3.15) focal-security; urgency=medium
 
   * SECURITY UPDATE: mod_macro buffer over-read
diff --git a/debian/config-dir/mods-available/setenvif.conf b/debian/config-dir/mods-available/setenvif.conf
index b6c4cc4..e03913c 100644
--- a/debian/config-dir/mods-available/setenvif.conf
+++ b/debian/config-dir/mods-available/setenvif.conf
@@ -26,6 +26,8 @@
 	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
 
 </IfModule>
 
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 5c85d49..578663c 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