diff options
Diffstat (limited to 'community/duplicity')
| -rw-r--r-- | community/duplicity/PKGBUILD | 21 | ||||
| -rw-r--r-- | community/duplicity/botobackend.patch | 13 | ||||
| -rw-r--r-- | community/duplicity/duplicity-0.6.17-fix-memleak.patch | 29 | ||||
| -rw-r--r-- | community/duplicity/u1backend.patch | 16 |
4 files changed, 6 insertions, 73 deletions
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 56c51bbcf..9705c7d36 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92894 2013-06-18 09:01:17Z lfleischer $ +# $Id: PKGBUILD 96719 2013-09-03 12:45:13Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.21 -pkgrel=3 +pkgver=0.6.22 +pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' @@ -18,18 +18,9 @@ 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} - "u1backend.patch") -md5sums=('4ade1de475e0af64211bb6933b593057' - '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 -} +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('5b035359a6bb7b2f3f3b9829c6c071e1' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/duplicity/botobackend.patch b/community/duplicity/botobackend.patch deleted file mode 100644 index 302e1e2b1..000000000 --- a/community/duplicity/botobackend.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file duplicity/backends/botobackend.py ---- duplicity/backends/botobackend.py 2011-11-25 17:47:57 +0000 -+++ duplicity/backends/botobackend.py 2011-12-01 16:15:25 +0000 -@@ -26,6 +26,6 @@ - if sys.version_info[:2] < (2,6): - print "Sorry, S3 multiprocessing requires version 2.6 or later of python" - sys.exit(1) -- import _boto_multi.py -+ import _boto_multi - else: -- import _boto_single.py -+ import _boto_single - diff --git a/community/duplicity/duplicity-0.6.17-fix-memleak.patch b/community/duplicity/duplicity-0.6.17-fix-memleak.patch deleted file mode 100644 index 1c4c8daff..000000000 --- a/community/duplicity/duplicity-0.6.17-fix-memleak.patch +++ /dev/null @@ -1,29 +0,0 @@ -=== modified file 'duplicity/util.py' ---- duplicity/util.py 2011-08-23 18:14:17 +0000 -+++ duplicity/util.py 2012-01-20 21:50:01 +0000 -@@ -71,6 +71,10 @@ - else: - raise - -+class BlackHoleList(list): -+ def append(self, x): -+ pass -+ - class FakeTarFile: - debug = 0 - def __iter__(self): -@@ -83,7 +87,12 @@ - # yet. So we want to ignore ReadError exceptions, which are used to signal - # this. - try: -- return tarfile.TarFile("arbitrary", mode, fp) -+ tf = tarfile.TarFile("arbitrary", mode, fp) -+ # Now we cause TarFile to not cache TarInfo objects. It would end up -+ # consuming a lot of memory over the lifetime of our long-lasting -+ # signature files otherwise. -+ tf.members = BlackHoleList() -+ return tf - except tarfile.ReadError: - return FakeTarFile() - - diff --git a/community/duplicity/u1backend.patch b/community/duplicity/u1backend.patch deleted file mode 100644 index 7aba89fbb..000000000 --- a/community/duplicity/u1backend.patch +++ /dev/null @@ -1,16 +0,0 @@ -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} |