Merge ~ahasenack/ubuntu/+source/rclone:rclone-fix-gdrive-download-1937136-JAMMY into ubuntu/+source/rclone:ubuntu/devel

[Andreas Hasenack]

This fixes downloading certain files from google drive. The linked SRU bug has testing details. Setting this up, with the required API keys, is a bit less than a nightmare in my opinion, other clouds were much easier, but hey :)

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/rclone-gdrive-download-1937136/

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the MP Andreas. I have a small comment:

- Add the following Debian bug as a DEP-3 header: https://bugs.debian.org/991124
  + Maybe comment in there saying we are applying this patch to fix the issue.

I did run the test plan and it indeed fixed the issue, good work. The SRU bug description also looks really good.

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

Good point, done. I'll add the comment to the debian bug once this is merged, in which case I can give a stable link to the patch in our git tree, and even submit it to salsa.

[Andreas Hasenack (ahasenack)]

I went ahead and created a salsa PR[1] for this, and added a comment in the debian bug pointing to it.

1. https://salsa.debian.org/go-team/packages/rclone/-/merge_requests/4

[Lucas Kanashiro (lucaskanashiro)]

Awesome, thanks!

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded

$ dput ubuntu ../rclone_1.53.3-4ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../rclone_1.53.3-4ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../rclone_1.53.3-4ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading rclone_1.53.3-4ubuntu1.dsc: done.
  Uploading rclone_1.53.3-4ubuntu1.debian.tar.xz: done.
  Uploading rclone_1.53.3-4ubuntu1_source.buildinfo: done.
  Uploading rclone_1.53.3-4ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 5731d80..7c2ec38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rclone (1.53.3-4ubuntu1) jammy; urgency=medium
+
+  * d/p/0008-fix-gdrive-download.patch: remove check for size, so google
+    docs are identified solely by not having an MD5 checksum
+    (LP: #1937136)
+
+ -- Andreas Hasenack <[e-mail]>  Mon, 28 Mar 2022 18:45:23 -0300
+
 rclone (1.53.3-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 629436a..9c6c681 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: rclone
 Section: net
 Priority: optional
-Maintainer: Debian Go Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Go Packaging Team <[e-mail]>
 Uploaders: Dr. Tobias Quathamer <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-bash-completion,
diff --git a/debian/patches/0008-fix-gdrive-download.patch b/debian/patches/0008-fix-gdrive-download.patch
new file mode 100644
index 0000000..587a5fd
--- /dev/null
+++ b/debian/patches/0008-fix-gdrive-download.patch
@@ -0,0 +1,52 @@
+From 94b1439299e57f84dec27e865fba2b7356f3ea79 Mon Sep 17 00:00:00 2001
+From: Nick Craig-Wood <[e-mail]>
+Date: Wed, 14 Jul 2021 10:23:35 +0100
+Subject: [PATCH] drive: fix some google docs being treated as files - fixes
+ #5455
+
+At some point some google docs files started having sizes returned in
+their listing information.
+
+This then caused rclone to treat the docs as files which caused
+downloads to fail.
+
+The API docs now state that google docs may have sizes (whereas I'm
+pretty sure it didn't earlier).
+
+This fix removes the check for size, so google docs are identified
+solely by not having an MD5 checksum.
+---
+ backend/drive/drive.go | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Origin: upstream, https://github.com/rclone/rclone/commit/94b1439299e57f84dec27e865fba2b7356f3ea79
+Bug: https://github.com/rclone/rclone/issues/5455
+Bug-Debian: https://bugs.debian.org/991124
+Bug-Ubuntu: https://bugs.launchpad.net/rclone/+bug/1937136
+Applied-Upstream: 1.56.0
+Last-Update: 2022-03-28
+
+--- a/backend/drive/drive.go
++++ b/backend/drive/drive.go
+@@ -1295,8 +1295,8 @@
+ //
+ // When the drive.File cannot be represented as an fs.Object it will return (nil, nil).
+ func (f *Fs) newObjectWithInfo(remote string, info *drive.File) (fs.Object, error) {
+-	// If item has MD5 sum or a length it is a file stored on drive
+-	if info.Md5Checksum != "" || info.Size > 0 {
++	// If item has MD5 sum it is a file stored on drive
++	if info.Md5Checksum != "" {
+ 		return f.newRegularObject(remote, info), nil
+ 	}
+ 
+@@ -1329,8 +1329,8 @@
+ 		// Pretend a dangling shortcut is a regular object
+ 		// It will error if used, but appear in listings so it can be deleted
+ 		return f.newRegularObject(remote, info), nil
+-	case info.Md5Checksum != "" || info.Size > 0:
+-		// If item has MD5 sum or a length it is a file stored on drive
++	case info.Md5Checksum != "":
++		// If item has MD5 sum it is a file stored on drive
+ 		return f.newRegularObject(remote, info), nil
+ 	case f.opt.SkipGdocs:
+ 		fs.Debugf(remote, "Skipping google document type %q", info.MimeType)
diff --git a/debian/patches/series b/debian/patches/series
index fc2bd4f..321935b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
 0004-Disable-FTP-server-of-rclone.patch
 0005-Do-not-include-installation-instructions-in-manpage.patch
 0007-Remove-script-to-disable-possible-privacy-breach.patch
+0008-fix-gdrive-download.patch
 ignore_tardigrade_backend.patch
 skip_TestParseDuration.patch
 skip_sftp_webdav_TestIntegration.patch