svn commit: r494419 - head/sysutils/duplicity
Danilo G. Baio
dbaio at FreeBSD.org
Sat Mar 2 16:59:50 UTC 2019
Author: dbaio
Date: Sat Mar 2 16:59:49 2019
New Revision: 494419
URL: https://svnweb.freebsd.org/changeset/ports/494419
Log:
sysutils/duplicity: Options update
- Use GNUPG2 as default [1]
- Drop SSH option
Install paramiko and pexpect as SSH/SCP/SFTP backend.
Duplicity uses paramiko as default, and pexpect is necessary for
par2backend.py, thats why we are also installing it. [2]
scp:// will use paramiko, you can also set like this
paramiko+scp:// or pexpect+scp://
PR: 232927 [1]
Reported by: rs.os at t-online.de [1]
Reported by: Paul Holmanskikh <paul.holmanskikh at gmail.com> [2]
Modified:
head/sysutils/duplicity/Makefile
Modified: head/sysutils/duplicity/Makefile
==============================================================================
--- head/sysutils/duplicity/Makefile Sat Mar 2 16:55:53 2019 (r494418)
+++ head/sysutils/duplicity/Makefile Sat Mar 2 16:59:49 2019 (r494419)
@@ -3,6 +3,7 @@
PORTNAME= duplicity
PORTVERSION= 0.7.18.2
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/
@@ -13,7 +14,9 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= librsync.so:net/librsync2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${PY_FLAVOR}
+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}
USES= python:2.7 shebangfix
USE_PYTHON= autoplist distutils
@@ -24,11 +27,10 @@ SHEBANG_FILES= bin/duplicity bin/rdiffdir
PORTDOCS= CHANGELOG COPYING README README-REPO README-LOG
OPTIONS_DEFINE= DOCS FTP FTPS GDOCS GIO NLS S3
-OPTIONS_GROUP= GPG SSH
+OPTIONS_GROUP= GPG
OPTIONS_SINGLE= GPG
OPTIONS_SINGLE_GPG= GNUPG GNUPG2
-OPTIONS_GROUP_SSH= PARAMIKO PEXPECT
-OPTIONS_DEFAULT= FTP FTPS GNUPG PARAMIKO PEXPECT S3
+OPTIONS_DEFAULT= FTP FTPS GNUPG2 S3
FTP_DESC= FTP backend
FTPS_DESC= FTPS backend
GDOCS_DESC= Google Docs backend
@@ -37,9 +39,6 @@ GPG_DESC= GnuPG support
GNUPG_DESC= Use GnuPG 1
GNUPG2_DESC= Use GnuPG 2
S3_DESC= Amazon S3 backend
-SSH_DESC= SSH/SCP/SFTP backend
-PARAMIKO_DESC= python ssh implementation
-PEXPECT_DESC= pexpect and use ssh binaries
FTP_RUN_DEPENDS= ncftp>=3.2.2:ftp/ncftp3
FTPS_RUN_DEPENDS= lftp>=3.7.15:ftp/lftp
@@ -49,8 +48,6 @@ GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:deve
GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1
GNUPG2_RUN_DEPENDS= gpg2:security/gnupg
NLS_USES= gettext
-PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${PY_FLAVOR}
-PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto@${PY_FLAVOR}
post-patch:
@@ -61,14 +58,6 @@ post-patch:
post-patch-NLS-off:
@${REINPLACE_CMD} -e '56,67d' \
${WRKSRC}/setup.py
-
-post-patch-PARAMIKO-off:
- @${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 \
- -name '*ssh_paramiko*' -delete
-
-post-patch-PEXPECT-off:
- @${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 \
- -name '*ssh_pexpect*' -delete
post-patch-FTP-off:
@${RM} ${WRKSRC}/${PORTNAME}/backends/ftpbackend.py
More information about the svn-ports-all
mailing list