owncloud: 9.1.1 (backported from Fedora, thanks James)

17 files changed, 230 insertions, 335 deletions

diff --git a/owncloud-8.2.3-amazon-autoloader.patch b/owncloud-8.2.3-amazon-autoloader.patch
deleted file mode 100644
index 1ddf8cc..0000000
--- a/owncloud-8.2.3-amazon-autoloader.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index 0091514..4106191 100644
---- a/apps/files_external/lib/amazons3.php
-+++ b/apps/files_external/lib/amazons3.php
-@@ -35,10 +35,6 @@
- 
- namespace OC\Files\Storage;
- 
--set_include_path(get_include_path() . PATH_SEPARATOR .
--	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
--require 'aws-autoloader.php';
--
- use Aws\S3\S3Client;
- use Aws\S3\Exception\S3Exception;
- use Icewind\Streams\IteratorDirectory;
diff --git a/owncloud-8.2.3-dont_warn_php54_eol.patch b/owncloud-8.2.3-dont_warn_php54_eol.patch
deleted file mode 100644
index c3454b2..0000000
--- a/owncloud-8.2.3-dont_warn_php54_eol.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
-index bd0737a..064058a 100644
---- a/settings/controller/checksetupcontroller.php
-+++ b/settings/controller/checksetupcontroller.php
-@@ -205,10 +205,7 @@ class CheckSetupController extends Controller {
- 	private function isPhpSupported() {
- 		$eol = false;
- 
--		//PHP 5.4 is EOL on 14 Sep 2015
--		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
--			$eol = true;
--		}
-+    // Red Hat provide support for the system PHP so never eol
- 
- 		return ['eol' => $eol, 'version' => PHP_VERSION];
- 	}
diff --git a/owncloud-9.0.1-dont_update_htacess.patch b/owncloud-9.0.1-dont_update_htacess.patch
deleted file mode 100644
index d6c4efe..0000000
--- a/owncloud-9.0.1-dont_update_htacess.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/lib/private/setup.php b/lib/private/setup.php
-index 6303d0d..7c30955 100644
---- a/lib/private/setup.php
-+++ b/lib/private/setup.php
-@@ -373,10 +373,6 @@ class Setup {
- 			// out that this is indeed an ownCloud data directory
- 			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
- 
--			// Update .htaccess files
--			Setup::updateHtaccess();
--			Setup::protectDataDirectory();
--
- 			//try to write logtimezone
- 			if (date_default_timezone_get()) {
- 				$config->setSystemValue('logtimezone', date_default_timezone_get());
-diff --git a/lib/private/updater.php b/lib/private/updater.php
-index 0d567b8..6b0b1ad 100644
---- a/lib/private/updater.php
-+++ b/lib/private/updater.php
-@@ -55,10 +55,10 @@ class Updater extends BasicEmitter {
- 
- 	/** @var ILogger $log */
- 	private $log;
--	
-+
- 	/** @var \OC\HTTPHelper $helper */
- 	private $httpHelper;
--	
-+
- 	/** @var IConfig */
- 	private $config;
- 
-@@ -294,14 +294,6 @@ class Updater extends BasicEmitter {
- 			throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
- 		}
- 
--		// Update .htaccess files
--		try {
--			Setup::updateHtaccess();
--			Setup::protectDataDirectory();
--		} catch (\Exception $e) {
--			throw new \Exception($e->getMessage());
--		}
--
- 		// create empty file in data dir, so we can later find
- 		// out that this is indeed an ownCloud data directory
- 		// (in case it didn't exist before)
diff --git a/owncloud-9.0.2-default_integrity_check_disabled.patch b/owncloud-9.0.2-default_integrity_check_disabled.patch
deleted file mode 100644
index 5f48dfc..0000000
--- a/owncloud-9.0.2-default_integrity_check_disabled.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/private/integritycheck/checker.php b/lib/private/integritycheck/checker.php
-index b991f66..e2111b7 100644
---- a/lib/private/integritycheck/checker.php
-+++ b/lib/private/integritycheck/checker.php
-@@ -107,7 +107,7 @@ class Checker {
- 		 * applicable for very specific scenarios and we should not advertise it
- 		 * too prominent. So please do not add it to config.sample.php.
- 		 */
--		$isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false);
-+		$isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', true);
- 		if($isIntegrityCheckDisabled === true) {
- 			return false;
- 		}
diff --git a/owncloud-9.0.4-further_htaccess_cleanup.patch b/owncloud-9.0.4-further_htaccess_cleanup.patch
deleted file mode 100644
index b709102..0000000
--- a/owncloud-9.0.4-further_htaccess_cleanup.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit a8c9a64d54bbf547017f58a943e04efcb3d8d6f5
-Author: James Hogarth <james.hogarth@gmail.com>
-Date:   Tue Jul 19 12:34:06 2016 +0100
-
-    kill htaccess updates
-
-diff --git a/lib/private/setup.php b/lib/private/setup.php
-index a2f8fdd..f5be6e2 100644
---- a/lib/private/setup.php
-+++ b/lib/private/setup.php
-@@ -396,69 +396,7 @@ class Setup {
- 	 * Append the correct ErrorDocument path for Apache hosts
- 	 */
- 	public static function updateHtaccess() {
--		$config = \OC::$server->getConfig();
--
--		// For CLI read the value from overwrite.cli.url
--		if(\OC::$CLI) {
--			$webRoot = $config->getSystemValue('overwrite.cli.url', '');
--			if($webRoot === '') {
--				return;
--			}
--			$webRoot = parse_url($webRoot, PHP_URL_PATH);
--			$webRoot = rtrim($webRoot, '/');
--		} else {
--			$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
--		}
--
--		$setupHelper = new \OC\Setup($config, \OC::$server->getIniWrapper(),
--			\OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(),
--			\OC::$server->getSecureRandom());
--
--		$htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
--		$content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
--		$htaccessContent = explode($content, $htaccessContent, 2)[0];
--
--		//custom 403 error page
--		$content.= "\nErrorDocument 403 ".$webRoot."/core/templates/403.php";
--
--		//custom 404 error page
--		$content.= "\nErrorDocument 404 ".$webRoot."/core/templates/404.php";
--
--		// Add rewrite rules if the RewriteBase is configured
--		$rewriteBase = $config->getSystemValue('htaccess.RewriteBase', '');
--		if($rewriteBase !== '') {
--			$content .= "\n<IfModule mod_rewrite.c>";
--			$content .= "\n  Options -MultiViews";
--			$content .= "\n  RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]";
--			$content .= "\n  RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !\\.(css|js|svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/remote.php";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/public.php";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/cron.php";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/status.php";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/updater/";
--			$content .= "\n  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/";
--			$content .= "\n  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*";
--			$content .= "\n  RewriteRule . index.php [PT,E=PATH_INFO:$1]";
--			$content .= "\n  RewriteBase " . $rewriteBase;
--			$content .= "\n  <IfModule mod_env.c>";
--			$content .= "\n    SetEnv front_controller_active true";
--			$content .= "\n    <IfModule mod_dir.c>";
--			$content .= "\n      DirectorySlash off";
--			$content .= "\n    </IfModule>";
--			$content .= "\n  </IfModule>";
--			$content .= "\n</IfModule>";
--		}
--
--		if ($content !== '') {
--			//suppress errors in case we don't have permissions for it
--			@file_put_contents($setupHelper->pathToHtaccess(), $htaccessContent.$content . "\n");
--		}
--
-+        return true;
- 	}
- 
- 	public static function protectDataDirectory() {
diff --git a/owncloud-9.0.4-no_3rdparty_repairs.patch b/owncloud-9.0.4-no_3rdparty_repairs.patch
deleted file mode 100644
index e1382d6..0000000
--- a/owncloud-9.0.4-no_3rdparty_repairs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 85baad4c378d359e497eff2206ac083ab2bd1f7e
-Author: James Hogarth <james.hogarth@gmail.com>
-Date:   Tue Jul 19 12:37:00 2016 +0100
-
-    no need to do a repair of 3rd party
-
-diff --git a/lib/private/repair/brokenupdaterrepair.php b/lib/private/repair/brokenupdaterrepair.php
-index 0e4431f..3ec1027 100644
---- a/lib/private/repair/brokenupdaterrepair.php
-+++ b/lib/private/repair/brokenupdaterrepair.php
-@@ -46,47 +46,7 @@ class BrokenUpdaterRepair extends BasicEmitter implements \OC\RepairStep {
- 	 * @return bool True if action performed, false otherwise
- 	 */
- 	private function manuallyCopyThirdPartyFiles() {
--		$resourceDir = __DIR__ . '/../../../resources/updater-fixes/';
--		$thirdPartyDir = __DIR__ . '/../../../3rdparty/';
--
--		$filesToCopy = [
--			// Composer updates
--			'composer.json',
--			'composer.lock',
--			'composer/autoload_classmap.php',
--			'composer/installed.json',
--			'composer/LICENSE',
--			// Icewind stream library
--			'icewind/streams/src/DirectoryFilter.php',
--			'icewind/streams/src/DirectoryWrapper.php',
--			'icewind/streams/src/RetryWrapper.php',
--			'icewind/streams/src/SeekableWrapper.php',
--			// Sabre update
--			'sabre/dav/CHANGELOG.md',
--			'sabre/dav/composer.json',
--			'sabre/dav/lib/CalDAV/Plugin.php',
--			'sabre/dav/lib/CardDAV/Backend/PDO.php',
--			'sabre/dav/lib/DAV/CorePlugin.php',
--			'sabre/dav/lib/DAV/Version.php',
--		];
--
--		// Check the hash for the autoload_classmap.php file, if the hash does match
--		// the expected value then the third-party folder has already been copied
--		// properly.
--		if(hash_file('sha512', $thirdPartyDir . '/composer/autoload_classmap.php') === 'abe09be19b6d427283cbfa7c4156d2c342cd9368d7d0564828a00ae02c435b642e7092cef444f94635f370dbe507eb6b2aa05109b32d8fb5d8a65c3a5a1c658f') {
--			$this->emit('\OC\Repair', 'info', ['Third-party files seem already to have been copied. No repair necessary.']);
--			return false;
--		}
--
--		foreach($filesToCopy as $file) {
--			$state = copy($resourceDir . '/' . $file, $thirdPartyDir . '/' . $file);
--			if($state === true) {
--				$this->emit('\OC\Repair', 'info', ['Successfully replaced '.$file.' with new version.']);
--			} else {
--				$this->emit('\OC\Repair', 'warning', ['Could not replace '.$file.' with new version.']);
--			}
--		}
--		return true;
-+		return false;
- 	}
- 
- 	/**
diff --git a/owncloud-9.1.0-amazon-autoloader.patch b/owncloud-9.1.0-amazon-autoloader.patch
new file mode 100644
index 0000000..d30bf1b
--- /dev/null
+++ b/owncloud-9.1.0-amazon-autoloader.patch
@@ -0,0 +1,15 @@
+diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
+index 4bb4312..85e04a3 100644
+--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
++++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
+@@ -35,10 +35,6 @@
+ 
+ namespace OCA\Files_External\Lib\Storage;
+ 
+-set_include_path(get_include_path() . PATH_SEPARATOR .
+-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+-require 'aws-autoloader.php';
+-
+ use Aws\S3\S3Client;
+ use Aws\S3\Exception\S3Exception;
+ use Icewind\Streams\IteratorDirectory;
diff --git a/owncloud-9.1.0-default_integrity_check_disabled.patch b/owncloud-9.1.0-default_integrity_check_disabled.patch
new file mode 100644
index 0000000..03834da
--- /dev/null
+++ b/owncloud-9.1.0-default_integrity_check_disabled.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
+index d4038f8..7901a2c 100644
+--- a/lib/private/IntegrityCheck/Checker.php
++++ b/lib/private/IntegrityCheck/Checker.php
+@@ -109,7 +109,7 @@ class Checker {
+ 		 * too prominent. So please do not add it to config.sample.php.
+ 		 */
+ 		if ($this->config !== null) {
+-			$isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false);
++			$isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', true);
+ 		} else {
+ 			$isIntegrityCheckDisabled = false;
+ 		}
diff --git a/owncloud-9.1.0-dont_update_htacess.patch b/owncloud-9.1.0-dont_update_htacess.patch
new file mode 100644
index 0000000..c274855
--- /dev/null
+++ b/owncloud-9.1.0-dont_update_htacess.patch
@@ -0,0 +1,105 @@
+diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php
+deleted file mode 100644
+index 5bfcb88..0000000
+--- a/core/Command/Maintenance/UpdateHtaccess.php
++++ /dev/null
+@@ -1,44 +0,0 @@
+-<?php
+-/**
+- * @author Lukas Reschke <lukas@statuscode.ch>
+- *
+- * @copyright Copyright (c) 2016, ownCloud, Inc.
+- * @license AGPL-3.0
+- *
+- * This code is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Affero General Public License, version 3,
+- * as published by the Free Software Foundation.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Affero General Public License for more details.
+- *
+- * You should have received a copy of the GNU Affero General Public License, version 3,
+- * along with this program.  If not, see <http://www.gnu.org/licenses/>
+- *
+- */
+-namespace OC\Core\Command\Maintenance;
+-
+-use InvalidArgumentException;
+-use OC\Setup;
+-use OCP\IConfig;
+-use Symfony\Component\Console\Command\Command;
+-use Symfony\Component\Console\Input\InputInterface;
+-use Symfony\Component\Console\Input\InputOption;
+-use Symfony\Component\Console\Output\OutputInterface;
+-
+-class UpdateHtaccess extends Command {
+-
+-	protected function configure() {
+-		$this
+-			->setName('maintenance:update:htaccess')
+-			->setDescription('Updates the .htaccess file');
+-	}
+-
+-	protected function execute(InputInterface $input, OutputInterface $output) {
+-		\OC\Setup::updateHtaccess();
+-		$output->writeln('.htaccess has been updated');
+-		return 0;
+-	}
+-}
+diff --git a/core/register_command.php b/core/register_command.php
+index ebb6ce8..bd28270 100644
+--- a/core/register_command.php
++++ b/core/register_command.php
+@@ -59,7 +59,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
+ 	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
+ 	$application->add(new OC\Core\Command\App\GetPath());
+ 	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
+-	
++
+ 	$application->add(new OC\Core\Command\TwoFactorAuth\Enable(
+ 		\OC::$server->getTwoFactorAuthManager(), \OC::$server->getUserManager()
+ 	));
+@@ -125,7 +125,6 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
+ 		new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
+ 		\OC::$server->getEventDispatcher()));
+ 	$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
+-	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
+ 
+ 	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
+ 
+diff --git a/lib/private/Setup.php b/lib/private/Setup.php
+index 46969f5..f171642 100644
+--- a/lib/private/Setup.php
++++ b/lib/private/Setup.php
+@@ -382,10 +382,6 @@ class Setup {
+ 			// out that this is indeed an ownCloud data directory
+ 			file_put_contents($config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
+ 
+-			// Update .htaccess files
+-			Setup::updateHtaccess();
+-			Setup::protectDataDirectory();
+-
+ 			//try to write logtimezone
+ 			if (date_default_timezone_get()) {
+ 				$config->setSystemValue('logtimezone', date_default_timezone_get());
+diff --git a/lib/private/Updater.php b/lib/private/Updater.php
+index 229f112..3a2ce90 100644
+--- a/lib/private/Updater.php
++++ b/lib/private/Updater.php
+@@ -210,14 +210,6 @@ class Updater extends BasicEmitter {
+ 			throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
+ 		}
+ 
+-		// Update .htaccess files
+-		try {
+-			Setup::updateHtaccess();
+-			Setup::protectDataDirectory();
+-		} catch (\Exception $e) {
+-			throw new \Exception($e->getMessage());
+-		}
+-
+ 		// create empty file in data dir, so we can later find
+ 		// out that this is indeed an ownCloud data directory
+ 		// (in case it didn't exist before)
diff --git a/owncloud-9.0.3-dropbox-autoloader.patch b/owncloud-9.1.0-dropbox-autoloader.patch
index 5789db2..58ae094 100644
--- a/owncloud-9.0.3-dropbox-autoloader.patch
+++ b/owncloud-9.1.0-dropbox-autoloader.patch
@@ -1,5 +1,5 @@
 diff --git a/apps/files_external/ajax/oauth1.php b/apps/files_external/ajax/oauth1.php
-index ea7db25..4279cec 100644
+index e363e6c..d2aefbc 100644
 --- a/apps/files_external/ajax/oauth1.php
 +++ b/apps/files_external/ajax/oauth1.php
 @@ -23,7 +23,6 @@
@@ -10,15 +10,15 @@ index ea7db25..4279cec 100644
  
  OCP\JSON::checkAppEnabled('files_external');
  OCP\JSON::checkLoggedIn();
-diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
-index 8381ccb..174baec 100644
---- a/apps/files_external/lib/dropbox.php
-+++ b/apps/files_external/lib/dropbox.php
+diff --git a/apps/files_external/lib/Lib/Storage/Dropbox.php b/apps/files_external/lib/Lib/Storage/Dropbox.php
+index f0f62f9..1b20a62 100644
+--- a/apps/files_external/lib/Lib/Storage/Dropbox.php
++++ b/apps/files_external/lib/Lib/Storage/Dropbox.php
 @@ -34,8 +34,6 @@ use Icewind\Streams\IteratorDirectory;
  use Icewind\Streams\RetryWrapper;
  use OCP\Files\StorageNotAvailableException;
  
--require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
+-require_once __DIR__ . '/../../../3rdparty/Dropbox/autoload.php';
 -
  class Dropbox extends \OC\Files\Storage\Common {
  
diff --git a/owncloud-9.0.1-google-autoloader.patch b/owncloud-9.1.0-google-autoloader.patch
index 09f50e8..db2ad48 100644
--- a/owncloud-9.0.1-google-autoloader.patch
+++ b/owncloud-9.1.0-google-autoloader.patch
@@ -1,5 +1,5 @@
 diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php
-index b110cba..1367c7b 100644
+index 2d1fae2..d8dac91 100644
 --- a/apps/files_external/ajax/oauth2.php
 +++ b/apps/files_external/ajax/oauth2.php
 @@ -26,9 +26,6 @@
@@ -8,30 +8,30 @@ index b110cba..1367c7b 100644
   */
 -set_include_path(get_include_path().PATH_SEPARATOR.
 -	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
--require_once 'Google/Client.php';
+-require_once 'Google/autoload.php';
  
  OCP\JSON::checkAppEnabled('files_external');
  OCP\JSON::checkLoggedIn();
-diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
-index 62d264d..45b87c6 100644
---- a/apps/files_external/lib/google.php
-+++ b/apps/files_external/lib/google.php
-@@ -37,10 +37,6 @@ use GuzzleHttp\Exception\RequestException;
+diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php
+index 0b617aa..d40ac36 100644
+--- a/apps/files_external/lib/Lib/Storage/Google.php
++++ b/apps/files_external/lib/Lib/Storage/Google.php
+@@ -38,10 +38,6 @@ use GuzzleHttp\Exception\RequestException;
  use Icewind\Streams\IteratorDirectory;
  use Icewind\Streams\RetryWrapper;
  
 -set_include_path(get_include_path().PATH_SEPARATOR.
 -	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
--require_once 'Google/Client.php';
--require_once 'Google/Service/Drive.php';
- 
+-require_once 'Google/autoload.php';
+-
  class Google extends \OC\Files\Storage\Common {
  
-@@ -445,7 +441,6 @@ class Google extends \OC\Files\Storage\Common {
+ 	private $client;
+@@ -462,7 +458,6 @@ class Google extends \OC\Files\Storage\Common {
  							$response = $client->get($downloadUrl, [
  								'headers' => $httpRequest->getRequestHeaders(),
  								'stream' => true,
--								'verify' => __DIR__ . '/../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem',
+-								'verify' => realpath(__DIR__ . '/../../../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem'),
  							]);
  						} catch (RequestException $e) {
  							if(!is_null($e->getResponse())) {
diff --git a/owncloud-9.1.1-dont_warn_php54_eol.patch b/owncloud-9.1.1-dont_warn_php54_eol.patch
new file mode 100644
index 0000000..6772ec5
--- /dev/null
+++ b/owncloud-9.1.1-dont_warn_php54_eol.patch
@@ -0,0 +1,14 @@
+--- ./settings/Controller/CheckSetupController.php.old	2016-10-07 13:04:26.349194620 +0200
++++ ./settings/Controller/CheckSetupController.php	2016-10-07 13:04:56.642349253 +0200
+@@ -214,10 +214,7 @@
+ 	private function isPhpSupported() {
+ 		$eol = false;
+ 
+-		//PHP 5.4 is EOL on 14 Sep 2015
+-		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
+-			$eol = true;
+-		}
++		// Red Hat provide support for the system PHP so never eol
+ 
+ 		return ['eol' => $eol, 'version' => PHP_VERSION];
+ 	}
diff --git a/owncloud-8.1.6-work-arround-nss-issue.patch b/owncloud-9.1.1-work-arround-nss-issue.patch
index 5a10748..37bc783 100644
--- a/owncloud-8.1.6-work-arround-nss-issue.patch
+++ b/owncloud-9.1.1-work-arround-nss-issue.patch
@@ -1,8 +1,6 @@
-diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
-index f849e3e..acfbc4e 100644
---- a/settings/controller/checksetupcontroller.php
-+++ b/settings/controller/checksetupcontroller.php
-@@ -83,8 +83,8 @@ class CheckSetupController extends Controller {
+--- ./settings/Controller/CheckSetupController.php.old	2016-10-07 13:08:05.373312550 +0200
++++ ./settings/Controller/CheckSetupController.php	2016-10-07 13:11:14.959280009 +0200
+@@ -94,8 +94,8 @@ class CheckSetupController extends Contr
  
  		try {
  			$client = $this->clientService->newClient();
@@ -13,7 +11,7 @@ index f849e3e..acfbc4e 100644
  			return true;
  		} catch (\Exception $e) {
  			return false;
-@@ -162,13 +162,13 @@ class CheckSetupController extends Controller {
+@@ -191,13 +191,13 @@ class CheckSetupController extends Contr
  		if(strpos($versionString, 'NSS/') === 0) {
  			try {
  				$firstClient = $this->clientService->newClient();
@@ -30,20 +28,18 @@ index f849e3e..acfbc4e 100644
  				}
  			}
  		}
-diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index 359b5b4..28370f1 100644
---- a/lib/private/ocsclient.php
-+++ b/lib/private/ocsclient.php
-@@ -344,7 +344,12 @@ class OCSClient {
+--- ./lib/private/OCSClient.php.old	2016-10-07 13:11:45.206434361 +0200
++++ ./lib/private/OCSClient.php	2016-10-07 13:13:50.509073781 +0200
+@@ -346,7 +346,12 @@ class OCSClient {
  		$tmp = $data->data->content;
  		$app = [];
  		if (isset($tmp->downloadlink)) {
 -			$app['downloadlink'] = (string)$tmp->downloadlink;
-+            if (preg_match("/apps\.owncloud\.com/", (string)$tmp->downloadlink)) {
-+                $downloadURL = preg_replace("/apps\.owncloud\.com/", "api.owncloud.com", (string)$tmp->downloadlink);
-+            } else {
-+                $downloadURL = (string)$tmp->downloadlink;
-+            }
++			if (preg_match("/apps\.owncloud\.com/", (string)$tmp->downloadlink)) {
++				$downloadURL = preg_replace("/apps\.owncloud\.com/", "api.owncloud.com", (string)$tmp->downloadlink);
++			} else {
++				$downloadURL = (string)$tmp->downloadlink;
++			}
 +			$app['downloadlink'] = $downloadURL;
  		} else {
  			$app['downloadlink'] = '';
diff --git a/owncloud-README.fedora b/owncloud-README.fedora
index 7c75cfa..df97145 100644
--- a/owncloud-README.fedora
+++ b/owncloud-README.fedora
@@ -44,9 +44,6 @@ and user for ownCloud manually, before you can finish the setup process. The
 README.postgresql and README.mysql files provide more details and help with
 this.
 
-In addition if using a remote database then then selinux must be configured to
-allow the webserver to connect to it - see the selinux section further down.
-
 Configuration
 -------------
 You can find the main configuration file at '/etc/owncloud/config.php'. Until
@@ -89,11 +86,6 @@ If you want to use external files (eg remote smb/cifs server) the httpd_can_netw
 selinux boolean should be toggled on. If you want to use libreoffice document conversion
 then the httpd_execmem should be toggled on and the unoconv package should be installed.
 
-If not using an external file source but still using an external database then the boolean
-httpd_can_network_connect_db should be toggled on for access to regular DB ports. The general
-network connect can alternatiely be used for non-standard ports or for a broader permission 
-in case of future external files requirements.
-
 Memory caching
 --------------
 For performance reasons a memory cache should be configured. In larger installs redis
diff --git a/owncloud-default-nginx.conf b/owncloud-default-nginx.conf
index 81459b9..fddf25e 100644
--- a/owncloud-default-nginx.conf
+++ b/owncloud-default-nginx.conf
@@ -10,6 +10,8 @@
         add_header X-Frame-Options "SAMEORIGIN";
         add_header X-XSS-Protection "1; mode=block";
         add_header X-Robots-Tag none;
+        add_header X-Download-Options noopen;
+        add_header X-Permitted-Cross-Domain-Policies none;
 
         # set max upload size
         client_max_body_size 10G;
diff --git a/owncloud-fedora-autoloader.php b/owncloud-fedora-autoloader.php
index 4caa7b7..3eeb912 100644
--- a/owncloud-fedora-autoloader.php
+++ b/owncloud-fedora-autoloader.php
@@ -24,12 +24,8 @@ require_once $vendor . '/ZipStreamer/autoload.php';
 require_once $vendor . '/phpseclib/autoload.php';
 // "rackspace/php-opencloud"
 require_once $vendor . '/OpenCloud/autoload.php';
-// "james-heinrich/getid3"
-require_once $vendor . '/getid3/autoload.php';
 // "jeremeamia/superclosure"
 require_once $vendor . '/SuperClosure/autoload.php';
-// "ircmaxell/random-lib"
-require_once $vendor . '/RandomLib/autoload.php';
 // "bantu/ini-get-wrapper"
 require_once $vendor . '/bantu/IniGetWrapper/IniGetWrapper.php';
 // "natxet/CssMin"
@@ -70,4 +66,5 @@ require_once $vendor . '/Patchwork/JSqueeze.php';
 require_once $vendor . '/Assetic/autoload.php';
 // "symfony/polyfill-php{55,56,70}"
 require_once $vendor . '/Symfony/Polyfill/autoload.php';
-
+// "lukasreschke/id3parser"
+require_once $vendor . '/ID3Parser/autoload.php';
diff --git a/owncloud.spec b/owncloud.spec
index af4735f..b86a7d9 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -8,7 +8,7 @@
 # Please preserve changelog entries
 #
 Name:           owncloud
-Version:        9.0.5
+Version:        9.1.1
 Release:        1%{?dist}
 Summary:        Private file sync and share server
 Group:          Applications/Internet
@@ -44,34 +44,28 @@ Source8:        %{name}-fedora-autoloader.php
 
 # Stop OC from trying to do stuff to .htaccess files. Just calm down, OC.
 # Distributors are on the case.
-Patch2:         %{name}-9.0.1-dont_update_htacess.patch
+Patch2:         %{name}-9.1.0-dont_update_htacess.patch
 
 # Remove explicit load of dropbox
-Patch3:         %{name}-9.0.3-dropbox-autoloader.patch
+Patch3:         %{name}-9.1.0-dropbox-autoloader.patch
 
 # Remove explicit load of google
-Patch4:         %{name}-9.0.1-google-autoloader.patch
+Patch4:         %{name}-9.1.0-google-autoloader.patch
 
 # Remove explicit load of aws
-Patch5:         %{name}-8.2.3-amazon-autoloader.patch
+Patch5:         %{name}-9.1.0-amazon-autoloader.patch
 
 # Display the appropriate upgrade command for fedora/epel users bz#1321417
 Patch6:         %{name}-8.2.3-correct-cli-upgrade-command.patch
 
 # Disable the integrity checking whilst a better way to deal with it is found
-Patch8:         %{name}-9.0.2-default_integrity_check_disabled.patch
-
-# There's additional htaccess calls to clean up
-Patch9:         %{name}-9.0.4-further_htaccess_cleanup.patch
-
-# Since we unbundle we don't want 3rdparty libraries to be repaired
-Patch10:        %{name}-9.0.4-no_3rdparty_repairs.patch
+Patch8:         %{name}-9.1.0-default_integrity_check_disabled.patch
 
 # Need to work around an NSS issue in el7.2, due to be fix el7.3 bz#1241172
-Patch11:         %{name}-8.1.6-work-arround-nss-issue.patch
+Patch9:         %{name}-9.1.1-work-arround-nss-issue.patch
 
 # RH provide support for php54 so don't tell users it's EOL
-Patch12:         %{name}-8.2.3-dont_warn_php54_eol.patch
+Patch10:         %{name}-9.1.1-dont_warn_php54_eol.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -84,26 +78,23 @@ BuildRequires:  php-pear
 BuildRequires:       php-cli
 BuildRequires:       php-composer(sabre/dav)  >= 3.0.8
 BuildRequires:       php-composer(sabre/dav)  < 4.0
-BuildRequires:       php-composer(doctrine/dbal) >= 2.5.2
+BuildRequires:       php-composer(doctrine/dbal) >= 2.5.4
 BuildRequires:       php-composer(doctrine/dbal) < 2.6
 BuildRequires:       php-composer(mcnetic/zipstreamer) >= 1.0
 BuildRequires:       php-composer(mcnetic/zipstreamer) < 2.0
 BuildRequires:       php-composer(phpseclib/phpseclib) >= 2.0
 BuildRequires:       php-composer(phpseclib/phpseclib) < 3.0
 BuildRequires:       php-opencloud >= 1.9.2
-BuildRequires:       php-composer(james-heinrich/getid3) >= 1.9.12
 BuildRequires:       php-composer(jeremeamia/superclosure) >= 2.1.0
-BuildRequires:       php-composer(ircmaxell/random-lib) >= 1.1
-BuildRequires:       php-composer(ircmaxell/random-lib) < 2.0
 BuildRequires:       php-composer(bantu/ini-get-wrapper) >= 1.0.1
 BuildRequires:       php-composer(natxet/CssMin) >= 3.0.4
 BuildRequires:       php-composer(punic/punic) >= 1.6.3
-BuildRequires:       php-composer(pear/archive_tar) >= 1.4.0
+BuildRequires:       php-composer(pear/archive_tar) >= 1.4.1
 BuildRequires:       php-composer(pear/archive_tar) < 2.0
 BuildRequires:       php-composer(patchwork/utf8) >= 1.2.6
 BuildRequires:       php-composer(patchwork/utf8) < 2.0
-BuildRequires:       php-composer(symfony/console) >= 2.8.1
-BuildRequires:       php-composer(symfony/event-dispatcher) >= 2.8.1
+BuildRequires:       php-composer(symfony/console) >= 2.8.3
+BuildRequires:       php-composer(symfony/event-dispatcher) >= 2.8.3
 BuildRequires:       php-composer(symfony/routing) >= 2.8.1
 BuildRequires:       php-composer(symfony/process) >= 2.8.1
 BuildRequires:       php-composer(pimple/pimple) >= 3.0.2
@@ -111,18 +102,18 @@ BuildRequires:       php-composer(pimple/pimple) < 4.0
 BuildRequires:       php-composer(ircmaxell/password-compat) >= 1.0.0
 BuildRequires:       php-composer(nikic/php-parser) >= 1.4.1
 BuildRequires:       php-composer(nikic/php-parser) < 2.0
-BuildRequires:       php-composer(icewind/streams) >= 0.4.0
+BuildRequires:       php-composer(icewind/streams) >= 0.4.1
 BuildRequires:       php-composer(swiftmailer/swiftmailer) >= 5.4.1
-BuildRequires:       php-composer(guzzlehttp/guzzle) >= 5.3.1
+BuildRequires:       php-composer(guzzlehttp/guzzle) >= 5.3.0
 BuildRequires:       php-composer(guzzlehttp/guzzle) < 6.0
-BuildRequires:       php-composer(league/flysystem) >= 1.0.16
+BuildRequires:       php-composer(league/flysystem) >= 1.0.20
 BuildRequires:       php-composer(interfasys/lognormalizer) >= 1.0
 BuildRequires:       php-composer(owncloud/tarstreamer) >= 0.1
 BuildRequires:       php-composer(patchwork/jsqueeze) >= 2.0
 BuildRequires:       php-composer(patchwork/jsqueeze) < 3.0
 BuildRequires:       php-composer(kriswallsmith/assetic) >= 1.3.2-3
 BuildRequires:       php-composer(kriswallsmith/assetic) < 2.0
-BuildRequires:       php-composer(icewind/smb)     >= 1.0.8
+BuildRequires:       php-composer(icewind/smb)     >= 1.1.0
 %if 0%{?rhel} != 5
 BuildRequires:       php-pecl(smbclient) >= 0.8.0
 %endif
@@ -137,7 +128,8 @@ BuildRequires:       php-composer(symfony/polyfill-php55) >= 1.0
 BuildRequires:       php-composer(symfony/polyfill-php55) < 2.0
 BuildRequires:       php-composer(symfony/polyfill-php56) >= 1.0
 BuildRequires:       php-composer(symfony/polyfill-php56) < 2.0
-
+BuildRequires:       php-composer(lukasreschke/id3parser) >= 0.0.1
+BuildRequires:       php-composer(lukasreschke/id3parser) < 1.0.0
 
 Requires:       %{name}-webserver = %{version}-%{release}
 Requires:       %{name}-database = %{version}-%{release}
@@ -165,10 +157,10 @@ Requires:       php-filter
 ### External PHP libs required by OC core
 
 
-# "doctrine/dbal": "2.5.2"
+# "doctrine/dbal": "2.5.4"
 # pulls in doctrine/common as a strict requires
 # which pulls in doctrine/{annotations,inflector,cache,collections,lexer} as strict requires
-Requires:       php-composer(doctrine/dbal) >= 2.5.2
+Requires:       php-composer(doctrine/dbal) >= 2.5.4
 Requires:       php-composer(doctrine/dbal) < 2.6
 
 #"mcnetic/zipstreamer": "^1.0"
@@ -184,17 +176,9 @@ Requires:       php-composer(phpseclib/phpseclib) < 3.0
 # guzzle/http package include common, parser and stream too
 Requires:       php-opencloud >= 1.9.2
 
-#"james-heinrich/getid3": "dev-master"
-Requires:       php-composer(james-heinrich/getid3) >= 1.9.12
-
 # "jeremeamia/superclosure": "2.1.0"
 Requires:       php-composer(jeremeamia/superclosure) >= 2.1.0
 
-# "ircmaxell/random-lib": "~1.1"
-# Also pulls in ircmaxell/security-lib which is a strict requires
-Requires:       php-composer(ircmaxell/random-lib) >= 1.1
-Requires:       php-composer(ircmaxell/random-lib) < 2.0
-
 # "bantu/ini-get-wrapper": "v1.0.1"
 Requires:       php-composer(bantu/ini-get-wrapper) >= 1.0.1
 
@@ -205,17 +189,17 @@ Requires:       php-composer(natxet/CssMin) >= 3.0.4
 Requires:       php-composer(punic/punic) >= 1.6.3
 
 # "pear/archive_tar": "1.4.1"
-Requires:       php-composer(pear/archive_tar) >= 1.4.0
+Requires:       php-composer(pear/archive_tar) >= 1.4.1
 Requires:       php-composer(pear/archive_tar) < 2.0
 
 # "patchwork/utf8": "1.2.6"
 Requires:       php-composer(patchwork/utf8) >= 1.2.6
 Requires:       php-composer(patchwork/utf8) < 2.0
 
-# "symfony/console": "2.8.1"
-Requires:       php-composer(symfony/console) >= 2.8.1
-# "symfony/event-dispatcher": "2.8.1"
-Requires:       php-composer(symfony/event-dispatcher) >= 2.8.1
+# "symfony/console": "2.8.3"
+Requires:       php-composer(symfony/console) >= 2.8.3
+# "symfony/event-dispatcher": "2.8.3"
+Requires:       php-composer(symfony/event-dispatcher) >= 2.8.3
 # "symfony/routing": "2.8.1"
 Requires:       php-composer(symfony/routing) >= 2.8.1
 # "symfony/process": "2.8.1"
@@ -232,21 +216,21 @@ Requires:       php-composer(ircmaxell/password-compat) >= 1.0.0
 Requires:       php-composer(nikic/php-parser) >= 1.4.1
 Requires:       php-composer(nikic/php-parser) < 2.0
 
-# "icewind/Streams": "0.4.0"
-Requires:       php-composer(icewind/streams) >= 0.4.0
+# "icewind/Streams": "0.4.1"
+Requires:       php-composer(icewind/streams) >= 0.4.1
 
 # "swiftmailer/swiftmailer": "@stable"
 # Version 5.4.1 for autoloader in /usr/share/php
 Requires:       php-composer(swiftmailer/swiftmailer) >= 5.4.1
 
-# "guzzlehttp/guzzle": "5.3.1"
+# "guzzlehttp/guzzle": "5.3.0"
 # pulls in guzzlehttp/ringphp as strict requires
 # ringphp pulls in guzzlehttp/streams and react/promise as strict requires
-Requires:       php-composer(guzzlehttp/guzzle) >= 5.3.1
+Requires:       php-composer(guzzlehttp/guzzle) >= 5.3.0
 Requires:       php-composer(guzzlehttp/guzzle) < 6.0
 
-# "league/flysystem": "1.0.16"
-Requires:       php-composer(league/flysystem) >= 1.0.16
+# "league/flysystem": "1.0.20"
+Requires:       php-composer(league/flysystem) >= 1.0.20
 
 
 # "pear/pear-core-minimal": "v1.10.1"
@@ -289,13 +273,17 @@ Requires:       php-composer(symfony/polyfill-php55) < 2.0
 Requires:       php-composer(symfony/polyfill-php56) >= 1.0
 Requires:       php-composer(symfony/polyfill-php56) < 2.0
 
+# "lukasreschke/id3parser" : "^0.0.1"
+Requires:       php-composer(lukasreschke/id3parser) >= 0.0.1
+Requires:       php-composer(lukasreschke/id3parser) < 1.0.0
+
 ### For dependencies of apps/files_external
 
 ## SMB/CIFS external storage stuff
 
-#"icewind/smb": "1.0.8"
+#"icewind/smb": "1.1.0"
 # note that streams is a dep but already required by core anyway
-Requires:       php-composer(icewind/smb)     >= 1.0.8
+Requires:       php-composer(icewind/smb)     >= 1.1.0
 # This makes smb external storage usable in performance
 # and doesn't break things like encryption due to timeouts
 %if 0%{?rhel} != 5
@@ -433,11 +421,9 @@ work with an SQLite 3 database stored on the local system.
 %patch5 -p1
 %patch6 -p1
 %patch8 -p1
+%if 0%{?rhel}
 %patch9 -p1
 %patch10 -p1
-%if 0%{?rhel}
-%patch11 -p1
-%patch12 -p1
 %endif
 
 # patch backup files and .git stuff
@@ -445,24 +431,25 @@ find . -name \*.orig    -type f        -exec rm    {} \; -print
 find . -name .gitignore -type f        -exec rm    {} \; -print
 find . -name .github    -type d -prune -exec rm -r {} \; -print
 
+
 # prepare package doc
 cp %{SOURCE3} README.fedora
 cp %{SOURCE4} README.mysql
 cp %{SOURCE5} README.postgresql
 
+
 mv 3rdparty/composer.json 3rdparty_composer.json
 mv apps/files_external/3rdparty/composer.json files_external_composer.json
 mv apps/gallery/composer.json gallery_composer.json
 
+
 # Explicitly remove the bundled libraries we're aware of
 pushd 3rdparty
 rm -r doctrine/{annotations,cache,collections,common,dbal,inflector,lexer}
 rm -r mcnetic/zipstreamer
 rm -r phpseclib/phpseclib
 rm -r rackspace/php-opencloud guzzle/{http,common,parser,stream}
-rm -r james-heinrich/getid3
 rm -r jeremeamia/SuperClosure
-rm -r ircmaxell/{random-lib,security-lib}
 rm -r bantu/ini-get-wrapper
 rm -r natxet/CssMin
 rm -r punic/punic
@@ -487,6 +474,7 @@ rm -r kriswallsmith/assetic
 rm -r sabre/{dav,event,http,vobject,uri,xml}
 rm -r symfony/polyfill-{php55,php56,php70,mbstring,util}
 rm -r paragonie/random_compat
+rm -r lukasreschke/id3parser
 rm README.md
 
 # remove composer stuff
@@ -542,10 +530,11 @@ find . -size 0 -type f -exec rm {} \;
 # let's not ship upstream's 'updatenotification' app, which has zero chance of working and
 # a big chance of blowing things up
 rm -r apps/updatenotification
+
 # also remove the actual updater
 rm -r updater
-# removing the updater fixes as not required on our build
-rm -r resources/updater-fixes
+
+
 
 %check
 # files_external checks
@@ -579,7 +568,7 @@ php %{buildroot}%{_datadir}/%{name}/3rdparty/autoload.php
 
 # There should not be an composer.json files remaining
 nb=$(find -name 'composer.*' | wc -l)
-if [ $nb -gt 0 ]
+if [ $nb -gt 0  ]
   then
   false found unexpected composer.json files
 fi
@@ -749,6 +738,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 06 2016 James Hogarth <james.hogarth@gmail.com> - 9.1.1-1
+- Update to 9.1.1
+
 * Tue Sep 20 2016 Remi Collet <remi@fedoraproject.org> - 9.0.5-1
 - Update to 9.0.5