Date: Sat, 28 Jul 2012 22:24:28 +1000 (EST) From: "Kubilay Kocak <koobs.freebsd@gmail.com>" <koobs.freebsd@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/170231: [PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS Message-ID: <20120728122428.236F039F48@freebsd-90-amd64.localdomain> Resent-Message-ID: <201207281230.q6SCU7w8043634@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170231
>Category: ports
>Synopsis: [PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 28 12:30:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Kubilay Kocak <koobs.freebsd@gmail.com>
>Release: FreeBSD 9.0-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD freebsd-90-amd64 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Sat Jul 7 21:26:56 EST
>Description:
-Fix the reverse logic of PORT_OPTIONS:MTHREADS
PTHREAD_* is added when MTHREADS is Flase, not True as intended. Looks like it
was missed from previous fixes to other options
Port maintainer (dinoex@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- openssl-1.0.1_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/openssl/Makefile ./Makefile
--- /usr/ports/security/openssl/Makefile 2012-06-30 21:33:28.000000000 +1000
+++ ./Makefile 2012-07-28 20:47:09.000000000 +1000
@@ -1105,17 +1105,17 @@
.endif
.if ${PORT_OPTIONS:MPADLOCK}
-PATCH_DIST_STRIP= -p1
-PATCH_SITES+= http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock
-PATCHFILES+= 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \
-0003-engines-e_padlock-backport-cvs-head-changes.patch:padlock \
-0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch:padlock \
-0005-crypto-engine-autoload-padlock-dynamic-engine.patch:padlock
+PATCH_DIST_STRIP= -p1
+PATCH_SITES+= http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock
+PATCHFILES+= 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \
+ 0003-engines-e_padlock-backport-cvs-head-changes.patch:padlock \
+ 0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch:padlock \
+ 0005-crypto-engine-autoload-padlock-dynamic-engine.patch:padlock
.endif
.if ${PORT_OPTIONS:MGMP}
EXTRACONFIGURE+= enable-gmp
-IGNORE= GMP is LGPLv3 an can not be linked.
+IGNORE= GMP is LGPLv3 and can not be linked
.else
EXTRACONFIGURE+= no-gmp
.endif
@@ -1146,15 +1146,16 @@
do-configure:
@${REINPLACE_CMD} -e "s|options 386|options|" \
${WRKSRC}/config
+
.if ${PORT_OPTIONS:MTHREADS}
cd ${WRKSRC} \
&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
+ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
-L${PREFIX}/lib ${EXTRACONFIGURE}
.else
cd ${WRKSRC} \
&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
- PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
-L${PREFIX}/lib ${EXTRACONFIGURE}
.endif
--- openssl-1.0.1_3.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?20120728122428.236F039F48>