From owner-svn-ports-head@freebsd.org Sun Jul 16 11:28:02 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D49ECBFD1A9; Sun, 16 Jul 2017 11:28:02 +0000 (UTC) (envelope-from koobs@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 mx1.freebsd.org (Postfix) with ESMTPS id 9C875768D6; Sun, 16 Jul 2017 11:28:02 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6GBS121015096; Sun, 16 Jul 2017 11:28:01 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6GBS1pP015095; Sun, 16 Jul 2017 11:28:01 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201707161128.v6GBS1pP015095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sun, 16 Jul 2017 11:28:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445996 - head/sysutils/py-ploy X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: head/sysutils/py-ploy X-SVN-Commit-Revision: 445996 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 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: Sun, 16 Jul 2017 11:28:02 -0000 Author: koobs Date: Sun Jul 16 11:28:01 2017 New Revision: 445996 URL: https://svnweb.freebsd.org/changeset/ports/445996 Log: sysutils/py-ploy: Switch to paramiko (2.x) Chase the devel/py-fabric update made in r445866 [1], which switched the paramiko dependency from security/paramiko1 to security/paramiko (2.x), by updating this port to use paramiko 2.x as well. This fixes an installation conflict and package failure of sysutils/py_ploy_fabric, due to two ports, both dependencies of py-ploy_fabric trying to install different versions of paramiko: pkg-static: py27-paramiko-2.0.5 conflicts with py27-paramiko1-1.18.2 (installs files into the same place). Problematic file: /usr/local/lib/python2.7/site-packages/paramiko/__init__.py This has happened before [2][3] in the opposite direction (paramiko -> paramiko1) [1] https://svnweb.freebsd.org/changeset/ports/445866 [2] https://svnweb.freebsd.org/changeset/ports/425687 [3] https://bugs.freebsd.org/214379 PR: 214379 [3] Reported by: pkg-fallout Modified: head/sysutils/py-ploy/Makefile Modified: head/sysutils/py-ploy/Makefile ============================================================================== --- head/sysutils/py-ploy/Makefile Sun Jul 16 10:43:06 2017 (r445995) +++ head/sysutils/py-ploy/Makefile Sun Jul 16 11:28:01 2017 (r445996) @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \ - ${PYTHON_PKGNAMEPREFIX}paramiko1>0:security/py-paramiko1 \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools USES= python