[arch-commits] Commit in owncloud/trunk (4 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Jan 23 11:15:07 UTC 2017
Date: Monday, January 23, 2017 @ 11:15:06
Author: spupykin
Revision: 208499
upgpkg: owncloud 9.1.3-2
upd
Added:
owncloud/trunk/owncloud-463e2ea-php71-backport.patch
owncloud/trunk/owncloud-9.1.2-dont_warn_about_php_versions.patch
owncloud/trunk/owncloud-b129d5d-php71-backport.patch
Modified:
owncloud/trunk/PKGBUILD
---------------------------------------------------+
PKGBUILD | 19 +++-
owncloud-463e2ea-php71-backport.patch | 22 ++++
owncloud-9.1.2-dont_warn_about_php_versions.patch | 89 ++++++++++++++++++++
owncloud-b129d5d-php71-backport.patch | 13 ++
4 files changed, 140 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-23 11:10:18 UTC (rev 208498)
+++ PKGBUILD 2017-01-23 11:15:06 UTC (rev 208499)
@@ -4,7 +4,7 @@
pkgname=owncloud
pkgver=9.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
arch=('any')
url="https://owncloud.org/"
@@ -28,11 +28,24 @@
backup=('etc/webapps/owncloud/apache.example.conf')
validpgpkeys=('E3036906AD9F30807351FAC32D5D5E97F6978A26')
source=("https://download.owncloud.org/community/owncloud-${pkgver}.tar.bz2"{,.asc}
- 'apache.example.conf')
+ 'apache.example.conf'
+ owncloud-463e2ea-php71-backport.patch
+ owncloud-9.1.2-dont_warn_about_php_versions.patch
+ owncloud-b129d5d-php71-backport.patch)
sha256sums=('e0a1eb35fffb61dab5ca41f6d3fdb4ddcc3ec09683cd620b8094846785d4f6e9'
'SKIP'
- '4a2ad4b4ecc6ede355bec9a21cbf8c8c4b9144033bdf0ed3366617bcb4df1144')
+ '4a2ad4b4ecc6ede355bec9a21cbf8c8c4b9144033bdf0ed3366617bcb4df1144'
+ '9a68c60cba0ee12c05467a66b581adad284447f4d22cb56eec55ed8e4ab0a7d6'
+ '5821d6b3234967d9cc86c4ccd1778190d2a95930316821455059ab63b417999e'
+ '5916b893303a10eaff72f23394ca8fb566af6413460f16d74877ad822f2e8694')
+prepare() {
+ cd "$srcdir"/${pkgname}
+ patch -p1 <"$srcdir"/owncloud-463e2ea-php71-backport.patch
+ patch -p1 <"$srcdir"/owncloud-9.1.2-dont_warn_about_php_versions.patch
+ patch -p1 <"$srcdir"/owncloud-b129d5d-php71-backport.patch
+}
+
package() {
# install license
install -d "$pkgdir"/usr/share/licenses/${pkgname}
Added: owncloud-463e2ea-php71-backport.patch
===================================================================
--- owncloud-463e2ea-php71-backport.patch (rev 0)
+++ owncloud-463e2ea-php71-backport.patch 2017-01-23 11:15:06 UTC (rev 208499)
@@ -0,0 +1,22 @@
+From 463e2ea15d6fb71b96363d60c7e4bdc2c020eddf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller at tmit.eu>
+Date: Mon, 4 Jul 2016 13:47:03 +0200
+Subject: [PATCH] Initialize array elements properly
+
+---
+ lib/private/App/InfoParser.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php
+index c158e5c..843ed02 100644
+--- a/lib/private/App/InfoParser.php
++++ b/lib/private/App/InfoParser.php
+@@ -141,7 +141,7 @@ function xmlToArray($xml) {
+ $totalElement = count($xml->{$element});
+
+ if (!isset($array[$element])) {
+- $array[$element] = "";
++ $array[$element] = $totalElement > 1 ? [] : "";
+ }
+ /** @var \SimpleXMLElement $node */
+ // Has attributes
Added: owncloud-9.1.2-dont_warn_about_php_versions.patch
===================================================================
--- owncloud-9.1.2-dont_warn_about_php_versions.patch (rev 0)
+++ owncloud-9.1.2-dont_warn_about_php_versions.patch 2017-01-23 11:15:06 UTC (rev 208499)
@@ -0,0 +1,89 @@
+diff --git a/console.php b/console.php
+index 7235965..1f4b721 100644
+--- a/console.php
++++ b/console.php
+@@ -33,21 +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 9.2.0.
+-if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
+- echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>';
+- echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 9.2.0.';
+- return;
+-}
+
+ function exceptionHandler($exception) {
+ echo "An unhandled exception has been thrown:" . PHP_EOL;
+@@ -78,7 +63,7 @@ try {
+ echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
+ echo "Current user: " . $user['name'] . PHP_EOL;
+ echo "Owner of config.php: " . $configUser['name'] . PHP_EOL;
+- echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
++ echo "Try adding 'sudo -u " . $configUser['name'] . " ' to the beginning of the command (without the single quotes)" . PHP_EOL;
+ exit(0);
+ }
+ }
+diff --git a/index.php b/index.php
+index 136ddcb..5230cb2 100644
+--- a/index.php
++++ b/index.php
+@@ -24,31 +24,9 @@
+ *
+ */
+
+-// 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<br/>';
+- 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 9.2.0.
+-if (version_compare(PHP_VERSION, '7.1.0') !== -1) {
+- echo 'This version of ownCloud is not compatible with PHP 7.1.<br/>';
+- echo 'You are currently running ' . PHP_VERSION . '. Please use at least ownCloud 9.2.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 {
+-
++
+ require_once 'lib/base.php';
+
+ OC::handleRequest();
+diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
+index 52ef34d..e39fdf2 100644
+--- a/settings/Controller/CheckSetupController.php
++++ b/settings/Controller/CheckSetupController.php
+@@ -349,11 +349,7 @@ 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;
+ }
+ }
Added: owncloud-b129d5d-php71-backport.patch
===================================================================
--- owncloud-b129d5d-php71-backport.patch (rev 0)
+++ owncloud-b129d5d-php71-backport.patch 2017-01-23 11:15:06 UTC (rev 208499)
@@ -0,0 +1,13 @@
+diff --git a/settings/Controller/SecuritySettingsController.php b/settings/Controller/SecuritySettingsController.php
+index 88b2803..5c6f174 100644
+--- a/settings/Controller/SecuritySettingsController.php
++++ b/settings/Controller/SecuritySettingsController.php
+@@ -60,7 +60,7 @@ protected function returnSuccess() {
+ * @return array
+ */
+ public function trustedDomains($newTrustedDomain) {
+- $trustedDomains = $this->config->getSystemValue('trusted_domains');
++ $trustedDomains = $this->config->getSystemValue('trusted_domains', []);
+ $trustedDomains[] = $newTrustedDomain;
+ $this->config->setSystemValue('trusted_domains', $trustedDomains);
+
More information about the arch-commits
mailing list