Date: Wed, 3 Feb 2010 13:09:52 +0100 (CET) From: Dan Lukes <dan@obluda.cz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143526: [ PATCH ] mail/cclient doesn't link against OpenSSL from ports Message-ID: <201002031209.o13C9qG2078894@master7.ms.mff.cuni.cz> Resent-Message-ID: <201002031210.o13CA2l3026426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002031209.o13C9qG2078894>