Date: Fri, 15 Nov 2019 14:38:15 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517676 - in head/sysutils: . duplicity duplicity-devel duplicity-devel/files Message-ID: <201911151438.xAFEcFpW045664@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Fri Nov 15 14:38:15 2019 New Revision: 517676 URL: https://svnweb.freebsd.org/changeset/ports/517676 Log: Add sysutils/duplicity-devel: Backup tool that uses librsync and GnuPG This is the current development release. Duplicity backs directories by producing encrypted tar-format volumes and uploading them to a remote or local file server. Because duplicity uses librsync, the incremental archives are space efficient and only record the parts of files that have changed since the last backup. Because duplicity uses GnuPG to encrypt and/or sign these archives, they will be safe from spying and/or modification by the server. WWW: http://duplicity.nongnu.org Added: head/sysutils/duplicity-devel/ - copied from r517675, head/sysutils/duplicity/ Modified: head/sysutils/Makefile head/sysutils/duplicity-devel/Makefile head/sysutils/duplicity-devel/distinfo head/sysutils/duplicity-devel/files/patch-setup.py head/sysutils/duplicity/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Fri Nov 15 14:00:46 2019 (r517675) +++ head/sysutils/Makefile Fri Nov 15 14:38:15 2019 (r517676) @@ -277,6 +277,7 @@ SUBDIR += dunst SUBDIR += dupd SUBDIR += duplicity + SUBDIR += duplicity-devel SUBDIR += duply SUBDIR += dupmerge SUBDIR += dvd+rw-tools Modified: head/sysutils/duplicity-devel/Makefile ============================================================================== --- head/sysutils/duplicity/Makefile Fri Nov 15 14:00:46 2019 (r517675) +++ head/sysutils/duplicity-devel/Makefile Fri Nov 15 14:38:15 2019 (r517676) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= duplicity -PORTVERSION= 0.7.19 +PORTVERSION= 0.8.07 CATEGORIES= sysutils -MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/ +MASTER_SITES= http://launchpad.net/duplicity/0.8-series/${PORTVERSION}/+download/ +PKGNAMESUFFIX= -devel MAINTAINER= dbaio@FreeBSD.org COMMENT= Backup tool that uses librsync and GnuPG @@ -14,13 +15,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librsync.so:net/librsync2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} -USES= python:2.7 shebangfix -USE_PYTHON= autoplist distutils +USES= localbase python shebangfix +USE_PYTHON= autoplist distutils noflavors USE_LDCONFIG= yes +CONFLICTS_INSTALL= duplicity + SHEBANG_FILES= bin/duplicity bin/rdiffdir PORTDOCS= CHANGELOG COPYING README README-REPO README-LOG @@ -55,7 +62,7 @@ post-patch: .endfor post-patch-NLS-off: - @${REINPLACE_CMD} -e '56,67d' \ + @${REINPLACE_CMD} -e '55,63d' \ ${WRKSRC}/setup.py post-patch-FTP-off: @@ -76,7 +83,7 @@ post-patch-GIO-off: @${RM} ${WRKSRC}/${PORTNAME}/backends/giobackend.py post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/duplicity/_librsync.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/duplicity/_librsync.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/duplicity-devel/distinfo ============================================================================== --- head/sysutils/duplicity/distinfo Fri Nov 15 14:00:46 2019 (r517675) +++ head/sysutils/duplicity-devel/distinfo Fri Nov 15 14:38:15 2019 (r517676) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557002912 -SHA256 (duplicity-0.7.19.tar.gz) = a6aa905a63df5101193d3e8fd4ffdf35acb9307b184ac7a9d68a76aaed6ce929 -SIZE (duplicity-0.7.19.tar.gz) = 1727321 +TIMESTAMP = 1573778409 +SHA256 (duplicity-0.8.07.tar.gz) = e961a108763fa45a9f9c8d13d9cd6dae518b68f09922a0371c9468b0f0c13781 +SIZE (duplicity-0.8.07.tar.gz) = 1848584 Modified: head/sysutils/duplicity-devel/files/patch-setup.py ============================================================================== --- head/sysutils/duplicity/files/patch-setup.py Fri Nov 15 14:00:46 2019 (r517675) +++ head/sysutils/duplicity-devel/files/patch-setup.py Fri Nov 15 14:38:15 2019 (r517676) @@ -1,4 +1,4 @@ ---- setup.py.orig 2017-06-15 18:48:07 UTC +--- setup.py.orig 2019-07-25 14:48:21 UTC +++ setup.py @@ -23,7 +23,6 @@ import sys @@ -8,60 +8,46 @@ from setuptools.command.install import install from setuptools.command.sdist import sdist from distutils.command.build_scripts import build_scripts -@@ -35,6 +34,9 @@ if sys.version_info[:2] < (2, 6) or sys. - sys.exit(1) - - incdir_list = libdir_list = None -+LOCALBASE = os.environ.get("LOCALBASE", "/usr/local") -+incdir_list = ['%s/include' % LOCALBASE] -+libdir_list = ['%s/lib/' % LOCALBASE] - - if os.name == 'posix': - LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '') -@@ -47,15 +49,9 @@ if os.name == 'posix': - incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')] - libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')] - --data_files = [('share/man/man1', -+data_files = [('man/man1', - ['bin/duplicity.1', - 'bin/rdiffdir.1']), -- ('share/doc/duplicity-%s' % version_string, -- ['COPYING', -- 'README', -- 'README-REPO', -- 'README-LOG', -- 'CHANGELOG']), +@@ -50,12 +49,6 @@ if os.name == u'posix': + data_files = [(u'share/man/man1', + [u'bin/duplicity.1', + u'bin/rdiffdir.1']), +- (u'share/doc/duplicity-%s' % version_string, +- [u'COPYING', +- u'README', +- u'README-REPO', +- u'README-LOG', +- u'CHANGELOG']), ] top_dir = os.path.dirname(os.path.abspath(__file__)) -@@ -70,46 +66,9 @@ for root, dirs, files in os.walk(os.path - ["po/%s/duplicity.mo" % lang])) +@@ -79,47 +72,9 @@ else: + ext_modules = [] -class TestCommand(test): - - def run(self): - # Make sure all modules are ready -- build_cmd = self.get_finalized_command("build_py") +- build_cmd = self.get_finalized_command(u"build_py") - build_cmd.run() - # And make sure our scripts are ready -- build_scripts_cmd = self.get_finalized_command("build_scripts") +- build_scripts_cmd = self.get_finalized_command(u"build_scripts") - build_scripts_cmd.run() - - # make symlinks for test data - if build_cmd.build_lib != top_dir: -- for path in ['testfiles.tar.gz', 'gnupg']: -- src = os.path.join(top_dir, 'testing', path) -- target = os.path.join(build_cmd.build_lib, 'testing', path) +- for path in [u'testfiles.tar.gz', u'gnupg']: +- src = os.path.join(top_dir, u'testing', path) +- target = os.path.join(build_cmd.build_lib, u'testing', path) - try: - os.symlink(src, target) - except Exception: - pass - -- os.environ['PATH'] = "%s:%s" % ( +- os.environ[u'PATH'] = u"%s:%s" % ( - os.path.abspath(build_scripts_cmd.build_dir), -- os.environ.get('PATH')) +- os.environ.get(u'PATH')) - - test.run(self) - @@ -72,38 +58,38 @@ - # Normally, install will call build(). But we want to delete the - # testing dir between building and installing. So we manually build - # and mark ourselves to skip building when we run() for real. -- self.run_command('build') +- self.run_command(u'build') - self.skip_build = True - - # This should always be true, but just to make sure! - if self.build_lib != top_dir: -- testing_dir = os.path.join(self.build_lib, 'testing') -- os.system("rm -rf %s" % testing_dir) - +- testing_dir = os.path.join(self.build_lib, u'testing') +- os.system(u"rm -rf %s" % testing_dir) +- install.run(self) -@@ -177,11 +136,7 @@ setup(name="duplicity", - url="http://duplicity.nongnu.org/index.html", - packages=['duplicity', - 'duplicity.backends', -- 'duplicity.backends.pyrax_identity', -- 'testing', -- 'testing.functional', -- 'testing.overrides', -- 'testing.unit'], -+ 'duplicity.backends.pyrax_identity'], - package_dir={"duplicity": "duplicity", - "duplicity.backends": "duplicity/backends", }, - ext_modules=[Extension("duplicity._librsync", -@@ -192,10 +147,7 @@ setup(name="duplicity", - scripts=['bin/rdiffdir', 'bin/duplicity'], - data_files=data_files, - install_requires=['fasteners'], -- tests_require=['fasteners', 'mock', 'pexpect'], -- test_suite='testing', -- cmdclass={'test': TestCommand, -- 'install': InstallCommand, -+ cmdclass={'install': InstallCommand, - 'sdist': SDistCommand, - 'build_scripts': BSCommand}, - ) + +@@ -186,21 +141,14 @@ setup(name=u"duplicity", + url=u"http://duplicity.nongnu.org/index.html", + packages=[u'duplicity', + u'duplicity.backends', +- u'duplicity.backends.pyrax_identity', +- u'testing', +- u'testing.functional', +- u'testing.overrides', +- u'testing.unit'], ++ u'duplicity.backends.pyrax_identity'], + package_dir={u"duplicity": u"duplicity", + u"duplicity.backends": u"duplicity/backends", }, + ext_modules=ext_modules, + scripts=[u'bin/rdiffdir', u'bin/duplicity'], + data_files=data_files, + install_requires=[u'fasteners', u'future'], +- tests_require=[u'pytest', u'pytest-runner', u'fasteners', u'future', u'mock', u'pexpect'], +- test_suite=u'testing', +- cmdclass={u'test': TestCommand, +- u'install': InstallCommand, ++ cmdclass={u'install': InstallCommand, + u'sdist': SDistCommand, + u'build_scripts': BSCommand}, + classifiers=[u"Programming Language :: Python :: 2", Modified: head/sysutils/duplicity/Makefile ============================================================================== --- head/sysutils/duplicity/Makefile Fri Nov 15 14:00:46 2019 (r517675) +++ head/sysutils/duplicity/Makefile Fri Nov 15 14:38:15 2019 (r517676) @@ -21,6 +21,8 @@ USES= python:2.7 shebangfix USE_PYTHON= autoplist distutils USE_LDCONFIG= yes +CONFLICTS_INSTALL= duplicity-devel + SHEBANG_FILES= bin/duplicity bin/rdiffdir PORTDOCS= CHANGELOG COPYING README README-REPO README-LOG
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911151438.xAFEcFpW045664>