From alepulver@FreeBSD.org  Wed Apr 25 17:56:32 2007
Return-Path: <alepulver@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 44A3316A404
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Apr 2007 17:56:32 +0000 (UTC)
	(envelope-from alepulver@FreeBSD.org)
Received: from relay00.pair.com (relay00.pair.com [209.68.5.9])
	by mx1.freebsd.org (Postfix) with SMTP id F38F113C46E
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 25 Apr 2007 17:56:31 +0000 (UTC)
	(envelope-from alepulver@FreeBSD.org)
Received: (qmail 9160 invoked from network); 25 Apr 2007 17:56:30 -0000
Received: from 190.55.91.88 (HELO deimos.mars.bsd) (190.55.91.88)
  by relay00.pair.com with SMTP; 25 Apr 2007 17:56:30 -0000
Message-Id: <1177523798.5224@deimos.mars.bsd>
Date: Wed, 25 Apr 2007 14:56:38 -0300
From: "Alejandro Pulver" <alepulver@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [PATCH] security/py-m2crypto: use OpenSSL from ports
X-Send-Pr-Version: gtk-send-pr 0.4.8 
X-GNATS-Notify:

>Number:         112131
>Category:       ports
>Synopsis:       [PATCH] security/py-m2crypto: use OpenSSL from ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mnag
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 25 18:00:11 GMT 2007
>Closed-Date:    Wed May 02 16:22:09 GMT 2007
>Last-Modified:  Wed May 02 23:58:15 GMT 2007
>Originator:     Alejandro Pulver
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:


System: FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007
    root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP



>Description:


- Move DIST_SUBDIR to the frist part of the port.
- Use OpenSSL from the ports (see below).

The reason is that two Python based Bittorrent clients will be added and need a py-m2crypto module that is only compiled when OpenSSL version is >= 0.9.8 (in FreeBSD 6.2 it's 0.9.7.x).

Also there is only one port that needs it (and one that requires the last one), so after the addition of the new ports there would be more chances the user will need the version from ports.

Otherwise a check has to be added (probably should be implemented in bsd.openssl.mk), but before bsd.port.pre.mk so variables (PKG_INFO, CUT, etc.) can't be used.


>How-To-Repeat:





>Fix:


--- py-m2crypto.diff begins here ---
Index: py-m2crypto/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/py-m2crypto/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- py-m2crypto/Makefile	6 Apr 2007 04:06:31 -0000	1.17
+++ py-m2crypto/Makefile	25 Apr 2007 01:37:37 -0000
@@ -10,16 +10,21 @@
 CATEGORIES=	security python
 MASTER_SITES=	http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	python
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Crypto and SSL toolkit for Python
 
 BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
 
-DIST_SUBDIR=	python
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=yes
 USE_OPENSSL=	yes
+WITH_OPENSSL_PORT=	yes
+
+.if defined(WITH_OPENSSL_PORT)
+PYDISTUTILS_BUILDARGS=	--openssl="${LOCALBASE}"
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" ${WRKSRC}/SWIG/Makefile
--- py-m2crypto.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mnag 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Apr 25 18:00:21 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112131 
State-Changed-From-To: open->closed 
State-Changed-By: alepulver 
State-Changed-When: Wed May 2 16:22:07 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112131 

Adding from misfiled PR caught in spamtrap:

To: bug-followup@FreeBSD.org
Subject: Re: ports/112131: commit references a PR
Date: Wed,  2 May 2007 16:21:47 +0000 (UTC)
From: dfilter@FreeBSD.ORG (dfilter service)

 alepulver    2007-05-02 16:21:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/py-m2crypto Makefile 
   Log:
   - Move DIST_SUBDIR to the frist part of the port.
   - Use OpenSSL from the ports (the new version makes additional functionality
     to be compiled, which enables future - 2 right now - ports to work).
   
   PR:             ports/112131
   Submitted by:   alepulver (myself)
   Approved by:    mnag (maintainer, timeout)
   
   Revision  Changes    Path
   1.18      +6 -1      ports/security/py-m2crypto/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
