[owncloud] new release 8.0.0: patch updates, dep updates etc
Adam Williamson
adamwill at fedoraproject.org
Sat Mar 7 01:48:27 UTC 2015
commit 5ba915c4e8c14f380e3ea3f80fb74877a7471f8e
Author: Adam Williamson <awilliam at redhat.com>
Date: Mon Feb 23 10:42:42 2015 -0800
new release 8.0.0: patch updates, dep updates etc
Various patches rediffed, merged upstream, or newly required.
Several dep changes. New directory /var/lib/owncloud/assets is
/owncloud/assets in the URL tree. Remove upstream use of non-
free JSMin. Update bundling notes.
0001-drop-AWS-autoloader.patch | 74 +++++++
...tup-allow-disabling-all-htaccess-fiddling.patch | 46 ++++
owncloud-7.0.2-composer_3rdparty_autoloader.patch | 90 --------
owncloud-7.0.3-3rdparty_includes.patch | 168 ---------------
owncloud-7.0.4-google1.patch | 234 ---------------------
owncloud-8.0.0-autoloader_paths.patch | 14 ++
owncloud-8.0.0-disable_minify.patch | 18 ++
owncloud-access-httpd.conf.avail | 4 +
owncloud-config.php | 3 +
...-delete-jslint.sh => owncloud-delete-nonfree.sh | 8 +-
owncloud-httpd.conf | 6 +
owncloud-nginx.conf | 4 +
owncloud.spec | 161 ++++++++------
13 files changed, 266 insertions(+), 564 deletions(-)
---
diff --git a/0001-drop-AWS-autoloader.patch b/0001-drop-AWS-autoloader.patch
new file mode 100644
index 0000000..879e1e8
--- /dev/null
+++ b/0001-drop-AWS-autoloader.patch
@@ -0,0 +1,74 @@
+From 28d0809a2c8f79b706cc790e8375197bb04f8620 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Tue, 30 Dec 2014 13:53:54 -0800
+Subject: [PATCH] drop AWS autoloader
+
+Fedora doesn't need it, as the systemwide copy will be found
+by the Composer autoloader.
+---
+ .../3rdparty/aws-sdk-php/aws-autoloader.php | 37 ----------------------
+ apps/files_external/lib/amazons3.php | 4 ---
+ 2 files changed, 41 deletions(-)
+ delete mode 100644 apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
+
+diff --git a/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php b/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
+deleted file mode 100644
+index 8072b11..0000000
+--- a/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
++++ /dev/null
+@@ -1,37 +0,0 @@
+-<?php
+-/**
+- * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License").
+- * You may not use this file except in compliance with the License.
+- * A copy of the License is located at
+- *
+- * http://aws.amazon.com/apache2.0
+- *
+- * or in the "license" file accompanying this file. This file is distributed
+- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+- * express or implied. See the License for the specific language governing
+- * permissions and limitations under the License.
+- */
+-
+-require_once __DIR__ . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+-
+-if (!defined('AWS_FILE_PREFIX')) {
+- define('AWS_FILE_PREFIX', __DIR__);
+-}
+-
+-$classLoader = new Symfony\Component\ClassLoader\UniversalClassLoader();
+-$classLoader->registerNamespaces(array(
+- 'Aws' => AWS_FILE_PREFIX,
+- 'Guzzle' => AWS_FILE_PREFIX,
+- 'Symfony' => AWS_FILE_PREFIX,
+-
+- // Not needed for basic S3-functionality.
+- //'Doctrine' => AWS_FILE_PREFIX,
+- //'Psr' => AWS_FILE_PREFIX,
+- //'Monolog' => AWS_FILE_PREFIX
+-));
+-
+-$classLoader->register();
+-
+-return $classLoader;
+diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
+index 4d94e35..3ceb17a 100644
+--- a/apps/files_external/lib/amazons3.php
++++ b/apps/files_external/lib/amazons3.php
+@@ -24,10 +24,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;
+
+--
+2.2.0
+
diff --git a/0001-setup-allow-disabling-all-htaccess-fiddling.patch b/0001-setup-allow-disabling-all-htaccess-fiddling.patch
new file mode 100644
index 0000000..7dc3adb
--- /dev/null
+++ b/0001-setup-allow-disabling-all-htaccess-fiddling.patch
@@ -0,0 +1,46 @@
+From 4675a32fd8f7189a0aec875004c5ffed831adec2 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at redhat.com>
+Date: Sat, 21 Feb 2015 16:53:03 -0800
+Subject: [PATCH] setup: allow disabling all htaccess fiddling
+
+Distribution-packaged ownCloud, and other deployments where
+the admin/deployer has sufficient control over the system, can
+do this stuff much better. For instance, a sensible packaged
+OC will use a directory that is not accessible via the web
+server *at all* as the data directory (rendering it unnecessary
+to attempt to 'protect' it with a .htaccess file) and will
+include the 403/404 ErrorDocument directives, along with other
+appropriate Apache configuration directives, in a config file
+stored (again) outside the web-served locations.
+
+This makes both of setup's attempts to fiddle about with
+.htaccess stuff optional - they won't happen if the config
+directive check_for_working_htaccess is set to false. We
+could maybe keep that directive with its current meaning and
+add a new one for 'don't mess with htaccess files at all',
+but I think anyone who's setting it to false probably wants
+this behaviour.
+---
+ lib/private/setup.php | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/private/setup.php b/lib/private/setup.php
+index e8a2cce..7aa0146 100644
+--- a/lib/private/setup.php
++++ b/lib/private/setup.php
+@@ -233,7 +233,11 @@ class OC_Setup {
+ file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.ocdata', '');
+
+ // Update htaccess files for apache hosts
+- if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
++ if (
++ isset($_SERVER['SERVER_SOFTWARE']) &&
++ strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') &&
++ OC::$server->getConfig()->getSystemValue('check_for_working_htaccess', true)
++ ) {
+ self::updateHtaccess();
+ self::protectDataDirectory();
+ }
+--
+2.3.0
+
diff --git a/owncloud-8.0.0-autoloader_paths.patch b/owncloud-8.0.0-autoloader_paths.patch
new file mode 100644
index 0000000..3cc1c89
--- /dev/null
+++ b/owncloud-8.0.0-autoloader_paths.patch
@@ -0,0 +1,14 @@
+--- owncloud/lib/base.php 2014-07-29 00:27:51.154263240 -0700
++++ owncloud/lib/base.php.new 2014-07-29 00:30:26.998084605 -0700
+@@ -475,7 +475,10 @@
+ // setup 3rdparty autoloader
+ $vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
+ if (file_exists($vendorAutoLoad)) {
+- require_once $vendorAutoLoad;
++ $loader = require_once $vendorAutoLoad;
++ $loader->add('Pimple', '/usr/share/php/Pimple');
++ $loader->add('Sabre', '/usr/share/php');
++ $loader->add('Sabre\VObject', '/usr/share/pear');
+ } else {
+ OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
diff --git a/owncloud-8.0.0-disable_minify.patch b/owncloud-8.0.0-disable_minify.patch
new file mode 100644
index 0000000..f1673a7
--- /dev/null
+++ b/owncloud-8.0.0-disable_minify.patch
@@ -0,0 +1,18 @@
+--- owncloud/lib/private/templatelayout.php 2015-02-18 11:23:48.588804666 -0800
++++ owncloud/lib/private/templatelayout.php.new 2015-02-21 12:07:47.616822741 -0800
+@@ -5,7 +5,6 @@
+ use Assetic\Filter\CssImportFilter;
+ use Assetic\Filter\CssMinFilter;
+ use Assetic\Filter\CssRewriteFilter;
+-use Assetic\Filter\JSMinFilter;
+ use OC\Assetic\SeparatorFilter; // waiting on upstream
+
+ /**
+@@ -172,7 +171,6 @@
+ ), $root, $file);
+ }
+ return new FileAsset($root . '/' . $file, array(
+- new JSMinFilter(),
+ new SeparatorFilter(';')
+ ), $root, $file);
+ }, $jsFiles);
diff --git a/owncloud-access-httpd.conf.avail b/owncloud-access-httpd.conf.avail
index 2673f14..70986dc 100644
--- a/owncloud-access-httpd.conf.avail
+++ b/owncloud-access-httpd.conf.avail
@@ -18,3 +18,7 @@
<Directory /var/lib/owncloud/apps/>
Include conf.d/owncloud-auth-any.inc
</Directory>
+
+<Directory /var/lib/owncloud/assets/>
+ Include conf.d/owncloud-auth-any.inc
+</Directory>
diff --git a/owncloud-config.php b/owncloud-config.php
index 71c57ee..1140054 100644
--- a/owncloud-config.php
+++ b/owncloud-config.php
@@ -4,6 +4,9 @@ $CONFIG = array (
"datadirectory" => "/var/lib/owncloud/data",
"updatechecker" => false,
"check_for_working_htaccess" => false,
+ "asset-pipeline.enabled" => false,
+ "assetdirectory" => '/var/lib/owncloud',
+
"apps_paths" => array(
0 =>
array (
diff --git a/owncloud-delete-jslint.sh b/owncloud-delete-nonfree.sh
similarity index 54%
rename from owncloud-delete-jslint.sh
rename to owncloud-delete-nonfree.sh
index 6f1b6d1..fe6c53c 100755
--- a/owncloud-delete-jslint.sh
+++ b/owncloud-delete-nonfree.sh
@@ -9,9 +9,13 @@ REPACK_SOURCE="$(basename $ORIG_SOURCE $SUFFIX)-repack${SUFFIX}"
tar -xf $1
# delete jslint
-cd owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/
+pushd owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/
sed -i '/^ \* JSHint, by JSHint Community\.$/,/^})()$/d' worker-javascript.js
-cd -
+popd
+
+# delete minify entirely as it's a mess that contains at least one instance
+# of JSMin, which is under the same problematic license as jslint
+rm -rf owncloud/3rdparty/mrclay/minify
tar -cjf $REPACK_SOURCE owncloud
rm -rf owncloud
diff --git a/owncloud-httpd.conf b/owncloud-httpd.conf
index 476d9a1..7609997 100644
--- a/owncloud-httpd.conf
+++ b/owncloud-httpd.conf
@@ -10,6 +10,7 @@
# ln -s /etc/httpd/conf.d/owncloud-access.conf.avail /etc/httpd/conf.d/z-owncloud-access.conf
Alias /owncloud/apps-appstore /var/lib/owncloud/apps
+Alias /owncloud/assets /var/lib/owncloud/assets
Alias /owncloud /usr/share/owncloud
# Allows compliant CalDAV / CardDAV clients to be configured using only
@@ -31,6 +32,11 @@ Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
Include conf.d/owncloud-defaults.inc
</Directory>
+<Directory /var/lib/owncloud/assets/>
+ Include conf.d/owncloud-auth-local.inc
+ Include conf.d/owncloud-defaults.inc
+</Directory>
+
# For safety, explicitly deny any access to these locations.
# Upstream's .htaccess does something similar with mod_rewrite.
diff --git a/owncloud-nginx.conf b/owncloud-nginx.conf
index d33def6..d03dedf 100644
--- a/owncloud-nginx.conf
+++ b/owncloud-nginx.conf
@@ -44,6 +44,10 @@ server {
alias /var/lib/owncloud/apps;
}
+ location /assets/ {
+ alias /var/lib/owncloud/assets;
+ }
+
location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
deny all;
}
diff --git a/owncloud.spec b/owncloud.spec
index a9a53d0..8183ce3 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,14 +1,16 @@
Name: owncloud
-Version: 7.0.4
+Version: 8.0.0
Release: 3%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
URL: http://owncloud.org
-# removed any occurences of jslint, see script delete-jslint
+# Tarball with non-free sources stripped. To generate:
+# ./owncloud-delete-nonfree.sh %%{name}-%%{version}.tar.bz2
Source0: %{name}-%{version}-repack.tar.bz2
# orig source: https://download.owncloud.org/community/%%{name}-%%{version}.tar.bz2
# sha256sum: https://download.owncloud.org/community/%%{name}-%%{version}.tar.bz2.sha256
+# snapshot source: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
Source1: %{name}-httpd.conf
Source2: %{name}-access-httpd.conf.avail
Source6: %{name}-nginx.conf
@@ -26,16 +28,12 @@ Source5: %{name}-postgresql.txt
Source7: %{name}-config.php
# used to repack the source tarball
-Source42: %{name}-delete-jslint.sh
+Source42: %{name}-delete-nonfree.sh
# Adjust mediaelement not to use its SWF and Silverlight plugins. This
# changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to
# 'plugins:["youtube","vimeo"]'
Patch1: %{name}-6.0.2-videoviewer_noplugins.patch
-# Submitted upstream: https://github.com/owncloud/core/pull/9994
-# Uses Composer's autoloader, not OC's, for loading non Composer-managed
-# 3rdparty includes: it's better at it.
-Patch10: owncloud-7.0.2-composer_3rdparty_autoloader.patch
# Ugly way to deal with Pimple 1.x's lack of PSR-0 compliance. Also forces the
# paths to Sabre deps: /usr/share/php for most of Sabre (to ensure php-sabre-dav
# package, 1.8 version, is used), /usr/share/pear for Sabre\VObject (to ensure
@@ -43,26 +41,26 @@ Patch10: owncloud-7.0.2-composer_3rdparty_autoloader.patch
# and *test* if changing this; test with all versions of all Sabre packages
# installed to make sure it DTRT. Keep an eye on upstream for future changes
# also.
-Patch11: %{name}-7.0.2-autoloader_paths.patch
+Patch2: %{name}-8.0.0-autoloader_paths.patch
# Turn on include path usage for the Composer autoloader (so it'll find
# systemwide PSR-0 and PSR-4 compliant libraries)
# Upstream wouldn't likely take this, they probably only care about their
# bundled copies
-Patch12: %{name}-7.0.2-composer_includepath.patch
+Patch3: %{name}-7.0.2-composer_includepath.patch
# Submitted upstream: https://github.com/owncloud/core/pull/12113
# Use Composer autoloader for Dropbox (in apps/files_external/3rdparty)
-Patch13: 0001-dropbox-use-Composer-autoloader.patch
-# Blowfish bits are obsoleted upstream at 8.x as support for the legacy
-# encryption that used it is dropped. Will submit PR for MANIFEST files
-# soon.
-Patch14: %{name}-7.0.3-3rdparty_includes.patch
+Patch4: 0001-dropbox-use-Composer-autoloader.patch
# Submitted upstream: https://github.com/owncloud/core/pull/11056
# Be less heavy-handed about clearing the opcache after editing config.php
# Avoids triggering a crash in php-opcache: https://github.com/owncloud/core/issues/9885
-Patch15: %{name}-7.0.3-opcache_invalidate.patch
-# Backported from upstream 8.x, updates Google Drive external storage support
-# for v1.x of the Google API library.
-Patch16: %{name}-7.0.4-google1.patch
+Patch5: %{name}-7.0.3-opcache_invalidate.patch
+# Drop use of aws-sdk's dead autoloader (composer will find the systemwide copy)
+Patch6: 0001-drop-AWS-autoloader.patch
+# Disable JS minification (uses non-free JSMin minifier)
+Patch7: owncloud-8.0.0-disable_minify.patch
+# Stop OC from trying to do stuff to .htaccess files. Just calm down, OC.
+# Distributors are on the case.
+Patch8: 0001-setup-allow-disabling-all-htaccess-fiddling.patch
BuildArch: noarch
@@ -95,41 +93,52 @@ Requires: php-filter
%endif
# External PHP libs required by OC core
-Requires: php-Assetic
+# "kriswallsmith/assetic": "1.2.*@dev"
+Requires: php-composer(kriswallsmith/assetic) >= 1.2
+Requires: php-composer(kriswallsmith/assetic) < 1.3
Requires: php-getid3
-Requires: php-PHPMailer
-Requires: php-phpass
-Requires: php-Pimple
-# Upstream switched from Blowfish to AES in 5.0.7:
-# http://blog.schiessle.org/2013/05/28/introduction-to-the-new-owncloud-encryption-app
-# This is now only used when decrypting files encrypted with older
-# versions. It has already been dropped from OC master after OC 7 branching,
-# will not be used in OC 8 (support for legacy encryption is dropped).
-Requires: php-pear(Crypt_Blowfish)
-
-Requires: php-pear(pear.doctrine-project.org/DoctrineDBAL) >= 2.4.2
-Requires: php-pear(pear.symfony.com/Routing)
-Requires: php-pear(pear.symfony.com/Console)
-# Note, OC actually includes Guzzle in Composer/Packagist form, not PEAR form
-# Used by both core and apps/files_external Swift implementations
-Requires: php-pear(guzzlephp.org/pear/Guzzle)
+# states 5.2.8 exactly, but will work with 5.2.9 or later
+Requires: php-composer(phpmailer/phpmailer)
+# "pimple/pimple": "~3.0"
+Requires: php-composer(pimple/pimple) >= 3.0
+Requires: php-composer(pimple/pimple) < 4.0
+Requires: php-opencloud
+Requires: php-composer(doctrine/dbal) >= 2.5.0
+Requires: php-composer(doctrine/dbal) < 2.6
+# "symfony/console": "~2.5"
+Requires: php-composer(symfony/console) >= 2.5.0
+Requires: php-composer(symfony/console) < 2.6
+# "symfony/routing": "~2.5"
+Requires: php-composer(symfony/routing) >= 2.5.0
+Requires: php-composer(symfony/routing) < 2.6
+
+# NB: this will also pull in php-compose(guzzle/guzzle), which is in OC's
+# 3rdparty directory. OC sort of has a direct dependency on it but in fact
+# it's innately tied to the use of php-opencloud and php-aws-sdk and would
+# drop out without those.
+# NB 2: also required by apps/files_external
+#Requires: php-composer(rackspace/php-opencloud) >= 1.9.2
+Requires: php-opencloud >= 1.9.2
+
+# "bantu/ini-get-wrapper": "v1.0.1"
+Requires: php-composer(bantu/ini-get-wrapper) >= 1.0.1
+# "ircmaxell/random-lib": "v1.0.0"
+# Also pulls in ircmaxell/security-lib which is a dep
+Requires: php-composer(ircmaxell/random-lib) >= 1.0.0
## SabreDAV
#Requires: php-composer(sabre/dav) >= 1.8.0
Requires: php-sabre-dav >= 1.8.0
# OwnCloud uses vobject directly as well as dav, and it is not at all compatible
-# with 3.x; calendar 'rework' branch will fix this when it lands, probably 8.x
+# with 3.x; calendar 'rework' branch will fix this when it lands, probably 9.x
Requires: php-pear(pear.sabredav.org/Sabre_VObject) >= 2.0.0
-# PHP libs required by applications provided as part of core OC package
-## apps/search_lucene
-Requires: php-ZendFramework-Pdf
-Requires: php-ZendFramework-Search-Lucene
-
## apps/files_external
Requires: php-pear(pear.dropbox-php.com/Dropbox)
Requires: php-pear(phpseclib.sourceforge.net/Net_SFTP)
-Requires: php-composer(google/apiclient) >= 1.0.3
+# Not pulled via Composer but manually dumped into files_external/3rdparty
+Requires: php-google-apiclient >= 1.0.3
+Requires: php-aws-sdk >= 2.7.0
%if 0%{?rhel}
Requires(post): policycoreutils-python
@@ -223,14 +232,15 @@ work with an SQLite 3 database stored on the local system.
%setup -q -n %{name}
# Fix line endings of a file we're about to patch
sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
-%patch1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
+#patch1
+%patch1 -p0
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
# prepare package doc
cp %{SOURCE3} README.fedora
@@ -239,8 +249,8 @@ cp %{SOURCE5} README.postgresql
# Strip bundled libraries from global 3rdparty dir
-rm -r 3rdparty/{Archive,Console,OS,guzzle,james-heinrich,kriswallsmith,phpass,phpmailer/phpmailer/*,phpseclib,PEAR,symfony,sabre,Pimple,doctrine}
-rm 3rdparty/{System,PEAR5}.php 3rdparty/PEAR-LICENSE
+rm -r 3rdparty/{bantu,doctrine,guzzle,ircmaxell/random-lib,ircmaxell/security-lib,james-heinrich,kriswallsmith,pear,phpmailer/phpmailer/*,phpseclib,pimple,rackspace,sabre,symfony}
+rm 3rdparty/{PEAR,PEAR5}.php
# we need to symlink some annoying files back here, though...direct file
# autoloading sucks. "files" sections of "autoload" statements in
# composer.json files cause composer to basically hardcode the path to a
@@ -250,14 +260,14 @@ mkdir -p 3rdparty/kriswallsmith/assetic/src
mkdir -p 3rdparty/phpseclib/phpseclib/phpseclib/Crypt
# individual core apps now bundle libs as well - yay
-rm -r apps/files_encryption/3rdparty/Crypt_Blowfish
-rm -r apps/search_lucene/3rdparty/Zend
-rm -r apps/files_external/3rdparty/Dropbox
-rm -r apps/files_external/3rdparty/google-api-php-client
+#rm -r apps/search_lucene/3rdparty/Zend
+rm -r apps/files_external/3rdparty/{Dropbox,google-api-php-client,aws-sdk-php}
# ===== BUNDLING NOTES =====
-## 3rdparty/Patchwork - https://github.com/nicolas-grekas/Patchwork-UTF8
+## 3rdparty/patchwork - https://github.com/nicolas-grekas/Patchwork-UTF8
+# "patchwork/utf8": "~1.1"
+#
# Used to set a UTF-8 locale (function isSetLocaleWorking does not
# just test whether setlocale works, it actually asks Patchwork to
# set a locale) and for its pure PHP implementation of the Normalizer
@@ -267,9 +277,9 @@ rm -r apps/files_external/3rdparty/google-api-php-client
# We'd also have to set a UTF-8 locale some other way to entirely
# replace OC's use of Patchwork.
-## 3rdparty/rackspace/php-opencloud - https://github.com/rackspace/php-opencloud
-
## 3rdparty/mcnetic/phpzipstreamer - https://github.com/McNetic/PHPZipStreamer
+# "mcnetic/phpzipstreamer": "dev-master"
+#
# OC's copy is somewhat behind upstream, and slightly forked: they imported
# it on 2014-02-20, and added a downstream patch to make it work with
# PHP 5.3 on 2014-03-17:
@@ -278,22 +288,26 @@ rm -r apps/files_external/3rdparty/google-api-php-client
# https://github.com/McNetic/PHPZipStreamer/commit/0af57cc0d113b27e44455be4be690908c4909d78
# but OC has never synced with that fix. See:
# https://github.com/owncloud/core/pull/3439
-# Handled by Composer
## apps/files_external/3rdparty/smb4php - forked php class from
# http://www.phpclasses.org/package/4129-PHP-Stream-wrapper-to-access-Windows-shared-files.html
+# Replaced by https://github.com/icewind1991/SMB post-8.0
+
+## 3rdparty/punic - https://github.com/punic/punic
+# "punic/punic": "1.1.0"
+#
+# Used in date localization: lib/private/l10n.php
+# Should be straightforward to unbundle
-## apps/files_external/3rdparty/aws-sdk-php - https://github.com/aws/aws-sdk-php
-# Old version, 2.4.0. Not forked, but stripped. We have 2.5.3 packaged as
-# php-aws-sdk. Upstream master is up to 2.6.11, now provided via Packagist/Composer.
-# https://github.com/owncloud/core/issues/12023#issuecomment-62568064 proposes
-# going to 2.7.3. https://bugzilla.redhat.com/show_bug.cgi?id=1157501 shows
-# Fedora/EPEL packages being bumped to 2.7.3.
+## 3rdparty/natxet/CssMin
+# "natxet/CssMin": "dev-master"
+#
+# Used for optional CSS minification
+# Review request: https://bugzilla.redhat.com/show_bug.cgi?id=1177692
# ===== END BUNDLING NOTES =====
# clean up content
-rm -r apps/documents/src
for f in {l10n.pl,init.sh,setup_owncloud.sh,image-optimization.sh,install_dependencies.sh}; do
find . -name "$f" -exec rm {} \;
done
@@ -358,11 +372,8 @@ install -Dpm 644 %{SOURCE6} \
# symlink 3rdparty libs - if possible
# global
ln -s %{_datadir}/php/PHPMailer/class.{phpmailer.php,pop3.php,smtp.php} %{buildroot}%{_datadir}/%{name}/3rdparty/phpmailer/phpmailer
-ln -s %{pear_phpdir}/Archive %{buildroot}%{_datadir}/%{name}/3rdparty/Archive
ln -s %{_datadir}/php/Assetic/functions.php %{buildroot}%{_datadir}/%{name}/3rdparty/kriswallsmith/assetic/src/functions.php
ln -s %{_datadir}/pear/Crypt/Random.php %{buildroot}%{_datadir}/%{name}/3rdparty/phpseclib/phpseclib/phpseclib/Crypt/Random.php
-# individual
-ln -s %{_datadir}/php/Zend %{buildroot}%{_datadir}/%{name}/apps/search_lucene/3rdparty/Zend
%if 0%{?rhel} < 7
@@ -446,10 +457,20 @@ fi
%changelog
+* Mon Feb 23 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-3
+- merge second version of Apache/Nginx config changes into 8.x build
+
* Sun Feb 22 2015 Adam Williamson <awilliam at redhat.com> - 7.0.4-3
- revise and strengthen Apache configuration layout, fix external apps
- fix external apps for Nginx
+* Sun Feb 22 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-2
+- Initial version of Apache/Nginx config changes later re-done in 7.0.4-3
+
+* Sat Feb 21 2015 Adam Williamson <awilliam at redhat.com> - 8.0.0-1
+- new release 8.0.0
+- rediff patches, adjust for new bundled libs, etc etc
+
* Sat Dec 20 2014 Adam Williamson <awilliam at redhat.com> - 7.0.4-2
- backport upstream support for google PHP lib 1.x and unbundle it
More information about the scm-commits
mailing list