[Pkg-owncloud-commits] [owncloud] 221/223: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sun Jun 22 01:54:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 36123b842c1fdef4dac215cd854e220e4c07ec84
Author: David Prévot <taffit at debian.org>
Date: Sat Jun 21 14:21:18 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 10 +-
debian/patches/0002-Fix-displayed-version.patch | 2 +-
debian/patches/0003-Improve-logfile-handling.patch | 2 +-
.../patches/0012-update-SabreDAV-to-1.8.10.patch | 345 ---------------------
.../patches/0013-update-SabreDAV-to-1.8.10.patch | 303 ------------------
.../patches/0014-pass-in-the-right-backend.patch | 22 --
...ctrine-Symphony-Patchwork-and-Pimple-path.patch | 2 +-
debian/patches/series | 3 -
8 files changed, 8 insertions(+), 681 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 8610456..13d4e89 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,7 +23,7 @@ Last-Update: 2014-04-22
8 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 4b1ab2f..6301b70 100644
+index 6da00fc..647682f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -80,8 +80,10 @@ $CONFIG = array(
@@ -55,7 +55,7 @@ index 4b1ab2f..6301b70 100644
),
'user_backends'=>array(
diff --git a/lib/base.php b/lib/base.php
-index 5871ecb..dadaa5f 100644
+index 7bde1db..7c269dd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -149,7 +149,7 @@ class OC {
@@ -68,10 +68,10 @@ index 5871ecb..dadaa5f 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 2650ad9..b9c4e02 100644
+index a626239..2de296f 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
-@@ -446,7 +446,7 @@ class OC_App {
+@@ -440,7 +440,7 @@ class OC_App {
* @return string
*/
public static function getInstallPath() {
@@ -160,7 +160,7 @@ index b68083f..844a43a 100644
}
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index 776c322..639e756 100644
+index b35eda4..bf937e8 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -9,7 +9,7 @@
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 45efe6a..d674980 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -18,7 +18,7 @@ Last-Update: 2013-10-17
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 6301b70..2737495 100644
+index 647682f..46d5641 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -152,8 +152,8 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index ae1c483..f9b2a68 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -13,7 +13,7 @@ Last-Update: 2013-10-23
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 2737495..01d686e 100644
+index 46d5641..9c6140a 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -167,7 +167,7 @@ $CONFIG = array(
diff --git a/debian/patches/0012-update-SabreDAV-to-1.8.10.patch b/debian/patches/0012-update-SabreDAV-to-1.8.10.patch
deleted file mode 100644
index 774ef24..0000000
--- a/debian/patches/0012-update-SabreDAV-to-1.8.10.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From: =?utf-8?q?Thomas_M=C3=BCller?= <thomas.mueller at tmit.eu>
-Date: Mon, 26 May 2014 22:09:12 +0200
-Subject: update SabreDAV to 1.8.10
-
-Origin: upstream, https://github.com/owncloud/contacts/commit/ea6629df63776e72eaf245077ad4f2357aa5047e
----
- apps/contacts/appinfo/remote.php | 12 ++++++------
- apps/contacts/lib/carddav/addressbook.php | 16 ++++++++--------
- apps/contacts/lib/carddav/addressbookroot.php | 8 ++++----
- apps/contacts/lib/carddav/backend.php | 26 +++++++++++++-------------
- apps/contacts/lib/carddav/card.php | 10 +++++-----
- apps/contacts/lib/carddav/plugin.php | 10 +++++-----
- apps/contacts/lib/carddav/useraddressbooks.php | 4 ++--
- apps/contacts/lib/utils/jsonserializer.php | 2 +-
- 8 files changed, 44 insertions(+), 44 deletions(-)
-
-diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
-index 3b5bcbd..b4aecf7 100644
---- a/apps/contacts/appinfo/remote.php
-+++ b/apps/contacts/appinfo/remote.php
-@@ -48,7 +48,7 @@ $carddavBackend = new OCA\Contacts\CardDAV\Backend($backends);
- $requestBackend = new OC_Connector_Sabre_Request();
-
- // Root nodes
--$principalCollection = new Sabre_CalDAV_Principal_Collection($principalBackend);
-+$principalCollection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
- $principalCollection->disableListing = true; // Disable listing
-
- $addressBookRoot = new OCA\Contacts\CardDAV\AddressBookRoot($principalBackend, $carddavBackend);
-@@ -60,15 +60,15 @@ $nodes = array(
- );
-
- // Fire up server
--$server = new Sabre_DAV_Server($nodes);
-+$server = new \Sabre\DAV\Server($nodes);
- $server->httpRequest = $requestBackend;
- $server->setBaseUri($baseuri);
- // Add plugins
--$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
-+$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud'));
- $server->addPlugin(new OCA\Contacts\CardDAV\Plugin());
--$server->addPlugin(new Sabre_DAVACL_Plugin());
--$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
--$server->addPlugin(new Sabre_CardDAV_VCFExportPlugin());
-+$server->addPlugin(new \Sabre\DAVACL\Plugin());
-+$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false)); // Show something in the Browser, but no upload
-+$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
- $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('carddav'));
-
- if (defined('DEBUG') && DEBUG) {
-diff --git a/apps/contacts/lib/carddav/addressbook.php b/apps/contacts/lib/carddav/addressbook.php
-index d9d2f9a..d167bf1 100644
---- a/apps/contacts/lib/carddav/addressbook.php
-+++ b/apps/contacts/lib/carddav/addressbook.php
-@@ -26,28 +26,28 @@ use OCA\Contacts;
-
- /**
- * This class overrides __construct to get access to $addressBookInfo and
-- * $carddavBackend, Sabre_CardDAV_AddressBook::getACL() to return read/write
-+ * $carddavBackend, \Sabre\CardDAV\AddressBook::getACL() to return read/write
- * permissions based on user and shared state and it overrides
-- * Sabre_CardDAV_AddressBook::getChild() and Sabre_CardDAV_AddressBook::getChildren()
-+ * \Sabre\CardDAV\AddressBook::getChild() and \Sabre\CardDAV\AddressBook::getChildren()
- * to instantiate \OCA\Contacts\CardDAV\Cards.
- */
--class AddressBook extends \Sabre_CardDAV_AddressBook {
-+class AddressBook extends \Sabre\CardDAV\AddressBook {
-
- /**
- * CardDAV backend
- *
-- * @var Sabre_CardDAV_Backend_Abstract
-+ * @var \Sabre\CardDAV\Backend\AbstractBackend
- */
- protected $carddavBackend;
-
- /**
- * Constructor
- *
-- * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-+ * @param \Sabre\CardDAV\Backend\AbstractBackend $carddavBackend
- * @param array $addressBookInfo
- */
- public function __construct(
-- \Sabre_CardDAV_Backend_Abstract $carddavBackend,
-+ \Sabre\CardDAV\Backend\AbstractBackend $carddavBackend,
- array $addressBookInfo
- ) {
-
-@@ -199,13 +199,13 @@ class AddressBook extends \Sabre_CardDAV_AddressBook {
- * Returns a card
- *
- * @param string $name
-- * @return OC_Connector_Sabre_DAV_Card
-+ * @return Card
- */
- public function getChild($name) {
-
- $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
- if (!$obj) {
-- throw new \Sabre_DAV_Exception_NotFound('Card not found');
-+ throw new \Sabre\DAV\Exception\NotFound('Card not found');
- }
- return new Card($this->carddavBackend,$this->addressBookInfo,$obj);
-
-diff --git a/apps/contacts/lib/carddav/addressbookroot.php b/apps/contacts/lib/carddav/addressbookroot.php
-index e7601f0..b3d49ff 100644
---- a/apps/contacts/lib/carddav/addressbookroot.php
-+++ b/apps/contacts/lib/carddav/addressbookroot.php
-@@ -23,10 +23,10 @@
- namespace OCA\Contacts\CardDAV;
-
- /**
-- * This class overrides Sabre_CardDAV_AddressBookRoot::getChildForPrincipal()
-+ * This class overrides \Sabre\CardDAV\AddressBookRoot::getChildForPrincipal()
- * to instantiate OC_Connector_CardDAV_UserAddressBooks.
- */
--class AddressBookRoot extends \Sabre_CardDAV_AddressBookRoot {
-+class AddressBookRoot extends \Sabre\CardDAV\AddressBookRoot {
-
- /**
- * This method returns a node for a principal.
-@@ -36,7 +36,7 @@ class AddressBookRoot extends \Sabre_CardDAV_AddressBookRoot {
- * supplied by the authentication backend.
- *
- * @param array $principal
-- * @return Sabre_DAV_INode
-+ * @return \Sabre\DAV\INode
- */
- public function getChildForPrincipal(array $principal) {
-
-@@ -44,4 +44,4 @@ class AddressBookRoot extends \Sabre_CardDAV_AddressBookRoot {
-
- }
-
--}
-\ No newline at end of file
-+}
-diff --git a/apps/contacts/lib/carddav/backend.php b/apps/contacts/lib/carddav/backend.php
-index 90d010e..71e5675 100644
---- a/apps/contacts/lib/carddav/backend.php
-+++ b/apps/contacts/lib/carddav/backend.php
-@@ -33,7 +33,7 @@ use OCA\Contacts;
- * in that backend. For your own address books it can be e.g 'local::1' for
- * an address book shared with you it could be 'shared::2' an so forth.
- */
--class Backend extends \Sabre_CardDAV_Backend_Abstract {
-+class Backend extends \Sabre\CardDAV\Backend\AbstractBackend {
-
- public function __construct($backends) {
- $this->backends = $backends;
-@@ -64,11 +64,11 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- 'uri' => $addressBook['uri'],
- 'principaluri' => 'principals/'.$addressBook['owner'],
- '{DAV:}displayname' => $addressBook['displayname'],
-- '{' . \Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description'
-+ '{' . \Sabre\CardDAV\Plugin::NS_CARDDAV . '}addressbook-description'
- => $addressBook['description'],
- '{http://calendarserver.org/ns/}getctag' => $addressBook['lastmodified'],
-- '{' . \Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' =>
-- new \Sabre_CardDAV_Property_SupportedAddressData(),
-+ '{' . \Sabre\CardDAV\Plugin::NS_CARDDAV . '}supported-address-data' =>
-+ new \Sabre\CardDAV\Property\SupportedAddressData(),
- );
- }
- }
-@@ -81,12 +81,12 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- /**
- * Updates an addressbook's properties
- *
-- * See Sabre_DAV_IProperties for a description of the mutations array, as
-+ * See \Sabre\DAV\IProperties for a description of the mutations array, as
- * well as the return value.
- *
- * @param mixed $addressbookid
- * @param array $mutations
-- * @see Sabre_DAV_IProperties::updateProperties
-+ * @see \Sabre\DAV\IProperties::updateProperties
- * @return bool|array
- */
- public function updateAddressBook($addressbookid, array $mutations) {
-@@ -97,7 +97,7 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- case '{DAV:}displayname' :
- $changes['displayname'] = $newvalue;
- break;
-- case '{' . \Sabre_CardDAV_Plugin::NS_CARDDAV
-+ case '{' . \Sabre\CardDAV\Plugin::NS_CARDDAV
- . '}addressbook-description' :
- $changes['description'] = $newvalue;
- break;
-@@ -129,12 +129,12 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- case '{DAV:}displayname' :
- $properties['displayname'] = $newvalue;
- break;
-- case '{' . \Sabre_CardDAV_Plugin::NS_CARDDAV
-+ case '{' . \Sabre\CardDAV\Plugin::NS_CARDDAV
- . '}addressbook-description' :
- $properties['description'] = $newvalue;
- break;
- default :
-- throw new \Sabre_DAV_Exception_BadRequest('Unknown property: '
-+ throw new \Sabre\DAV\Exception\BadRequest('Unknown property: '
- . $property);
- }
-
-@@ -206,7 +206,7 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- try {
- $contact = $backend->getContact($id, array('uri' => urldecode($carduri)));
- } catch(\Exception $e) {
-- //throw new \Sabre_DAV_Exception_NotFound($e->getMessage());
-+ //throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
- \OCP\Util::writeLog('contacts', __METHOD__.', Exception: '. $e->getMessage(), \OCP\Util::DEBUG);
- return false;
- }
-@@ -214,7 +214,7 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- $contact['etag'] = '"' . md5($contact['carddata']) . '"';
- return $contact;
- }
-- //throw new \Sabre_DAV_Exception('Error retrieving the card');
-+ //throw new \Sabre\DAV\Exception('Error retrieving the card');
- return false;
- }
-
-@@ -266,7 +266,7 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- * @return string
- */
- public function userIDByPrincipal($principaluri) {
-- list(, $userid) = \Sabre_DAV_URLUtil::splitPath($principaluri);
-+ list(, $userid) = \Sabre\DAV\URLUtil::splitPath($principaluri);
- return $userid;
- }
-
-@@ -283,6 +283,6 @@ class Backend extends \Sabre_CardDAV_Backend_Abstract {
- if($backend->name === $backendName && $backend->hasAddressBook($id)) {
- return array($id, $backend);
- }
-- throw new \Sabre_DAV_Exception_NotFound('Backend not found: ' . $addressbookid);
-+ throw new \Sabre\DAV\Exception\NotFound('Backend not found: ' . $addressbookid);
- }
- }
-diff --git a/apps/contacts/lib/carddav/card.php b/apps/contacts/lib/carddav/card.php
-index e70230a..003434f 100644
---- a/apps/contacts/lib/carddav/card.php
-+++ b/apps/contacts/lib/carddav/card.php
-@@ -25,10 +25,10 @@ namespace OCA\Contacts\CardDAV;
- use OCA\Contacts;
-
- /**
-- * This class overrides Sabre_CardDAV_Card::getACL()
-+ * This class overrides \Sabre\CardDAV\Card::getACL()
- * to return read/write permissions based on user and shared state.
- */
--class Card extends \Sabre_CardDAV_Card {
-+class Card extends \Sabre\CardDAV\Card {
-
- /**
- * Array with information about the containing addressbook
-@@ -40,11 +40,11 @@ class Card extends \Sabre_CardDAV_Card {
- /**
- * Constructor
- *
-- * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
-+ * @param \Sabre\CardDAV\Backend\AbstractBackend $carddavBackend
- * @param array $addressBookInfo
- * @param array $cardData
- */
-- public function __construct(\Sabre_CardDAV_Backend_Abstract $carddavBackend, array $addressBookInfo, array $cardData) {
-+ public function __construct(\Sabre\CardDAV\Backend\AbstractBackend $carddavBackend, array $addressBookInfo, array $cardData) {
-
- $this->addressBookInfo = $addressBookInfo;
- parent::__construct($carddavBackend, $addressBookInfo, $cardData);
-@@ -96,4 +96,4 @@ class Card extends \Sabre_CardDAV_Card {
-
- }
-
--}
-\ No newline at end of file
-+}
-diff --git a/apps/contacts/lib/carddav/plugin.php b/apps/contacts/lib/carddav/plugin.php
-index 5f8acd3..4cd4b4e 100644
---- a/apps/contacts/lib/carddav/plugin.php
-+++ b/apps/contacts/lib/carddav/plugin.php
-@@ -28,11 +28,11 @@ use Sabre\VObject;
- use OCA\Contacts\VObject\VCard;
-
- /**
-- * This class overrides Sabre_CardDAV_Plugin::validateVCard() to be able
-+ * This class overrides \Sabre\CardDAV\Plugin::validateVCard() to be able
- * to import partially invalid vCards by ignoring invalid lines and to
- * validate and upgrade using \OCA\Contacts\VCard.
- */
--class Plugin extends \Sabre_CardDAV_Plugin {
-+class Plugin extends \Sabre\CardDAV\Plugin {
-
- /**
- * Checks if the submitted vCard data is in fact, valid.
-@@ -54,14 +54,14 @@ class Plugin extends \Sabre_CardDAV_Plugin {
- try {
- $vobj = VObject\Reader::read($data, VObject\Reader::OPTION_IGNORE_INVALID_LINES);
- } catch (VObject\ParseException $e) {
-- throw new \Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());
-+ throw new \Sabre\DAV\Exception\UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());
- }
-
- if ($vobj->name !== 'VCARD') {
-- throw new \Sabre_DAV_Exception_UnsupportedMediaType('This collection can only support vcard objects.');
-+ throw new \Sabre\DAV\Exception\UnsupportedMediaType('This collection can only support vcard objects.');
- }
-
- $vobj->validate(VCard::REPAIR|VCard::UPGRADE);
- $data = $vobj->serialize();
- }
--}
-\ No newline at end of file
-+}
-diff --git a/apps/contacts/lib/carddav/useraddressbooks.php b/apps/contacts/lib/carddav/useraddressbooks.php
-index 2243fe1..5d8bfdf 100644
---- a/apps/contacts/lib/carddav/useraddressbooks.php
-+++ b/apps/contacts/lib/carddav/useraddressbooks.php
-@@ -23,10 +23,10 @@
- namespace OCA\Contacts\CardDAV;
-
- /**
-- * This class overrides Sabre_CardDAV_UserAddressBooks::getChildren()
-+ * This class overrides \Sabre\CardDAV\UserAddressBooks::getChildren()
- * to instantiate \OCA\Contacts\CardDAV\AddressBooks.
- */
--class UserAddressBooks extends \Sabre_CardDAV_UserAddressBooks {
-+class UserAddressBooks extends \Sabre\CardDAV\UserAddressBooks {
-
- /**
- * Returns a list of addressbooks
-diff --git a/apps/contacts/lib/utils/jsonserializer.php b/apps/contacts/lib/utils/jsonserializer.php
-index 6391923..84e33a7 100644
---- a/apps/contacts/lib/utils/jsonserializer.php
-+++ b/apps/contacts/lib/utils/jsonserializer.php
-@@ -199,7 +199,7 @@ class JSONSerializer {
- $parameter->name = 'PREF';
- $parameter->value = '1';
- }
-- // NOTE: Apparently Sabre_VObject_Reader can't always deal with value list parameters
-+ // NOTE: Apparently \Sabre\VObject\Reader can't always deal with value list parameters
- // like TYPE=HOME,CELL,VOICE. Tanghus.
- // TODO: Check if parameter is has commas and split + merge if so.
- if ($parameter->name == 'TYPE') {
diff --git a/debian/patches/0013-update-SabreDAV-to-1.8.10.patch b/debian/patches/0013-update-SabreDAV-to-1.8.10.patch
deleted file mode 100644
index 545a99c..0000000
--- a/debian/patches/0013-update-SabreDAV-to-1.8.10.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From: =?utf-8?q?Thomas_M=C3=BCller?= <thomas.mueller at tmit.eu>
-Date: Mon, 26 May 2014 22:09:12 +0200
-Subject: update SabreDAV to 1.8.10
-
-Origin: upstream, https://github.com/owncloud/calendar/commit/7b11c913bf7d3c0917a5da9849f0d0f086854831
----
- apps/calendar/appinfo/remote.php | 14 +++++++-------
- apps/calendar/lib/calendar.php | 2 +-
- apps/calendar/lib/object.php | 8 ++++----
- apps/calendar/lib/sabre/backend.php | 20 ++++++++++----------
- apps/calendar/lib/sabre/calendar.php | 14 +++++++-------
- apps/calendar/lib/sabre/calendarroot.php | 8 ++++----
- apps/calendar/lib/sabre/object.php | 6 +++---
- apps/calendar/lib/sabre/usercalendars.php | 10 +++++-----
- 8 files changed, 41 insertions(+), 41 deletions(-)
-
-diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
-index 139addf..9f29475 100644
---- a/apps/calendar/appinfo/remote.php
-+++ b/apps/calendar/appinfo/remote.php
-@@ -25,7 +25,7 @@ $caldavBackend = new OC_Connector_Sabre_CalDAV();
- $requestBackend = new OC_Connector_Sabre_Request();
-
- // Root nodes
--$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend);
-+$Sabre_CalDAV_Principal_Collection = new \Sabre\CalDAV\Principal\Collection($principalBackend);
- $Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
-
- $calendarRoot = new OC_Connector_Sabre_CalDAV_CalendarRoot($principalBackend, $caldavBackend);
-@@ -37,15 +37,15 @@ $nodes = array(
- );
-
- // Fire up server
--$server = new Sabre_DAV_Server($nodes);
-+$server = new \Sabre\DAV\Server($nodes);
- $server->httpRequest = $requestBackend;
- $server->setBaseUri($baseuri);
- // Add plugins
--$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
--$server->addPlugin(new Sabre_CalDAV_Plugin());
--$server->addPlugin(new Sabre_DAVACL_Plugin());
--$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
--$server->addPlugin(new Sabre_CalDAV_ICSExportPlugin());
-+$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend,'ownCloud'));
-+$server->addPlugin(new \Sabre\CalDAV\Plugin());
-+$server->addPlugin(new \Sabre\DAVACL\Plugin());
-+$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false)); // Show something in the Browser, but no upload
-+$server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-
- // And off we go!
- $server->exec();
-diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
-index 3bbf080..17e80fa 100644
---- a/apps/calendar/lib/calendar.php
-+++ b/apps/calendar/lib/calendar.php
-@@ -325,7 +325,7 @@ class OC_Calendar_Calendar{
- * @return string
- */
- public static function extractUserID($principaluri) {
-- list($prefix,$userid) = Sabre_DAV_URLUtil::splitPath($principaluri);
-+ list($prefix,$userid) = \Sabre\DAV\URLUtil::splitPath($principaluri);
- return $userid;
- }
-
-diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
-index 54f9527..1d3fd2b 100644
---- a/apps/calendar/lib/object.php
-+++ b/apps/calendar/lib/object.php
-@@ -158,7 +158,7 @@ class OC_Calendar_Object{
- if ($calendar['userid'] != OCP\User::getUser()) {
- $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
- if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_CREATE)) {
-- throw new Sabre_DAV_Exception_Forbidden(
-+ throw new \Sabre\DAV\Exception\Forbidden(
- OC_Calendar_App::$l10n->t(
- 'You do not have the permissions to add events to this calendar.'
- )
-@@ -170,7 +170,7 @@ class OC_Calendar_Object{
- $vevent = self::getElement($object);
-
- if($shared && isset($vevent->CLASS) && (string)$vevent->CLASS !== 'PUBLIC') {
-- throw new Sabre_DAV_Exception_PreconditionFailed(
-+ throw new \Sabre\DAV\Exception\PreconditionFailed(
- OC_Calendar_App::$l10n->t(
- 'You cannot add non-public events to a shared calendar.'
- )
-@@ -240,7 +240,7 @@ class OC_Calendar_Object{
- $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $cid);
- $sharedAccessClassPermissions = OC_Calendar_Object::getAccessClassPermissions($oldvobject);
- if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE) || !($sharedAccessClassPermissions & OCP\PERMISSION_UPDATE)) {
-- throw new Sabre_DAV_Exception_Forbidden(
-+ throw new \Sabre\DAV\Exception\Forbidden(
- OC_Calendar_App::$l10n->t(
- 'You do not have the permissions to edit this event.'
- )
-@@ -304,7 +304,7 @@ class OC_Calendar_Object{
- if ($calendar['userid'] != OCP\User::getUser()) {
- $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $cid);
- if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_DELETE)) {
-- throw new Sabre_DAV_Exception_Forbidden(
-+ throw new \Sabre\DAV\Exception\Forbidden(
- OC_Calendar_App::$l10n->t(
- 'You do not have the permissions to delete this event.'
- )
-diff --git a/apps/calendar/lib/sabre/backend.php b/apps/calendar/lib/sabre/backend.php
-index 23043bb..539ac6c 100644
---- a/apps/calendar/lib/sabre/backend.php
-+++ b/apps/calendar/lib/sabre/backend.php
-@@ -1,6 +1,6 @@
- <?php
-
--class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
-+class OC_Connector_Sabre_CalDAV extends \Sabre\CalDAV\Backend\AbstractBackend {
- /**
- * List of CalDAV properties, and how they map to database fieldnames
- *
-@@ -47,9 +47,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
- 'id' => $row['id'],
- 'uri' => $row['uri'],
- 'principaluri' => 'principals/'.$row['userid'],
-- '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
-- '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'
-- => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
-+ '{' . \Sabre\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
-+ '{' . \Sabre\CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set'
-+ => new \Sabre\CalDAV\Property\SupportedCalendarComponentSet($components),
- );
-
- foreach($this->propertyMap as $xmlName=>$dbName) {
-@@ -74,9 +74,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
- 'uri' => 'contact_birthdays',
- '{DAV:}displayname' => (string)OC_Calendar_App::$l10n->t('Contact birthdays'),
- 'principaluri' => 'principals/contact_birthdays',
-- '{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $ctag,
-- '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'
-- => new Sabre_CalDAV_Property_SupportedCalendarComponentSet(array('VEVENT')),
-+ '{' . \Sabre\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => $ctag,
-+ '{' . \Sabre\CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set'
-+ => new \Sabre\CalDAV\Property\SupportedCalendarComponentSet(array('VEVENT')),
- );
- }
- return $calendars;
-@@ -111,8 +111,8 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
- if (!isset($properties[$sccs])) {
- $values[':components'] = 'VEVENT,VTODO';
- } else {
-- if (!($properties[$sccs] instanceof Sabre_CalDAV_Property_SupportedCalendarComponentSet)) {
-- throw new Sabre_DAV_Exception('The ' . $sccs . ' property must be of type: Sabre_CalDAV_Property_SupportedCalendarComponentSet');
-+ if (!($properties[$sccs] instanceof \Sabre\CalDAV\Property\SupportedCalendarComponentSet)) {
-+ throw new \Sabre\DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
- }
- $values[':components'] = implode(',',$properties[$sccs]->getValue());
- }
-@@ -239,7 +239,7 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
- */
- public function deleteCalendar($calendarId) {
- if(preg_match( '=iCal/[1-4]?.*Mac OS X/10.[1-6](.[0-9])?=', $_SERVER['HTTP_USER_AGENT'] )) {
-- throw new Sabre_DAV_Exception_Forbidden("Action is not possible with OSX 10.6.x", 403);
-+ throw new \Sabre\DAV\Exception\Forbidden("Action is not possible with OSX 10.6.x", 403);
- }
-
- OC_Calendar_Calendar::deleteCalendar($calendarId);
-diff --git a/apps/calendar/lib/sabre/calendar.php b/apps/calendar/lib/sabre/calendar.php
-index b5c40f3..260be9e 100644
---- a/apps/calendar/lib/sabre/calendar.php
-+++ b/apps/calendar/lib/sabre/calendar.php
-@@ -21,12 +21,12 @@
- */
-
- /**
-- * This class overrides Sabre_CalDAV_Calendar::getACL() to return read/write
-+ * This class overrides \Sabre\CalDAV\Calendar::getACL() to return read/write
- * permissions based on user and shared state and it overrides
-- * Sabre_CalDAV_Calendar::getChild() and Sabre_CalDAV_Calendar::getChildren()
-+ * \Sabre\CalDAV\Calendar::getChild() and \Sabre\CalDAV\Calendar::getChildren()
- * to instantiate OC_Connector_Sabre_CalDAV_CalendarObjects.
- */
--class OC_Connector_Sabre_CalDAV_Calendar extends Sabre_CalDAV_Calendar {
-+class OC_Connector_Sabre_CalDAV_Calendar extends \Sabre\CalDAV\Calendar {
-
- /**
- * Returns a list of ACE's for this node.
-@@ -87,7 +87,7 @@ class OC_Connector_Sabre_CalDAV_Calendar extends Sabre_CalDAV_Calendar {
- 'protected' => true,
- ),
- array(
-- 'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
-+ 'privilege' => '{' . \Sabre\CalDAV\Plugin::NS_CALDAV . '}read-free-busy',
- 'principal' => '{DAV:}authenticated',
- 'protected' => true,
- ),
-@@ -102,12 +102,12 @@ class OC_Connector_Sabre_CalDAV_Calendar extends Sabre_CalDAV_Calendar {
- * The contained calendar objects are for example Events or Todo's.
- *
- * @param string $name
-- * @return Sabre_DAV_ICalendarObject
-+ * @return \Sabre\CalDAV\ICalendarObject
- */
- public function getChild($name) {
- $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
- if (!$obj) {
-- throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
-+ throw new \Sabre\DAV\Exception\NotFound('Calendar object not found');
- }
- return new OC_Connector_Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-
-@@ -129,4 +129,4 @@ class OC_Connector_Sabre_CalDAV_Calendar extends Sabre_CalDAV_Calendar {
-
- }
-
--}
-\ No newline at end of file
-+}
-diff --git a/apps/calendar/lib/sabre/calendarroot.php b/apps/calendar/lib/sabre/calendarroot.php
-index e09731c..c17cf64 100644
---- a/apps/calendar/lib/sabre/calendarroot.php
-+++ b/apps/calendar/lib/sabre/calendarroot.php
-@@ -21,10 +21,10 @@
- */
-
- /**
-- * This class overrides Sabre_CalDAV_CalendarRootNode::getChildForPrincipal()
-+ * This class overrides \Sabre\CalDAV\CalendarRootNode::getChildForPrincipal()
- * to instantiate OC_Connector_Sabre_CalDAV_UserCalendars.
- */
--class OC_Connector_Sabre_CalDAV_CalendarRoot extends Sabre_CalDAV_CalendarRootNode {
-+class OC_Connector_Sabre_CalDAV_CalendarRoot extends \Sabre\CalDAV\CalendarRootNode {
-
- /**
- * This method returns a node for a principal.
-@@ -34,7 +34,7 @@ class OC_Connector_Sabre_CalDAV_CalendarRoot extends Sabre_CalDAV_CalendarRootNo
- * supplied by the authentication backend.
- *
- * @param array $principal
-- * @return Sabre_DAV_INode
-+ * @return \Sabre\DAV\INode
- */
- public function getChildForPrincipal(array $principal) {
-
-@@ -42,4 +42,4 @@ class OC_Connector_Sabre_CalDAV_CalendarRoot extends Sabre_CalDAV_CalendarRootNo
-
- }
-
--}
-\ No newline at end of file
-+}
-diff --git a/apps/calendar/lib/sabre/object.php b/apps/calendar/lib/sabre/object.php
-index 4941df9..1fda4ea 100644
---- a/apps/calendar/lib/sabre/object.php
-+++ b/apps/calendar/lib/sabre/object.php
-@@ -21,10 +21,10 @@
- */
-
- /**
-- * This class overrides Sabre_CalDAV_CalendarObject::getACL()
-+ * This class overrides \Sabre\CalDAV\CalendarObject::getACL()
- * to return read/write permissions based on user and shared state.
- */
--class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObject {
-+class OC_Connector_Sabre_CalDAV_CalendarObject extends \Sabre\CalDAV\CalendarObject {
-
- /**
- * Returns a list of ACE's for this node.
-@@ -90,4 +90,4 @@ class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObje
-
- }
-
--}
-\ No newline at end of file
-+}
-diff --git a/apps/calendar/lib/sabre/usercalendars.php b/apps/calendar/lib/sabre/usercalendars.php
-index 919f6b2..678f48d 100644
---- a/apps/calendar/lib/sabre/usercalendars.php
-+++ b/apps/calendar/lib/sabre/usercalendars.php
-@@ -21,10 +21,10 @@
- */
-
- /**
-- * This class overrides Sabre_CalDAV_UserCalendars::getChildren()
-+ * This class overrides \Sabre\CalDAV\UserCalendars::getChildren()
- * to instantiate OC_Connector_Sabre_CalDAV_Calendars.
- */
--class OC_Connector_Sabre_CalDAV_UserCalendars extends Sabre_CalDAV_UserCalendars {
-+class OC_Connector_Sabre_CalDAV_UserCalendars extends \Sabre\CalDAV\UserCalendars {
-
- /**
- * Returns a list of calendars
-@@ -36,11 +36,11 @@ class OC_Connector_Sabre_CalDAV_UserCalendars extends Sabre_CalDAV_UserCalendars
- $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
- $objs = array();
- foreach($calendars as $calendar) {
-- $objs[] = new OC_Connector_Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
-+ $objs[] = new OC_Connector_Sabre_CalDAV_Calendar($this->caldavBackend, $calendar);
- }
-- $objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
-+ $objs[] = new \Sabre\CalDAV\Schedule\Outbox($this->principalInfo['uri']);
- return $objs;
-
- }
-
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/0014-pass-in-the-right-backend.patch b/debian/patches/0014-pass-in-the-right-backend.patch
deleted file mode 100644
index e35d954..0000000
--- a/debian/patches/0014-pass-in-the-right-backend.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Thomas_M=C3=BCller?= <thomas.mueller at tmit.eu>
-Date: Tue, 3 Jun 2014 20:39:56 +0200
-Subject: pass in the right backend
-
-Origin: upstream, https://github.com/owncloud/calendar/commit/2aea76600a7534f104267b2b29998aafa1683bed
----
- apps/calendar/lib/sabre/calendarroot.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/apps/calendar/lib/sabre/calendarroot.php b/apps/calendar/lib/sabre/calendarroot.php
-index c17cf64..89fa349 100644
---- a/apps/calendar/lib/sabre/calendarroot.php
-+++ b/apps/calendar/lib/sabre/calendarroot.php
-@@ -38,7 +38,7 @@ class OC_Connector_Sabre_CalDAV_CalendarRoot extends \Sabre\CalDAV\CalendarRootN
- */
- public function getChildForPrincipal(array $principal) {
-
-- return new OC_Connector_Sabre_CalDAV_UserCalendars($this->principalBackend, $this->caldavBackend, $principal['uri']);
-+ return new OC_Connector_Sabre_CalDAV_UserCalendars($this->caldavBackend, $principal['uri']);
-
- }
-
diff --git a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index 96a22f3..958df83 100644
--- a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -15,7 +15,7 @@ Gbp: Topic path
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index dadaa5f..adf4422 100644
+index 7c269dd..0da2e0e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -426,12 +426,12 @@ class OC {
diff --git a/debian/patches/series b/debian/patches/series
index fa1d3bc..82043a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,3 @@ path/0008-Adapt-google-api-php-client-path.patch
path/0009-Adapt-Dropbox-path.patch
path/0010-Adapt-php-opencloud-path.patch
0011-Disable-Flash-and-Silverlight-plugins.patch
-0012-update-SabreDAV-to-1.8.10.patch
-0013-update-SabreDAV-to-1.8.10.patch
-0014-pass-in-the-right-backend.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list