#2 Update to 11.0.5
Closed 6 years ago by jhogarth. Opened 6 years ago by elsupergomez.
rpms/ elsupergomez/nextcloud 11.0.5  into  master

file modified
+2
@@ -1,2 +1,4 @@ 

  /nextcloud-10.0.3.tar.bz2

  /nextcloud-10.0.4.tar.bz2

+ /nextcloud-10.0.6.tar.bz2

+ /nextcloud-11.0.5.tar.bz2

@@ -0,0 +1,16 @@ 

+ 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

+ @@ -36,10 +36,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_once 'aws-autoloader.php';

+ -

+  use Aws\S3\S3Client;

+  use Aws\S3\Exception\S3Exception;

+  use Icewind\Streams\IteratorDirectory;

+ 

@@ -0,0 +1,45 @@ 

+ diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php

+ index 87f9396..368a533 100644

+ --- a/core/templates/update.admin.php

+ +++ b/core/templates/update.admin.php

+ @@ -38,7 +38,7 @@

+  		<div class="infogroup">

+  			<em>

+  			<?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?>

+ -			<pre>./occ upgrade</pre>

+ +			<pre>sudo -u apache php /usr/share/nextcloud/occ upgrade</pre>

+  			</em>

+  		</div>

+  	</div>

+ 

+ diff --git a/core/templates/update.use-cli.php b/core/templates/update.use-cli.php

+ index 52d40cd..945d4d9 100644

+ --- a/core/templates/update.use-cli.php

+ +++ b/core/templates/update.use-cli.php

+ @@ -7,8 +7,9 @@

+  			} else {

+  				p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));

+  			} ?><br><br>

+ -			<?php

+ -			print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>

+ +			<code>

+ +			sudo -u apache php /usr/share/nextcloud/occ upgrade

+ +			</code><br><br>

+  		</div>

+  	</div>

+  </div>

+ 

+ diff --git a/updater/index.php b/updater/index.php

+ index 017ca70..085c250 100644

+ --- a/updater/index.php

+ +++ b/updater/index.php

+ @@ -1833,7 +1833,7 @@

+  			var el = document.getElementById('step-maintenance-mode')

+  				.getElementsByClassName('output')[0];

+  			if (keepActive) {

+ -				el.innerHTML = 'Maintenance mode will kept active.<br>Now trigger the migration via command line: <code>./occ upgrade</code><br>';

+ +				el.innerHTML = 'Maintenance mode will kept active.<br>Now trigger the migration via command line: <code>sudo -u apache php /usr/share/nextcloud/occ upgrade</code><br>';

+  				successStep('step-maintenance-mode');

+  				currentStep('step-done');

+  				performStep(11, performStepCallbacks[11]);

+ 

@@ -0,0 +1,97 @@ 

+ diff --git a/console.php b/console.php

+ index b2724db..149c265 100644

+ --- a/console.php

+ +++ b/console.php

+ @@ -31,27 +31,6 @@

+  

+  define('OC_CONSOLE', 1);

+  

+ -// Show warning if a PHP version below 5.6.0 is used, this has to happen here

+ -// because base.php will already use 5.6 syntax.

+ -if (version_compare(PHP_VERSION, '5.6.0') === -1) {

+ -	echo 'This version of Nextcloud requires at least PHP 5.6.0'.PHP_EOL;

+ -	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL;

+ -	return;

+ -}

+ -

+ -// Show warning if PHP 7.2 is used as Nextcloud is not compatible with PHP 7.2 for now

+ -// @see https://github.com/nextcloud/server/pull/5791

+ -if (version_compare(PHP_VERSION, '7.2.0') !== -1) {

+ -	echo 'This version of Nextcloud is not compatible with PHP 7.2.<br/>';

+ -	echo 'You are currently running ' . PHP_VERSION . '.';

+ -	return;

+ -}

+ -

+ -function exceptionHandler($exception) {

+ -	echo "An unhandled exception has been thrown:" . PHP_EOL;

+ -	echo $exception;

+ -	exit(1);

+ -}

+  try {

+  	require_once __DIR__ . '/lib/base.php';

+  

+ 

+ diff --git a/cron.php b/cron.php

+ index 4473dba..7a4e1a6 100644

+ --- a/cron.php

+ +++ b/cron.php

+ @@ -29,13 +29,6 @@

+   * along with this program.  If not, see <http://www.gnu.org/licenses/>

+   *

+   */

+ -

+ -// Show warning if a PHP version below 5.6.0 is used

+ -if (version_compare(PHP_VERSION, '5.6.0') === -1) {

+ -	echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';

+ -	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';

+ -	return;

+ -}

+  

+  try {

+  

+ 

+ diff --git a/index.php b/index.php

+ index e72d38c..29920d7 100644

+ --- a/index.php

+ +++ b/index.php

+ @@ -24,22 +24,6 @@

+   * along with this program.  If not, see <http://www.gnu.org/licenses/>

+   *

+   */

+ -

+ -// Show warning if a PHP version below 5.6.0 is used, this has to happen here

+ -// because base.php will already use 5.6 syntax.

+ -if (version_compare(PHP_VERSION, '5.6.0') === -1) {

+ -	echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';

+ -	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';

+ -	return;

+ -}

+ -

+ -// Show warning if PHP 7.2 is used as Nextcloud is not compatible with PHP 7.2 for now

+ -// @see https://github.com/nextcloud/server/pull/5791

+ -if (version_compare(PHP_VERSION, '7.2.0') !== -1) {

+ -	echo 'This version of Nextcloud is not compatible with PHP 7.2.<br/>';

+ -	echo 'You are currently running ' . PHP_VERSION . '.';

+ -	return;

+ -}

+  

+  try {

+  

+ 

+ diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php

+ index 86b9b76..ac42177 100644

+ --- a/settings/Controller/CheckSetupController.php

+ +++ b/settings/Controller/CheckSetupController.php

+ @@ -233,10 +233,7 @@

+  	 * @return bool

+  	 */

+  	protected function isPhpOutdated() {

+ -		if (version_compare(PHP_VERSION, '5.5.0') === -1) {

+ -			return true;

+ -		}

+ -

+ +		// PHP supported in distribution

+  		return false;

+  	}

+  

+ 

@@ -0,0 +1,105 @@ 

+ diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php

+ deleted file mode 100644

+ index 2185078..0000000

+ --- a/core/Command/Maintenance/UpdateHtaccess.php

+ +++ /dev/null

+ @@ -1,49 +0,0 @@

+ -<?php

+ -/**

+ - * @copyright Copyright (c) 2016, ownCloud, Inc.

+ - *

+ - * @author Lukas Reschke <lukas@statuscode.ch>

+ - *

+ - * @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) {

+ -		if (\OC\Setup::updateHtaccess()) {

+ -			$output->writeln('.htaccess has been updated');

+ -			return 0;

+ -		} else {

+ -			$output->writeln('<error>Error updating .htaccess file, not enough permissions?</error>');

+ -			return 1;

+ -		}

+ -	}

+ -}

+ 

+ diff --git a/core/register_command.php b/core/register_command.php

+ index 6f20769..09535fe 100644

+ --- a/core/register_command.php

+ +++ b/core/register_command.php

+ @@ -124,7 +124,6 @@

+  	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));

+  	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));

+  	$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()));

+  	$application->add(new OC\Core\Command\Maintenance\Repair(

+ 

+ diff --git a/lib/private/Setup.php b/lib/private/Setup.php

+ index 3b3a57c..cd56795 100644

+ --- a/lib/private/Setup.php

+ +++ b/lib/private/Setup.php

+ @@ -371,10 +371,6 @@

+  			// 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 609e965..85d4869 100644

+ --- a/lib/private/Updater.php

+ +++ b/lib/private/Updater.php

+ @@ -233,14 +233,6 @@

+  			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)

+ 

file modified
+20 -27
@@ -1,6 +1,6 @@ 

  Name:           nextcloud

- Version:        10.0.4

- Release:        3%{?dist}

+ Version:        11.0.5

+ Release:        1%{?dist}

  Summary:        Private file sync and share server

  

  License:        AGPLv3+ and MIT and BSD and ASL 2.0 and WTFPL and CC-BY-SA and GPLv3+ and Adobe
@@ -39,7 +39,7 @@ 

  

  # Stop OC from trying to do stuff to .htaccess files. Just calm down, OC.

  # Distributors are on the case.

- Patch1:         %{name}-9.1.0-dont_update_htacess.patch

+ Patch1:         %{name}-%{version}-dont_update_htacess.patch

  

  # Remove explicit load of dropbox

  Patch2:         %{name}-9.1.0-dropbox-autoloader.patch
@@ -48,18 +48,16 @@ 

  Patch3:         %{name}-9.1.0-google-autoloader.patch

  

  # Remove explicit load of aws

- Patch4:         %{name}-9.1.0-amazon-autoloader.patch

+ Patch4:         %{name}-%{version}-amazon-autoloader.patch

  

  # Disable the integrity checking whilst a better way to deal with it is found

  Patch5:         %{name}-9.1.0-default_integrity_check_disabled.patch

  

  # Apply the backport patches to support PHP7.1 and don't complain

- Patch6:         %{name}-463e2ea-php71-backport.patch

- Patch7:         %{name}-b129d5d-php71-backport.patch

- Patch8:         %{name}-10.0.3-dont-check-php-version.patch

+ Patch6:         %{name}-%{version}-dont-check-php-version.patch

  

  # Direct the admin to the correct cli command for upgrades

- Patch9:         %{name}-10.0.4-correct-cli-upgrade.patch

+ Patch7:         %{name}-%{version}-correct-cli-upgrade.patch

  

  BuildArch:      noarch

  
@@ -109,8 +107,6 @@ 

  BuildRequires:       php-composer(symfony/process) < 3.0.0

  BuildRequires:       php-composer(pimple/pimple) >= 3.0.2

  BuildRequires:       php-composer(pimple/pimple) < 4.0

- BuildRequires:       php-composer(ircmaxell/password-compat) >= 1.0.0

- BuildRequires:       php-composer(ircmaxell/password-compat) < 2.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.1
@@ -136,10 +132,6 @@ 

  BuildRequires:       php-composer(patchwork/jsqueeze) < 3.0

  BuildRequires:       php-composer(symfony/polyfill-php70) >= 1.0

  BuildRequires:       php-composer(symfony/polyfill-php70) < 2.0

- 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

  BuildRequires:       php-composer(icewind/smb) >= 1.1.0
@@ -250,10 +242,6 @@ 

  Requires:       php-composer(pimple/pimple) >= 3.0.2

  Requires:       php-composer(pimple/pimple) < 4.0

  

- # "ircmaxell/password-compat": "1.0.*"

- Requires:       php-composer(ircmaxell/password-compat) >= 1.0.0

- Requires:       php-composer(ircmaxell/password-compat) < 2.0

- 

  # "nikic/php-parser": "1.4.1"

  Requires:       php-composer(nikic/php-parser) >= 1.4.1

  Requires:       php-composer(nikic/php-parser) < 2.0
@@ -314,12 +302,6 @@ 

  # pulls in s strict requires of paragonie/random_compat

  Requires:       php-composer(symfony/polyfill-php70) >= 1.0

  Requires:       php-composer(symfony/polyfill-php70) < 2.0

- # "symfony/polyfill-php55": "^1.0",

- Requires:       php-composer(symfony/polyfill-php55) >= 1.0

- Requires:       php-composer(symfony/polyfill-php55) < 2.0

- # "symfony/polyfill-php56": "^1.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
@@ -533,7 +515,6 @@ 

  rm -r symfony/routing

  rm -r symfony/process

  rm -r pimple/pimple

- rm -r ircmaxell/password-compat

  rm -r nikic/php-parser

  rm -r icewind/streams

  rm -r swiftmailer/swiftmailer
@@ -544,9 +525,11 @@ 

  rm -r deepdiver1975/tarstreamer

  rm -r patchwork/jsqueeze

  rm -r sabre/{dav,event,http,vobject,uri,xml}

- rm -r symfony/polyfill-{php55,php56,php70,mbstring,util}

+ rm -r symfony/polyfill-{php70,mbstring}

  rm -r paragonie/random_compat

  rm -r lukasreschke/id3parser

+ rm -r psr/log

+ rm -r stecman/symfony-console-completion

  rm README.md

  

  # remove composer stuff
@@ -632,18 +615,19 @@ 

  mv apps/files_pdfviewer/vendor/pdfjs/LICENSE js-pdfjs-LICENSE

  mv apps/files_pdfviewer/vendor/pdfjs/web/cmaps/LICENSE js-pdfjs-cmaps-LICENSE

  mv apps/files_retention/LICENSE files_retention-LICENSE

+ mv apps/files_texteditor/js/core/vendor/ace-builds/LICENSE ace-builds-LICENSE

  mv apps/gallery/COPYING gallery-LICENSE

  mv apps/gallery/js/vendor/bigshot/LICENSE.txt js-bigshot-LICENSE

  mv apps/gallery/js/vendor/commonmark/LICENSE js-commonmark-LICENSE

  mv apps/gallery/js/vendor/dompurify/LICENSE js-dompurify-LICENSE

  mv apps/gallery/js/vendor/eventsource-polyfill/LICENSE js-eventsource-polyfill-LICENSE

+ mv apps/nextcloud_announcements/COPYING nextcloud_announcements-LICENSE

  mv apps/notifications/COPYING notifications-LICENSE

  mv apps/password_policy/LICENSE password_policy-LICENSE

  mv apps/serverinfo/COPYING serverinfo-LICENSE

  mv apps/survey_client/COPYING survey_client-LICENSE

  mv apps/theming/js/3rdparty/jscolor/LICENSE.txt js-jscolor-LICENSE

  mv apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE js-jqueryui-multiselect-LICENSE

- mv COPYING-AGPL nextcloud-LICENSE

  mv core/fonts/LICENSE.txt fonts-LICENSE

  mv core/vendor/backbone/LICENSE js-backbone-LICENSE

  mv core/vendor/base64/LICENSE js-base64-LICENSE
@@ -658,6 +642,9 @@ 

  mv core/vendor/strengthify/LICENSE js-strengthify-LICENSE

  mv core/vendor/underscore/LICENSE js-underscore-LICENSE

  mv core/vendor/zxcvbn/LICENSE.txt js-zxcvbn-LICENSE

+ mv core/vendor/DOMPurify/LICENSE dompurify-LICENSE

+ mv core/vendor/marked/LICENSE marked-LICENSE

+ mv core/vendor/autosize/LICENSE.md autosize-LICENSE

  mv lib/composer/composer/LICENSE composer-LICENSE

  

  %check
@@ -853,6 +840,12 @@ 

  

  

  %changelog

+ * Tue Nov 21 2017 Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org> - 11.0.5-1

+ - update to 11.0.5

+ 

+ * Fri Nov 17 2017 Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org> - 10.0.6-1

+ - update to 10.0.6

+ 

  * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.4-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (nextcloud-10.0.4.tar.bz2) = 4bb7a760b56088780eee7be83dd4c645703095f8bf11818f3d4cbf52c6636637d8724c3d972df068c54b0d98836ae29cd7c206e6fb5845ee646aeacc098e701d

+ SHA512 (nextcloud-11.0.5.tar.bz2) = 4e25fefb34c68d2244fe9bbfba33a140b6d0833a485f4bffdd24b5f774f1053b80a9a8eb161a673b1fcbe278a929f8ae80b5f9da0163b668f6f41bacaaac478a