From owner-svn-ports-head@freebsd.org Sat Mar 2 16:59:50 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18D161504F5F; Sat, 2 Mar 2019 16:59:50 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B01386F83A; Sat, 2 Mar 2019 16:59:49 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B8A979B4; Sat, 2 Mar 2019 16:59:49 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x22GxnXb089589; Sat, 2 Mar 2019 16:59:49 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x22Gxnwb089588; Sat, 2 Mar 2019 16:59:49 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201903021659.x22Gxnwb089588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sat, 2 Mar 2019 16:59:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494419 - head/sysutils/duplicity X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: head/sysutils/duplicity X-SVN-Commit-Revision: 494419 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B01386F83A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Mar 2019 16:59:50 -0000 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@t-online.de [1] Reported by: Paul Holmanskikh [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