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

[Michał Małoszewski]

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-michal-maloszewski99-ppa-dolphin-1927742/?format=plain)
  apache2 @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-michal-maloszewski99-ppa-dolphin-1927742/mantic/amd64/a/apache2/20231009_222247_279b3@/log.gz
    09.10.23 22:22:47 ✅ Triggers: apache2/2.4.57-2ubuntu3~ppa1
  apache2 @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-michal-maloszewski99-ppa-dolphin-1927742/mantic/arm64/a/apache2/20231009_230447_5f001@/log.gz
    09.10.23 23:04:47 ✅ Triggers: apache2/2.4.57-2ubuntu3~ppa1
  apache2 @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-michal-maloszewski99-ppa-dolphin-1927742/mantic/armhf/a/apache2/20231009_224723_414f5@/log.gz
    09.10.23 22:47:23 ✅ Triggers: apache2/2.4.57-2ubuntu3~ppa1
  apache2 @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-michal-maloszewski99-ppa-dolphin-1927742/mantic/ppc64el/a/apache2/20231009_222619_20b38@/log.gz
    09.10.23 22:26:19 ✅ Triggers: apache2/2.4.57-2ubuntu3~ppa1
  apache2 @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-mantic-michal-maloszewski99-ppa-dolphin-1927742/mantic/s390x/a/apache2/20231009_222204_203b0@/log.gz
    09.10.23 22:22:04 ✅ Triggers: apache2/2.4.57-2ubuntu3~ppa1
Running: (none)
Waiting: (none)

[Bryce Harrington (bryce)]

This will need re-spun as an SRU update for mantic (and a regular update to 24.04 once it opens).

Michal, you can go ahead and mark this abandoned/deleted, and I'll pick it up again once 20.04 opens.

review: Needs Resubmitting

[Andreas Hasenack (ahasenack)]

Marking this as rejected, given previous comment.

Unmerged commits

5d22c34... by Michał Małoszewski on 2023-10-09

changelog

a565f49... 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)

05bf4fb... by Lena Voytek on 2023-07-21

2.4.57-2ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

8f012d7... by Marc Deslauriers on 2023-06-07

2.4.57-2ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 118f242..e56a4f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.57-2ubuntu3) mantic; 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:07:37 +0200
+
 apache2 (2.4.57-2ubuntu2) mantic; urgency=medium
 
   * d/control: Upgrade lua build dependency to 5.4
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 d2c00e2..186045f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ fix-macro.patch
 
 # This patch is applied manually
 #suexec-custom.patch
+fix-dolphin-to-delete-webdav-dirs.patch