summaryrefslogtreecommitdiff
path: root/community/duplicity
diff options
context:
space:
mode:
Diffstat (limited to 'community/duplicity')
-rw-r--r--community/duplicity/PKGBUILD17
-rw-r--r--community/duplicity/u1backend.patch16
2 files changed, 29 insertions, 4 deletions
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index fe50cb4ca..56c51bbcf 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87789 2013-04-06 16:50:31Z bgyorgy $
+# $Id: PKGBUILD 92894 2013-06-18 09:01:17Z lfleischer $
# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Aaron Schaefer <aaron@elasticdog.com>
pkgname=duplicity
pkgver=0.6.21
-pkgrel=2
+pkgrel=3
pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
arch=('i686' 'x86_64')
url='http://www.nongnu.org/duplicity/'
@@ -18,9 +18,18 @@ optdepends=('lftp: FTPS backend'
'python2-httplib2: Ubuntu One backend'
'python2-oauthlib: Ubuntu One backend'
'rsync: rsync backend')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+ "u1backend.patch")
md5sums=('4ade1de475e0af64211bb6933b593057'
- '3521d679ba7dff46653313aa3b3e6855')
+ '3521d679ba7dff46653313aa3b3e6855'
+ 'b7aede10a3f5503ae4428a506b57486c')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Fix Ubuntu One backup (FS#35487, upstream revisions 912 and 913, will be fixed in 0.6.22).
+ patch -p0 duplicity/backends/u1backend.py ../u1backend.patch
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/duplicity/u1backend.patch b/community/duplicity/u1backend.patch
new file mode 100644
index 000000000..7aba89fbb
--- /dev/null
+++ b/community/duplicity/u1backend.patch
@@ -0,0 +1,16 @@
+86a87,90
+>
+> if isinstance(body, file):
+> body.seek(0) # Go to the beginning of the file for the retry
+>
+108a113,115
+> if isinstance(body, file):
+> body.seek(0) # Go to the beginning of the file for the retry
+>
+209a217
+> size = os.path.getsize(source_path.name)
+213c221,222
+< headers = {"Content-Type": content_type}
+---
+> headers = {"Content-Length": str(size),
+> "Content-Type": content_type}