Merge ~michal-maloszewski99/ubuntu/+source/apache2:dolphin-focal-1927742 into ubuntu/+source/apache2:ubuntu/focal-devel

[Michał Małoszewski]

Unmerged commits

ff6fe4d... by Michał Małoszewski on 2023-10-09

changelog

516029b... by Michał Małoszewski on 2023-10-09

* d/p/fix-dolphin-to-delete-webdav-dirs.patch: Fix dolphin to make it
  possible to delete webdav directories. (LP: #1927742)

diff --git a/debian/changelog b/debian/changelog
index 07440f4..31e2331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.41-4ubuntu3.15) focal; urgency=medium
+
+  * d/p/fix-dolphin-to-delete-webdav-dirs.patch: Fix dolphin to make it
+    possible to delete webdav directories. (LP: #1927742)
+
+ -- Michal Maloszewski <[e-mail]>  Mon, 09 Oct 2023 21:47:01 +0200
+
 apache2 (2.4.41-4ubuntu3.14) focal-security; urgency=medium
 
   * SECURITY UPDATE: HTTP request splitting with mod_rewrite and mod_proxy
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..84fd8d1
--- /dev/null
+++ b/debian/patches/fix-dolphin-to-delete-webdav-dirs.patch
@@ -0,0 +1,17 @@
+Description: Fix dolphin to make it possible to delete webdav dirs
+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: 2023-10-09
+---
+docs/conf/extra/httpd-dav.conf.in | 2 ++
+1 file changed, 2 insertions(+), 0 deletions(-)
+
+--- 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 b652571..74bf6fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -60,3 +60,4 @@ CVE-2022-37436.patch
 CVE-2023-25690-1.patch
 CVE-2023-25690-2.patch
 CVE-2023-27522.patch
+fix-dolphin-to-delete-webdav-dirs.patch