From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 3 12:10:02 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92D541065672 for ; Wed, 3 Feb 2010 12:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 52EDC8FC1A for ; Wed, 3 Feb 2010 12:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o13CA2b1026427 for ; Wed, 3 Feb 2010 12:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o13CA2l3026426; Wed, 3 Feb 2010 12:10:02 GMT (envelope-from gnats) Resent-Date: Wed, 3 Feb 2010 12:10:02 GMT Resent-Message-Id: <201002031210.o13CA2l3026426@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Lukes Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 599BF1065676 for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/143526: [ PATCH ] mail/cclient doesn't link against OpenSSL from ports X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Lukes List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2010 12:10:02 -0000 >Number: 143526 >Category: ports >Synopsis: [ PATCH ] mail/cclient doesn't link against OpenSSL from ports >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Feb 03 12:10:01 UTC 2010 >Closed-Date: >Last-Modified: >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 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: >Unformatted: