From mhjacks@swbell.net Tue Aug 22 00:35:16 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFE1F16A4DA for ; Tue, 22 Aug 2006 00:35:16 +0000 (UTC) (envelope-from mhjacks@swbell.net) Received: from smtp106.sbc.mail.mud.yahoo.com (smtp106.sbc.mail.mud.yahoo.com [68.142.198.205]) by mx1.FreeBSD.org (Postfix) with SMTP id EEF1B43D53 for ; Tue, 22 Aug 2006 00:35:13 +0000 (GMT) (envelope-from mhjacks@swbell.net) Received: (qmail 93719 invoked from network); 22 Aug 2006 00:35:13 -0000 Received: from unknown (HELO anduril.minas.tirith) (mhjacks@swbell.net@65.67.72.193 with login) by smtp106.sbc.mail.mud.yahoo.com with SMTP; 22 Aug 2006 00:35:13 -0000 Received: from localhost (localhost [127.0.0.1]) by anduril.minas.tirith (Postfix) with ESMTP id 2D1262E031; Mon, 21 Aug 2006 19:35:12 -0500 (CDT) Received: from anduril.minas.tirith ([127.0.0.1]) by localhost (anduril.minas.tirith [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZniqH7Xx7KD6; Mon, 21 Aug 2006 19:35:11 -0500 (CDT) Received: by anduril.minas.tirith (Postfix, from userid 0) id 0486F2E02E; Mon, 21 Aug 2006 19:35:10 -0500 (CDT) Message-Id: <20060822003511.0486F2E02E@anduril.minas.tirith> Date: Mon, 21 Aug 2006 19:35:10 -0500 (CDT) From: Martin Jackson To: FreeBSD-gnats-submit@freebsd.org Cc: lulf@pvv.ntnu.no Subject: [PATCH] security/py-paramiko: [fix to install along with setuptools] X-Send-Pr-Version: 3.113 X-GNATS-Notify: lulf@pvv.ntnu.no >Number: 102368 >Category: ports >Synopsis: [PATCH] security/py-paramiko: [fix to install along with setuptools] >Confidential: no >Severity: non-critical >Priority: low >Responsible: miwi >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Aug 22 00:40:16 GMT 2006 >Closed-Date: Wed Aug 23 12:44:15 GMT 2006 >Last-Modified: Wed Aug 23 12:44:15 GMT 2006 >Originator: Martin Jackson >Release: FreeBSD 6.1-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD anduril.minas.tirith 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #7: Sun Jul 9 16:45:37 CDT >Description: [DESCRIBE CHANGES] security/py-paramiko has a conditional setup.py that invokes setuptools if it is installed. The port, as currently designed, is not equipped to deal with that (it installs a single .egg file instead of the paramiko directory in site-packages). The patch elminates the possibility of invoking setuptools and allows this port to be installed normally. Note: I got the idea for this from Gentoo Linux bug #131678 Added file(s): - files/patch-nosetuptools-setup.py Port maintainer (lulf@pvv.ntnu.no) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- py24-paramiko-1.6.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/py-paramiko/files/patch-nosetuptools-setup.py /root/ports_devel/py-paramiko/files/patch-nosetuptools-setup.py --- /usr/ports/security/py-paramiko/files/patch-nosetuptools-setup.py Wed Dec 31 18:00:00 1969 +++ /root/ports_devel/py-paramiko/files/patch-nosetuptools-setup.py Mon Aug 21 19:23:41 2006 @@ -0,0 +1,19 @@ +--- setup.py.orig Mon Aug 21 19:21:34 2006 ++++ setup.py Mon Aug 21 19:22:15 2006 +@@ -32,14 +32,8 @@ + #import ez_setup + #ez_setup.use_setuptools() + +-try: +- from setuptools import setup +- kw = { +- 'install_requires': 'pycrypto >= 1.9', +- } +-except ImportError: +- from distutils.core import setup +- kw = {} ++from distutils.core import setup ++kw = {} + + setup(name = "paramiko", + version = "1.6.2", --- py24-paramiko-1.6.2.patch ends here --- >Release-Note: >Audit-Trail: State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Tue Aug 22 00:40:24 UTC 2006 State-Changed-Why: Awaiting maintainers feedback http://www.freebsd.org/cgi/query-pr.cgi?pr=102368 Responsible-Changed-From-To: freebsd-ports-bugs->miwi Responsible-Changed-By: miwi Responsible-Changed-When: Tue Aug 22 06:22:06 UTC 2006 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=102368 State-Changed-From-To: feedback->closed State-Changed-By: miwi State-Changed-When: Wed Aug 23 12:44:11 UTC 2006 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=102368 >Unformatted: