From 87e0ac33ad13cf8c1a35f2b81087f4726c7840bd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Nov 2017 12:55:38 +0100 Subject: v9.1.7 --- owncloud-9.1.4-dont_warn_about_php_versions.patch | 78 ----------------------- owncloud-9.1.7-dont_warn_about_php_versions.patch | 78 +++++++++++++++++++++++ owncloud.spec | 21 ++++-- 3 files changed, 93 insertions(+), 84 deletions(-) delete mode 100644 owncloud-9.1.4-dont_warn_about_php_versions.patch create mode 100644 owncloud-9.1.7-dont_warn_about_php_versions.patch diff --git a/owncloud-9.1.4-dont_warn_about_php_versions.patch b/owncloud-9.1.4-dont_warn_about_php_versions.patch deleted file mode 100644 index bef22bb..0000000 --- a/owncloud-9.1.4-dont_warn_about_php_versions.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/console.php b/console.php -index 2bb3a2b..0df5343 100644 ---- a/console.php -+++ b/console.php -@@ -33,22 +33,6 @@ use Symfony\Component\Console\Output\ConsoleOutput; - - define('OC_CONSOLE', 1); - --// Show warning if a PHP version below 5.4.0 is used, this has to happen here --// because base.php will already use 5.4 syntax. --if (version_compare(PHP_VERSION, '5.4.0') === -1) { -- echo 'This version of ownCloud requires at least PHP 5.4.0'.PHP_EOL; -- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL; -- return; --} -- --// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until --// version 10.0.0. --if (version_compare(PHP_VERSION, '7.1.0') !== -1) { -- echo 'This version of ownCloud is not compatible with PHP 7.1.
'; -- echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 10.0.0.'; -- return; --} -- - function exceptionHandler($exception) { - echo "An unhandled exception has been thrown:" . PHP_EOL; - echo $exception; -diff --git a/index.php b/index.php -index ad33ad9..1210e4b 100644 ---- a/index.php -+++ b/index.php -@@ -24,28 +24,6 @@ - * - */ - --// Show warning if a PHP version below 5.4.0 is used, this has to happen here --// because base.php will already use 5.4 syntax. --if (version_compare(PHP_VERSION, '5.4.0') === -1) { -- echo 'This version of ownCloud requires at least PHP 5.4.0
'; -- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; -- return; --} -- --// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until --// version 10.0.0. --if (version_compare(PHP_VERSION, '7.1.0') !== -1) { -- echo 'This version of ownCloud is not compatible with PHP 7.1.
'; -- echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 10.0.0.'; -- return; --} -- --// running oC on Windows is unsupported since 8.1, this has to happen here because --// is seems that the autoloader on Windows fails later and just throws an exception. --if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { -- echo 'ownCloud Server does not support Microsoft Windows.'; -- return; --} - - try { - -diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php -index 52ef34d..bdb2a3a 100644 ---- a/settings/Controller/CheckSetupController.php -+++ b/settings/Controller/CheckSetupController.php -@@ -349,11 +349,8 @@ Raw output - protected function isEndOfLive() { - $eol = false; - -- //PHP 5.4 is EOL on 14 Sep 2015 -- if (version_compare(PHP_VERSION, '5.5.0') === -1) { -- $eol = true; -- return $eol; -- } -+ // Red Hat support PHP so don't EOL -+ - return $eol; - } - } diff --git a/owncloud-9.1.7-dont_warn_about_php_versions.patch b/owncloud-9.1.7-dont_warn_about_php_versions.patch new file mode 100644 index 0000000..abfdb55 --- /dev/null +++ b/owncloud-9.1.7-dont_warn_about_php_versions.patch @@ -0,0 +1,78 @@ +diff --git a/console.php b/console.php +index 2bb3a2b..0df5343 100644 +--- a/console.php ++++ b/console.php +@@ -33,22 +33,6 @@ use Symfony\Component\Console\Output\ConsoleOutput; + + define('OC_CONSOLE', 1); + +-// Show warning if a PHP version below 5.4.0 is used, this has to happen here +-// because base.php will already use 5.4 syntax. +-if (version_compare(PHP_VERSION, '5.4.0') === -1) { +- echo 'This version of ownCloud requires at least PHP 5.4.0'.PHP_EOL; +- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL; +- return; +-} +- +-// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until +-// version 10.0.0. +-if (version_compare(PHP_VERSION, '7.1.0') !== -1) { +- echo 'This version of ownCloud is not compatible with PHP 7.1.
'; +- echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 10.0.0.'; +- return; +-} +- + function exceptionHandler($exception) { + echo "An unhandled exception has been thrown:" . PHP_EOL; + echo $exception; +diff --git a/index.php b/index.php +index ad33ad9..1210e4b 100644 +--- a/index.php ++++ b/index.php +@@ -24,28 +24,6 @@ + * + */ + +-// Show warning if a PHP version below 5.4.0 is used, this has to happen here +-// because base.php will already use 5.4 syntax. +-if (version_compare(PHP_VERSION, '5.4.0') === -1) { +- echo 'This version of ownCloud requires at least PHP 5.4.0
'; +- echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; +- return; +-} +- +-// Show warning if PHP 7.1 is used as ownCloud is not compatible with PHP 7.1 until +-// version 10.0.0. +-if (version_compare(PHP_VERSION, '7.1.0') !== -1) { +- echo 'This version of ownCloud is not compatible with PHP 7.1.
'; +- echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 10.0.0.'; +- return; +-} +- +-// running oC on Windows is unsupported since 8.1, this has to happen here because +-// is seems that the autoloader on Windows fails later and just throws an exception. +-if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { +- echo 'ownCloud Server does not support Microsoft Windows.'; +- return; +-} + + try { + +diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php +index 52ef34d..bdb2a3a 100644 +--- a/settings/Controller/CheckSetupController.php ++++ b/settings/Controller/CheckSetupController.php +@@ -348,12 +348,7 @@ Raw output + protected function isEndOfLive() { + $eol = false; + +- // PHP 5.4 is EOL on 14 Sep 2015 +- // PHP 5.5 is EOL on 21 Jul 2016 +- if (version_compare(PHP_VERSION, '5.6.0') === -1) { +- $eol = true; +- return $eol; +- } ++ // Red Hat support PHP so don't EOL + return $eol; + } + } diff --git a/owncloud.spec b/owncloud.spec index 002c5a5..01ed060 100644 --- a/owncloud.spec +++ b/owncloud.spec @@ -15,7 +15,7 @@ %endif Name: owncloud -Version: 9.1.5 +Version: 9.1.7 Release: 1%{?dist} Summary: Private file sync and share server Group: Applications/Internet @@ -73,7 +73,7 @@ Patch6: %{name}-9.1.4-correct-cli-upgrade.patch Patch7: %{name}-9.1.0-default_integrity_check_disabled.patch # No need to check PHP versions, Fedora maintainers are on the job -Patch8: %{name}-9.1.4-dont_warn_about_php_versions.patch +Patch8: %{name}-9.1.7-dont_warn_about_php_versions.patch #Backport of php7.1 fixes Patch9: %{name}-b129d5d-php71-backport.patch @@ -100,7 +100,7 @@ BuildRequires: php-pear # For sanity %%check BuildRequires: php-cli -BuildRequires: php-composer(sabre/dav) >= 3.0.8 +BuildRequires: php-composer(sabre/dav) >= 3.0.9 BuildRequires: php-composer(sabre/dav) < 4.0 BuildRequires: php-composer(doctrine/dbal) >= 2.5.4 BuildRequires: php-composer(doctrine/dbal) < 2.6 @@ -150,7 +150,7 @@ BuildRequires: php-composer(owncloud/tarstreamer) >= 0.1 BuildRequires: php-composer(owncloud/tarstreamer) < 1.0 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) >= 1.3.2 BuildRequires: php-composer(kriswallsmith/assetic) < 2.0 BuildRequires: php-composer(icewind/smb) >= 1.1.0 BuildRequires: php-composer(icewind/smb) < 2.0 @@ -310,12 +310,12 @@ Requires: php-composer(patchwork/jsqueeze) < 3.0 # "kriswallsmith/assetic": "1.3.2" # Need release 3 for the autoloader fix to avoid it spamming the logs -Requires: php-composer(kriswallsmith/assetic) >= 1.3.2-3 +Requires: php-composer(kriswallsmith/assetic) >= 1.3.2 Requires: php-composer(kriswallsmith/assetic) < 2.0 # "sabre/dav" : "3.0.8" # pulls in sabre event, http and vobject, xml, uri as strict requires -Requires: php-composer(sabre/dav) >= 3.0.8 +Requires: php-composer(sabre/dav) >= 3.0.9 Requires: php-composer(sabre/dav) < 4.0 # symfony/polyfill-mbstring is not in composer.json but is in the 3rdparty folder @@ -830,6 +830,15 @@ rm -rf %{buildroot} %changelog +* Thu Nov 23 2017 Remi Collet - 9.1.7-1 +- update to 9.1.7 + +* Thu May 18 2017 James Hogarth - 9.1.5-1 +- Update to 9.1.5 + +* Fri May 5 2017 Remi Collet - 9.1.6-1 +- update to 9.1.6 + * Fri May 5 2017 Remi Collet - 9.1.5-1 - update to 9.1.5 -- cgit