Update duplicity to 0.7.11

- Apply patch directly to binaries
- Add paramiko for SCP and use --system-site-packages
- Prep package release

cross/duplicity/Makefile

@@ -1,6 +1,6 @@
 PKG_NAME = duplicity
 PKG_SHORT_VERS = 0.7
-PKG_VERS = $(PKG_SHORT_VERS).06
+PKG_VERS = $(PKG_SHORT_VERS).11
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://launchpad.net/$(PKG_NAME)/$(PKG_SHORT_VERS)-series/$(PKG_VERS)/+download

cross/duplicity/digests

@@ -1,3 +1,3 @@
-duplicity-0.7.06.tar.gz SHA1 08b7ee08e52205b73541829f83485b79f360ba2c
-duplicity-0.7.06.tar.gz SHA256 0075595edb894399cf00fae9154aae93a07eaadc031fede5df4cc595436c7f8c
-duplicity-0.7.06.tar.gz MD5 ca81b220ead17dcd454ffcf52dbb6f33
+duplicity-0.7.11.tar.gz SHA1 493b26f3e2ee15979a05cb651af9c1841ab226a2
+duplicity-0.7.11.tar.gz SHA256 b047a1590a1f5bb3974643ad2cc9dfdd32f61adbf2c1989191fb12cb59c2ec07
+duplicity-0.7.11.tar.gz MD5 9904a5bd8eb1d57d50ff1518a106dfc6

cross/duplicity/patches/fix_shebang.patch

@@ -0,0 +1,16 @@
+--- bin/duplicity.orig	2017-01-28 20:52:26.982988635 +0100
++++ bin/duplicity	2017-01-28 20:52:56.506988742 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/local/duplicity/env/bin/python2
+ # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+ #
+ # duplicity -- Encrypted bandwidth efficient backup
+--- bin/rdiffdir.orig	2017-01-28 20:52:33.682988659 +0100
++++ bin/rdiffdir	2017-01-28 20:53:14.698988808 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/local/duplicity/env/bin/python2
+ # rdiffdir -- Extend rdiff functionality to directories
+ # Version 0.7.11 released December 31, 2016
+ #

cross/duplicity/patches/setup.py.patch

@@ -1,43 +0,0 @@
---- setup.py.orig	2016-03-24 11:29:14.846659092 +0100
-+++ setup.py	2016-03-24 11:29:01.422658618 +0100
-@@ -26,6 +26,7 @@
- from setuptools.command.test import test
- from setuptools.command.install import install
- from setuptools.command.sdist import sdist
-+from setuptools.command.install_scripts import install_scripts
- from distutils.command.build_scripts import build_scripts
- 
- version_string = "0.7.06"
-@@ -126,6 +127,24 @@
-         os.system("mkdir -p " + self.dist_dir)
-         os.system("mv duplicity-" + version + ".tar.gz " + self.dist_dir)
- 
-+class InstallScriptsCommand(install_scripts):
-+    def run(self):
-+        install_scripts.run(self)
-+
-+        for outfile in self.outfiles:
-+            fp = open(outfile, 'rb')
-+            data = fp.read()
-+            fp.close()
-+
-+            # skip binary files
-+            if '\0' in data:
-+                continue
-+
-+            shebang = '#!python'
-+            data = data.replace('#!/usr/local/duplicity/bin/python2.7', shebang.encode('string_escape'))
-+            fp = open(outfile, 'wb')
-+            fp.write(data)
-+            fp.close()
- 
- # don't touch my shebang
- class BSCommand (build_scripts):
-@@ -198,5 +217,6 @@
-       cmdclass={'test': TestCommand,
-                 'install': InstallCommand,
-                 'sdist': SDistCommand,
--                'build_scripts': BSCommand},
-+                'build_scripts': BSCommand,
-+                'install_scripts': InstallScriptsCommand},                
-       )

spk/duplicity/Makefile

@@ -1,13 +1,11 @@
 SPK_NAME = duplicity
-SPK_VERS = 0.7.06
-SPK_REV = 3
+SPK_VERS = 0.7.11
+SPK_REV = 4
 SPK_ICON = src/duplicity.png
 
 BUILD_DEPENDS = cross/python cross/setuptools cross/pip cross/wheel
 BUILD_DEPENDS += cross/$(SPK_NAME)
-
 DEPENDS = cross/librsync cross/bash cross/duply
-
 WHEELS = src/requirements.txt
 SPK_DEPENDS = "python>=2.7.8-9:gnupg>=2.1.6-1"
 
@@ -15,7 +13,7 @@ MAINTAINER = SynoCommunity
 DESCRIPTION = Encrypted bandwidth-efficient backup using the rsync algorithm using a command line interface. Also contains duply wrapper script.
 STARTABLE = no
 DISPLAY_NAME = Duplicity
-CHANGELOG = "1. Upgraded Duplicity to 0.7.06 (which adds Backblaze B2 support among other things)<br>2. Upgraded Duply to 1.11.2"
+CHANGELOG = "1. Upgraded Duplicity to 0.7.11<br>2. Upgraded Duply to 2.0.1"
 BETA = 1
 
 HOMEPAGE = http://duplicity.nongnu.org/

spk/duplicity/src/installer.sh

@@ -21,7 +21,7 @@ postinst ()
     ln -s ${SYNOPKG_PKGDEST} ${INSTALL_DIR}
 
     # Create a Python virtualenv
-    ${VIRTUALENV} ${INSTALL_DIR}/env > /dev/null
+    ${VIRTUALENV} --system-site-packages ${INSTALL_DIR}/env > /dev/null
 
     # Install the wheels
     ${INSTALL_DIR}/env/bin/pip install --no-deps --no-index -U --force-reinstall -f ${INSTALL_DIR}/share/wheelhouse ${INSTALL_DIR}/share/wheelhouse/*.whl > /dev/null 2>&1

spk/duplicity/src/requirements.txt

@@ -1,42 +1,41 @@
 # Included for reference
-duplicity==0.7.06
+#duplicity==0.7.11
 
-# Cross compiling
-boto==2.38.0
-msgpack-python==0.4.6
-netifaces==0.10.4
-simplejson==3.6.5
-wrapt==1.10.4
+# Main requirements
+boto==2.45.0
+lockfile==0.12.2
+paramiko==2.1.1 # SCP
+pycryptopp==0.7.1.869544967005693312591928092448767568728501330214
 
-# Pure python
-Babel==1.3
-argparse==1.4.0
-debtcollector==0.5.0
-funcsigs==0.4
-futures==3.0.3
-ip-associations-python-novaclient-ext==0.1
-iso8601==0.1.10
-keyring==5.6
-lockfile==0.10.2
-mock==1.3.0
-netaddr==0.7.14
-os-diskconfig-python-novaclient-ext==0.1.2
-os-networksv2-python-novaclient-ext==0.25
-os-virtual-interfacesv2-python-novaclient-ext==0.19
-oslo.config==1.12.0
-oslo.i18n==1.7.0
-oslo.serialization==1.6.0
-oslo.utils==1.6.0
-pbr==1.0.1
+rackspace-novaclient==2.1 # Rackspace support
+
+# rackspace-novaclient dependencies
+Babel==2.3.4
+debtcollector==1.11.0
+funcsigs==1.0.2
+ip-associations-python-novaclient-ext==0.2
+iso8601==0.1.11
+keystoneauth1==2.18.0
+monotonic==1.2
+# msgpack-python==0.4.8 # Via Python package
+netaddr==0.7.19
+netifaces==0.10.4 # Pinned to 0.10.4, 0.10.5 is broken for older Linux kernels
+os-diskconfig-python-novaclient-ext==0.1.3
+os-networksv2-python-novaclient-ext==0.26
+os-virtual-interfacesv2-python-novaclient-ext==0.20
+oslo.i18n==3.12.0
+oslo.serialization==2.16.0
+oslo.utils==3.22.0
+pbr==1.10.0
+positional==1.1.1
 prettytable==0.7.2
-pyrax==1.9.4
-python-keystoneclient==1.6.0
-python-novaclient==2.25.0
-python-swiftclient==2.3.1
-pytz==2015.4
+python-novaclient==7.1.0
+pytz==2016.10
 rackspace-auth-openstack==1.3
-rackspace-novaclient==1.5
-rax-default-network-flags-python-novaclient-ext==0.3.2
+rackspace-novaclient==2.1
+rax-default-network-flags-python-novaclient-ext==0.4.0
 rax-scheduled-images-python-novaclient-ext==0.3.1
-requests==2.7.0
-stevedore==1.5.0
+requests==2.13.0
+simplejson==3.10.0
+stevedore==1.20.0
+wrapt==1.10.8