diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:53:51 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:53:51 -0300 |
commit | a41239c941341e3c2017c6d3644e2cce0f1badf2 (patch) | |
tree | efc401addf8099fa96ecaff2dea962b2cdbc813b /community/duplicity | |
parent | d333dde0a4d6295e9530ab8e988efa1d654e8716 (diff) | |
parent | 85e0e667660650d70269432a90401d4288776d9d (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/frei0r-plugins/PKGBUILD
extra/cairo/PKGBUILD
extra/libxml++/PKGBUILD
Diffstat (limited to 'community/duplicity')
-rw-r--r-- | community/duplicity/PKGBUILD | 13 | ||||
-rw-r--r-- | community/duplicity/u1-ascii-error.patch | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 5465eeb87..f7c359639 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 79351 2012-11-03 14:29:23Z lfleischer $ +# $Id: PKGBUILD 79464 2012-11-05 20:16:41Z bgyorgy $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.20 -pkgrel=1 +pkgrel=2 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + u1-ascii-error.patch) md5sums=('83a56c4c17fc50961c961943867deae4' - '2bd2d4a3a331ab728473f46963dc87da') + '2bd2d4a3a331ab728473f46963dc87da' + '7e19cc49547848ce847297b1880f5a8e') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # Fix ascii error in U1 backend + patch -Np0 -i "${srcdir}/u1-ascii-error.patch" + # python2 fix for file in $(find . -name '*.py' -print); do sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file diff --git a/community/duplicity/u1-ascii-error.patch b/community/duplicity/u1-ascii-error.patch new file mode 100644 index 000000000..0812653b9 --- /dev/null +++ b/community/duplicity/u1-ascii-error.patch @@ -0,0 +1,13 @@ +=== modified file 'duplicity/backends/u1backend.py' +--- duplicity/backends/u1backend.py 2012-10-27 12:16:19 +0000 ++++ duplicity/backends/u1backend.py 2012-11-03 21:39:23 +0000 +@@ -207,7 +207,7 @@ + "Content-Type": content_type} + resp, content = self.client.request(remote_full, + method="PUT", +- body=str(data), ++ body=bytearray(data), + headers=headers) + + def get(self, filename, local_path): + |