From dan+master7.ms.mff.cuni.cz@ms.mff.cuni.cz  Wed Feb  3 12:09:54 2010
Return-Path: <dan+master7.ms.mff.cuni.cz@ms.mff.cuni.cz>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 599BF1065676
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Feb 2010 12:09:54 +0000 (UTC)
	(envelope-from dan+master7.ms.mff.cuni.cz@ms.mff.cuni.cz)
Received: from master7.ms.mff.cuni.cz (master7.ms.mff.cuni.cz [195.113.20.22])
	by mx1.freebsd.org (Postfix) with ESMTP id DEC008FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Feb 2010 12:09:53 +0000 (UTC)
Received: from master7.ms.mff.cuni.cz (localhost [127.0.0.1])
	by master7.ms.mff.cuni.cz (8.14.3/8.14.3) with ESMTP id o13C9q6m078895
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 3 Feb 2010 13:09:52 +0100 (CET)
	(envelope-from dan@master7.ms.mff.cuni.cz)
Received: (from root@localhost)
	by master7.ms.mff.cuni.cz (8.14.3/8.14.3/Submit) id o13C9qG2078894;
	Wed, 3 Feb 2010 13:09:52 +0100 (CET)
	(envelope-from dan)
Message-Id: <201002031209.o13C9qG2078894@master7.ms.mff.cuni.cz>
Date: Wed, 3 Feb 2010 13:09:52 +0100 (CET)
From: Dan Lukes <dan@obluda.cz>
Reply-To: Dan Lukes <dan@obluda.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ PATCH ] mail/cclient doesn't link against OpenSSL from ports
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         143526
>Category:       ports
>Synopsis:       [ PATCH ] mail/cclient doesn't link against OpenSSL from ports
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 03 12:10:01 UTC 2010
>Closed-Date:    Wed Sep 08 01:59:47 UTC 2010
>Last-Modified:  Wed Sep  8 02:00:17 UTC 2010
>Originator:     Dan Lukes
>Release:        FreeBSD 7.2-RELEASE-p6 i386
>Organization:
Obludarium
>Environment:
System: FreeBSD 7.2-RELEASE-p6 i386
$FreeBSD: ports/mail/cclient/Makefile,v 1.44 2009/11/18 22:39:52

>Description:
Even make called with WITH_OPENSSL_PORT=yes the result is linked against base libraries, not port.
>How-To-Repeat:
See description
>Fix:
See attached patch
--- patch begins here ---
--- Makefile.orig	2010-02-03 12:28:21.000000000 +0100
+++ Makefile	2010-02-03 13:01:16.000000000 +0100
@@ -26,6 +26,10 @@
 
 MAKE_JOBS_UNSAFE=	yes
 
+.if ! defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 USE_LDCONFIG=	yes
@@ -33,11 +37,10 @@
 .if defined(WITHOUT_SSL)
 MAKE_ARGS+=	SSLTYPE=none SSLDIR=${OPENSSLBASE}
 .else
-USE_OPENSSL=	yes
 .if defined(WITH_SSL_AND_PLAINTEXT)
-MAKE_ARGS+=	SSLTYPE=unix
+MAKE_ARGS+=	SSLTYPE=unix SSLDIR=${OPENSSLDIR}
 .else
-MAKE_ARGS+=	SSLTYPE=unix.nopwd
+MAKE_ARGS+=	SSLTYPE=unix.nopwd SSLDIR=${OPENSSLDIR}
 .endif
 .endif
 
@@ -46,7 +49,7 @@
 SHLIBBASE=	c-client4
 SHLIBMAJ=	9
 SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}
-MAKE_ENV=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
+MAKE_ENV+=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 PLIST_SUB=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 
 post-patch:
@@ -55,6 +58,11 @@
 .endfor
 	@${REINPLACE_CMD} -e "s:/etc/ssl/certs:${PREFIX}/certs:g; \
 		s:/etc/ssl/private:${PREFIX}/certs:g" ${WRKSRC}/Makefile
+.if ! defined(WITHOUT_SSL)
+	@${REINPLACE_CMD} -e " \
+		s:SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib:SSLINCLUDE=${OPENSSLINC} SSLLIB=${OPENSSLLIB}: \
+		" ${WRKSRC}/Makefile
+.endif
 .if !defined(WITHOUT_IPV6)
 	@${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \
 		${WRKSRC}/src/osdep/unix/Makefile
--- patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->anders 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 3 12:10:12 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143526 
Responsible-Changed-From-To: anders->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Thu Sep 2 05:36:45 UTC 2010 
Responsible-Changed-Why:  
maintainer timeout (anders ; 211 days) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143526 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Wed Sep 8 01:59:46 UTC 2010 
State-Changed-Why:  
Committed, Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/143526: commit references a PR
Date: Wed,  8 Sep 2010 01:59:54 +0000 (UTC)

 pgollucci    2010-09-08 01:59:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/cclient         Makefile 
   Log:
   - Correctly support WITH_OPENSSL_PORT=yes
   
   PR:             ports/143526
   Submitted by:   Dan Lukes <dan@obluda.cz>
   Approved by:    maintainer timeout (anders ; 211 days)
   
   Revision  Changes    Path
   1.45      +14 -4     ports/mail/cclient/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:
