From b5b9f9024f8e6ed7e5839eb7be63a6abcad07fc8 Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Wed, 16 Jun 2021 22:13:59 +0200
Subject: [PATCH 01/32] bump version

---
 changelog/{unreleased => 10.8.0_2021-06-23}/38172   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38465   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38474   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38506   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38552   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38567   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38581   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38591   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38598-1 | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38598-2 | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38600   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38602   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38605   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38616   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38625   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38631   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38639   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38643   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38647   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38649   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38653   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38656   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38682   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38689   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38691   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38693   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38698   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38704   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38705   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38709   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38714   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38719   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38722   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38725   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38728   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38737   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38738   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38742   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38748   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38750   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38751   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38753   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38767   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38774   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38775   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38778   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38785   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38787   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38788   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38794   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38795   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38804   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38819   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38831   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38841   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38844   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38858   | 0
 changelog/{unreleased => 10.8.0_2021-06-23}/38860   | 0
 version.php                                         | 4 ++--
 59 files changed, 2 insertions(+), 2 deletions(-)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38172 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38465 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38474 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38506 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38552 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38567 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38581 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38591 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38598-1 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38598-2 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38600 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38602 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38605 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38616 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38625 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38631 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38639 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38643 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38647 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38649 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38653 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38656 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38682 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38689 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38691 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38693 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38698 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38704 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38705 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38709 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38714 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38719 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38722 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38725 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38728 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38737 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38738 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38742 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38748 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38750 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38751 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38753 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38767 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38774 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38775 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38778 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38785 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38787 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38788 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38794 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38795 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38804 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38819 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38831 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38841 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38844 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38858 (100%)
 rename changelog/{unreleased => 10.8.0_2021-06-23}/38860 (100%)

diff --git a/changelog/unreleased/38172 b/changelog/10.8.0_2021-06-23/38172
similarity index 100%
rename from changelog/unreleased/38172
rename to changelog/10.8.0_2021-06-23/38172
diff --git a/changelog/unreleased/38465 b/changelog/10.8.0_2021-06-23/38465
similarity index 100%
rename from changelog/unreleased/38465
rename to changelog/10.8.0_2021-06-23/38465
diff --git a/changelog/unreleased/38474 b/changelog/10.8.0_2021-06-23/38474
similarity index 100%
rename from changelog/unreleased/38474
rename to changelog/10.8.0_2021-06-23/38474
diff --git a/changelog/unreleased/38506 b/changelog/10.8.0_2021-06-23/38506
similarity index 100%
rename from changelog/unreleased/38506
rename to changelog/10.8.0_2021-06-23/38506
diff --git a/changelog/unreleased/38552 b/changelog/10.8.0_2021-06-23/38552
similarity index 100%
rename from changelog/unreleased/38552
rename to changelog/10.8.0_2021-06-23/38552
diff --git a/changelog/unreleased/38567 b/changelog/10.8.0_2021-06-23/38567
similarity index 100%
rename from changelog/unreleased/38567
rename to changelog/10.8.0_2021-06-23/38567
diff --git a/changelog/unreleased/38581 b/changelog/10.8.0_2021-06-23/38581
similarity index 100%
rename from changelog/unreleased/38581
rename to changelog/10.8.0_2021-06-23/38581
diff --git a/changelog/unreleased/38591 b/changelog/10.8.0_2021-06-23/38591
similarity index 100%
rename from changelog/unreleased/38591
rename to changelog/10.8.0_2021-06-23/38591
diff --git a/changelog/unreleased/38598-1 b/changelog/10.8.0_2021-06-23/38598-1
similarity index 100%
rename from changelog/unreleased/38598-1
rename to changelog/10.8.0_2021-06-23/38598-1
diff --git a/changelog/unreleased/38598-2 b/changelog/10.8.0_2021-06-23/38598-2
similarity index 100%
rename from changelog/unreleased/38598-2
rename to changelog/10.8.0_2021-06-23/38598-2
diff --git a/changelog/unreleased/38600 b/changelog/10.8.0_2021-06-23/38600
similarity index 100%
rename from changelog/unreleased/38600
rename to changelog/10.8.0_2021-06-23/38600
diff --git a/changelog/unreleased/38602 b/changelog/10.8.0_2021-06-23/38602
similarity index 100%
rename from changelog/unreleased/38602
rename to changelog/10.8.0_2021-06-23/38602
diff --git a/changelog/unreleased/38605 b/changelog/10.8.0_2021-06-23/38605
similarity index 100%
rename from changelog/unreleased/38605
rename to changelog/10.8.0_2021-06-23/38605
diff --git a/changelog/unreleased/38616 b/changelog/10.8.0_2021-06-23/38616
similarity index 100%
rename from changelog/unreleased/38616
rename to changelog/10.8.0_2021-06-23/38616
diff --git a/changelog/unreleased/38625 b/changelog/10.8.0_2021-06-23/38625
similarity index 100%
rename from changelog/unreleased/38625
rename to changelog/10.8.0_2021-06-23/38625
diff --git a/changelog/unreleased/38631 b/changelog/10.8.0_2021-06-23/38631
similarity index 100%
rename from changelog/unreleased/38631
rename to changelog/10.8.0_2021-06-23/38631
diff --git a/changelog/unreleased/38639 b/changelog/10.8.0_2021-06-23/38639
similarity index 100%
rename from changelog/unreleased/38639
rename to changelog/10.8.0_2021-06-23/38639
diff --git a/changelog/unreleased/38643 b/changelog/10.8.0_2021-06-23/38643
similarity index 100%
rename from changelog/unreleased/38643
rename to changelog/10.8.0_2021-06-23/38643
diff --git a/changelog/unreleased/38647 b/changelog/10.8.0_2021-06-23/38647
similarity index 100%
rename from changelog/unreleased/38647
rename to changelog/10.8.0_2021-06-23/38647
diff --git a/changelog/unreleased/38649 b/changelog/10.8.0_2021-06-23/38649
similarity index 100%
rename from changelog/unreleased/38649
rename to changelog/10.8.0_2021-06-23/38649
diff --git a/changelog/unreleased/38653 b/changelog/10.8.0_2021-06-23/38653
similarity index 100%
rename from changelog/unreleased/38653
rename to changelog/10.8.0_2021-06-23/38653
diff --git a/changelog/unreleased/38656 b/changelog/10.8.0_2021-06-23/38656
similarity index 100%
rename from changelog/unreleased/38656
rename to changelog/10.8.0_2021-06-23/38656
diff --git a/changelog/unreleased/38682 b/changelog/10.8.0_2021-06-23/38682
similarity index 100%
rename from changelog/unreleased/38682
rename to changelog/10.8.0_2021-06-23/38682
diff --git a/changelog/unreleased/38689 b/changelog/10.8.0_2021-06-23/38689
similarity index 100%
rename from changelog/unreleased/38689
rename to changelog/10.8.0_2021-06-23/38689
diff --git a/changelog/unreleased/38691 b/changelog/10.8.0_2021-06-23/38691
similarity index 100%
rename from changelog/unreleased/38691
rename to changelog/10.8.0_2021-06-23/38691
diff --git a/changelog/unreleased/38693 b/changelog/10.8.0_2021-06-23/38693
similarity index 100%
rename from changelog/unreleased/38693
rename to changelog/10.8.0_2021-06-23/38693
diff --git a/changelog/unreleased/38698 b/changelog/10.8.0_2021-06-23/38698
similarity index 100%
rename from changelog/unreleased/38698
rename to changelog/10.8.0_2021-06-23/38698
diff --git a/changelog/unreleased/38704 b/changelog/10.8.0_2021-06-23/38704
similarity index 100%
rename from changelog/unreleased/38704
rename to changelog/10.8.0_2021-06-23/38704
diff --git a/changelog/unreleased/38705 b/changelog/10.8.0_2021-06-23/38705
similarity index 100%
rename from changelog/unreleased/38705
rename to changelog/10.8.0_2021-06-23/38705
diff --git a/changelog/unreleased/38709 b/changelog/10.8.0_2021-06-23/38709
similarity index 100%
rename from changelog/unreleased/38709
rename to changelog/10.8.0_2021-06-23/38709
diff --git a/changelog/unreleased/38714 b/changelog/10.8.0_2021-06-23/38714
similarity index 100%
rename from changelog/unreleased/38714
rename to changelog/10.8.0_2021-06-23/38714
diff --git a/changelog/unreleased/38719 b/changelog/10.8.0_2021-06-23/38719
similarity index 100%
rename from changelog/unreleased/38719
rename to changelog/10.8.0_2021-06-23/38719
diff --git a/changelog/unreleased/38722 b/changelog/10.8.0_2021-06-23/38722
similarity index 100%
rename from changelog/unreleased/38722
rename to changelog/10.8.0_2021-06-23/38722
diff --git a/changelog/unreleased/38725 b/changelog/10.8.0_2021-06-23/38725
similarity index 100%
rename from changelog/unreleased/38725
rename to changelog/10.8.0_2021-06-23/38725
diff --git a/changelog/unreleased/38728 b/changelog/10.8.0_2021-06-23/38728
similarity index 100%
rename from changelog/unreleased/38728
rename to changelog/10.8.0_2021-06-23/38728
diff --git a/changelog/unreleased/38737 b/changelog/10.8.0_2021-06-23/38737
similarity index 100%
rename from changelog/unreleased/38737
rename to changelog/10.8.0_2021-06-23/38737
diff --git a/changelog/unreleased/38738 b/changelog/10.8.0_2021-06-23/38738
similarity index 100%
rename from changelog/unreleased/38738
rename to changelog/10.8.0_2021-06-23/38738
diff --git a/changelog/unreleased/38742 b/changelog/10.8.0_2021-06-23/38742
similarity index 100%
rename from changelog/unreleased/38742
rename to changelog/10.8.0_2021-06-23/38742
diff --git a/changelog/unreleased/38748 b/changelog/10.8.0_2021-06-23/38748
similarity index 100%
rename from changelog/unreleased/38748
rename to changelog/10.8.0_2021-06-23/38748
diff --git a/changelog/unreleased/38750 b/changelog/10.8.0_2021-06-23/38750
similarity index 100%
rename from changelog/unreleased/38750
rename to changelog/10.8.0_2021-06-23/38750
diff --git a/changelog/unreleased/38751 b/changelog/10.8.0_2021-06-23/38751
similarity index 100%
rename from changelog/unreleased/38751
rename to changelog/10.8.0_2021-06-23/38751
diff --git a/changelog/unreleased/38753 b/changelog/10.8.0_2021-06-23/38753
similarity index 100%
rename from changelog/unreleased/38753
rename to changelog/10.8.0_2021-06-23/38753
diff --git a/changelog/unreleased/38767 b/changelog/10.8.0_2021-06-23/38767
similarity index 100%
rename from changelog/unreleased/38767
rename to changelog/10.8.0_2021-06-23/38767
diff --git a/changelog/unreleased/38774 b/changelog/10.8.0_2021-06-23/38774
similarity index 100%
rename from changelog/unreleased/38774
rename to changelog/10.8.0_2021-06-23/38774
diff --git a/changelog/unreleased/38775 b/changelog/10.8.0_2021-06-23/38775
similarity index 100%
rename from changelog/unreleased/38775
rename to changelog/10.8.0_2021-06-23/38775
diff --git a/changelog/unreleased/38778 b/changelog/10.8.0_2021-06-23/38778
similarity index 100%
rename from changelog/unreleased/38778
rename to changelog/10.8.0_2021-06-23/38778
diff --git a/changelog/unreleased/38785 b/changelog/10.8.0_2021-06-23/38785
similarity index 100%
rename from changelog/unreleased/38785
rename to changelog/10.8.0_2021-06-23/38785
diff --git a/changelog/unreleased/38787 b/changelog/10.8.0_2021-06-23/38787
similarity index 100%
rename from changelog/unreleased/38787
rename to changelog/10.8.0_2021-06-23/38787
diff --git a/changelog/unreleased/38788 b/changelog/10.8.0_2021-06-23/38788
similarity index 100%
rename from changelog/unreleased/38788
rename to changelog/10.8.0_2021-06-23/38788
diff --git a/changelog/unreleased/38794 b/changelog/10.8.0_2021-06-23/38794
similarity index 100%
rename from changelog/unreleased/38794
rename to changelog/10.8.0_2021-06-23/38794
diff --git a/changelog/unreleased/38795 b/changelog/10.8.0_2021-06-23/38795
similarity index 100%
rename from changelog/unreleased/38795
rename to changelog/10.8.0_2021-06-23/38795
diff --git a/changelog/unreleased/38804 b/changelog/10.8.0_2021-06-23/38804
similarity index 100%
rename from changelog/unreleased/38804
rename to changelog/10.8.0_2021-06-23/38804
diff --git a/changelog/unreleased/38819 b/changelog/10.8.0_2021-06-23/38819
similarity index 100%
rename from changelog/unreleased/38819
rename to changelog/10.8.0_2021-06-23/38819
diff --git a/changelog/unreleased/38831 b/changelog/10.8.0_2021-06-23/38831
similarity index 100%
rename from changelog/unreleased/38831
rename to changelog/10.8.0_2021-06-23/38831
diff --git a/changelog/unreleased/38841 b/changelog/10.8.0_2021-06-23/38841
similarity index 100%
rename from changelog/unreleased/38841
rename to changelog/10.8.0_2021-06-23/38841
diff --git a/changelog/unreleased/38844 b/changelog/10.8.0_2021-06-23/38844
similarity index 100%
rename from changelog/unreleased/38844
rename to changelog/10.8.0_2021-06-23/38844
diff --git a/changelog/unreleased/38858 b/changelog/10.8.0_2021-06-23/38858
similarity index 100%
rename from changelog/unreleased/38858
rename to changelog/10.8.0_2021-06-23/38858
diff --git a/changelog/unreleased/38860 b/changelog/10.8.0_2021-06-23/38860
similarity index 100%
rename from changelog/unreleased/38860
rename to changelog/10.8.0_2021-06-23/38860
diff --git a/version.php b/version.php
index 866e1ea0a240..89779bba6ede 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [10, 8, 0, 0];
+$OC_Version = [10, 8, 0, 1];
 
 // The human readable string
-$OC_VersionString = '10.8.0 prealpha';
+$OC_VersionString = '10.8.0beta1';
 
 $OC_VersionCanBeUpgradedFrom = [[8, 2, 11],[9, 0, 9],[9, 1]];
 

From 1f6d196939c9bcac904ef5e570ccd71807c8dac8 Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Mon, 5 Jul 2021 14:22:19 +0200
Subject: [PATCH 02/32] bump version, prepare changelog

---
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38172      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38465      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38474      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38506      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38552      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38567      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38581      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38591      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38598-1    | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38598-2    | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38600      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38602      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38605      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38616      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38625      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38631      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38639      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38643      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38647      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38649      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38653      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38656      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38682      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38689      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38691      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38693      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38698      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38704      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38705      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38709      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38714      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38719      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38722      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38725      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38728      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38737      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38738      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38742      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38748      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38750      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38751      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38753      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38767      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38774      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38775      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38778      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38785      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38787      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38788      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38794      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38795      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38804      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38819      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38831      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38841      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38844      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38858      | 0
 changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38860      | 0
 changelog/{unreleased => 10.8.0_2021-07-05}/38880             | 0
 changelog/{unreleased => 10.8.0_2021-07-05}/38917             | 0
 changelog/{unreleased => 10.8.0_2021-07-05}/38922             | 0
 changelog/{unreleased => 10.8.0_2021-07-05}/38934             | 0
 .../PHPdependencies20210625onward                             | 0
 version.php                                                   | 4 ++--
 64 files changed, 2 insertions(+), 2 deletions(-)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38172 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38465 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38474 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38506 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38552 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38567 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38581 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38591 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38598-1 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38598-2 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38600 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38602 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38605 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38616 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38625 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38631 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38639 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38643 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38647 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38649 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38653 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38656 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38682 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38689 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38691 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38693 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38698 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38704 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38705 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38709 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38714 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38719 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38722 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38725 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38728 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38737 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38738 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38742 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38748 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38750 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38751 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38753 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38767 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38774 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38775 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38778 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38785 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38787 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38788 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38794 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38795 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38804 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38819 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38831 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38841 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38844 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38858 (100%)
 rename changelog/{10.8.0_2021-06-23 => 10.8.0_2021-07-05}/38860 (100%)
 rename changelog/{unreleased => 10.8.0_2021-07-05}/38880 (100%)
 rename changelog/{unreleased => 10.8.0_2021-07-05}/38917 (100%)
 rename changelog/{unreleased => 10.8.0_2021-07-05}/38922 (100%)
 rename changelog/{unreleased => 10.8.0_2021-07-05}/38934 (100%)
 rename changelog/{unreleased => 10.8.0_2021-07-05}/PHPdependencies20210625onward (100%)

diff --git a/changelog/10.8.0_2021-06-23/38172 b/changelog/10.8.0_2021-07-05/38172
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38172
rename to changelog/10.8.0_2021-07-05/38172
diff --git a/changelog/10.8.0_2021-06-23/38465 b/changelog/10.8.0_2021-07-05/38465
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38465
rename to changelog/10.8.0_2021-07-05/38465
diff --git a/changelog/10.8.0_2021-06-23/38474 b/changelog/10.8.0_2021-07-05/38474
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38474
rename to changelog/10.8.0_2021-07-05/38474
diff --git a/changelog/10.8.0_2021-06-23/38506 b/changelog/10.8.0_2021-07-05/38506
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38506
rename to changelog/10.8.0_2021-07-05/38506
diff --git a/changelog/10.8.0_2021-06-23/38552 b/changelog/10.8.0_2021-07-05/38552
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38552
rename to changelog/10.8.0_2021-07-05/38552
diff --git a/changelog/10.8.0_2021-06-23/38567 b/changelog/10.8.0_2021-07-05/38567
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38567
rename to changelog/10.8.0_2021-07-05/38567
diff --git a/changelog/10.8.0_2021-06-23/38581 b/changelog/10.8.0_2021-07-05/38581
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38581
rename to changelog/10.8.0_2021-07-05/38581
diff --git a/changelog/10.8.0_2021-06-23/38591 b/changelog/10.8.0_2021-07-05/38591
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38591
rename to changelog/10.8.0_2021-07-05/38591
diff --git a/changelog/10.8.0_2021-06-23/38598-1 b/changelog/10.8.0_2021-07-05/38598-1
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38598-1
rename to changelog/10.8.0_2021-07-05/38598-1
diff --git a/changelog/10.8.0_2021-06-23/38598-2 b/changelog/10.8.0_2021-07-05/38598-2
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38598-2
rename to changelog/10.8.0_2021-07-05/38598-2
diff --git a/changelog/10.8.0_2021-06-23/38600 b/changelog/10.8.0_2021-07-05/38600
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38600
rename to changelog/10.8.0_2021-07-05/38600
diff --git a/changelog/10.8.0_2021-06-23/38602 b/changelog/10.8.0_2021-07-05/38602
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38602
rename to changelog/10.8.0_2021-07-05/38602
diff --git a/changelog/10.8.0_2021-06-23/38605 b/changelog/10.8.0_2021-07-05/38605
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38605
rename to changelog/10.8.0_2021-07-05/38605
diff --git a/changelog/10.8.0_2021-06-23/38616 b/changelog/10.8.0_2021-07-05/38616
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38616
rename to changelog/10.8.0_2021-07-05/38616
diff --git a/changelog/10.8.0_2021-06-23/38625 b/changelog/10.8.0_2021-07-05/38625
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38625
rename to changelog/10.8.0_2021-07-05/38625
diff --git a/changelog/10.8.0_2021-06-23/38631 b/changelog/10.8.0_2021-07-05/38631
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38631
rename to changelog/10.8.0_2021-07-05/38631
diff --git a/changelog/10.8.0_2021-06-23/38639 b/changelog/10.8.0_2021-07-05/38639
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38639
rename to changelog/10.8.0_2021-07-05/38639
diff --git a/changelog/10.8.0_2021-06-23/38643 b/changelog/10.8.0_2021-07-05/38643
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38643
rename to changelog/10.8.0_2021-07-05/38643
diff --git a/changelog/10.8.0_2021-06-23/38647 b/changelog/10.8.0_2021-07-05/38647
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38647
rename to changelog/10.8.0_2021-07-05/38647
diff --git a/changelog/10.8.0_2021-06-23/38649 b/changelog/10.8.0_2021-07-05/38649
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38649
rename to changelog/10.8.0_2021-07-05/38649
diff --git a/changelog/10.8.0_2021-06-23/38653 b/changelog/10.8.0_2021-07-05/38653
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38653
rename to changelog/10.8.0_2021-07-05/38653
diff --git a/changelog/10.8.0_2021-06-23/38656 b/changelog/10.8.0_2021-07-05/38656
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38656
rename to changelog/10.8.0_2021-07-05/38656
diff --git a/changelog/10.8.0_2021-06-23/38682 b/changelog/10.8.0_2021-07-05/38682
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38682
rename to changelog/10.8.0_2021-07-05/38682
diff --git a/changelog/10.8.0_2021-06-23/38689 b/changelog/10.8.0_2021-07-05/38689
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38689
rename to changelog/10.8.0_2021-07-05/38689
diff --git a/changelog/10.8.0_2021-06-23/38691 b/changelog/10.8.0_2021-07-05/38691
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38691
rename to changelog/10.8.0_2021-07-05/38691
diff --git a/changelog/10.8.0_2021-06-23/38693 b/changelog/10.8.0_2021-07-05/38693
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38693
rename to changelog/10.8.0_2021-07-05/38693
diff --git a/changelog/10.8.0_2021-06-23/38698 b/changelog/10.8.0_2021-07-05/38698
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38698
rename to changelog/10.8.0_2021-07-05/38698
diff --git a/changelog/10.8.0_2021-06-23/38704 b/changelog/10.8.0_2021-07-05/38704
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38704
rename to changelog/10.8.0_2021-07-05/38704
diff --git a/changelog/10.8.0_2021-06-23/38705 b/changelog/10.8.0_2021-07-05/38705
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38705
rename to changelog/10.8.0_2021-07-05/38705
diff --git a/changelog/10.8.0_2021-06-23/38709 b/changelog/10.8.0_2021-07-05/38709
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38709
rename to changelog/10.8.0_2021-07-05/38709
diff --git a/changelog/10.8.0_2021-06-23/38714 b/changelog/10.8.0_2021-07-05/38714
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38714
rename to changelog/10.8.0_2021-07-05/38714
diff --git a/changelog/10.8.0_2021-06-23/38719 b/changelog/10.8.0_2021-07-05/38719
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38719
rename to changelog/10.8.0_2021-07-05/38719
diff --git a/changelog/10.8.0_2021-06-23/38722 b/changelog/10.8.0_2021-07-05/38722
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38722
rename to changelog/10.8.0_2021-07-05/38722
diff --git a/changelog/10.8.0_2021-06-23/38725 b/changelog/10.8.0_2021-07-05/38725
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38725
rename to changelog/10.8.0_2021-07-05/38725
diff --git a/changelog/10.8.0_2021-06-23/38728 b/changelog/10.8.0_2021-07-05/38728
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38728
rename to changelog/10.8.0_2021-07-05/38728
diff --git a/changelog/10.8.0_2021-06-23/38737 b/changelog/10.8.0_2021-07-05/38737
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38737
rename to changelog/10.8.0_2021-07-05/38737
diff --git a/changelog/10.8.0_2021-06-23/38738 b/changelog/10.8.0_2021-07-05/38738
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38738
rename to changelog/10.8.0_2021-07-05/38738
diff --git a/changelog/10.8.0_2021-06-23/38742 b/changelog/10.8.0_2021-07-05/38742
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38742
rename to changelog/10.8.0_2021-07-05/38742
diff --git a/changelog/10.8.0_2021-06-23/38748 b/changelog/10.8.0_2021-07-05/38748
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38748
rename to changelog/10.8.0_2021-07-05/38748
diff --git a/changelog/10.8.0_2021-06-23/38750 b/changelog/10.8.0_2021-07-05/38750
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38750
rename to changelog/10.8.0_2021-07-05/38750
diff --git a/changelog/10.8.0_2021-06-23/38751 b/changelog/10.8.0_2021-07-05/38751
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38751
rename to changelog/10.8.0_2021-07-05/38751
diff --git a/changelog/10.8.0_2021-06-23/38753 b/changelog/10.8.0_2021-07-05/38753
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38753
rename to changelog/10.8.0_2021-07-05/38753
diff --git a/changelog/10.8.0_2021-06-23/38767 b/changelog/10.8.0_2021-07-05/38767
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38767
rename to changelog/10.8.0_2021-07-05/38767
diff --git a/changelog/10.8.0_2021-06-23/38774 b/changelog/10.8.0_2021-07-05/38774
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38774
rename to changelog/10.8.0_2021-07-05/38774
diff --git a/changelog/10.8.0_2021-06-23/38775 b/changelog/10.8.0_2021-07-05/38775
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38775
rename to changelog/10.8.0_2021-07-05/38775
diff --git a/changelog/10.8.0_2021-06-23/38778 b/changelog/10.8.0_2021-07-05/38778
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38778
rename to changelog/10.8.0_2021-07-05/38778
diff --git a/changelog/10.8.0_2021-06-23/38785 b/changelog/10.8.0_2021-07-05/38785
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38785
rename to changelog/10.8.0_2021-07-05/38785
diff --git a/changelog/10.8.0_2021-06-23/38787 b/changelog/10.8.0_2021-07-05/38787
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38787
rename to changelog/10.8.0_2021-07-05/38787
diff --git a/changelog/10.8.0_2021-06-23/38788 b/changelog/10.8.0_2021-07-05/38788
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38788
rename to changelog/10.8.0_2021-07-05/38788
diff --git a/changelog/10.8.0_2021-06-23/38794 b/changelog/10.8.0_2021-07-05/38794
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38794
rename to changelog/10.8.0_2021-07-05/38794
diff --git a/changelog/10.8.0_2021-06-23/38795 b/changelog/10.8.0_2021-07-05/38795
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38795
rename to changelog/10.8.0_2021-07-05/38795
diff --git a/changelog/10.8.0_2021-06-23/38804 b/changelog/10.8.0_2021-07-05/38804
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38804
rename to changelog/10.8.0_2021-07-05/38804
diff --git a/changelog/10.8.0_2021-06-23/38819 b/changelog/10.8.0_2021-07-05/38819
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38819
rename to changelog/10.8.0_2021-07-05/38819
diff --git a/changelog/10.8.0_2021-06-23/38831 b/changelog/10.8.0_2021-07-05/38831
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38831
rename to changelog/10.8.0_2021-07-05/38831
diff --git a/changelog/10.8.0_2021-06-23/38841 b/changelog/10.8.0_2021-07-05/38841
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38841
rename to changelog/10.8.0_2021-07-05/38841
diff --git a/changelog/10.8.0_2021-06-23/38844 b/changelog/10.8.0_2021-07-05/38844
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38844
rename to changelog/10.8.0_2021-07-05/38844
diff --git a/changelog/10.8.0_2021-06-23/38858 b/changelog/10.8.0_2021-07-05/38858
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38858
rename to changelog/10.8.0_2021-07-05/38858
diff --git a/changelog/10.8.0_2021-06-23/38860 b/changelog/10.8.0_2021-07-05/38860
similarity index 100%
rename from changelog/10.8.0_2021-06-23/38860
rename to changelog/10.8.0_2021-07-05/38860
diff --git a/changelog/unreleased/38880 b/changelog/10.8.0_2021-07-05/38880
similarity index 100%
rename from changelog/unreleased/38880
rename to changelog/10.8.0_2021-07-05/38880
diff --git a/changelog/unreleased/38917 b/changelog/10.8.0_2021-07-05/38917
similarity index 100%
rename from changelog/unreleased/38917
rename to changelog/10.8.0_2021-07-05/38917
diff --git a/changelog/unreleased/38922 b/changelog/10.8.0_2021-07-05/38922
similarity index 100%
rename from changelog/unreleased/38922
rename to changelog/10.8.0_2021-07-05/38922
diff --git a/changelog/unreleased/38934 b/changelog/10.8.0_2021-07-05/38934
similarity index 100%
rename from changelog/unreleased/38934
rename to changelog/10.8.0_2021-07-05/38934
diff --git a/changelog/unreleased/PHPdependencies20210625onward b/changelog/10.8.0_2021-07-05/PHPdependencies20210625onward
similarity index 100%
rename from changelog/unreleased/PHPdependencies20210625onward
rename to changelog/10.8.0_2021-07-05/PHPdependencies20210625onward
diff --git a/version.php b/version.php
index 89779bba6ede..7b7e80c028cf 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [10, 8, 0, 1];
+$OC_Version = [10, 8, 0, 2];
 
 // The human readable string
-$OC_VersionString = '10.8.0beta1';
+$OC_VersionString = '10.8.0beta2';
 
 $OC_VersionCanBeUpgradedFrom = [[8, 2, 11],[9, 0, 9],[9, 1]];
 

From 07b240e983588a883f6cab22ff1de582212f4f05 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Tue, 6 Jul 2021 16:36:49 +0200
Subject: [PATCH 03/32] fix faulty css

---
 core/css/header.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/css/header.css b/core/css/header.css
index 900a12c94ad6..46f7eb514e7a 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -410,7 +410,8 @@
 	opacity: .7;
 	box-sizing: border-box;
 }
-#expanddiv a img, .icon {
+#expanddiv a img,
+#expanddiv a .icon {
 	display: inline-block;
 	margin-bottom: -3px;
 	margin-right: 6px;

From 9250bbfdb5916cd3e44471530da755613f76ffd1 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Tue, 6 Jul 2021 19:47:18 +0200
Subject: [PATCH 04/32] Extend changelog

---
 changelog/10.8.0_2021-07-05/38172 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog/10.8.0_2021-07-05/38172 b/changelog/10.8.0_2021-07-05/38172
index af323823b7fe..f250b370a955 100644
--- a/changelog/10.8.0_2021-07-05/38172
+++ b/changelog/10.8.0_2021-07-05/38172
@@ -10,4 +10,5 @@ and more space to enter another server address.
 
 https://github.com/owncloud/enterprise/issues/4393
 https://github.com/owncloud/core/pull/38712
-https://github.com/owncloud/core/pull/38928
\ No newline at end of file
+https://github.com/owncloud/core/pull/38928
+https://github.com/owncloud/core/pull/38948
\ No newline at end of file

From 26b35e2c9b511a0fd8b669116dfe8c2623d39b79 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Tue, 6 Jul 2021 09:36:11 +0200
Subject: [PATCH 05/32] add class menutoggle

---
 apps/federatedfilesharing/js/public.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/federatedfilesharing/js/public.js b/apps/federatedfilesharing/js/public.js
index f4306467e9b7..27e5a6d9f473 100644
--- a/apps/federatedfilesharing/js/public.js
+++ b/apps/federatedfilesharing/js/public.js
@@ -11,7 +11,7 @@ $(document).ready(function () {
 		'<img src="' + OC.imagePath('core', 'loading-small.gif') + '"' +
 		'</span>' +
 		'</a>' +
-		'<div id="save-to-oc-expand-container">' +
+		'<div id="save-to-oc-expand-container" class="menutoggle">' +
 		'<a href="#" class="button" id="save-to-oc-button-expand">' +
 		'		<img class="svg" alt="" src="'+ OC.imagePath('core', 'actions/triangle-s') +'">' +
 		'</a>' +

From 2934369df15c4d18b46aac93b0f7c48b46e7f242 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Tue, 6 Jul 2021 09:39:38 +0200
Subject: [PATCH 06/32] Expand existing changelog

---
 changelog/10.8.0_2021-07-05/38172 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog/10.8.0_2021-07-05/38172 b/changelog/10.8.0_2021-07-05/38172
index f250b370a955..db630ad7a460 100644
--- a/changelog/10.8.0_2021-07-05/38172
+++ b/changelog/10.8.0_2021-07-05/38172
@@ -11,4 +11,5 @@ and more space to enter another server address.
 https://github.com/owncloud/enterprise/issues/4393
 https://github.com/owncloud/core/pull/38712
 https://github.com/owncloud/core/pull/38928
-https://github.com/owncloud/core/pull/38948
\ No newline at end of file
+https://github.com/owncloud/core/pull/38942
+https://github.com/owncloud/core/pull/38948

From 30ec0c36edf069723bef4ffb507ddf3af8bc2a9d Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 8 Jul 2021 10:47:42 +0200
Subject: [PATCH 07/32] Fix case sensitive trashbin_skip_extensions

---
 .../lib/TrashbinSkipChecker.php               |   5 +-
 changelog/10.8.0_2021-07-05/38704             |   3 +-
 config/config.sample.php                      |   1 +
 .../features/apiTrashbin/trashbinSkip.feature | 112 +++++++++++++++++-
 .../trashbinSkipOc10Isssue38952.feature       |  55 +++++++++
 5 files changed, 171 insertions(+), 5 deletions(-)
 create mode 100644 tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature

diff --git a/apps/files_trashbin/lib/TrashbinSkipChecker.php b/apps/files_trashbin/lib/TrashbinSkipChecker.php
index debad67d0528..d028bfa71395 100644
--- a/apps/files_trashbin/lib/TrashbinSkipChecker.php
+++ b/apps/files_trashbin/lib/TrashbinSkipChecker.php
@@ -111,10 +111,9 @@ protected function checkFileExtension(string $relativePath): bool {
 		$fileExtensionsToSkip = $this->config->getSystemValue('trashbin_skip_extensions', []);
 
 		foreach ($fileExtensionsToSkip as $skipItem) {
-			$skipItem = \trim($skipItem);
-			$skipItem = '.'.$skipItem;
+			$skipItem = '.'.\strtolower(\trim($skipItem));
 
-			if (\substr($relativePath, -\strlen($skipItem)) === $skipItem) {
+			if (\strtolower(\substr($relativePath, -\strlen($skipItem))) === $skipItem) {
 				$this->logger->info("Path $relativePath skipped the trashbin and has been deleted immediately due to the trashbin_skip_extensions config $skipItem");
 				return true;
 			}
diff --git a/changelog/10.8.0_2021-07-05/38704 b/changelog/10.8.0_2021-07-05/38704
index 2ea71a8f7674..e2cefb7e34f9 100644
--- a/changelog/10.8.0_2021-07-05/38704
+++ b/changelog/10.8.0_2021-07-05/38704
@@ -4,4 +4,5 @@ With this change new config parameters has been introduced.
 Admins can now decide, based on file extensions, directory names and size,
 if a resource should not be observed by the trashbin and deleted immediately.
 
-https://github.com/owncloud/core/pull/38704
\ No newline at end of file
+https://github.com/owncloud/core/pull/38704
+https://github.com/owncloud/core/pull/38960
\ No newline at end of file
diff --git a/config/config.sample.php b/config/config.sample.php
index ad405761451d..e9af9b556e6b 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -608,6 +608,7 @@
  * Extension names are valid for all mount points, take care when selecting the names.
  *
  * Values must not have a leading ".", otherwise corresponding files wont be detected.
+ * Values are case insensitive
  *
  */
 'trashbin_skip_extensions' => [
diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
index aa58e509e7a5..83de12929971 100644
--- a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
+++ b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
@@ -10,6 +10,7 @@ Feature: files and folders can be deleted completely skipping the trashbin
     And user "Alice" has created folder "simple-folder"
     And user "Alice" has created folder "lorem-folder"
 
+
   Scenario Outline: Skip trashbin based on extensions
     Given the administrator has set the following file extensions to be skipped from the trashbin
       | extension |
@@ -39,6 +40,76 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
+
+  Scenario Outline: Skip trashbin based on extensions - match is case-insensitive
+    Given the administrator has set the following file extensions to be skipped from the trashbin
+      | extension |
+      | dat       |
+      | php       |
+      | go        |
+    And user "Alice" has uploaded file with content "sample delete file 1" to "sample.TXT"
+    And user "Alice" has uploaded file with content "sample delete file 1" to "sample.txt"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "sample.DAT"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "sample.dat"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "sample.PHP"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "sample.php"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "sample.GO"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "sample.go"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "sample.PY"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "sample.py"
+    And using <dav-path> DAV path
+    When user "Alice" deletes the following files
+      | path       |
+      | sample.TXT |
+      | sample.txt |
+      | sample.DAT |
+      | sample.dat |
+      | sample.PHP |
+      | sample.php |
+      | sample.GO  |
+      | sample.go  |
+      | sample.PY  |
+      | sample.py  |
+    Then as "Alice" the file with original path "/sample.TXT" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.txt" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.PY" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.py" should exist in the trashbin
+    But as "Alice" the file with original path "/sample.DAT" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.PHP" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.php" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.GO" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.go" should not exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+  @issue-38952 @skipOnOcV10
+  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
+    Given the administrator has set the following file extensions to be skipped from the trashbin
+      | extension |
+      | dat       |
+      | php       |
+      | go        |
+    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
+    And using <dav-path> DAV path
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
+    But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+
   Scenario Outline: Skip trashbin based on directory
     Given the administrator has set the following directories to be skipped from the trashbin
       | directory     |
@@ -67,7 +138,28 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
-  Scenario Outline: Delete a folder skipped from trashbin
+
+  Scenario Outline: Skip trashbin based on directory should match only the root folder name
+    Given the administrator has set the following directories to be skipped from the trashbin
+      | directory     |
+      | simple-folder |
+    And using <dav-path> DAV path
+    And user "Alice" has created folder "PARENT/simple-folder"
+    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/p.txt"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/simple-folder/sub.txt"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "simple-folder/s.txt"
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    And user "Alice" deletes folder "simple-folder" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/p.txt" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/simple-folder/sub.txt" should exist in the trashbin
+    But as "Alice" the file with original path "simple-folder/s.txt" should not exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+
+  Scenario Outline: Delete a file in a folder skipped from trashbin
     Given the administrator has set the following directories to be skipped from the trashbin
       | directory |
       | PARENT    |
@@ -81,6 +173,7 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
+
   Scenario Outline: Delete a file with same name as folder skipped from trashbin
     Given the administrator has set the following directories to be skipped from the trashbin
       | directory |
@@ -94,6 +187,7 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
+
   Scenario Outline: Delete a file from a folder skipped from trashbin but different case
     Given the administrator has set the following directories to be skipped from the trashbin
       | directory |
@@ -107,6 +201,7 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
+
   Scenario Outline: Skip file from trashbin based on size threshold
     Given the administrator has set the trashbin skip size threshold to "10"
     And using <dav-path> DAV path
@@ -121,6 +216,21 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
+  @issue-38952 @skipOnOcV10
+  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
+    Given the administrator has set the trashbin skip size threshold to "10"
+    And using <dav-path> DAV path
+    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
+    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
+    But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+
   Scenario Outline: Delete files when multiple skip trashbin rules are set
     Given the administrator has set the following directories to be skipped from the trashbin
       | directory |
diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature b/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
new file mode 100644
index 000000000000..68ae27c17323
--- /dev/null
+++ b/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
@@ -0,0 +1,55 @@
+@api @files_trashbin-app-required @notToImplementOnOCIS @skipOnOcV10.6 @skipOnOcV10.7
+Feature: files and folders can be deleted completely skipping the trashbin
+  As an admin
+  I want to configure some files to be deleted without the trashbin
+  So that I can control my trashbin space and which files are kept in that space
+
+  These scenarios demonstrate the unwanted behavior described in issue-38952.
+  To fix the issue, delete these scenarios, and enable the corresponding good
+  scenarios in trashbinSkip.feature. Then make those scenarios pass.
+
+  Background:
+    Given user "Alice" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "PARENT"
+
+  @issue-38952
+  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
+    Given the administrator has set the following file extensions to be skipped from the trashbin
+      | extension |
+      | dat       |
+      | php       |
+      | go        |
+    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
+    And using <dav-path> DAV path
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
+    #But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
+    #And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
+    #And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.dat" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.php" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.go" should exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+  @issue-38952
+  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
+    Given the administrator has set the trashbin skip size threshold to "10"
+    And using <dav-path> DAV path
+    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
+    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
+    #But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/lorem.dat" should exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |

From a44720f59cc63819c7341b2f444c3b46910d6050 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Thu, 8 Jul 2021 16:42:34 +0545
Subject: [PATCH 08/32] Adjust tests to match trashbin-skip requirements

---
 .../features/apiTrashbin/trashbinSkip.feature | 60 ++++++++++++++++---
 .../trashbinSkipOc10Isssue38952.feature       | 55 -----------------
 2 files changed, 52 insertions(+), 63 deletions(-)
 delete mode 100644 tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature

diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
index 83de12929971..1e65319107fe 100644
--- a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
+++ b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
@@ -41,6 +41,36 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | new      |
 
 
+  Scenario Outline: Skip trashbin based on extensions - file in a folder
+    Given the administrator has set the following file extensions to be skipped from the trashbin
+      | extension |
+      | dat       |
+      | php       |
+      | go        |
+    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
+    And using <dav-path> DAV path
+    When user "Alice" deletes the following files
+      | path              |
+      | PARENT/sample.txt |
+      | PARENT/sample.dat |
+      | PARENT/sample.php |
+      | PARENT/sample.go  |
+      | PARENT/sample.py  |
+    Then as "Alice" the file with original path "/PARENT/sample.txt" should exist in the trashbin
+    And as "Alice" the file with original path "/PARENT/sample.py" should exist in the trashbin
+    But as "Alice" the file with original path "/PARENT/sample.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "/PARENT/sample.php" should not exist in the trashbin
+    And as "Alice" the file with original path "/PARENT/sample.go" should not exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+
   Scenario Outline: Skip trashbin based on extensions - match is case-insensitive
     Given the administrator has set the following file extensions to be skipped from the trashbin
       | extension |
@@ -85,8 +115,7 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
-  @issue-38952 @skipOnOcV10
-  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
+  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder - skip-by-extension rules should not be applied
     Given the administrator has set the following file extensions to be skipped from the trashbin
       | extension |
       | dat       |
@@ -101,9 +130,9 @@ Feature: files and folders can be deleted completely skipping the trashbin
     When user "Alice" deletes folder "PARENT" using the WebDAV API
     Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
     And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
-    But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.dat" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.php" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.go" should exist in the trashbin
     Examples:
       | dav-path |
       | old      |
@@ -216,13 +245,14 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
-  @issue-38952 @skipOnOcV10
-  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
+
+  Scenario Outline: Skip file from trashbin based on size threshold - file in a folder
     Given the administrator has set the trashbin skip size threshold to "10"
     And using <dav-path> DAV path
     And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
     And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
-    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    When user "Alice" deletes file "PARENT/lorem.txt" using the WebDAV API
+    And user "Alice" deletes file "PARENT/lorem.dat" using the WebDAV API
     Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
     But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
     Examples:
@@ -231,6 +261,20 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | new      |
 
 
+  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder - skip-by-size rules should not be applied
+    Given the administrator has set the trashbin skip size threshold to "10"
+    And using <dav-path> DAV path
+    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
+    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/lorem.dat" should exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+
   Scenario Outline: Delete files when multiple skip trashbin rules are set
     Given the administrator has set the following directories to be skipped from the trashbin
       | directory |
diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature b/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
deleted file mode 100644
index 68ae27c17323..000000000000
--- a/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
+++ /dev/null
@@ -1,55 +0,0 @@
-@api @files_trashbin-app-required @notToImplementOnOCIS @skipOnOcV10.6 @skipOnOcV10.7
-Feature: files and folders can be deleted completely skipping the trashbin
-  As an admin
-  I want to configure some files to be deleted without the trashbin
-  So that I can control my trashbin space and which files are kept in that space
-
-  These scenarios demonstrate the unwanted behavior described in issue-38952.
-  To fix the issue, delete these scenarios, and enable the corresponding good
-  scenarios in trashbinSkip.feature. Then make those scenarios pass.
-
-  Background:
-    Given user "Alice" has been created with default attributes and without skeleton files
-    And user "Alice" has created folder "PARENT"
-
-  @issue-38952
-  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
-    Given the administrator has set the following file extensions to be skipped from the trashbin
-      | extension |
-      | dat       |
-      | php       |
-      | go        |
-    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
-    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
-    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
-    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
-    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
-    And using <dav-path> DAV path
-    When user "Alice" deletes folder "PARENT" using the WebDAV API
-    Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
-    #But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
-    #And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
-    #And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.dat" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.php" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.go" should exist in the trashbin
-    Examples:
-      | dav-path |
-      | old      |
-      | new      |
-
-  @issue-38952
-  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
-    Given the administrator has set the trashbin skip size threshold to "10"
-    And using <dav-path> DAV path
-    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
-    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
-    When user "Alice" deletes folder "PARENT" using the WebDAV API
-    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
-    #But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/lorem.dat" should exist in the trashbin
-    Examples:
-      | dav-path |
-      | old      |
-      | new      |

From 69876a7b6e3873d51dde4c999fa3d0eb856a920b Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 8 Jul 2021 14:21:23 +0200
Subject: [PATCH 09/32] Change default sync client url

---
 changelog/unreleased/38962      | 5 +++++
 lib/private/legacy/defaults.php | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelog/unreleased/38962

diff --git a/changelog/unreleased/38962 b/changelog/unreleased/38962
new file mode 100644
index 000000000000..ce69e8a2c5f7
--- /dev/null
+++ b/changelog/unreleased/38962
@@ -0,0 +1,5 @@
+Change: Update url for sync client button and docs
+
+
+https://github.com/owncloud/core/pull/38962
+https://github.com/owncloud/core/issues/38957
\ No newline at end of file
diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php
index 8c089511cc1f..10df4ca7d74e 100644
--- a/lib/private/legacy/defaults.php
+++ b/lib/private/legacy/defaults.php
@@ -64,11 +64,11 @@ public function __construct() {
 		$this->defaultName = 'ownCloud'; /* short name, used when referring to the software */
 		$this->defaultTitle = 'ownCloud'; /* can be a longer name, for titles */
 		$this->defaultBaseUrl = 'https://owncloud.org';
-		$this->defaultSyncClientUrl = 'https://owncloud.org/install/#install-clients';
+		$this->defaultSyncClientUrl = 'https://owncloud.com/desktop-app/';
 		$this->defaultiOSClientUrl = 'https://apps.apple.com/app/id1359583808';
 		$this->defaultiTunesAppId = '1359583808';
 		$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android';
-		$this->defaultDocBaseUrl = 'https://doc.owncloud.org';
+		$this->defaultDocBaseUrl = 'https://doc.owncloud.com';
 		$this->defaultDocVersion = $version[0] . '.' . $version[1]; // used to generate doc links
 		$this->defaultSlogan = $this->l->t('A safe home for all your data');
 		$this->defaultLogoClaim = '';

From 455e9cc4bd0294c3d60715ace64177128cfaafa6 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Thu, 8 Jul 2021 21:48:52 +0545
Subject: [PATCH 10/32] Adjust tests for doc links

---
 tests/Settings/Panels/Admin/EncryptionTest.php                  | 2 +-
 tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Settings/Panels/Admin/EncryptionTest.php b/tests/Settings/Panels/Admin/EncryptionTest.php
index fc0a25979c2d..4df97fb78d6a 100644
--- a/tests/Settings/Panels/Admin/EncryptionTest.php
+++ b/tests/Settings/Panels/Admin/EncryptionTest.php
@@ -37,6 +37,6 @@ public function testGetPriority() {
 
 	public function testGetPanel() {
 		$templateHtml = $this->panel->getPanel()->fetchPage();
-		$this->assertStringContainsString('org', $templateHtml);
+		$this->assertStringContainsString('com', $templateHtml);
 	}
 }
diff --git a/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php b/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php
index 8f9a2f963789..836e258142de 100644
--- a/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php
+++ b/tests/acceptance/features/bootstrap/WebUIHelpAndTipsContext.php
@@ -70,7 +70,7 @@ protected function generateHelpLinks($to) {
 		$version = SetupHelper::getSystemConfigValue('version');
 		$version = \explode(".", $version);
 		$version = (string) $version[0] . "." . (string) $version[1];
-		return "https://doc.owncloud.org/server/$version/go.php?to=$to";
+		return "https://doc.owncloud.com/server/$version/go.php?to=$to";
 	}
 
 	/**

From 309d0fa5d61acb43b4813ff89786e2b533037a76 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 8 Jul 2021 15:26:41 +0200
Subject: [PATCH 11/32] Introduce new api route for resend invitation mail

---
 .phpunit.result.cache                         |  1 +
 changelog/10.8.0_2021-07-05/38774             |  1 +
 settings/Controller/UsersController.php       | 53 ++++++++++++++++++-
 settings/js/users/users.js                    | 19 +++----
 settings/routes.php                           |  1 +
 .../Controller/UsersControllerTest.php        | 51 ++++++++++++++++++
 6 files changed, 114 insertions(+), 12 deletions(-)
 create mode 100644 .phpunit.result.cache

diff --git a/.phpunit.result.cache b/.phpunit.result.cache
new file mode 100644
index 000000000000..e60cc65db5a3
--- /dev/null
+++ b/.phpunit.result.cache
@@ -0,0 +1 @@
+{"version":1,"defects":{"Tests\\Settings\\Controller\\UsersControllerTest::testResendInvitation":4,"Tests\\Settings\\Controller\\UsersControllerTest::tearDownAfterClass":3},"times":{"Tests\\Settings\\Controller\\UsersControllerTest::testResendInvitation":0.008,"Tests\\Settings\\Controller\\UsersControllerTest::tearDownAfterClass":0}}
\ No newline at end of file
diff --git a/changelog/10.8.0_2021-07-05/38774 b/changelog/10.8.0_2021-07-05/38774
index 10f822de27d7..8e32d9a405e3 100644
--- a/changelog/10.8.0_2021-07-05/38774
+++ b/changelog/10.8.0_2021-07-05/38774
@@ -4,4 +4,5 @@ Implemented an action to resend the invitation email for a user that has
 never been logged in yet.
 
 https://github.com/owncloud/core/pull/38774
+https://github.com/owncloud/core/pull/38963
 https://github.com/owncloud/enterprise/issues/4577
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 0ea606fecc3e..e97d22c90ad0 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -651,6 +651,58 @@ public function resendToken($userId) {
 		);
 	}
 
+	/**
+	 * @AdminRequired
+	 *
+	 * @param $userId
+	 * @return JSONResponse
+	 */
+	public function resendInvitation($userId) {
+		$user = $this->userManager->get($userId);
+
+		if ($user === null) {
+			$this->log->error('User: ' . $userId . ' does not exist', ['app' => 'settings']);
+			return new JSONResponse(
+				[
+					"error" => $this->l10n->t('Failed to create activation link. Please contact your administrator.')
+				],
+				HTTP::STATUS_NOT_FOUND
+			);
+		}
+
+		if ($user->getLastLogin() > 0) {
+			$this->log->error('User: ' . $userId . ' already logged in', ['app' => 'settings']);
+			return new JSONResponse(
+				[
+					"error" => $this->l10n->t('Failed to create activation link. Please contact your administrator.')
+				],
+				HTTP::STATUS_CONFLICT
+			);
+		}
+
+		if ($user->getEMailAddress() === null) {
+			$this->log->error('Email address not set for: ' . $userId, ['app' => 'settings']);
+			return new JSONResponse(
+				[
+					["error" => $this->l10n->t('Failed to create activation link. Please contact your administrator.', [$userId])],
+				],
+				HTTP::STATUS_CONFLICT
+			);
+		}
+
+		try {
+			$this->generateTokenAndSendMail($user->getUID(), $user->getEMailAddress());
+		} catch (\Exception $e) {
+			$this->log->error("Can't send new user mail to " . $user->getEMailAddress() . ": " . $e->getMessage(), ['app' => 'settings']);
+			return new JSONResponse(
+				["error" => $this->l10n->t('Can\'t send email to the user. Contact your administrator.')],
+				HTTP::STATUS_INTERNAL_SERVER_ERROR
+			);
+		}
+
+		return new JSONResponse();
+	}
+
 	/**
 	 * @PublicPage
 	 * @NoAdminRequired
@@ -1081,7 +1133,6 @@ public function sendEmail($userId, $mailAddress) {
 	}
 
 	/**
-	 * @NoAdminRequired
 	 *
 	 * @param string $id
 	 * @param string $mailAddress
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index a00571164d1d..f14fe6e5a686 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -399,20 +399,17 @@ var UserList = {
 			);
 		});
 	},
-	initResendInvitationEmailHandling: function() {
+	initResendInvitationEmailHandling: function () {
 		$userListBody.on('click', '.action.resendInvitationEmail', function () {
 			var uid = UserList.getUID(this);
 			$.post(
-				OC.generateUrl('/resend/token/{id}', {id: uid}),
-				{},
-				function (result, status) {
-					if (status === 'success'){
-						OC.Notification.showTemporary(t('settings', 'The invitation email for this user has been resent'));
-					} else {
-						OC.Notification.showTemporary(t('settings', 'The invitation email for this user could not be resent'));
-					}
-				}
-			);
+				OC.generateUrl('/resend/invitation/{id}', {id: uid}),
+				{}
+			).done(function () {
+				OC.Notification.showTemporary(t('settings', 'The invitation email for this user has been resent'));
+			}).error(function () {
+				OC.Notification.showTemporary(t('settings', 'The invitation email for this user could not be resent'));
+			});
 		});
 	},
 	update: function (gid, limit) {
diff --git a/settings/routes.php b/settings/routes.php
index 4340ae9590cf..bdcecf8ed391 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -70,6 +70,7 @@
 		['name' => 'ChangePassword#changePassword', 'url' => '/users/changepassword', 'verb' => 'POST'],
 		['name' => 'Users#setPasswordForm', 'url' => '/settings/users/setpassword/form/{token}/{userId}', 'verb' => 'GET'],
 		['name' => 'Users#resendToken', 'url' => '/resend/token/{userId}', 'verb' => 'POST'],
+		['name' => 'Users#resendInvitation', 'url' => '/resend/invitation/{userId}', 'verb' => 'POST'],
 		['name' => 'Users#setPassword', 'url' => '/setpassword/{token}/{userId}', 'verb' => 'POST'],
 		['name' => 'Groups#getAssignableAndRemovableGroups', 'url' => '/settings/groups/available', 'verb' => 'GET'],
 	]
diff --git a/tests/Settings/Controller/UsersControllerTest.php b/tests/Settings/Controller/UsersControllerTest.php
index 4d8639c458b5..faf3c6197364 100644
--- a/tests/Settings/Controller/UsersControllerTest.php
+++ b/tests/Settings/Controller/UsersControllerTest.php
@@ -3002,6 +3002,57 @@ public function testResendToken() {
 		);
 	}
 
+	public function testResendInvitation() {
+		$user = $this->createMock(IUser::class);
+		$user->method('getEMailAddress')
+			->willReturn('foo@bar.com');
+
+		$this->container['UserManager']->expects($this->once())
+			->method('get')
+			->willReturn($user);
+
+		$this->container['SecureRandom']->expects($this->once())
+			->method('generate')
+			->willReturn('foOBaZ1');
+		$this->container['URLGenerator']->expects($this->once())
+			->method('linkToRouteAbsolute')
+			->willReturn('http://localhost/setpassword/foOBaZ1/foo');
+
+		$message = $this->createMock(Message::class);
+		$message->expects($this->once())
+			->method('setTo')
+			->willReturn($message);
+		$message->expects($this->once())
+			->method('setSubject')
+			->willReturn($message);
+		$message->expects($this->once())
+			->method('setHtmlBody')
+			->willReturn($message);
+		$message->expects($this->once())
+			->method('setPlainBody')
+			->willReturn($message);
+		$message->expects($this->once())
+			->method('setFrom')
+			->willReturn($message);
+
+		$this->container['Defaults']->method('getName')
+			->willReturn('ownCloud');
+
+		$this->container['Mailer']->expects($this->once())
+			->method('createMessage')
+			->willReturn($message);
+		$this->container['Mailer']->expects($this->once())
+			->method('send')
+			->with($message)
+			->willReturn([]);
+
+		$result = $this->container['UsersController']->resendInvitation('foo');
+		$this->assertEquals(
+			new Http\JSONResponse(),
+			$result
+		);
+	}
+
 	/**
 	 * @param $conditionForException
 	 */

From 4670ef1f0443b77d65ab81883dbfe7fa3fd5a270 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Fri, 9 Jul 2021 09:57:23 +0200
Subject: [PATCH 12/32] ignore .phpunit.result.cache in every path

---
 .gitignore            | 3 +--
 .phpunit.result.cache | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 .phpunit.result.cache

diff --git a/.gitignore b/.gitignore
index a191eb8ce62d..4256bfcaf3e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,7 +122,6 @@ vendor-bin/**/composer.lock
 
 # Tests - auto-generated files
 /data-autotest
-/tests/.phpunit.result.cache
 /tests/coverage*
 /tests/karma-coverage
 /tests/acceptance/server_tmp
@@ -135,7 +134,7 @@ vendor-bin/**/composer.lock
 clover.xml
 /tests/output
 .php-cs-fixer.cache
-
+.phpunit.result.cache
 # old php-cs-fixer v2 files
 .php_cs.cache
 .php_cs
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
deleted file mode 100644
index e60cc65db5a3..000000000000
--- a/.phpunit.result.cache
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"defects":{"Tests\\Settings\\Controller\\UsersControllerTest::testResendInvitation":4,"Tests\\Settings\\Controller\\UsersControllerTest::tearDownAfterClass":3},"times":{"Tests\\Settings\\Controller\\UsersControllerTest::testResendInvitation":0.008,"Tests\\Settings\\Controller\\UsersControllerTest::tearDownAfterClass":0}}
\ No newline at end of file

From 54e9f8303e3731238b622764534c8694bff77c86 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Fri, 9 Jul 2021 14:44:38 +0200
Subject: [PATCH 13/32] Always restore agent author

---
 apps/files_sharing/lib/ExpireSharesJob.php |  5 ++--
 lib/private/Share20/Manager.php            | 34 ++++++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php
index 399a8f920fc4..e51d84f49df0 100644
--- a/apps/files_sharing/lib/ExpireSharesJob.php
+++ b/apps/files_sharing/lib/ExpireSharesJob.php
@@ -105,6 +105,7 @@ public function run($argument) {
 
 		$shares = $qb->execute();
 		while ($share = $shares->fetch()) {
+			$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 			try {
 				/*
 				 * The type of $share['id'] changes depends on the db type. (int for pgsql, string for others)
@@ -112,11 +113,11 @@ public function run($argument) {
 				 * $share['id'] has been casted to string to ensure consistency.
 				 */
 				$shareObject = $this->defaultShareProvider->getShareById((string)$share['id']);
-				$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 				$this->shareManager->deleteShare($shareObject);
-				$this->activityManager->restoreAgentAuthor();
 			} catch (ShareNotFound $ex) {
 				//already deleted
+			} finally {
+				$this->activityManager->restoreAgentAuthor();
 			}
 		}
 		$shares->closeCursor();
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index a9d364027f15..5bf72e5ecd84 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1263,12 +1263,13 @@ public function getAllSharesBy($userId, $shareTypes, $nodeIDs, $reshares = false
 			$queriedShares = $provider->getAllSharesBy($userId, $shareTypeArray, $nodeIDs, $reshares);
 			foreach ($queriedShares as $queriedShare) {
 				if (self::shareHasExpired($queriedShare)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($queriedShare);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1304,12 +1305,13 @@ public function getSharesBy($userId, $shareType, $path = null, $reshares = false
 			foreach ($shares as $share) {
 				// Check if the share is expired and if so delete it
 				if (self::shareHasExpired($share)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($share);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1365,12 +1367,13 @@ public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $o
 			foreach ($shares as $share) {
 				// Check if the share is expired and if so delete it
 				if (self::shareHasExpired($share)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($share);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1424,12 +1427,13 @@ public function getAllSharedWith($userId, $shareTypes, $node = null) {
 			$queriedShares = $provider->getAllSharedWith($userId, $node);
 			foreach ($queriedShares as $queriedShare) {
 				if (self::shareHasExpired($queriedShare)) {
+					$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 					try {
-						$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
 						$this->deleteShare($queriedShare);
-						$this->activityManager->restoreAgentAuthor();
 					} catch (NotFoundException $e) {
 						//Ignore since this basically means the share is deleted
+					} finally {
+						$this->activityManager->restoreAgentAuthor();
 					}
 					continue;
 				}
@@ -1456,8 +1460,11 @@ public function getShareById($id, $recipient = null) {
 		// Validate shares expiration date
 		if (self::shareHasExpired($share)) {
 			$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
-			$this->deleteShare($share);
-			$this->activityManager->restoreAgentAuthor();
+			try {
+				$this->deleteShare($share);
+			} finally {
+				$this->activityManager->restoreAgentAuthor();
+			}
 			throw new ShareNotFound();
 		}
 
@@ -1514,8 +1521,11 @@ public function getShareByToken($token) {
 
 		if (self::shareHasExpired($share)) {
 			$this->activityManager->setAgentAuthor(IEvent::AUTOMATION_AUTHOR);
-			$this->deleteShare($share);
-			$this->activityManager->restoreAgentAuthor();
+			try {
+				$this->deleteShare($share);
+			} finally {
+				$this->activityManager->restoreAgentAuthor();
+			}
 			throw new ShareNotFound();
 		}
 

From 847292543bd4a6785c6764ad37a83f0f5652e366 Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Fri, 9 Jul 2021 14:52:41 +0200
Subject: [PATCH 14/32] update old changelog

---
 changelog/10.8.0_2021-07-05/38605 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog/10.8.0_2021-07-05/38605 b/changelog/10.8.0_2021-07-05/38605
index f7b057b97158..97457933debc 100644
--- a/changelog/10.8.0_2021-07-05/38605
+++ b/changelog/10.8.0_2021-07-05/38605
@@ -5,4 +5,5 @@ were triggered by an automation (like the workflow app e.g.).
 
 https://github.com/owncloud/core/pull/38605
 https://github.com/owncloud/core/pull/38630
+https://github.com/owncloud/core/pull/38970
 https://github.com/owncloud/enterprise/issues/4222
\ No newline at end of file

From f252982c82b3e331e72d4cdf6489c4ac631d9b75 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Sun, 11 Jul 2021 21:47:15 +0545
Subject: [PATCH 15/32] pin phpstan to 0.12.91 for now

---
 vendor-bin/phpstan/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json
index 6c247eb96fc8..345f6a6135ed 100644
--- a/vendor-bin/phpstan/composer.json
+++ b/vendor-bin/phpstan/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "phpstan/phpstan": "^0.12.71"
+        "phpstan/phpstan": "0.12.91"
     }
 }

From 4abdcfbfca025b53ca525ccc04092d465bbe6ae9 Mon Sep 17 00:00:00 2001
From: mmattel <martin.mattel@diemattels.at>
Date: Sun, 11 Jul 2021 17:38:38 +0200
Subject: [PATCH 16/32] Fixes a config sample typo

---
 config/config.sample.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index e9af9b556e6b..b66eda1f3546 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -597,7 +597,7 @@
  * The setting expects folder names with or without trailing slash.
  * All the content of such directories including their subdirectories will also skip the trashbin.
  *
-*/
+ */
 'trashbin_skip_directories' => [
 	'temp',
 ],

From 3e7c62449b61aac353741605c09988303cb5bb9a Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Tue, 13 Jul 2021 11:44:03 +0200
Subject: [PATCH 17/32] bump version, prepare changelog

---
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38172      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38465      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38474      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38506      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38552      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38567      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38581      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38591      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38598-1    | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38598-2    | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38600      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38602      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38605      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38616      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38625      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38631      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38639      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38643      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38647      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38649      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38653      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38656      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38682      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38689      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38691      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38693      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38698      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38704      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38705      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38709      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38714      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38719      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38722      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38725      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38728      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38737      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38738      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38742      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38748      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38750      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38751      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38753      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38767      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38774      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38775      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38778      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38785      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38787      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38788      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38794      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38795      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38804      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38819      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38831      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38841      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38844      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38858      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38860      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38880      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38917      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38922      | 0
 changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38934      | 0
 changelog/{unreleased => 10.8.0_2021-07-13}/38962             | 0
 .../PHPdependencies20210625onward                             | 0
 version.php                                                   | 4 ++--
 65 files changed, 2 insertions(+), 2 deletions(-)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38172 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38465 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38474 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38506 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38552 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38567 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38581 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38591 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38598-1 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38598-2 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38600 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38602 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38605 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38616 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38625 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38631 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38639 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38643 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38647 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38649 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38653 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38656 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38682 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38689 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38691 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38693 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38698 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38704 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38705 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38709 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38714 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38719 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38722 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38725 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38728 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38737 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38738 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38742 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38748 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38750 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38751 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38753 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38767 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38774 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38775 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38778 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38785 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38787 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38788 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38794 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38795 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38804 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38819 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38831 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38841 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38844 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38858 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38860 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38880 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38917 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38922 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/38934 (100%)
 rename changelog/{unreleased => 10.8.0_2021-07-13}/38962 (100%)
 rename changelog/{10.8.0_2021-07-05 => 10.8.0_2021-07-13}/PHPdependencies20210625onward (100%)

diff --git a/changelog/10.8.0_2021-07-05/38172 b/changelog/10.8.0_2021-07-13/38172
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38172
rename to changelog/10.8.0_2021-07-13/38172
diff --git a/changelog/10.8.0_2021-07-05/38465 b/changelog/10.8.0_2021-07-13/38465
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38465
rename to changelog/10.8.0_2021-07-13/38465
diff --git a/changelog/10.8.0_2021-07-05/38474 b/changelog/10.8.0_2021-07-13/38474
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38474
rename to changelog/10.8.0_2021-07-13/38474
diff --git a/changelog/10.8.0_2021-07-05/38506 b/changelog/10.8.0_2021-07-13/38506
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38506
rename to changelog/10.8.0_2021-07-13/38506
diff --git a/changelog/10.8.0_2021-07-05/38552 b/changelog/10.8.0_2021-07-13/38552
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38552
rename to changelog/10.8.0_2021-07-13/38552
diff --git a/changelog/10.8.0_2021-07-05/38567 b/changelog/10.8.0_2021-07-13/38567
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38567
rename to changelog/10.8.0_2021-07-13/38567
diff --git a/changelog/10.8.0_2021-07-05/38581 b/changelog/10.8.0_2021-07-13/38581
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38581
rename to changelog/10.8.0_2021-07-13/38581
diff --git a/changelog/10.8.0_2021-07-05/38591 b/changelog/10.8.0_2021-07-13/38591
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38591
rename to changelog/10.8.0_2021-07-13/38591
diff --git a/changelog/10.8.0_2021-07-05/38598-1 b/changelog/10.8.0_2021-07-13/38598-1
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38598-1
rename to changelog/10.8.0_2021-07-13/38598-1
diff --git a/changelog/10.8.0_2021-07-05/38598-2 b/changelog/10.8.0_2021-07-13/38598-2
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38598-2
rename to changelog/10.8.0_2021-07-13/38598-2
diff --git a/changelog/10.8.0_2021-07-05/38600 b/changelog/10.8.0_2021-07-13/38600
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38600
rename to changelog/10.8.0_2021-07-13/38600
diff --git a/changelog/10.8.0_2021-07-05/38602 b/changelog/10.8.0_2021-07-13/38602
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38602
rename to changelog/10.8.0_2021-07-13/38602
diff --git a/changelog/10.8.0_2021-07-05/38605 b/changelog/10.8.0_2021-07-13/38605
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38605
rename to changelog/10.8.0_2021-07-13/38605
diff --git a/changelog/10.8.0_2021-07-05/38616 b/changelog/10.8.0_2021-07-13/38616
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38616
rename to changelog/10.8.0_2021-07-13/38616
diff --git a/changelog/10.8.0_2021-07-05/38625 b/changelog/10.8.0_2021-07-13/38625
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38625
rename to changelog/10.8.0_2021-07-13/38625
diff --git a/changelog/10.8.0_2021-07-05/38631 b/changelog/10.8.0_2021-07-13/38631
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38631
rename to changelog/10.8.0_2021-07-13/38631
diff --git a/changelog/10.8.0_2021-07-05/38639 b/changelog/10.8.0_2021-07-13/38639
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38639
rename to changelog/10.8.0_2021-07-13/38639
diff --git a/changelog/10.8.0_2021-07-05/38643 b/changelog/10.8.0_2021-07-13/38643
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38643
rename to changelog/10.8.0_2021-07-13/38643
diff --git a/changelog/10.8.0_2021-07-05/38647 b/changelog/10.8.0_2021-07-13/38647
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38647
rename to changelog/10.8.0_2021-07-13/38647
diff --git a/changelog/10.8.0_2021-07-05/38649 b/changelog/10.8.0_2021-07-13/38649
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38649
rename to changelog/10.8.0_2021-07-13/38649
diff --git a/changelog/10.8.0_2021-07-05/38653 b/changelog/10.8.0_2021-07-13/38653
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38653
rename to changelog/10.8.0_2021-07-13/38653
diff --git a/changelog/10.8.0_2021-07-05/38656 b/changelog/10.8.0_2021-07-13/38656
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38656
rename to changelog/10.8.0_2021-07-13/38656
diff --git a/changelog/10.8.0_2021-07-05/38682 b/changelog/10.8.0_2021-07-13/38682
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38682
rename to changelog/10.8.0_2021-07-13/38682
diff --git a/changelog/10.8.0_2021-07-05/38689 b/changelog/10.8.0_2021-07-13/38689
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38689
rename to changelog/10.8.0_2021-07-13/38689
diff --git a/changelog/10.8.0_2021-07-05/38691 b/changelog/10.8.0_2021-07-13/38691
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38691
rename to changelog/10.8.0_2021-07-13/38691
diff --git a/changelog/10.8.0_2021-07-05/38693 b/changelog/10.8.0_2021-07-13/38693
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38693
rename to changelog/10.8.0_2021-07-13/38693
diff --git a/changelog/10.8.0_2021-07-05/38698 b/changelog/10.8.0_2021-07-13/38698
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38698
rename to changelog/10.8.0_2021-07-13/38698
diff --git a/changelog/10.8.0_2021-07-05/38704 b/changelog/10.8.0_2021-07-13/38704
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38704
rename to changelog/10.8.0_2021-07-13/38704
diff --git a/changelog/10.8.0_2021-07-05/38705 b/changelog/10.8.0_2021-07-13/38705
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38705
rename to changelog/10.8.0_2021-07-13/38705
diff --git a/changelog/10.8.0_2021-07-05/38709 b/changelog/10.8.0_2021-07-13/38709
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38709
rename to changelog/10.8.0_2021-07-13/38709
diff --git a/changelog/10.8.0_2021-07-05/38714 b/changelog/10.8.0_2021-07-13/38714
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38714
rename to changelog/10.8.0_2021-07-13/38714
diff --git a/changelog/10.8.0_2021-07-05/38719 b/changelog/10.8.0_2021-07-13/38719
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38719
rename to changelog/10.8.0_2021-07-13/38719
diff --git a/changelog/10.8.0_2021-07-05/38722 b/changelog/10.8.0_2021-07-13/38722
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38722
rename to changelog/10.8.0_2021-07-13/38722
diff --git a/changelog/10.8.0_2021-07-05/38725 b/changelog/10.8.0_2021-07-13/38725
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38725
rename to changelog/10.8.0_2021-07-13/38725
diff --git a/changelog/10.8.0_2021-07-05/38728 b/changelog/10.8.0_2021-07-13/38728
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38728
rename to changelog/10.8.0_2021-07-13/38728
diff --git a/changelog/10.8.0_2021-07-05/38737 b/changelog/10.8.0_2021-07-13/38737
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38737
rename to changelog/10.8.0_2021-07-13/38737
diff --git a/changelog/10.8.0_2021-07-05/38738 b/changelog/10.8.0_2021-07-13/38738
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38738
rename to changelog/10.8.0_2021-07-13/38738
diff --git a/changelog/10.8.0_2021-07-05/38742 b/changelog/10.8.0_2021-07-13/38742
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38742
rename to changelog/10.8.0_2021-07-13/38742
diff --git a/changelog/10.8.0_2021-07-05/38748 b/changelog/10.8.0_2021-07-13/38748
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38748
rename to changelog/10.8.0_2021-07-13/38748
diff --git a/changelog/10.8.0_2021-07-05/38750 b/changelog/10.8.0_2021-07-13/38750
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38750
rename to changelog/10.8.0_2021-07-13/38750
diff --git a/changelog/10.8.0_2021-07-05/38751 b/changelog/10.8.0_2021-07-13/38751
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38751
rename to changelog/10.8.0_2021-07-13/38751
diff --git a/changelog/10.8.0_2021-07-05/38753 b/changelog/10.8.0_2021-07-13/38753
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38753
rename to changelog/10.8.0_2021-07-13/38753
diff --git a/changelog/10.8.0_2021-07-05/38767 b/changelog/10.8.0_2021-07-13/38767
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38767
rename to changelog/10.8.0_2021-07-13/38767
diff --git a/changelog/10.8.0_2021-07-05/38774 b/changelog/10.8.0_2021-07-13/38774
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38774
rename to changelog/10.8.0_2021-07-13/38774
diff --git a/changelog/10.8.0_2021-07-05/38775 b/changelog/10.8.0_2021-07-13/38775
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38775
rename to changelog/10.8.0_2021-07-13/38775
diff --git a/changelog/10.8.0_2021-07-05/38778 b/changelog/10.8.0_2021-07-13/38778
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38778
rename to changelog/10.8.0_2021-07-13/38778
diff --git a/changelog/10.8.0_2021-07-05/38785 b/changelog/10.8.0_2021-07-13/38785
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38785
rename to changelog/10.8.0_2021-07-13/38785
diff --git a/changelog/10.8.0_2021-07-05/38787 b/changelog/10.8.0_2021-07-13/38787
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38787
rename to changelog/10.8.0_2021-07-13/38787
diff --git a/changelog/10.8.0_2021-07-05/38788 b/changelog/10.8.0_2021-07-13/38788
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38788
rename to changelog/10.8.0_2021-07-13/38788
diff --git a/changelog/10.8.0_2021-07-05/38794 b/changelog/10.8.0_2021-07-13/38794
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38794
rename to changelog/10.8.0_2021-07-13/38794
diff --git a/changelog/10.8.0_2021-07-05/38795 b/changelog/10.8.0_2021-07-13/38795
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38795
rename to changelog/10.8.0_2021-07-13/38795
diff --git a/changelog/10.8.0_2021-07-05/38804 b/changelog/10.8.0_2021-07-13/38804
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38804
rename to changelog/10.8.0_2021-07-13/38804
diff --git a/changelog/10.8.0_2021-07-05/38819 b/changelog/10.8.0_2021-07-13/38819
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38819
rename to changelog/10.8.0_2021-07-13/38819
diff --git a/changelog/10.8.0_2021-07-05/38831 b/changelog/10.8.0_2021-07-13/38831
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38831
rename to changelog/10.8.0_2021-07-13/38831
diff --git a/changelog/10.8.0_2021-07-05/38841 b/changelog/10.8.0_2021-07-13/38841
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38841
rename to changelog/10.8.0_2021-07-13/38841
diff --git a/changelog/10.8.0_2021-07-05/38844 b/changelog/10.8.0_2021-07-13/38844
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38844
rename to changelog/10.8.0_2021-07-13/38844
diff --git a/changelog/10.8.0_2021-07-05/38858 b/changelog/10.8.0_2021-07-13/38858
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38858
rename to changelog/10.8.0_2021-07-13/38858
diff --git a/changelog/10.8.0_2021-07-05/38860 b/changelog/10.8.0_2021-07-13/38860
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38860
rename to changelog/10.8.0_2021-07-13/38860
diff --git a/changelog/10.8.0_2021-07-05/38880 b/changelog/10.8.0_2021-07-13/38880
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38880
rename to changelog/10.8.0_2021-07-13/38880
diff --git a/changelog/10.8.0_2021-07-05/38917 b/changelog/10.8.0_2021-07-13/38917
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38917
rename to changelog/10.8.0_2021-07-13/38917
diff --git a/changelog/10.8.0_2021-07-05/38922 b/changelog/10.8.0_2021-07-13/38922
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38922
rename to changelog/10.8.0_2021-07-13/38922
diff --git a/changelog/10.8.0_2021-07-05/38934 b/changelog/10.8.0_2021-07-13/38934
similarity index 100%
rename from changelog/10.8.0_2021-07-05/38934
rename to changelog/10.8.0_2021-07-13/38934
diff --git a/changelog/unreleased/38962 b/changelog/10.8.0_2021-07-13/38962
similarity index 100%
rename from changelog/unreleased/38962
rename to changelog/10.8.0_2021-07-13/38962
diff --git a/changelog/10.8.0_2021-07-05/PHPdependencies20210625onward b/changelog/10.8.0_2021-07-13/PHPdependencies20210625onward
similarity index 100%
rename from changelog/10.8.0_2021-07-05/PHPdependencies20210625onward
rename to changelog/10.8.0_2021-07-13/PHPdependencies20210625onward
diff --git a/version.php b/version.php
index 7b7e80c028cf..f7a699aea3fe 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [10, 8, 0, 2];
+$OC_Version = [10, 8, 0, 3];
 
 // The human readable string
-$OC_VersionString = '10.8.0beta2';
+$OC_VersionString = '10.8.0 RC1';
 
 $OC_VersionCanBeUpgradedFrom = [[8, 2, 11],[9, 0, 9],[9, 1]];
 

From ee1f77ec7e7358a8ed8ae8f7243323b435eb88bc Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Thu, 8 Jul 2021 09:00:15 +0545
Subject: [PATCH 18/32] add more trashbinSkip tests

---
 .../features/apiTrashbin/trashbinSkip.feature | 83 +++----------------
 .../trashbinSkipOc10Isssue38952.feature       | 55 ++++++++++++
 2 files changed, 67 insertions(+), 71 deletions(-)
 create mode 100644 tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature

diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
index 1e65319107fe..40d99b79112b 100644
--- a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
+++ b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
@@ -41,81 +41,37 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | new      |
 
 
-  Scenario Outline: Skip trashbin based on extensions - file in a folder
-    Given the administrator has set the following file extensions to be skipped from the trashbin
-      | extension |
-      | dat       |
-      | php       |
-      | go        |
-    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
-    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
-    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
-    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
-    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
-    And using <dav-path> DAV path
-    When user "Alice" deletes the following files
-      | path              |
-      | PARENT/sample.txt |
-      | PARENT/sample.dat |
-      | PARENT/sample.php |
-      | PARENT/sample.go  |
-      | PARENT/sample.py  |
-    Then as "Alice" the file with original path "/PARENT/sample.txt" should exist in the trashbin
-    And as "Alice" the file with original path "/PARENT/sample.py" should exist in the trashbin
-    But as "Alice" the file with original path "/PARENT/sample.dat" should not exist in the trashbin
-    And as "Alice" the file with original path "/PARENT/sample.php" should not exist in the trashbin
-    And as "Alice" the file with original path "/PARENT/sample.go" should not exist in the trashbin
-    Examples:
-      | dav-path |
-      | old      |
-      | new      |
-
-
-  Scenario Outline: Skip trashbin based on extensions - match is case-insensitive
+  Scenario Outline: Skip trashbin based on extensions - match is case-sensitive
     Given the administrator has set the following file extensions to be skipped from the trashbin
       | extension |
       | dat       |
       | php       |
       | go        |
     And user "Alice" has uploaded file with content "sample delete file 1" to "sample.TXT"
-    And user "Alice" has uploaded file with content "sample delete file 1" to "sample.txt"
     And user "Alice" has uploaded file with content "sample delete file 2" to "sample.DAT"
-    And user "Alice" has uploaded file with content "sample delete file 2" to "sample.dat"
     And user "Alice" has uploaded file with content "sample delete file 3" to "sample.PHP"
-    And user "Alice" has uploaded file with content "sample delete file 3" to "sample.php"
     And user "Alice" has uploaded file with content "sample delete file 4" to "sample.GO"
-    And user "Alice" has uploaded file with content "sample delete file 4" to "sample.go"
     And user "Alice" has uploaded file with content "sample delete file 5" to "sample.PY"
-    And user "Alice" has uploaded file with content "sample delete file 5" to "sample.py"
     And using <dav-path> DAV path
     When user "Alice" deletes the following files
       | path       |
       | sample.TXT |
-      | sample.txt |
       | sample.DAT |
-      | sample.dat |
       | sample.PHP |
-      | sample.php |
       | sample.GO  |
-      | sample.go  |
       | sample.PY  |
-      | sample.py  |
     Then as "Alice" the file with original path "/sample.TXT" should exist in the trashbin
-    And as "Alice" the file with original path "/sample.txt" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.DAT" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.PHP" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.GO" should exist in the trashbin
     And as "Alice" the file with original path "/sample.PY" should exist in the trashbin
-    And as "Alice" the file with original path "/sample.py" should exist in the trashbin
-    But as "Alice" the file with original path "/sample.DAT" should not exist in the trashbin
-    And as "Alice" the file with original path "/sample.dat" should not exist in the trashbin
-    And as "Alice" the file with original path "/sample.PHP" should not exist in the trashbin
-    And as "Alice" the file with original path "/sample.php" should not exist in the trashbin
-    And as "Alice" the file with original path "/sample.GO" should not exist in the trashbin
-    And as "Alice" the file with original path "/sample.go" should not exist in the trashbin
     Examples:
       | dav-path |
       | old      |
       | new      |
 
-  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder - skip-by-extension rules should not be applied
+  @issue-38952 @skipOnOcV10
+  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
     Given the administrator has set the following file extensions to be skipped from the trashbin
       | extension |
       | dat       |
@@ -130,9 +86,9 @@ Feature: files and folders can be deleted completely skipping the trashbin
     When user "Alice" deletes folder "PARENT" using the WebDAV API
     Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
     And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.dat" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.php" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.go" should exist in the trashbin
+    But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
     Examples:
       | dav-path |
       | old      |
@@ -245,30 +201,15 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
-
-  Scenario Outline: Skip file from trashbin based on size threshold - file in a folder
-    Given the administrator has set the trashbin skip size threshold to "10"
-    And using <dav-path> DAV path
-    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
-    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
-    When user "Alice" deletes file "PARENT/lorem.txt" using the WebDAV API
-    And user "Alice" deletes file "PARENT/lorem.dat" using the WebDAV API
-    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
-    But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
-    Examples:
-      | dav-path |
-      | old      |
-      | new      |
-
-
-  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder - skip-by-size rules should not be applied
+  @issue-38952 @skipOnOcV10
+  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
     Given the administrator has set the trashbin skip size threshold to "10"
     And using <dav-path> DAV path
     And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
     And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
     When user "Alice" deletes folder "PARENT" using the WebDAV API
     Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/lorem.dat" should exist in the trashbin
+    But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
     Examples:
       | dav-path |
       | old      |
diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature b/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
new file mode 100644
index 000000000000..68ae27c17323
--- /dev/null
+++ b/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
@@ -0,0 +1,55 @@
+@api @files_trashbin-app-required @notToImplementOnOCIS @skipOnOcV10.6 @skipOnOcV10.7
+Feature: files and folders can be deleted completely skipping the trashbin
+  As an admin
+  I want to configure some files to be deleted without the trashbin
+  So that I can control my trashbin space and which files are kept in that space
+
+  These scenarios demonstrate the unwanted behavior described in issue-38952.
+  To fix the issue, delete these scenarios, and enable the corresponding good
+  scenarios in trashbinSkip.feature. Then make those scenarios pass.
+
+  Background:
+    Given user "Alice" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "PARENT"
+
+  @issue-38952
+  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
+    Given the administrator has set the following file extensions to be skipped from the trashbin
+      | extension |
+      | dat       |
+      | php       |
+      | go        |
+    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
+    And using <dav-path> DAV path
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
+    #But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
+    #And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
+    #And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.dat" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.php" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.go" should exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+  @issue-38952
+  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
+    Given the administrator has set the trashbin skip size threshold to "10"
+    And using <dav-path> DAV path
+    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
+    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
+    #But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/lorem.dat" should exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |

From 7b753085baa940866cc1b00f7fd76d96be2da544 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Thu, 8 Jul 2021 16:42:34 +0545
Subject: [PATCH 19/32] Adjust tests to match trashbin-skip requirements

---
 .../features/apiTrashbin/trashbinSkip.feature | 62 ++++++++++++++++---
 .../trashbinSkipOc10Isssue38952.feature       | 55 ----------------
 2 files changed, 53 insertions(+), 64 deletions(-)
 delete mode 100644 tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature

diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
index 40d99b79112b..7d13aa24f70a 100644
--- a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
+++ b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
@@ -41,7 +41,37 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | new      |
 
 
-  Scenario Outline: Skip trashbin based on extensions - match is case-sensitive
+  Scenario Outline: Skip trashbin based on extensions - file in a folder
+    Given the administrator has set the following file extensions to be skipped from the trashbin
+      | extension |
+      | dat       |
+      | php       |
+      | go        |
+    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
+    And using <dav-path> DAV path
+    When user "Alice" deletes the following files
+      | path              |
+      | PARENT/sample.txt |
+      | PARENT/sample.dat |
+      | PARENT/sample.php |
+      | PARENT/sample.go  |
+      | PARENT/sample.py  |
+    Then as "Alice" the file with original path "/PARENT/sample.txt" should exist in the trashbin
+    And as "Alice" the file with original path "/PARENT/sample.py" should exist in the trashbin
+    But as "Alice" the file with original path "/PARENT/sample.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "/PARENT/sample.php" should not exist in the trashbin
+    And as "Alice" the file with original path "/PARENT/sample.go" should not exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+
+  Scenario Outline: Skip trashbin based on extensions - match is case-insensitive
     Given the administrator has set the following file extensions to be skipped from the trashbin
       | extension |
       | dat       |
@@ -70,8 +100,7 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
-  @issue-38952 @skipOnOcV10
-  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
+  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder - skip-by-extension rules should not be applied
     Given the administrator has set the following file extensions to be skipped from the trashbin
       | extension |
       | dat       |
@@ -86,9 +115,9 @@ Feature: files and folders can be deleted completely skipping the trashbin
     When user "Alice" deletes folder "PARENT" using the WebDAV API
     Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
     And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
-    But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.dat" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.php" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/sample.go" should exist in the trashbin
     Examples:
       | dav-path |
       | old      |
@@ -201,13 +230,14 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | old      |
       | new      |
 
-  @issue-38952 @skipOnOcV10
-  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
+
+  Scenario Outline: Skip file from trashbin based on size threshold - file in a folder
     Given the administrator has set the trashbin skip size threshold to "10"
     And using <dav-path> DAV path
     And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
     And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
-    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    When user "Alice" deletes file "PARENT/lorem.txt" using the WebDAV API
+    And user "Alice" deletes file "PARENT/lorem.dat" using the WebDAV API
     Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
     But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
     Examples:
@@ -216,6 +246,20 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | new      |
 
 
+  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder - skip-by-size rules should not be applied
+    Given the administrator has set the trashbin skip size threshold to "10"
+    And using <dav-path> DAV path
+    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
+    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
+    When user "Alice" deletes folder "PARENT" using the WebDAV API
+    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
+    And as "Alice" the file with original path "PARENT/lorem.dat" should exist in the trashbin
+    Examples:
+      | dav-path |
+      | old      |
+      | new      |
+
+
   Scenario Outline: Delete files when multiple skip trashbin rules are set
     Given the administrator has set the following directories to be skipped from the trashbin
       | directory |
diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature b/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
deleted file mode 100644
index 68ae27c17323..000000000000
--- a/tests/acceptance/features/apiTrashbin/trashbinSkipOc10Isssue38952.feature
+++ /dev/null
@@ -1,55 +0,0 @@
-@api @files_trashbin-app-required @notToImplementOnOCIS @skipOnOcV10.6 @skipOnOcV10.7
-Feature: files and folders can be deleted completely skipping the trashbin
-  As an admin
-  I want to configure some files to be deleted without the trashbin
-  So that I can control my trashbin space and which files are kept in that space
-
-  These scenarios demonstrate the unwanted behavior described in issue-38952.
-  To fix the issue, delete these scenarios, and enable the corresponding good
-  scenarios in trashbinSkip.feature. Then make those scenarios pass.
-
-  Background:
-    Given user "Alice" has been created with default attributes and without skeleton files
-    And user "Alice" has created folder "PARENT"
-
-  @issue-38952
-  Scenario Outline: Skip trashbin based on extensions when deleting the parent folder
-    Given the administrator has set the following file extensions to be skipped from the trashbin
-      | extension |
-      | dat       |
-      | php       |
-      | go        |
-    And user "Alice" has uploaded file with content "sample delete file 1" to "PARENT/sample.txt"
-    And user "Alice" has uploaded file with content "sample delete file 2" to "PARENT/sample.dat"
-    And user "Alice" has uploaded file with content "sample delete file 3" to "PARENT/sample.php"
-    And user "Alice" has uploaded file with content "sample delete file 4" to "PARENT/sample.go"
-    And user "Alice" has uploaded file with content "sample delete file 5" to "PARENT/sample.py"
-    And using <dav-path> DAV path
-    When user "Alice" deletes folder "PARENT" using the WebDAV API
-    Then as "Alice" the file with original path "PARENT/sample.txt" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.py" should exist in the trashbin
-    #But as "Alice" the file with original path "PARENT/sample.dat" should not exist in the trashbin
-    #And as "Alice" the file with original path "PARENT/sample.php" should not exist in the trashbin
-    #And as "Alice" the file with original path "PARENT/sample.go" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.dat" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.php" should exist in the trashbin
-    And as "Alice" the file with original path "PARENT/sample.go" should exist in the trashbin
-    Examples:
-      | dav-path |
-      | old      |
-      | new      |
-
-  @issue-38952
-  Scenario Outline: Skip file from trashbin based on size threshold when deleting the parent folder
-    Given the administrator has set the trashbin skip size threshold to "10"
-    And using <dav-path> DAV path
-    And user "Alice" has uploaded file with content "sample" to "PARENT/lorem.txt"
-    And user "Alice" has uploaded file with content "sample delete file" to "PARENT/lorem.dat"
-    When user "Alice" deletes folder "PARENT" using the WebDAV API
-    Then as "Alice" the file with original path "PARENT/lorem.txt" should exist in the trashbin
-    #But as "Alice" the file with original path "PARENT/lorem.dat" should not exist in the trashbin
-    And as "Alice" the file with original path "PARENT/lorem.dat" should exist in the trashbin
-    Examples:
-      | dav-path |
-      | old      |
-      | new      |

From d74f04e9977b5d9380597fcdcb4280f29dd47c90 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 13 Jul 2021 19:09:14 +0545
Subject: [PATCH 20/32] Fixup case-insensitive tarshbinSkip scenario

---
 .../features/apiTrashbin/trashbinSkip.feature | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
index 7d13aa24f70a..1e65319107fe 100644
--- a/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
+++ b/tests/acceptance/features/apiTrashbin/trashbinSkip.feature
@@ -78,23 +78,38 @@ Feature: files and folders can be deleted completely skipping the trashbin
       | php       |
       | go        |
     And user "Alice" has uploaded file with content "sample delete file 1" to "sample.TXT"
+    And user "Alice" has uploaded file with content "sample delete file 1" to "sample.txt"
     And user "Alice" has uploaded file with content "sample delete file 2" to "sample.DAT"
+    And user "Alice" has uploaded file with content "sample delete file 2" to "sample.dat"
     And user "Alice" has uploaded file with content "sample delete file 3" to "sample.PHP"
+    And user "Alice" has uploaded file with content "sample delete file 3" to "sample.php"
     And user "Alice" has uploaded file with content "sample delete file 4" to "sample.GO"
+    And user "Alice" has uploaded file with content "sample delete file 4" to "sample.go"
     And user "Alice" has uploaded file with content "sample delete file 5" to "sample.PY"
+    And user "Alice" has uploaded file with content "sample delete file 5" to "sample.py"
     And using <dav-path> DAV path
     When user "Alice" deletes the following files
       | path       |
       | sample.TXT |
+      | sample.txt |
       | sample.DAT |
+      | sample.dat |
       | sample.PHP |
+      | sample.php |
       | sample.GO  |
+      | sample.go  |
       | sample.PY  |
+      | sample.py  |
     Then as "Alice" the file with original path "/sample.TXT" should exist in the trashbin
-    And as "Alice" the file with original path "/sample.DAT" should exist in the trashbin
-    And as "Alice" the file with original path "/sample.PHP" should exist in the trashbin
-    And as "Alice" the file with original path "/sample.GO" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.txt" should exist in the trashbin
     And as "Alice" the file with original path "/sample.PY" should exist in the trashbin
+    And as "Alice" the file with original path "/sample.py" should exist in the trashbin
+    But as "Alice" the file with original path "/sample.DAT" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.dat" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.PHP" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.php" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.GO" should not exist in the trashbin
+    And as "Alice" the file with original path "/sample.go" should not exist in the trashbin
     Examples:
       | dav-path |
       | old      |

From f99c3ba77af7ca32bb8e34a6bc9210f9cd047a97 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@gmail.com>
Date: Thu, 15 Jul 2021 11:14:41 +0200
Subject: [PATCH 21/32] Prevent checksum verify command from crashing on single
 files

---
 apps/files/lib/Command/VerifyChecksums.php | 9 ++++++++-
 changelog/10.8.0_2021-07-13/38785          | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/files/lib/Command/VerifyChecksums.php b/apps/files/lib/Command/VerifyChecksums.php
index 3a56189af09a..ec8ed5c2cb4a 100644
--- a/apps/files/lib/Command/VerifyChecksums.php
+++ b/apps/files/lib/Command/VerifyChecksums.php
@@ -155,7 +155,14 @@ private function verifyChecksumsForFile($file, InputInterface $input, OutputInte
 			return;
 		}
 
-		if (!self::fileExistsOnDisk($file)) {
+		try {
+			$fileExistsOnDisk = self::fileExistsOnDisk($file);
+		} catch (StorageNotAvailableException $e) {
+			$output->writeln("Skipping $storageId/$path => Storage is not available", OutputInterface::VERBOSITY_VERBOSE);
+			return;
+		}
+
+		if (!$fileExistsOnDisk) {
 			$output->writeln("Skipping $storageId/$path => File is in file-cache but doesn't exist on storage/disk", OutputInterface::VERBOSITY_VERBOSE);
 			return;
 		}
diff --git a/changelog/10.8.0_2021-07-13/38785 b/changelog/10.8.0_2021-07-13/38785
index da0f7abf4bf8..680a71bd1b64 100644
--- a/changelog/10.8.0_2021-07-13/38785
+++ b/changelog/10.8.0_2021-07-13/38785
@@ -4,4 +4,5 @@ The command now skips files with exceptions instead of crashing.
 A proper message will be displayed to the user who fires the command.
 
 https://github.com/owncloud/core/pull/38785
+https://github.com/owncloud/core/pull/39005
 https://github.com/owncloud/core/issues/38782

From d3f4fd96c63b852cca9244a7fd63f2b1805dec0d Mon Sep 17 00:00:00 2001
From: hurradieweltgehtunter <hi@florianlenz.com>
Date: Thu, 15 Jul 2021 12:07:28 +0200
Subject: [PATCH 22/32] fix file/foldername ellipsis

---
 apps/files/css/files.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 818ed92b6182..179bcf7a6bcd 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -408,6 +408,7 @@ table td.filename .nametext {
 	text-overflow: clip;
 	max-width: 800px;
 	height: 100%;
+	width: 100%;
 }
 
 .has-favorites #fileList td.filename a.name {

From b0377fac961f86a4604d6e51fe9e957b1f84ab19 Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Thu, 15 Jul 2021 14:31:12 +0200
Subject: [PATCH 23/32] prepare changelog

---
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38172          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38465          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38474          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38506          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38552          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38567          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38581          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38591          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38598-1        | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38598-2        | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38600          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38602          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38605          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38616          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38625          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38631          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38639          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38643          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38647          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38649          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38653          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38656          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38682          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38689          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38691          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38693          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38698          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38704          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38705          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38709          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38714          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38719          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38722          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38725          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38728          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38737          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38738          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38742          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38748          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38750          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38751          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38753          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38767          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38774          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38775          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38778          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38785          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38787          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38788          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38794          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38795          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38804          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38819          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38831          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38841          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38844          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38858          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38860          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38880          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38917          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38922          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38934          | 0
 changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38962          | 0
 .../PHPdependencies20210625onward                                 | 0
 64 files changed, 0 insertions(+), 0 deletions(-)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38172 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38465 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38474 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38506 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38552 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38567 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38581 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38591 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38598-1 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38598-2 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38600 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38602 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38605 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38616 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38625 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38631 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38639 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38643 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38647 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38649 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38653 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38656 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38682 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38689 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38691 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38693 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38698 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38704 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38705 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38709 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38714 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38719 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38722 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38725 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38728 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38737 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38738 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38742 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38748 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38750 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38751 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38753 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38767 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38774 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38775 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38778 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38785 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38787 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38788 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38794 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38795 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38804 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38819 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38831 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38841 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38844 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38858 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38860 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38880 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38917 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38922 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38934 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/38962 (100%)
 rename changelog/{10.8.0_2021-07-13 => 10.8.0_2021-07-15}/PHPdependencies20210625onward (100%)

diff --git a/changelog/10.8.0_2021-07-13/38172 b/changelog/10.8.0_2021-07-15/38172
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38172
rename to changelog/10.8.0_2021-07-15/38172
diff --git a/changelog/10.8.0_2021-07-13/38465 b/changelog/10.8.0_2021-07-15/38465
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38465
rename to changelog/10.8.0_2021-07-15/38465
diff --git a/changelog/10.8.0_2021-07-13/38474 b/changelog/10.8.0_2021-07-15/38474
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38474
rename to changelog/10.8.0_2021-07-15/38474
diff --git a/changelog/10.8.0_2021-07-13/38506 b/changelog/10.8.0_2021-07-15/38506
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38506
rename to changelog/10.8.0_2021-07-15/38506
diff --git a/changelog/10.8.0_2021-07-13/38552 b/changelog/10.8.0_2021-07-15/38552
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38552
rename to changelog/10.8.0_2021-07-15/38552
diff --git a/changelog/10.8.0_2021-07-13/38567 b/changelog/10.8.0_2021-07-15/38567
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38567
rename to changelog/10.8.0_2021-07-15/38567
diff --git a/changelog/10.8.0_2021-07-13/38581 b/changelog/10.8.0_2021-07-15/38581
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38581
rename to changelog/10.8.0_2021-07-15/38581
diff --git a/changelog/10.8.0_2021-07-13/38591 b/changelog/10.8.0_2021-07-15/38591
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38591
rename to changelog/10.8.0_2021-07-15/38591
diff --git a/changelog/10.8.0_2021-07-13/38598-1 b/changelog/10.8.0_2021-07-15/38598-1
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38598-1
rename to changelog/10.8.0_2021-07-15/38598-1
diff --git a/changelog/10.8.0_2021-07-13/38598-2 b/changelog/10.8.0_2021-07-15/38598-2
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38598-2
rename to changelog/10.8.0_2021-07-15/38598-2
diff --git a/changelog/10.8.0_2021-07-13/38600 b/changelog/10.8.0_2021-07-15/38600
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38600
rename to changelog/10.8.0_2021-07-15/38600
diff --git a/changelog/10.8.0_2021-07-13/38602 b/changelog/10.8.0_2021-07-15/38602
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38602
rename to changelog/10.8.0_2021-07-15/38602
diff --git a/changelog/10.8.0_2021-07-13/38605 b/changelog/10.8.0_2021-07-15/38605
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38605
rename to changelog/10.8.0_2021-07-15/38605
diff --git a/changelog/10.8.0_2021-07-13/38616 b/changelog/10.8.0_2021-07-15/38616
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38616
rename to changelog/10.8.0_2021-07-15/38616
diff --git a/changelog/10.8.0_2021-07-13/38625 b/changelog/10.8.0_2021-07-15/38625
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38625
rename to changelog/10.8.0_2021-07-15/38625
diff --git a/changelog/10.8.0_2021-07-13/38631 b/changelog/10.8.0_2021-07-15/38631
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38631
rename to changelog/10.8.0_2021-07-15/38631
diff --git a/changelog/10.8.0_2021-07-13/38639 b/changelog/10.8.0_2021-07-15/38639
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38639
rename to changelog/10.8.0_2021-07-15/38639
diff --git a/changelog/10.8.0_2021-07-13/38643 b/changelog/10.8.0_2021-07-15/38643
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38643
rename to changelog/10.8.0_2021-07-15/38643
diff --git a/changelog/10.8.0_2021-07-13/38647 b/changelog/10.8.0_2021-07-15/38647
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38647
rename to changelog/10.8.0_2021-07-15/38647
diff --git a/changelog/10.8.0_2021-07-13/38649 b/changelog/10.8.0_2021-07-15/38649
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38649
rename to changelog/10.8.0_2021-07-15/38649
diff --git a/changelog/10.8.0_2021-07-13/38653 b/changelog/10.8.0_2021-07-15/38653
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38653
rename to changelog/10.8.0_2021-07-15/38653
diff --git a/changelog/10.8.0_2021-07-13/38656 b/changelog/10.8.0_2021-07-15/38656
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38656
rename to changelog/10.8.0_2021-07-15/38656
diff --git a/changelog/10.8.0_2021-07-13/38682 b/changelog/10.8.0_2021-07-15/38682
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38682
rename to changelog/10.8.0_2021-07-15/38682
diff --git a/changelog/10.8.0_2021-07-13/38689 b/changelog/10.8.0_2021-07-15/38689
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38689
rename to changelog/10.8.0_2021-07-15/38689
diff --git a/changelog/10.8.0_2021-07-13/38691 b/changelog/10.8.0_2021-07-15/38691
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38691
rename to changelog/10.8.0_2021-07-15/38691
diff --git a/changelog/10.8.0_2021-07-13/38693 b/changelog/10.8.0_2021-07-15/38693
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38693
rename to changelog/10.8.0_2021-07-15/38693
diff --git a/changelog/10.8.0_2021-07-13/38698 b/changelog/10.8.0_2021-07-15/38698
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38698
rename to changelog/10.8.0_2021-07-15/38698
diff --git a/changelog/10.8.0_2021-07-13/38704 b/changelog/10.8.0_2021-07-15/38704
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38704
rename to changelog/10.8.0_2021-07-15/38704
diff --git a/changelog/10.8.0_2021-07-13/38705 b/changelog/10.8.0_2021-07-15/38705
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38705
rename to changelog/10.8.0_2021-07-15/38705
diff --git a/changelog/10.8.0_2021-07-13/38709 b/changelog/10.8.0_2021-07-15/38709
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38709
rename to changelog/10.8.0_2021-07-15/38709
diff --git a/changelog/10.8.0_2021-07-13/38714 b/changelog/10.8.0_2021-07-15/38714
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38714
rename to changelog/10.8.0_2021-07-15/38714
diff --git a/changelog/10.8.0_2021-07-13/38719 b/changelog/10.8.0_2021-07-15/38719
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38719
rename to changelog/10.8.0_2021-07-15/38719
diff --git a/changelog/10.8.0_2021-07-13/38722 b/changelog/10.8.0_2021-07-15/38722
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38722
rename to changelog/10.8.0_2021-07-15/38722
diff --git a/changelog/10.8.0_2021-07-13/38725 b/changelog/10.8.0_2021-07-15/38725
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38725
rename to changelog/10.8.0_2021-07-15/38725
diff --git a/changelog/10.8.0_2021-07-13/38728 b/changelog/10.8.0_2021-07-15/38728
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38728
rename to changelog/10.8.0_2021-07-15/38728
diff --git a/changelog/10.8.0_2021-07-13/38737 b/changelog/10.8.0_2021-07-15/38737
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38737
rename to changelog/10.8.0_2021-07-15/38737
diff --git a/changelog/10.8.0_2021-07-13/38738 b/changelog/10.8.0_2021-07-15/38738
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38738
rename to changelog/10.8.0_2021-07-15/38738
diff --git a/changelog/10.8.0_2021-07-13/38742 b/changelog/10.8.0_2021-07-15/38742
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38742
rename to changelog/10.8.0_2021-07-15/38742
diff --git a/changelog/10.8.0_2021-07-13/38748 b/changelog/10.8.0_2021-07-15/38748
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38748
rename to changelog/10.8.0_2021-07-15/38748
diff --git a/changelog/10.8.0_2021-07-13/38750 b/changelog/10.8.0_2021-07-15/38750
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38750
rename to changelog/10.8.0_2021-07-15/38750
diff --git a/changelog/10.8.0_2021-07-13/38751 b/changelog/10.8.0_2021-07-15/38751
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38751
rename to changelog/10.8.0_2021-07-15/38751
diff --git a/changelog/10.8.0_2021-07-13/38753 b/changelog/10.8.0_2021-07-15/38753
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38753
rename to changelog/10.8.0_2021-07-15/38753
diff --git a/changelog/10.8.0_2021-07-13/38767 b/changelog/10.8.0_2021-07-15/38767
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38767
rename to changelog/10.8.0_2021-07-15/38767
diff --git a/changelog/10.8.0_2021-07-13/38774 b/changelog/10.8.0_2021-07-15/38774
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38774
rename to changelog/10.8.0_2021-07-15/38774
diff --git a/changelog/10.8.0_2021-07-13/38775 b/changelog/10.8.0_2021-07-15/38775
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38775
rename to changelog/10.8.0_2021-07-15/38775
diff --git a/changelog/10.8.0_2021-07-13/38778 b/changelog/10.8.0_2021-07-15/38778
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38778
rename to changelog/10.8.0_2021-07-15/38778
diff --git a/changelog/10.8.0_2021-07-13/38785 b/changelog/10.8.0_2021-07-15/38785
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38785
rename to changelog/10.8.0_2021-07-15/38785
diff --git a/changelog/10.8.0_2021-07-13/38787 b/changelog/10.8.0_2021-07-15/38787
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38787
rename to changelog/10.8.0_2021-07-15/38787
diff --git a/changelog/10.8.0_2021-07-13/38788 b/changelog/10.8.0_2021-07-15/38788
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38788
rename to changelog/10.8.0_2021-07-15/38788
diff --git a/changelog/10.8.0_2021-07-13/38794 b/changelog/10.8.0_2021-07-15/38794
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38794
rename to changelog/10.8.0_2021-07-15/38794
diff --git a/changelog/10.8.0_2021-07-13/38795 b/changelog/10.8.0_2021-07-15/38795
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38795
rename to changelog/10.8.0_2021-07-15/38795
diff --git a/changelog/10.8.0_2021-07-13/38804 b/changelog/10.8.0_2021-07-15/38804
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38804
rename to changelog/10.8.0_2021-07-15/38804
diff --git a/changelog/10.8.0_2021-07-13/38819 b/changelog/10.8.0_2021-07-15/38819
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38819
rename to changelog/10.8.0_2021-07-15/38819
diff --git a/changelog/10.8.0_2021-07-13/38831 b/changelog/10.8.0_2021-07-15/38831
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38831
rename to changelog/10.8.0_2021-07-15/38831
diff --git a/changelog/10.8.0_2021-07-13/38841 b/changelog/10.8.0_2021-07-15/38841
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38841
rename to changelog/10.8.0_2021-07-15/38841
diff --git a/changelog/10.8.0_2021-07-13/38844 b/changelog/10.8.0_2021-07-15/38844
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38844
rename to changelog/10.8.0_2021-07-15/38844
diff --git a/changelog/10.8.0_2021-07-13/38858 b/changelog/10.8.0_2021-07-15/38858
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38858
rename to changelog/10.8.0_2021-07-15/38858
diff --git a/changelog/10.8.0_2021-07-13/38860 b/changelog/10.8.0_2021-07-15/38860
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38860
rename to changelog/10.8.0_2021-07-15/38860
diff --git a/changelog/10.8.0_2021-07-13/38880 b/changelog/10.8.0_2021-07-15/38880
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38880
rename to changelog/10.8.0_2021-07-15/38880
diff --git a/changelog/10.8.0_2021-07-13/38917 b/changelog/10.8.0_2021-07-15/38917
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38917
rename to changelog/10.8.0_2021-07-15/38917
diff --git a/changelog/10.8.0_2021-07-13/38922 b/changelog/10.8.0_2021-07-15/38922
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38922
rename to changelog/10.8.0_2021-07-15/38922
diff --git a/changelog/10.8.0_2021-07-13/38934 b/changelog/10.8.0_2021-07-15/38934
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38934
rename to changelog/10.8.0_2021-07-15/38934
diff --git a/changelog/10.8.0_2021-07-13/38962 b/changelog/10.8.0_2021-07-15/38962
similarity index 100%
rename from changelog/10.8.0_2021-07-13/38962
rename to changelog/10.8.0_2021-07-15/38962
diff --git a/changelog/10.8.0_2021-07-13/PHPdependencies20210625onward b/changelog/10.8.0_2021-07-15/PHPdependencies20210625onward
similarity index 100%
rename from changelog/10.8.0_2021-07-13/PHPdependencies20210625onward
rename to changelog/10.8.0_2021-07-15/PHPdependencies20210625onward

From ddc63a2670af20784ecf1bb5671233f92b5b6170 Mon Sep 17 00:00:00 2001
From: Martin <github@diemattels.at>
Date: Fri, 16 Jul 2021 16:29:39 +0200
Subject: [PATCH 24/32] Update config.sample.php

---
 config/config.sample.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index b66eda1f3546..415f520a07a8 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -652,7 +652,7 @@
  *
  * * `auto`
  *     default setting. Automatically expire versions according to expire
- *     rules. Please refer to https://doc.owncloud.org/server/latestadmin_manual/configuration/files/file_versioning.html
+ *     rules. Please refer to https://doc.owncloud.com/server/latest/admin_manual/configuration/files/file_versioning.html
  *    for more information.
  * * `D, auto`
  *     keep versions at least for D days, apply expire rules to all versions

From be0a1a105e80ed6ca7580737db4e5ae7d8de97ca Mon Sep 17 00:00:00 2001
From: mmattel <martin.mattel@diemattels.at>
Date: Fri, 16 Jul 2021 16:39:57 +0200
Subject: [PATCH 25/32] [release-10.8.0] [PR 39018] Update config.sample.php
 (url-typo)

Backport of PR #39018
---
 config/config.apps.sample.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.apps.sample.php b/config/config.apps.sample.php
index d1dd7dfa4934..d8fbcee6b90b 100644
--- a/config/config.apps.sample.php
+++ b/config/config.apps.sample.php
@@ -116,7 +116,7 @@
  */
 
 'customclient_desktop' =>
-	'https://owncloud.org/install/#install-clients',
+	'https://owncloud.com/desktop-app/',
 'customclient_android' =>
 	'https://play.google.com/store/apps/details?id=com.owncloud.android',
 'customclient_ios' =>

From a116a10ff954082abf857139148874b99578e4d1 Mon Sep 17 00:00:00 2001
From: David Christofas <dchristofas@owncloud.com>
Date: Mon, 19 Jul 2021 10:45:51 +0200
Subject: [PATCH 26/32] update ca-bundle.crt

---
 resources/config/ca-bundle.crt | 398 ++++++++++++++-------------------
 1 file changed, 172 insertions(+), 226 deletions(-)

diff --git a/resources/config/ca-bundle.crt b/resources/config/ca-bundle.crt
index 9691596dd2f2..ee4a04015b30 100644
--- a/resources/config/ca-bundle.crt
+++ b/resources/config/ca-bundle.crt
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Wed Mar 24 13:42:53 2021 GMT
+## Certificate data from Mozilla as of: Mon Jul 19 08:44:32 2021 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.28.
-## SHA256: 3bdc63d1de27058fec943a999a2a8a01fcc6806a611b19221a7727d3d9bbbdfd
+## SHA256: c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f
 ##
 
 
@@ -156,38 +156,6 @@ Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
 12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
 -----END CERTIFICATE-----
 
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
 QuoVadis Root CA 2
 ==================
 -----BEGIN CERTIFICATE-----
@@ -275,26 +243,6 @@ s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
 FL39vmwLAw==
 -----END CERTIFICATE-----
 
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -718,51 +666,6 @@ vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
 TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
 -----END CERTIFICATE-----
 
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
 NetLock Arany (Class Gold) Főtanúsítvány
 ========================================
 -----BEGIN CERTIFICATE-----
@@ -938,82 +841,6 @@ Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
 WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
 -----END CERTIFICATE-----
 
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
 Go Daddy Root Certificate Authority - G2
 ========================================
 -----BEGIN CERTIFICATE-----
@@ -1315,27 +1142,6 @@ OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
 vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
 -----END CERTIFICATE-----
 
-Trustis FPS Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
 Buypass Class 2 Root CA
 =======================
 -----BEGIN CERTIFICATE-----
@@ -1980,36 +1786,6 @@ uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
 yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
 -----END CERTIFICATE-----
 
-Staat der Nederlanden Root CA - G3
-==================================
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
-olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
-x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
-EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
-Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
-mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
-1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
-07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
-FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
-41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
-AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
-yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
-U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
-KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
-v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
-8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
-8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
-mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
-1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
-JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
-tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
------END CERTIFICATE-----
-
 Staat der Nederlanden EV Root CA
 ================================
 -----BEGIN CERTIFICATE-----
@@ -3226,3 +3002,173 @@ qqFJu3FS8r/2/yehNq+4tneI3TqkbZs0kNwUXTC/t+sX5Ie3cdCh13cV1ELX8vMxmV2b3RZtP+oG
 I/hGoiLtk/bdmuYqh7GYVPEi92tF4+KOdh2ajcQGjTa3FPOdVGm3jjzVpG2Tgbet9r1ke8LJaDmg
 kpzNNIaRkPpkUZ3+/uul9XXeifdy
 -----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM SERVIDORES SEGUROS
+===================================
+-----BEGIN CERTIFICATE-----
+MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQswCQYDVQQGEwJF
+UzERMA8GA1UECgwIRk5NVC1SQ00xDjAMBgNVBAsMBUNlcmVzMRgwFgYDVQRhDA9WQVRFUy1RMjgy
+NjAwNEoxLDAqBgNVBAMMI0FDIFJBSVogRk5NVC1SQ00gU0VSVklET1JFUyBTRUdVUk9TMB4XDTE4
+MTIyMDA5MzczM1oXDTQzMTIyMDA5MzczM1oweDELMAkGA1UEBhMCRVMxETAPBgNVBAoMCEZOTVQt
+UkNNMQ4wDAYDVQQLDAVDZXJlczEYMBYGA1UEYQwPVkFURVMtUTI4MjYwMDRKMSwwKgYDVQQDDCNB
+QyBSQUlaIEZOTVQtUkNNIFNFUlZJRE9SRVMgU0VHVVJPUzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BPa6V1PIyqvfNkpSIeSX0oNnnvBlUdBeh8dHsVnyV0ebAAKTRBdp20LHsbI6GA60XYyzZl2hNPk2
+LEnb80b8s0RpRBNm/dfF/a82Tc4DTQdxz69qBdKiQ1oKUm8BA06Oi6NCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFAG5L++/EYZg8k/QQW6rcx/n0m5JMAoGCCqG
+SM49BAMDA2kAMGYCMQCuSuMrQMN0EfKVrRYj3k4MGuZdpSRea0R7/DjiT8ucRRcRTBQnJlU5dUoD
+zBOQn5ICMQD6SmxgiHPz7riYYqnOK8LZiqZwMR2vsJRM60/G49HzYqc8/5MuB1xJAWdpEgJyv+c=
+-----END CERTIFICATE-----
+
+GlobalSign Root R46
+===================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUAMEYxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJv
+b3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAX
+BgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08Es
+CVeJOaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQGvGIFAha/
+r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud316HCkD7rRlr+/fKYIje
+2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo0q3v84RLHIf8E6M6cqJaESvWJ3En7YEt
+bWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSEy132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvj
+K8Cd+RTyG/FWaha/LIWFzXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD4
+12lPFzYE+cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCNI/on
+ccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzsx2sZy/N78CsHpdls
+eVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqaByFrgY/bxFn63iLABJzjqls2k+g9
+vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEM
+BQADggIBAHx47PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
+JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti2kM3S+LGteWy
+gxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIkpnnpHs6i58FZFZ8d4kuaPp92
+CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRFFRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZm
+OUdkLG5NrmJ7v2B0GbhWrJKsFjLtrWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qq
+JZ4d16GLuc1CLgSkZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwye
+qiv5u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP4vkYxboz
+nxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6N3ec592kD3ZDZopD8p/7
+DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3vouXsXgxT7PntgMTzlSdriVZzH81Xwj3
+QEUxeCp6
+-----END CERTIFICATE-----
+
+GlobalSign Root E46
+===================
+-----BEGIN CERTIFICATE-----
+MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYxCzAJBgNVBAYT
+AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3Qg
+RTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNV
+BAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkB
+jtjqR+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGddyXqBPCCj
+QjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQxCpCPtsad0kRL
+gLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZk
+vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
+CAezNIm8BZ/3Hobui3A=
+-----END CERTIFICATE-----
+
+GLOBALTRUST 2020
+================
+-----BEGIN CERTIFICATE-----
+MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx
+IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT
+VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh
+BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy
+MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi
+D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO
+VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM
+CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm
+fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA
+A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR
+JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG
+DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU
+clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ
+mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud
+IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
+VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw
+4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9
+iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS
+8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2
+HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS
+vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918
+oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF
+YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl
+gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
+-----END CERTIFICATE-----
+
+ANF Secure Server Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNVBAUTCUc2MzI4
+NzUxMDELMAkGA1UEBhMCRVMxJzAlBgNVBAoTHkFORiBBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lv
+bjEUMBIGA1UECxMLQU5GIENBIFJhaXoxIjAgBgNVBAMTGUFORiBTZWN1cmUgU2VydmVyIFJvb3Qg
+Q0EwHhcNMTkwOTA0MTAwMDM4WhcNMzkwODMwMTAwMDM4WjCBhDESMBAGA1UEBRMJRzYzMjg3NTEw
+MQswCQYDVQQGEwJFUzEnMCUGA1UEChMeQU5GIEF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uMRQw
+EgYDVQQLEwtBTkYgQ0EgUmFpejEiMCAGA1UEAxMZQU5GIFNlY3VyZSBTZXJ2ZXIgUm9vdCBDQTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANvrayvmZFSVgpCjcqQZAZ2cC4Ffc0m6p6zz
+BE57lgvsEeBbphzOG9INgxwruJ4dfkUyYA8H6XdYfp9qyGFOtibBTI3/TO80sh9l2Ll49a2pcbnv
+T1gdpd50IJeh7WhM3pIXS7yr/2WanvtH2Vdy8wmhrnZEE26cLUQ5vPnHO6RYPUG9tMJJo8gN0pcv
+B2VSAKduyK9o7PQUlrZXH1bDOZ8rbeTzPvY1ZNoMHKGESy9LS+IsJJ1tk0DrtSOOMspvRdOoiXse
+zx76W0OLzc2oD2rKDF65nkeP8Nm2CgtYZRczuSPkdxl9y0oukntPLxB3sY0vaJxizOBQ+OyRp1RM
+VwnVdmPF6GUe7m1qzwmd+nxPrWAI/VaZDxUse6mAq4xhj0oHdkLePfTdsiQzW7i1o0TJrH93PB0j
+7IKppuLIBkwC/qxcmZkLLxCKpvR/1Yd0DVlJRfbwcVw5Kda/SiOL9V8BY9KHcyi1Swr1+KuCLH5z
+JTIdC2MKF4EA/7Z2Xue0sUDKIbvVgFHlSFJnLNJhiQcND85Cd8BEc5xEUKDbEAotlRyBr+Qc5RQe
+8TZBAQIvfXOn3kLMTOmJDVb3n5HUA8ZsyY/b2BzgQJhdZpmYgG4t/wHFzstGH6wCxkPmrqKEPMVO
+Hj1tyRRM4y5Bu8o5vzY8KhmqQYdOpc5LMnndkEl/AgMBAAGjYzBhMB8GA1UdIwQYMBaAFJxf0Gxj
+o1+TypOYCK2Mh6UsXME3MB0GA1UdDgQWBBScX9BsY6Nfk8qTmAitjIelLFzBNzAOBgNVHQ8BAf8E
+BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEATh65isagmD9uw2nAalxJ
+UqzLK114OMHVVISfk/CHGT0sZonrDUL8zPB1hT+L9IBdeeUXZ701guLyPI59WzbLWoAAKfLOKyzx
+j6ptBZNscsdW699QIyjlRRA96Gejrw5VD5AJYu9LWaL2U/HANeQvwSS9eS9OICI7/RogsKQOLHDt
+dD+4E5UGUcjohybKpFtqFiGS3XNgnhAY3jyB6ugYw3yJ8otQPr0R4hUDqDZ9MwFsSBXXiJCZBMXM
+5gf0vPSQ7RPi6ovDj6MzD8EpTBNO2hVWcXNyglD2mjN8orGoGjR0ZVzO0eurU+AagNjqOknkJjCb
+5RyKqKkVMoaZkgoQI1YS4PbOTOK7vtuNknMBZi9iPrJyJ0U27U1W45eZ/zo1PqVUSlJZS2Db7v54
+EX9K3BR5YLZrZAPbFYPhor72I5dQ8AkzNqdxliXzuUJ92zg/LFis6ELhDtjTO0wugumDLmsx2d1H
+hk9tl5EuT+IocTUW0fJz/iUrB0ckYyfI+PbZa/wSMVYIwFNCr5zQM378BvAxRAMU8Vjq8moNqRGy
+g77FGr8H6lnco4g175x2MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3
+r5+qPeoott7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw=
+-----END CERTIFICATE-----
+
+Certum EC-384 CA
+================
+-----BEGIN CERTIFICATE-----
+MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQswCQYDVQQGEwJQ
+TDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2
+MDcyNDU0WhcNNDMwMzI2MDcyNDU0WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERh
+dGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx
+GTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATEKI6rGFtq
+vm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7TmFy8as10CW4kjPMIRBSqn
+iBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68KjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFI0GZnQkdjrzife81r1HfS+8EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNo
+ADBlAjADVS2m5hjEfO/JUG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0
+QoSZ/6vnnvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
+-----END CERTIFICATE-----
+
+Certum Trusted Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQG
+EwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0g
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0Ew
+HhcNMTgwMzE2MTIxMDEzWhcNNDMwMzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMY
+QXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZn0EGze2jusDbCSzBfN8p
+fktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/qp1x4EaTByIVcJdPTsuclzxFUl6s1wB52
+HO8AU5853BSlLCIls3Jy/I2z5T4IHhQqNwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2
+fJmItdUDmj0VDT06qKhF8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGt
+g/BKEiJ3HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGamqi4
+NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi7VdNIuJGmj8PkTQk
+fVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSFytKAQd8FqKPVhJBPC/PgP5sZ0jeJ
+P/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0PqafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSY
+njYJdmZm/Bo/6khUHL4wvYBQv3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHK
+HRzQ+8S1h9E6Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
+vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAEii1QAL
+LtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4WxmB82M+w85bj/UvXgF2Ez8s
+ALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvozMrnadyHncI013nR03e4qllY/p0m+jiGPp2K
+h2RX5Rc64vmNueMzeMGQ2Ljdt4NR5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8
+CYyqOhNf6DR5UMEQGfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA
+4kZf5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq0Uc9Nneo
+WWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7DP78v3DSk+yshzWePS/Tj
+6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTMqJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmT
+OPQD8rv7gmsHINFSH5pkAnuYZttcTVoP0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZck
+bxJF0WddCajJFdr60qZfE2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
+-----END CERTIFICATE-----

From ff4292104e374ef188059791367f9490d402df96 Mon Sep 17 00:00:00 2001
From: Juergen Weigert <jnweiger@gmail.com>
Date: Tue, 20 Jul 2021 18:47:52 +0200
Subject: [PATCH 27/32] bump final 10.8.0

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index f7a699aea3fe..5007c8e52f2b 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [10, 8, 0, 3];
+$OC_Version = [10, 8, 0, 4];
 
 // The human readable string
-$OC_VersionString = '10.8.0 RC1';
+$OC_VersionString = '10.8.0';
 
 $OC_VersionCanBeUpgradedFrom = [[8, 2, 11],[9, 0, 9],[9, 1]];
 

From 6f43bab6a1189570dc7a5903947b24545d024db9 Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Wed, 21 Jul 2021 09:55:33 +0200
Subject: [PATCH 28/32] fix merge conflict

---
 lib/private/legacy/defaults.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php
index 10df4ca7d74e..52916a70561c 100644
--- a/lib/private/legacy/defaults.php
+++ b/lib/private/legacy/defaults.php
@@ -63,7 +63,7 @@ public function __construct() {
 		$this->defaultEntity = 'ownCloud'; /* e.g. company name, used for footers and copyright notices */
 		$this->defaultName = 'ownCloud'; /* short name, used when referring to the software */
 		$this->defaultTitle = 'ownCloud'; /* can be a longer name, for titles */
-		$this->defaultBaseUrl = 'https://owncloud.org';
+		$this->defaultBaseUrl = 'https://owncloud.com';
 		$this->defaultSyncClientUrl = 'https://owncloud.com/desktop-app/';
 		$this->defaultiOSClientUrl = 'https://apps.apple.com/app/id1359583808';
 		$this->defaultiTunesAppId = '1359583808';

From ee5bd79225ff2e61882d72e5b41e9980e8627a7b Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Tue, 6 Jul 2021 15:15:47 +0545
Subject: [PATCH 29/32] DRY the dirs mentioned in .drone.star

---
 .drone.star | 120 +++++++++++++++++++++++++++-------------------------
 1 file changed, 63 insertions(+), 57 deletions(-)

diff --git a/.drone.star b/.drone.star
index f304e303415e..e0b608ff5814 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1,3 +1,9 @@
+dir = {
+    'base': '/drone',
+    'server': '/drone/src',
+    'federated': '/drone/federated',
+}
+
 config = {
 	'rocketchat': {
 		'channel': 'server',
@@ -413,7 +419,7 @@ def dependencies(ctx):
 				'type': 'docker',
 				'name': name,
 				'workspace' : {
-					'base': '/drone',
+					'base': dir['base'],
 					'path': 'src'
 				},
 				'steps':
@@ -485,7 +491,7 @@ def codestyle():
 				'type': 'docker',
 				'name': name,
 				'workspace' : {
-					'base': '/drone',
+					'base': dir['base'],
 					'path': 'src'
 				},
 				'steps':
@@ -543,7 +549,7 @@ def changelog(ctx):
 						],
 						'remote': 'https://github.com/%s' % (repo_slug),
 						'branch': ctx.build.source if ctx.build.event == 'pull_request' else 'master',
-						'path': '/drone/src',
+						'path': dir['server'],
 						'netrc_machine': 'github.com',
 						'netrc_username': {
 							'from_secret': 'github_username',
@@ -663,7 +669,7 @@ def phpstan():
 				'type': 'docker',
 				'name': name,
 				'workspace' : {
-					'base': '/drone',
+					'base': dir['base'],
 					'path': 'src'
 				},
 				'steps':
@@ -737,7 +743,7 @@ def phan():
 				'type': 'docker',
 				'name': name,
 				'workspace' : {
-					'base': '/drone',
+					'base': dir['base'],
 					'path': 'src'
 				},
 				'steps':
@@ -820,7 +826,7 @@ def litmus():
 				'type': 'docker',
 				'name': name,
 				'workspace' : {
-					'base': '/drone',
+					'base': dir['base'],
 					'path': 'src'
 				},
 				'steps':
@@ -917,7 +923,7 @@ def litmus():
 					],
 				'services':
 					databaseService(db) +
-					owncloudService(phpVersion, 'server', '/drone/src', params['useHttps']),
+					owncloudService(phpVersion, 'server', dir['server'], params['useHttps']),
 				'depends_on': [],
 				'trigger': {
 					'ref': [
@@ -987,7 +993,7 @@ def dav():
 					'type': 'docker',
 					'name': name,
 					'workspace' : {
-						'base': '/drone',
+						'base': dir['base'],
 						'path': 'src'
 					},
 					'steps':
@@ -1070,7 +1076,7 @@ def javascript(ctx, withCoverage):
 		'type': 'docker',
 		'name': 'test-javascript',
 		'workspace' : {
-			'base': '/drone',
+			'base': dir['base'],
 			'path': 'src'
 		},
 		'steps':
@@ -1261,7 +1267,7 @@ def phpTests(ctx, testType, withCoverage):
 						'type': 'docker',
 						'name': name,
 						'workspace' : {
-							'base': '/drone',
+							'base': dir['base'],
 							'path': 'src'
 						},
 						'steps':
@@ -1269,7 +1275,7 @@ def phpTests(ctx, testType, withCoverage):
 							composerInstall(phpVersion) +
 							yarnInstall(phpVersion) +
 							installServer(phpVersion, db, params['logLevel']) +
-							installExtraApps(phpVersion, extraAppsDict) +
+							installExtraApps(phpVersion, extraAppsDict, dir['server']) +
 							setupScality(phpVersion, needScality) +
 							params['extraSetup'] +
 							fixPermissions(phpVersion, False) +
@@ -1562,7 +1568,7 @@ def acceptance(ctx):
 								if params['testAgainstCoreTarball']:
 									pathOfServerUnderTest = '/drone/core'
 								else:
-									pathOfServerUnderTest = '/drone/src'
+									pathOfServerUnderTest = dir['server']
 
 								if (needObjectStore):
 									environment['OC_TEST_ON_OBJECTSTORE'] = '1'
@@ -1578,7 +1584,7 @@ def acceptance(ctx):
 									'type': 'docker',
 									'name': name,
 									'workspace' : {
-										'base': '/drone',
+										'base': dir['base'],
 										'path': 'src'
 									},
 									'steps':
@@ -1609,8 +1615,8 @@ def acceptance(ctx):
 											'pull': 'always',
 											'environment': environment,
 											'commands': params['extraCommandsBeforeTestRun'] + [
-												'touch /drone/saved-settings.sh',
-												'. /drone/saved-settings.sh',
+												'touch %s/saved-settings.sh' % dir['base'],
+												'. %s/saved-settings.sh' % dir['base'],
 												'%smake %s' % (suExecCommand, makeParameter)
 											]
 										}),
@@ -1626,7 +1632,7 @@ def acceptance(ctx):
 										params['extraServices'] +
 										owncloudService(phpVersion, 'server', pathOfServerUnderTest, params['useHttps']) +
 										((
-											owncloudService(params['federatedPhpVersion'], 'federated', '/drone/federated', params['useHttps']) +
+											owncloudService(params['federatedPhpVersion'], 'federated', dir["federated"], params['useHttps']) +
 											databaseServiceForFederation(federatedDb, federationDbSuffix)
 										) if params['federatedServerNeeded'] else []),
 									'depends_on': [],
@@ -1667,7 +1673,7 @@ def sonarAnalysis(ctx, phpVersion = '7.4'):
 		'type': 'docker',
 		'name': 'sonar-analysis',
 		'workspace' : {
-			'base': '/drone',
+			'base': dir['base'],
 			'path': 'src'
 		},
 		'clone': {
@@ -1716,7 +1722,7 @@ def sonarAnalysis(ctx, phpVersion = '7.4'):
 					'git clone https://github.com/owncloud/files_primary_s3.git',
 					'cd files_primary_s3',
 					'composer install',
-					'cd /drone/src'
+					'cd %s' % dir['server']
 				]
 			},
 			{
@@ -1827,7 +1833,7 @@ def buildGithubCommentForBuildStopped(alternateSuiteName, earlyFail):
             "image": "owncloud/ubuntu:16.04",
             "pull": "always",
             "commands": [
-                'echo ":boom: Acceptance tests pipeline <strong>%s</strong> failed. The build has been cancelled.\\n\\n${DRONE_BUILD_LINK}/${DRONE_JOB_NUMBER}${DRONE_STAGE_NUMBER}/1\\n" >> /drone/src/comments.file' % alternateSuiteName,
+                'echo ":boom: Acceptance tests pipeline <strong>%s</strong> failed. The build has been cancelled.\\n\\n${DRONE_BUILD_LINK}/${DRONE_JOB_NUMBER}${DRONE_STAGE_NUMBER}/1\\n" >> %s/comments.file' % (alternateSuiteName, dir['server']),
             ],
             "when": {
                  "status": [
@@ -1850,7 +1856,7 @@ def githubComment(earlyFail):
             "image": "jmccann/drone-github-comment:1",
             "pull": "if-not-exists",
             "settings": {
-                "message_file": "/drone/src/comments.file",
+                "message_file": "%s/comments.file" % dir['server'],
             },
             "environment": {
                 "GITHUB_TOKEN": {
@@ -2065,14 +2071,14 @@ def cephService(cephS3):
 		}
 	}]
 
-def owncloudService(phpVersion, name = 'server', pathOfServerUnderTest = '/drone/src', ssl = True):
+def owncloudService(phpVersion, name, pathOfServerUnderTest, ssl):
 	if ssl:
 		environment = {
 			'APACHE_WEBROOT': pathOfServerUnderTest,
 			'APACHE_CONFIG_TEMPLATE': 'ssl',
 			'APACHE_SSL_CERT_CN': name,
-			'APACHE_SSL_CERT': '/drone/%s.crt' % name,
-			'APACHE_SSL_KEY': '/drone/%s.key' % name,
+			'APACHE_SSL_CERT': '%s/%s.crt' % (dir['base'], name),
+			'APACHE_SSL_KEY': '%s/%s.key' % (dir['base'], name),
 			'APACHE_LOGGING_PATH': '/dev/null',
 		}
 	else:
@@ -2175,8 +2181,8 @@ def cacheClearOnEventPush(phpVersion):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'commands': [
-			'rm -Rf /drone/src/.cache/composer',
-			'rm -Rf /drone/src/.cache/yarn',
+			'rm -Rf %s/.cache/composer' % dir['server'],
+			'rm -Rf %s/.cache/yarn' % dir['server'],
 		],
 		'when': {
 			'event': [
@@ -2255,7 +2261,7 @@ def composerInstall(phpVersion):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'environment': {
-			'COMPOSER_HOME': '/drone/src/.cache/composer'
+			'COMPOSER_HOME': '%s/.cache/composer' % dir['server']
 		},
 		'commands': [
 			'make install-composer-deps'
@@ -2268,7 +2274,7 @@ def vendorbinCodestyle(phpVersion):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'environment': {
-			'COMPOSER_HOME': '/drone/src/.cache/composer'
+			'COMPOSER_HOME': '%s/.cache/composer' % dir['server']
 		},
 		'commands': [
 			'make vendor-bin-codestyle'
@@ -2281,7 +2287,7 @@ def vendorbinCodesniffer(phpVersion):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'environment': {
-			'COMPOSER_HOME': '/drone/src/.cache/composer'
+			'COMPOSER_HOME': '%s/.cache/composer' % dir['server']
 		},
 		'commands': [
 			'make vendor-bin-codesniffer'
@@ -2294,7 +2300,7 @@ def vendorbinPhan(phpVersion):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'environment': {
-			'COMPOSER_HOME': '/drone/src/.cache/composer'
+			'COMPOSER_HOME': '%s/.cache/composer' % dir['server']
 		},
 		'commands': [
 			'make vendor-bin-phan'
@@ -2307,7 +2313,7 @@ def vendorbinPhpstan(phpVersion):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'environment': {
-			'COMPOSER_HOME': '/drone/src/.cache/composer'
+			'COMPOSER_HOME': '%s/.cache/composer' % dir['server']
 		},
 		'commands': [
 			'make vendor-bin-phpstan'
@@ -2320,7 +2326,7 @@ def vendorbinBehat():
 		'image': 'owncloudci/php:7.4',
 		'pull': 'always',
 		'environment': {
-			'COMPOSER_HOME': '/drone/src/.cache/composer'
+			'COMPOSER_HOME': '%s/.cache/composer' % dir['server']
 		},
 		'commands': [
 			'make vendor-bin-behat'
@@ -2333,9 +2339,9 @@ def yarnInstall(phpVersion):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'environment': {
-			'NPM_CONFIG_CACHE': '/drone/src/.cache/npm',
-			'YARN_CACHE_FOLDER': '/drone/src/.cache/yarn',
-			'bower_storage__packages': '/drone/src/.cache/bower',
+			'NPM_CONFIG_CACHE': '%s/.cache/npm' % dir['server'],
+			'YARN_CACHE_FOLDER': '%s/.cache/yarn' % dir['server'],
+			'bower_storage__packages': '%s/.cache/bower' % dir['server'],
 		},
 		'commands': [
 			'make install-nodejs-deps'
@@ -2361,11 +2367,11 @@ def setupLocalStorage(phpVersion):
 			'OC_PASS': '123456',
 		},
 		'commands': [
-			'mkdir -p /drone/src/work/local_storage',
+			'mkdir -p %s/work/local_storage' % dir['server'],
 			'php occ app:enable files_external',
 			'php occ config:system:set files_external_allow_create_new_local --value=true',
 			'php occ config:app:set core enable_external_storage --value=yes',
-			'php occ files_external:create local_storage local null::null -c datadir=/drone/src/work/local_storage',
+			'php occ files_external:create local_storage local null::null -c datadir=%s/work/local_storage' % dir['server'],
 			'php occ user:add --password-from-env user1',
 		]
 	}]
@@ -2383,7 +2389,7 @@ def createShare(phpVersion):
 		]
 	}]
 
-def installExtraApps(phpVersion, extraApps, pathOfServerUnderTest = '/drone/src'):
+def installExtraApps(phpVersion, extraApps, pathOfServerUnderTest):
 	commandArray = []
 	for app, command in extraApps.items():
 		commandArray.append('ls %s/apps/%s || git clone https://github.com/owncloud/%s.git %s/apps/%s' % (pathOfServerUnderTest, app, app, pathOfServerUnderTest, app))
@@ -2451,9 +2457,9 @@ def installServer(phpVersion, db, logLevel = '2', ssl = False, federatedServerNe
 			'php occ log:manage --level %s' % logLevel,
 			'php occ config:list',
 		] + ([
-			'php occ security:certificates:import /drone/server.crt',
+			'php occ security:certificates:import %s/server.crt' % dir['base'],
 		] if ssl else []) + ([
-			'php occ security:certificates:import /drone/federated.crt',
+			'php occ security:certificates:import %s/federated.crt' % dir['base'],
 		] if federatedServerNeeded and ssl else []) + [
 			'php occ security:certificates',
 		]
@@ -2481,7 +2487,7 @@ def installFederated(ctx, federatedServerVersion, db, dbSuffix = 'fed'):
 		dbType = 'oci'
 
 	installerSettings = {
-				'core_path': '/drone/federated',
+				'core_path': dir["federated"],
 				'db_type': dbType,
 				'db_name': database,
 				'db_host': host + dbSuffix,
@@ -2516,7 +2522,7 @@ def configureFederated(phpVersion, logLevel, protocol):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'commands': [
-			'cd /drone/federated',
+			'cd %s' % dir["federated"],
 			'php occ a:l',
 			'php occ a:e testing',
 			'php occ a:l',
@@ -2524,9 +2530,9 @@ def configureFederated(phpVersion, logLevel, protocol):
 			'php occ config:system:set trusted_domains 2 --value=federated',
 			'php occ log:manage --level %s' % logLevel,
 			'php occ config:list',
-			'echo "export TEST_SERVER_FED_URL=%s://federated" > /drone/saved-settings.sh' % protocol,
-			'php occ security:certificates:import /drone/server.crt',
-			'php occ security:certificates:import /drone/federated.crt',
+			'echo "export TEST_SERVER_FED_URL=%s://federated" > %s/saved-settings.sh' % (protocol, dir['base']),
+			'php occ security:certificates:import %s/server.crt' % dir['base'],
+			'php occ security:certificates:import %s/federated.crt' % dir['base'],
 			'php occ security:certificates',
 		]
 	}
@@ -2541,8 +2547,8 @@ def setupCeph(phpVersion, cephS3):
 		'pull': 'always',
 		'commands': [
 			'wait-for-it -t 600 ceph:80',
-			'cd /drone/src/apps/files_primary_s3',
-			'cp tests/drone/ceph.config.php /drone/src/config',
+			'cd %s/apps/files_primary_s3' % dir['server'],
+			'cp tests/drone/ceph.config.php %s/config' % dir['server'],
 			'cd /var/www/owncloud/server',
 			'./apps/files_primary_s3/tests/drone/create-bucket.sh',
 		]
@@ -2566,14 +2572,14 @@ def setupScality(phpVersion, scalityS3):
 		'pull': 'always',
 		'commands': [
 			'wait-for-it -t 600 scality:8000',
-			'cp /drone/src/apps/files_primary_s3/tests/drone/%s /drone/src/config' % configFile,
+			'cp %s/apps/files_primary_s3/tests/drone/%s %s/config' % (dir['server'], configFile, dir['server']),
 			'php occ s3:create-bucket owncloud --accept-warning'
 		] + ([
 			'for I in $(seq 1 9); do php ./occ s3:create-bucket owncloud$I --accept-warning; done',
 		] if createExtraBuckets else [])
 	}]
 
-def fixPermissions(phpVersion, federatedServerNeeded, pathOfServerUnderTest = '/drone/src'):
+def fixPermissions(phpVersion, federatedServerNeeded, pathOfServerUnderTest = dir['server']):
 	return [{
 		'name': 'fix-permissions',
 		'image': 'owncloudci/php:%s' % phpVersion,
@@ -2581,7 +2587,7 @@ def fixPermissions(phpVersion, federatedServerNeeded, pathOfServerUnderTest = '/
 		'commands': [
 			'chown -R www-data %s' % pathOfServerUnderTest
 		] + ([
-			'chown -R www-data /drone/federated'
+			'chown -R www-data %s' % dir["federated"]
 		] if federatedServerNeeded else [])
 	}]
 
@@ -2695,9 +2701,9 @@ def installCoreFromTarball(version, db, logLevel = '2', ssl = False, federatedSe
 			'php occ log:manage --level %s' % logLevel,
 			'php occ config:list',
 		] + ([
-			'php occ security:certificates:import /drone/server.crt',
+			'php occ security:certificates:import %s/server.crt' % dir['base'],
 		] if ssl else []) + ([
-			'php occ security:certificates:import /drone/federated.crt',
+			'php occ security:certificates:import %s/federated.crt' % dir['base'],
 		] if federatedServerNeeded and ssl else []) + [
 			'php occ security:certificates',
 		]
@@ -2724,7 +2730,7 @@ def installFederatedFromTarball(federatedServerVersion, phpVersion, logLevel, pr
 			'pull': 'always',
 			'settings': {
 				'version': federatedServerVersion,
-				'core_path': '/drone/federated',
+				'core_path': dir["federated"],
 				'db_type': 'mysql',
 				'db_name': database,
 				'db_host': host + dbSuffix,
@@ -2737,8 +2743,8 @@ def installFederatedFromTarball(federatedServerVersion, phpVersion, logLevel, pr
 			'image': 'owncloudci/php:%s' % phpVersion,
 			'pull': 'always',
 			'commands': [
-				'echo "export TEST_SERVER_FED_URL=%s://federated" > /drone/saved-settings.sh' % protocol,
-				'cd /drone/federated',
+				'echo "export TEST_SERVER_FED_URL=%s://federated" > %s/saved-settings.sh' % (protocol, dir['base']),
+				'cd %s' % dir["federated"],
 				'php occ a:l',
 				'php occ a:e testing',
 				'php occ a:l',
@@ -2746,8 +2752,8 @@ def installFederatedFromTarball(federatedServerVersion, phpVersion, logLevel, pr
 				'php occ config:system:set trusted_domains 2 --value=federated',
 				'php occ log:manage --level %s' % logLevel,
 				'php occ config:list',
-				'php occ security:certificates:import /drone/server.crt',
-				'php occ security:certificates:import /drone/federated.crt',
+				'php occ security:certificates:import %s/server.crt' % dir['base'],
+				'php occ security:certificates:import %s/federated.crt' % dir['base'],
 				'php occ security:certificates',
 			]
 		}
@@ -2761,6 +2767,6 @@ def installTestRunner(ctx, phpVersion):
 		'commands': [
 			'mkdir /tmp/testrunner',
 			'git clone -b %s --depth=1 https://github.com/owncloud/core.git /tmp/testrunner' % ctx.build.source if ctx.build.event == 'pull_request' else 'master',
-			'rsync -aIX /tmp/testrunner/tests /drone/src/tests',
+			'rsync -aIX /tmp/testrunner/tests %s/tests' % dir['server'],
 		]
 	}]

From 07d17bcabe869437d4f6b67bfcf18edbabfe2c00 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil@jankaritech.com>
Date: Thu, 15 Jul 2021 17:47:12 +0545
Subject: [PATCH 30/32] Include nonCoverageTests in CI pipelines

---
 .drone.star | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.star b/.drone.star
index e0b608ff5814..0c1cbb57cfe1 100644
--- a/.drone.star
+++ b/.drone.star
@@ -330,7 +330,7 @@ def main(ctx):
 	after = afterPipelines(ctx)
 	dependsOn(afterCoverageTests + nonCoverageTests + stages, after)
 
-	return initial + before + coverageTests + afterCoverageTests + stages + after
+	return initial + before + coverageTests + afterCoverageTests + nonCoverageTests + stages + after
 
 def initialPipelines(ctx):
 	return dependencies(ctx)

From dc7e51afe1c126c5539e358ecf32568fe18be652 Mon Sep 17 00:00:00 2001
From: saw-jan <saw.jan.grg3e@gmail.com>
Date: Fri, 21 May 2021 13:12:38 +0545
Subject: [PATCH 31/32] API test coverage for adding public share to oC

add function to save public share

fix test steps

disable csrf on federated tests

address reviews
---
 .drone.star                                   |   3 +-
 .../savePublicShare.feature                   | 127 +++++++++++++++++
 .../savePublicShare.feature                   | 128 ++++++++++++++++++
 .../acceptance/features/bootstrap/Sharing.php |  78 +++++++++++
 4 files changed, 335 insertions(+), 1 deletion(-)
 create mode 100644 tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature
 create mode 100644 tests/acceptance/features/apiFederationToShares1/savePublicShare.feature

diff --git a/.drone.star b/.drone.star
index 0c1cbb57cfe1..57e11344c2af 100644
--- a/.drone.star
+++ b/.drone.star
@@ -2449,7 +2449,8 @@ def installServer(phpVersion, db, logLevel = '2', ssl = False, federatedServerNe
 			'php occ a:l',
 			'php occ config:system:set trusted_domains 1 --value=server',
 		] + ([
-			'php occ config:system:set trusted_domains 2 --value=federated'
+			'php occ config:system:set trusted_domains 2 --value=federated',
+			'php occ config:system:set csrf.disabled --value=true'
 		] if federatedServerNeeded else []) + [
 		] + ([
 			'php occ config:system:set trusted_domains 3 --value=proxy'
diff --git a/tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature b/tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature
new file mode 100644
index 000000000000..27c8cba0c042
--- /dev/null
+++ b/tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature
@@ -0,0 +1,127 @@
+@api @federation-app-required @files_sharing-app-required @notToImplementOnOCIS
+Feature: Save public shares created by oC users
+
+  Background:
+    Given using server "LOCAL"
+    And user "Alice" has been created with default attributes and without skeleton files
+
+
+  Scenario: Mount public share created from local server
+    Given user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "PARENT/lorem.txt"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    When user "Brian" adds the public share created from server "LOCAL" using the sharing API
+    Then the HTTP status code should be "200"
+    And as "Brian" folder "/PARENT" should exist
+    And as "Brian" file "/PARENT/lorem.txt" should exist
+
+
+  Scenario: Mount public share and then delete (local server share)
+    Given user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT |
+      | permissions | read    |
+    And user "Brian" has added the public share created from server "LOCAL" using the sharing API
+    When user "Brian" deletes folder "/PARENT" using the WebDAV API
+    Then the HTTP status code should be "204"
+    And as "Brian" folder "/PARENT" should not exist
+
+
+  Scenario: Mount public share and sharer unshares the share (local server share)
+    Given user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT    |
+      | permissions | read       |
+      | name        | sharedlink |
+    And user "Brian" has added the public share created from server "LOCAL" using the sharing API
+    When user "Alice" deletes public link share named "sharedlink" in file "/PARENT" using the sharing API
+    Then the HTTP status code should be "200"
+    And as "Brian" folder "/PARENT" should not exist
+
+
+  Scenario Outline: Mount public share and try to reshare (local server share)
+    Given using OCS API version "<ocs_api_version>"
+    And user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    And user "Brian" has added the public share created from server "LOCAL" using the sharing API
+    When user "Brian" creates a public link share using the sharing API with settings
+      | path | PARENT |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "<http_status_code>"
+    Examples:
+      | ocs_api_version | http_status_code |
+      | 1               | 200              |
+      | 2               | 404              |
+
+
+  Scenario: Mount public share created from remote server
+    Given using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has uploaded file "filesForUpload/textfile.txt" to "PARENT/lorem.txt"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    And using server "LOCAL"
+    When user "Alice" adds the public share created from server "REMOTE" using the sharing API
+    Then the HTTP status code should be "200"
+    And as "Alice" folder "/PARENT" should exist
+    And as "Alice" file "/PARENT/lorem.txt" should exist
+
+
+  Scenario: Mount public share and then delete (remote server share)
+    Given using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT |
+      | permissions | read    |
+    And using server "LOCAL"
+    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    When user "Alice" deletes folder "/PARENT" using the WebDAV API
+    Then the HTTP status code should be "204"
+    And as "Alice" folder "/PARENT" should not exist
+
+
+  Scenario: Mount public share and sharer unshares the share (remote server share)
+    Given using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT    |
+      | permissions | read       |
+      | name        | sharedlink |
+    And using server "LOCAL"
+    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And using server "REMOTE"
+    When user "RemoteAlice" deletes public link share named "sharedlink" in file "/PARENT" using the sharing API
+    And using server "LOCAL"
+    Then as "Alice" folder "/PARENT" should not exist
+
+
+  Scenario Outline: Mount public share and try to reshare (remote server share)
+    Given using OCS API version "<ocs_api_version>"
+    And using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    And using server "LOCAL"
+    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    When user "Alice" creates a public link share using the sharing API with settings
+      | path | PARENT |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "<http_status_code>"
+    Examples:
+      | ocs_api_version | http_status_code |
+      | 1               | 200              |
+      | 2               | 404              |
\ No newline at end of file
diff --git a/tests/acceptance/features/apiFederationToShares1/savePublicShare.feature b/tests/acceptance/features/apiFederationToShares1/savePublicShare.feature
new file mode 100644
index 000000000000..cb3a207a45c8
--- /dev/null
+++ b/tests/acceptance/features/apiFederationToShares1/savePublicShare.feature
@@ -0,0 +1,128 @@
+@api @federation-app-required @files_sharing-app-required @notToImplementOnOCIS
+Feature: Save public shares created by oC users
+
+  Background:
+    Given using server "LOCAL"
+    And the administrator has set the default folder for received shares to "Shares"
+    And user "Alice" has been created with default attributes and without skeleton files
+
+
+  Scenario: Mount public share created from local server
+    Given user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "PARENT/lorem.txt"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    When user "Brian" adds the public share created from server "LOCAL" using the sharing API
+    Then the HTTP status code should be "200"
+    And as "Brian" folder "/Shares/PARENT" should exist
+    And as "Brian" file "/Shares/PARENT/lorem.txt" should exist
+
+
+  Scenario: Mount public share and then delete (local server share)
+    Given user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT |
+      | permissions | read    |
+    And user "Brian" has added the public share created from server "LOCAL" using the sharing API
+    When user "Brian" deletes folder "/Shares/PARENT" using the WebDAV API
+    Then the HTTP status code should be "204"
+    And as "Brian" folder "/Shares/PARENT" should not exist
+
+
+  Scenario: Mount public share and sharer unshares the share (local server share)
+    Given user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT    |
+      | permissions | read       |
+      | name        | sharedlink |
+    And user "Brian" has added the public share created from server "LOCAL" using the sharing API
+    When user "Alice" deletes public link share named "sharedlink" in file "/PARENT" using the sharing API
+    Then the HTTP status code should be "200"
+    And as "Brian" folder "/Shares/PARENT" should not exist
+
+
+  Scenario Outline: Mount public share and try to reshare (local server share)
+    Given using OCS API version "<ocs_api_version>"
+    And user "Brian" has been created with default attributes and without skeleton files
+    And user "Alice" has created folder "/PARENT"
+    And user "Alice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    And user "Brian" has added the public share created from server "LOCAL" using the sharing API
+    When user "Brian" creates a public link share using the sharing API with settings
+      | path | /Shares/PARENT |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "<http_status_code>"
+    Examples:
+      | ocs_api_version | http_status_code |
+      | 1               | 200              |
+      | 2               | 404              |
+
+
+  Scenario: Mount public share created from remote server
+    Given using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has uploaded file "filesForUpload/textfile.txt" to "PARENT/lorem.txt"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    And using server "LOCAL"
+    When user "Alice" adds the public share created from server "REMOTE" using the sharing API
+    Then the HTTP status code should be "200"
+    And as "Alice" folder "/Shares/PARENT" should exist
+    And as "Alice" file "/Shares/PARENT/lorem.txt" should exist
+
+
+  Scenario: Mount public share and then delete (remote server share)
+    Given using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT |
+      | permissions | read    |
+    And using server "LOCAL"
+    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    When user "Alice" deletes folder "/Shares/PARENT" using the WebDAV API
+    Then the HTTP status code should be "204"
+    And as "Alice" folder "/Shares/PARENT" should not exist
+
+
+  Scenario: Mount public share and sharer unshares the share (remote server share)
+    Given using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT    |
+      | permissions | read       |
+      | name        | sharedlink |
+    And using server "LOCAL"
+    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And using server "REMOTE"
+    When user "RemoteAlice" deletes public link share named "sharedlink" in file "/PARENT" using the sharing API
+    And using server "LOCAL"
+    Then as "Alice" folder "/Shares/PARENT" should not exist
+
+
+  Scenario Outline: Mount public share and try to reshare (remote server share)
+    Given using OCS API version "<ocs_api_version>"
+    And using server "REMOTE"
+    And user "RemoteAlice" has been created with default attributes and without skeleton files
+    And user "RemoteAlice" has created folder "/PARENT"
+    And user "RemoteAlice" has created a public link share with settings
+      | path        | /PARENT                   |
+      | permissions | read,update,create,delete |
+    And using server "LOCAL"
+    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    When user "Alice" creates a public link share using the sharing API with settings
+      | path | /Shares/PARENT |
+    Then the OCS status code should be "404"
+    And the HTTP status code should be "<http_status_code>"
+    Examples:
+      | ocs_api_version | http_status_code |
+      | 1               | 200              |
+      | 2               | 404              |
\ No newline at end of file
diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
index f8f73b58fe1c..1baea88f0c4e 100644
--- a/tests/acceptance/features/bootstrap/Sharing.php
+++ b/tests/acceptance/features/bootstrap/Sharing.php
@@ -3114,6 +3114,84 @@ public function thePublicAccessesThePreviewOfTheSharedFileUsingTheSharingApi($pa
 		$this->getPublicPreviewOfFile($path, $token);
 	}
 
+	/**
+	 * @param string $user
+	 * @param string $shareServer
+	 * @param string $password
+	 *
+	 * @return void
+	 */
+	public function saveLastSharedPublicLinkShare(
+		$user,
+		$shareServer,
+		$password = ""
+	) {
+		$user = $this->getActualUsername($user);
+		$userPassword = $this->getPasswordForUser($user);
+
+		$shareData = $this->getLastShareData();
+		$owner = (string) $shareData->data->uid_owner;
+		$name = $this->encodePath((string) $shareData->data->file_target);
+		$name = \trim($name, "/");
+		$ownerDisplayName = (string) $shareData->data->displayname_owner;
+		$token = (string) $shareData->data->token;
+
+		if (\strtolower($shareServer) == "remote") {
+			$remote = $this->getRemoteBaseUrl();
+		} else {
+			$remote = $this->getLocalBaseUrl();
+		}
+
+		$body['remote'] = $remote;
+		$body['token'] = $token;
+		$body['owner'] = $owner;
+		$body['ownerDisplayName'] = $ownerDisplayName;
+		$body['name'] = $name;
+		$body['password'] = $password;
+
+		Assert::assertNotNull(
+			$token,
+			__METHOD__ . " could not find any public share"
+		);
+
+		$url = $this->getBaseUrl() . "/index.php/apps/files_sharing/external";
+
+		$response = HttpRequestHelper::post($url, $user, $userPassword, null, $body);
+		$this->setResponse($response);
+	}
+
+	/**
+	 * @Given /^user "([^"]*)" has added the public share created from server "([^"]*)" using the sharing API$/
+	 *
+	 * @param string $user
+	 * @param string $shareServer
+	 *
+	 * @return void
+	 */
+	public function userHasAddedPublicShareCreatedByUser($user, $shareServer) {
+		$this->saveLastSharedPublicLinkShare($user, $shareServer);
+		Assert::assertEquals(
+			200,
+			$this->response->getStatusCode(),
+			__METHOD__
+			. " Expected status code is '200' but got '"
+			. $this->response->getStatusCode()
+			. "'"
+		);
+	}
+
+	/**
+	 * @When /^user "([^"]*)" adds the public share created from server "([^"]*)" using the sharing API$/
+	 *
+	 * @param string $user
+	 * @param string $shareServer
+	 *
+	 * @return void
+	 */
+	public function userAddsPublicShareCreatedByUser($user, $shareServer) {
+		$this->saveLastSharedPublicLinkShare($user, $shareServer);
+	}
+
 	/**
 	 * replace values from table
 	 *

From c837175c3c93d12ecbd0e9ea46f64076f0c1664c Mon Sep 17 00:00:00 2001
From: saw-jan <saw.jan.grg3e@gmail.com>
Date: Wed, 14 Jul 2021 15:50:47 +0545
Subject: [PATCH 32/32] fix assertion and test step typo

---
 .../apiFederationToRoot1/savePublicShare.feature  |  6 +++---
 .../savePublicShare.feature                       |  6 +++---
 tests/acceptance/features/bootstrap/Sharing.php   | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature b/tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature
index 27c8cba0c042..93deb7ced0d4 100644
--- a/tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature
+++ b/tests/acceptance/features/apiFederationToRoot1/savePublicShare.feature
@@ -85,7 +85,7 @@ Feature: Save public shares created by oC users
       | path        | /PARENT |
       | permissions | read    |
     And using server "LOCAL"
-    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And user "Alice" has added the public share created from server "REMOTE" using the sharing API
     When user "Alice" deletes folder "/PARENT" using the WebDAV API
     Then the HTTP status code should be "204"
     And as "Alice" folder "/PARENT" should not exist
@@ -100,7 +100,7 @@ Feature: Save public shares created by oC users
       | permissions | read       |
       | name        | sharedlink |
     And using server "LOCAL"
-    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And user "Alice" has added the public share created from server "REMOTE" using the sharing API
     And using server "REMOTE"
     When user "RemoteAlice" deletes public link share named "sharedlink" in file "/PARENT" using the sharing API
     And using server "LOCAL"
@@ -116,7 +116,7 @@ Feature: Save public shares created by oC users
       | path        | /PARENT                   |
       | permissions | read,update,create,delete |
     And using server "LOCAL"
-    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And user "Alice" has added the public share created from server "REMOTE" using the sharing API
     When user "Alice" creates a public link share using the sharing API with settings
       | path | PARENT |
     Then the OCS status code should be "404"
diff --git a/tests/acceptance/features/apiFederationToShares1/savePublicShare.feature b/tests/acceptance/features/apiFederationToShares1/savePublicShare.feature
index cb3a207a45c8..b5ab420469cb 100644
--- a/tests/acceptance/features/apiFederationToShares1/savePublicShare.feature
+++ b/tests/acceptance/features/apiFederationToShares1/savePublicShare.feature
@@ -86,7 +86,7 @@ Feature: Save public shares created by oC users
       | path        | /PARENT |
       | permissions | read    |
     And using server "LOCAL"
-    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And user "Alice" has added the public share created from server "REMOTE" using the sharing API
     When user "Alice" deletes folder "/Shares/PARENT" using the WebDAV API
     Then the HTTP status code should be "204"
     And as "Alice" folder "/Shares/PARENT" should not exist
@@ -101,7 +101,7 @@ Feature: Save public shares created by oC users
       | permissions | read       |
       | name        | sharedlink |
     And using server "LOCAL"
-    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And user "Alice" has added the public share created from server "REMOTE" using the sharing API
     And using server "REMOTE"
     When user "RemoteAlice" deletes public link share named "sharedlink" in file "/PARENT" using the sharing API
     And using server "LOCAL"
@@ -117,7 +117,7 @@ Feature: Save public shares created by oC users
       | path        | /PARENT                   |
       | permissions | read,update,create,delete |
     And using server "LOCAL"
-    And user "Alice" has added the public share created from server "LOCAL" using the sharing API
+    And user "Alice" has added the public share created from server "REMOTE" using the sharing API
     When user "Alice" creates a public link share using the sharing API with settings
       | path | /Shares/PARENT |
     Then the OCS status code should be "404"
diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
index 1baea88f0c4e..d1211bea6990 100644
--- a/tests/acceptance/features/bootstrap/Sharing.php
+++ b/tests/acceptance/features/bootstrap/Sharing.php
@@ -3170,6 +3170,15 @@ public function saveLastSharedPublicLinkShare(
 	 */
 	public function userHasAddedPublicShareCreatedByUser($user, $shareServer) {
 		$this->saveLastSharedPublicLinkShare($user, $shareServer);
+
+		$resBody = json_decode($this->response->getBody()->getContents());
+		$status = '';
+		$message = '';
+		if ($resBody) {
+			$status = $resBody->status;
+			$message = $resBody->data->message;
+		}
+
 		Assert::assertEquals(
 			200,
 			$this->response->getStatusCode(),
@@ -3178,6 +3187,12 @@ public function userHasAddedPublicShareCreatedByUser($user, $shareServer) {
 			. $this->response->getStatusCode()
 			. "'"
 		);
+		Assert::assertNotEquals(
+			'error',
+			$status,
+			__METHOD__
+			. "\nFailed to save public share.\n'$message'"
+		);
 	}
 
 	/**