[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#770861: marked as done (unblock: php-dropbox/1.0.0-3)

Your message dated Mon, 24 Nov 2014 19:30:31 +0000
with message-id <1416857431.28376.21.camel@adam-barratt.org.uk>
and subject line Re: Bug#770861: unblock: php-dropbox/1.0.0-3
has caused the Debian Bug report #770861,
regarding unblock: php-dropbox/1.0.0-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
770861: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770861
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package php-dropbox

The Dropbox feature is currently broken in the Debian version of
ownCloud: https://github.com/owncloud/core/issues/12355

Even if it would only be a “normal” bug for owncloud, php-dropbox has
been packaged so that the owncloud package could depend on it instead of
shipping an embedded copy, for the sole purpose of providing this
feature. So, for php-dropbox, this issue should IMHO be considered at
least as important.

The user who reported it finally got back to me, confirming that this
version fixes the issue. The dropped patch was just changing a line now
commented away.

php-dropbox (1.0.0-3) unstable; urgency=medium

  * Include ownCloud specific patches

 -- David Prévot <taffit@debian.org>  Sat, 22 Nov 2014 12:45:56 -0400

unblock php-dropbox/1.0.0-3

Thanks in advance

Regards

David

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (110, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru php-dropbox-1.0.0/debian/changelog php-dropbox-1.0.0/debian/changelog
--- php-dropbox-1.0.0/debian/changelog	2014-08-24 00:44:18.000000000 -0400
+++ php-dropbox-1.0.0/debian/changelog	2014-11-22 12:45:56.000000000 -0400
@@ -1,3 +1,9 @@
+php-dropbox (1.0.0-3) unstable; urgency=medium
+
+  * Include ownCloud specific patches
+
+ -- David Prévot <taffit@debian.org>  Sat, 22 Nov 2014 12:45:56 -0400
+
 php-dropbox (1.0.0-2) unstable; urgency=medium
 
   * Add ownCloud for Debian to uploaders
diff -Nru php-dropbox-1.0.0/debian/patches/0001-Include-ownCloud-specific-patches.patch php-dropbox-1.0.0/debian/patches/0001-Include-ownCloud-specific-patches.patch
--- php-dropbox-1.0.0/debian/patches/0001-Include-ownCloud-specific-patches.patch	1969-12-31 20:00:00.000000000 -0400
+++ php-dropbox-1.0.0/debian/patches/0001-Include-ownCloud-specific-patches.patch	2014-11-22 12:44:00.000000000 -0400
@@ -0,0 +1,92 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
+Date: Sat, 22 Nov 2014 12:42:52 -0400
+Subject: Include ownCloud specific patches
+
+Origin: vendor, https://github.com/owncloud/3rdparty/commit/a86dd5f48fe6dedcb3e66a8194a05af3673480a6 https://github.com/owncloud/3rdparty/commit/dcaa5378b7b7d3273d250662e83e5e2eba226b57
+Bug: https://github.com/owncloud/core/issues/12355
+---
+ Dropbox-1.0.0/Dropbox/API.php        | 10 +++++-----
+ Dropbox-1.0.0/Dropbox/OAuth/Curl.php |  9 ++++-----
+ 2 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/Dropbox-1.0.0/Dropbox/API.php b/Dropbox-1.0.0/Dropbox/API.php
+index e3c8dce..8cdce67 100644
+--- a/Dropbox-1.0.0/Dropbox/API.php
++++ b/Dropbox-1.0.0/Dropbox/API.php
+@@ -106,7 +106,7 @@ class Dropbox_API {
+ 
+         if($directory==='.') $directory = '';
+         $directory = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($directory));
+-        $filename = str_replace('~', '%7E', rawurlencode($filename));
++//         $filename = str_replace('~', '%7E', rawurlencode($filename));
+         if (is_null($root)) $root = $this->root;
+ 
+         if (is_string($file)) {
+@@ -139,7 +139,7 @@ class Dropbox_API {
+     public function copy($from, $to, $root = null) {
+ 
+         if (is_null($root)) $root = $this->root;
+-        $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root));
++        $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root), 'POST');
+ 
+         return json_decode($response['body'],true);
+ 
+@@ -159,7 +159,7 @@ class Dropbox_API {
+         if (is_null($root)) $root = $this->root;
+ 
+         // Making sure the path starts with a /
+-        $path = '/' . ltrim($path,'/');
++//         $path = '/' . ltrim($path,'/');
+ 
+         $response = $this->oauth->fetch($this->api_url . 'fileops/create_folder', array('path' => $path, 'root' => $root),'POST');
+         return json_decode($response['body'],true);
+@@ -178,7 +178,7 @@ class Dropbox_API {
+     public function delete($path, $root = null) {
+ 
+         if (is_null($root)) $root = $this->root;
+-        $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root));
++        $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root), 'POST');
+         return json_decode($response['body']);
+ 
+     }
+@@ -196,7 +196,7 @@ class Dropbox_API {
+     public function move($from, $to, $root = null) {
+ 
+         if (is_null($root)) $root = $this->root;
+-        $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root));
++        $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root), 'POST');
+ 
+         return json_decode($response['body'],true);
+ 
+diff --git a/Dropbox-1.0.0/Dropbox/OAuth/Curl.php b/Dropbox-1.0.0/Dropbox/OAuth/Curl.php
+index dc81f8f..6ea6873 100644
+--- a/Dropbox-1.0.0/Dropbox/OAuth/Curl.php
++++ b/Dropbox-1.0.0/Dropbox/OAuth/Curl.php
+@@ -68,15 +68,14 @@ class Dropbox_OAuth_Curl extends Dropbox_OAuth {
+ 		} else {
+ 			$httpHeaders=array_merge($httpHeaders,$this->getOAuthHeader($uri, $arguments, $method));
+ 		}
+-		
+ 		$ch = curl_init();	
+ 		if (strtoupper($method) == 'POST') {
+ 			curl_setopt($ch, CURLOPT_URL, $uri);
+ 			curl_setopt($ch, CURLOPT_POST, true);
+-			if (is_array($arguments))
+-				$arguments=http_build_query($arguments);
++// 			if (is_array($arguments))
++// 				$arguments=http_build_query($arguments);
+ 			curl_setopt($ch, CURLOPT_POSTFIELDS, $arguments);
+-			$httpHeaders['Content-Length']=strlen($arguments);
++// 			$httpHeaders['Content-Length']=strlen($arguments);
+ 		} else {
+ 			curl_setopt($ch, CURLOPT_URL, $uri.'?'.http_build_query($arguments));
+ 			curl_setopt($ch, CURLOPT_POST, false);
+@@ -85,7 +84,7 @@ class Dropbox_OAuth_Curl extends Dropbox_OAuth {
+ 		curl_setopt($ch, CURLOPT_TIMEOUT, 300);
+         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+-        curl_setopt($ch, CURLOPT_CAINFO, "rootca");
++//         curl_setopt($ch, CURLOPT_CAINFO, "rootca");
+ 		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+ 		//Build header
+ 		$headers = array();
diff -Nru php-dropbox-1.0.0/debian/patches/0001-Rename-rootca-to-match-the-distributed-file.patch php-dropbox-1.0.0/debian/patches/0001-Rename-rootca-to-match-the-distributed-file.patch
--- php-dropbox-1.0.0/debian/patches/0001-Rename-rootca-to-match-the-distributed-file.patch	2014-08-24 00:38:20.000000000 -0400
+++ php-dropbox-1.0.0/debian/patches/0001-Rename-rootca-to-match-the-distributed-file.patch	1969-12-31 20:00:00.000000000 -0400
@@ -1,22 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
-Date: Sun, 24 Aug 2014 00:26:31 -0400
-Subject: Rename rootca to match the distributed file
-
-Bug-Debian: https://bugs.debian.org/758861
----
- Dropbox-1.0.0/Dropbox/OAuth/Curl.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Dropbox-1.0.0/Dropbox/OAuth/Curl.php b/Dropbox-1.0.0/Dropbox/OAuth/Curl.php
-index dc81f8f..ec7ba4f 100644
---- a/Dropbox-1.0.0/Dropbox/OAuth/Curl.php
-+++ b/Dropbox-1.0.0/Dropbox/OAuth/Curl.php
-@@ -85,7 +85,7 @@ class Dropbox_OAuth_Curl extends Dropbox_OAuth {
- 		curl_setopt($ch, CURLOPT_TIMEOUT, 300);
-         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
-         curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
--        curl_setopt($ch, CURLOPT_CAINFO, "rootca");
-+        curl_setopt($ch, CURLOPT_CAINFO, "thawte_Primary_Root_CA.pem");
- 		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
- 		//Build header
- 		$headers = array();
diff -Nru php-dropbox-1.0.0/debian/patches/series php-dropbox-1.0.0/debian/patches/series
--- php-dropbox-1.0.0/debian/patches/series	2014-08-24 00:38:20.000000000 -0400
+++ php-dropbox-1.0.0/debian/patches/series	2014-11-22 12:44:00.000000000 -0400
@@ -1 +1 @@
-0001-Rename-rootca-to-match-the-distributed-file.patch
+0001-Include-ownCloud-specific-patches.patch

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
On Mon, 2014-11-24 at 15:21 -0400, David Prévot wrote:
> The Dropbox feature is currently broken in the Debian version of
> ownCloud: https://github.com/owncloud/core/issues/12355
> 
> Even if it would only be a “normal” bug for owncloud, php-dropbox has
> been packaged so that the owncloud package could depend on it instead of
> shipping an embedded copy, for the sole purpose of providing this
> feature. So, for php-dropbox, this issue should IMHO be considered at
> least as important.

Unblocked, thanks.

Regards,

Adam

--- End Message ---
Reply to: