From 1c95dbfe90c7f49e4f6aefa145a9dd4e22a9a6b8 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 6 Jul 2020 13:18:52 +0200
Subject: [PATCH] 17.0.8 RC1

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 apps/accessibility/composer/composer/autoload_real.php      | 3 +++
 apps/admin_audit/composer/composer/autoload_real.php        | 3 +++
 .../composer/composer/autoload_real.php                     | 3 +++
 apps/comments/composer/composer/autoload_real.php           | 3 +++
 apps/dav/composer/composer/autoload_real.php                | 3 +++
 apps/encryption/composer/composer/autoload_real.php         | 3 +++
 .../composer/composer/autoload_real.php                     | 3 +++
 apps/federation/composer/composer/autoload_real.php         | 3 +++
 apps/files/composer/composer/autoload_real.php              | 3 +++
 apps/files_sharing/composer/composer/autoload_real.php      | 3 +++
 apps/files_trashbin/composer/composer/autoload_real.php     | 3 +++
 apps/files_versions/composer/composer/autoload_real.php     | 3 +++
 .../composer/composer/autoload_real.php                     | 3 +++
 apps/oauth2/composer/composer/autoload_real.php             | 3 +++
 apps/provisioning_api/composer/composer/autoload_real.php   | 3 +++
 apps/sharebymail/composer/composer/autoload_real.php        | 3 +++
 apps/systemtags/composer/composer/autoload_real.php         | 3 +++
 apps/testing/composer/composer/autoload_real.php            | 3 +++
 .../composer/composer/autoload_real.php                     | 3 +++
 apps/updatenotification/composer/composer/autoload_real.php | 3 +++
 apps/user_ldap/composer/composer/autoload_real.php          | 3 +++
 apps/workflowengine/composer/composer/autoload_real.php     | 3 +++
 lib/composer/composer/autoload_real.php                     | 3 +++
 resources/config/ca-bundle.crt                              | 6 +++---
 version.php                                                 | 4 ++--
 25 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/apps/accessibility/composer/composer/autoload_real.php b/apps/accessibility/composer/composer/autoload_real.php
index 97ed1285508..3f34f08ec06 100644
--- a/apps/accessibility/composer/composer/autoload_real.php
+++ b/apps/accessibility/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitAccessibility
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/admin_audit/composer/composer/autoload_real.php b/apps/admin_audit/composer/composer/autoload_real.php
index 8c3108af88c..8a1e94644d7 100644
--- a/apps/admin_audit/composer/composer/autoload_real.php
+++ b/apps/admin_audit/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitAdminAudit
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/cloud_federation_api/composer/composer/autoload_real.php b/apps/cloud_federation_api/composer/composer/autoload_real.php
index fe1341d9e92..9d299942ff1 100644
--- a/apps/cloud_federation_api/composer/composer/autoload_real.php
+++ b/apps/cloud_federation_api/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitCloudFederationAPI
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/comments/composer/composer/autoload_real.php b/apps/comments/composer/composer/autoload_real.php
index 40e29b668a4..7d4354376ba 100644
--- a/apps/comments/composer/composer/autoload_real.php
+++ b/apps/comments/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitComments
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/dav/composer/composer/autoload_real.php b/apps/dav/composer/composer/autoload_real.php
index 044f006c3b6..eb7bd06a5ca 100644
--- a/apps/dav/composer/composer/autoload_real.php
+++ b/apps/dav/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitDAV
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/encryption/composer/composer/autoload_real.php b/apps/encryption/composer/composer/autoload_real.php
index f79c0265ce0..3c94be68624 100644
--- a/apps/encryption/composer/composer/autoload_real.php
+++ b/apps/encryption/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitEncryption
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/federatedfilesharing/composer/composer/autoload_real.php b/apps/federatedfilesharing/composer/composer/autoload_real.php
index 6f491ff4175..052830f11f6 100644
--- a/apps/federatedfilesharing/composer/composer/autoload_real.php
+++ b/apps/federatedfilesharing/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitFederatedFileSharing
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/federation/composer/composer/autoload_real.php b/apps/federation/composer/composer/autoload_real.php
index 39f8fb171dc..75b98c785d4 100644
--- a/apps/federation/composer/composer/autoload_real.php
+++ b/apps/federation/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitFederation
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/files/composer/composer/autoload_real.php b/apps/files/composer/composer/autoload_real.php
index 3e6eddd34f5..4978e755797 100644
--- a/apps/files/composer/composer/autoload_real.php
+++ b/apps/files/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitFiles
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/files_sharing/composer/composer/autoload_real.php b/apps/files_sharing/composer/composer/autoload_real.php
index bd07706a288..0bf78319530 100644
--- a/apps/files_sharing/composer/composer/autoload_real.php
+++ b/apps/files_sharing/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitFiles_Sharing
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/files_trashbin/composer/composer/autoload_real.php b/apps/files_trashbin/composer/composer/autoload_real.php
index 7b05d7dd53a..63f9fa204cf 100644
--- a/apps/files_trashbin/composer/composer/autoload_real.php
+++ b/apps/files_trashbin/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitFiles_Trashbin
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/files_versions/composer/composer/autoload_real.php b/apps/files_versions/composer/composer/autoload_real.php
index 8ef47ad2b76..1fe3500d182 100644
--- a/apps/files_versions/composer/composer/autoload_real.php
+++ b/apps/files_versions/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitFiles_Versions
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/lookup_server_connector/composer/composer/autoload_real.php b/apps/lookup_server_connector/composer/composer/autoload_real.php
index a19405c7127..7ca049392ac 100644
--- a/apps/lookup_server_connector/composer/composer/autoload_real.php
+++ b/apps/lookup_server_connector/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitLookupServerConnector
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/oauth2/composer/composer/autoload_real.php b/apps/oauth2/composer/composer/autoload_real.php
index 111841c0f83..601fb1bdf60 100644
--- a/apps/oauth2/composer/composer/autoload_real.php
+++ b/apps/oauth2/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitOAuth2
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/provisioning_api/composer/composer/autoload_real.php b/apps/provisioning_api/composer/composer/autoload_real.php
index 33867a60f69..b159d8a9951 100644
--- a/apps/provisioning_api/composer/composer/autoload_real.php
+++ b/apps/provisioning_api/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitProvisioning_API
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/sharebymail/composer/composer/autoload_real.php b/apps/sharebymail/composer/composer/autoload_real.php
index 9149cbd9155..cd8a9958f0f 100644
--- a/apps/sharebymail/composer/composer/autoload_real.php
+++ b/apps/sharebymail/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitShareByMail
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/systemtags/composer/composer/autoload_real.php b/apps/systemtags/composer/composer/autoload_real.php
index dcd4bd99c31..cea5bccfe22 100644
--- a/apps/systemtags/composer/composer/autoload_real.php
+++ b/apps/systemtags/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitSystemTags
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/testing/composer/composer/autoload_real.php b/apps/testing/composer/composer/autoload_real.php
index 611d8e41c95..c9abc670c7d 100644
--- a/apps/testing/composer/composer/autoload_real.php
+++ b/apps/testing/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitTesting
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/twofactor_backupcodes/composer/composer/autoload_real.php b/apps/twofactor_backupcodes/composer/composer/autoload_real.php
index 9e6baad706d..a27608423b3 100644
--- a/apps/twofactor_backupcodes/composer/composer/autoload_real.php
+++ b/apps/twofactor_backupcodes/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitTwoFactorBackupCodes
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/updatenotification/composer/composer/autoload_real.php b/apps/updatenotification/composer/composer/autoload_real.php
index 263bae93867..b947dce1a8a 100644
--- a/apps/updatenotification/composer/composer/autoload_real.php
+++ b/apps/updatenotification/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitUpdateNotification
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/user_ldap/composer/composer/autoload_real.php b/apps/user_ldap/composer/composer/autoload_real.php
index 94d3383da77..aa5ac1c97c9 100644
--- a/apps/user_ldap/composer/composer/autoload_real.php
+++ b/apps/user_ldap/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitUser_LDAP
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/apps/workflowengine/composer/composer/autoload_real.php b/apps/workflowengine/composer/composer/autoload_real.php
index 5498316323f..0d355cff0f7 100644
--- a/apps/workflowengine/composer/composer/autoload_real.php
+++ b/apps/workflowengine/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInitWorkflowEngine
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/lib/composer/composer/autoload_real.php b/lib/composer/composer/autoload_real.php
index b9f89d16ad7..a17f25c5eaf 100644
--- a/lib/composer/composer/autoload_real.php
+++ b/lib/composer/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInit53792487c5a8370acc0b06b1a864ff4c
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/resources/config/ca-bundle.crt b/resources/config/ca-bundle.crt
index 651694e8a3a..eb8b0baccd2 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 Jan  1 04:12:10 2020 GMT
+## Certificate data from Mozilla as of: Wed Jun 24 03:12:10 2020 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -13,8 +13,8 @@
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
-## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70
+## Conversion done with mk-ca-bundle.pl version 1.28.
+## SHA256: 5796295533cad5a648a20a115b0894dc9b318c41501796e7158e824c323f11c3
 ##
 
 
diff --git a/version.php b/version.php
index 7f8dbce2430..ebfdaa655fc 100644
--- a/version.php
+++ b/version.php
@@ -29,10 +29,10 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
 
-$OC_Version = array(17, 0, 7, 1);
+$OC_Version = array(17, 0, 8, 0);
 
 // The human readable string
-$OC_VersionString = '17.0.7';
+$OC_VersionString = '17.0.8 RC1';
 
 $OC_VersionCanBeUpgradedFrom = [
 	'nextcloud' => [
-- 
2.39.5