From b3c87c01045870ca7999263f9bff4802a713cfe7 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 23 Mar 2016 09:07:11 +0100
Subject: owncloud: 8.2.3 (backported from Fedora)

---
 owncloud-8.2.2-drop-AWS-autoloader.patch | 58 ++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 owncloud-8.2.2-drop-AWS-autoloader.patch

(limited to 'owncloud-8.2.2-drop-AWS-autoloader.patch')

diff --git a/owncloud-8.2.2-drop-AWS-autoloader.patch b/owncloud-8.2.2-drop-AWS-autoloader.patch
new file mode 100644
index 0000000..1db87a7
--- /dev/null
+++ b/owncloud-8.2.2-drop-AWS-autoloader.patch
@@ -0,0 +1,58 @@
+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 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;
-- 
cgit