Bug 170231 - [PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS
[PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Dirk Meyer
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2012-07-28 13:30 UTC by koobs.freebsd
Modified: 2012-07-29 09:25 UTC (History)
1 user (show)

See Also:


Attachments
openssl-1.0.1_3.patch (1.90 KB, patch)
2012-07-28 13:30 UTC, koobs.freebsd
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description koobs.freebsd 2012-07-28 13:30:07 UTC
-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)
Comment 1 Edwin Groothuis freebsd_committer 2012-07-28 13:30:19 UTC
Responsible Changed
From-To: freebsd-ports-bugs->dinoex

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 koobs.freebsd 2012-07-28 14:58:35 UTC
Original patch is missing a PORTREVISION bump, apologies.

Also, Redports Build log:
https://redports.org/buildarchive/20120728105301-39049/
Comment 3 dfilter freebsd_committer 2012-07-29 09:10:54 UTC
Author: dinoex
Date: Sun Jul 29 08:10:38 2012
New Revision: 301677
URL: http://svn.freebsd.org/changeset/ports/301677

Log:
  - fix option THREADS
  - bump PORTREVISION
  PR:		170231
  Submitted by:	Kubilay Kocak

Modified:
  head/security/openssl/Makefile

Modified: head/security/openssl/Makefile
==============================================================================
--- head/security/openssl/Makefile	Sun Jul 29 08:01:59 2012	(r301676)
+++ head/security/openssl/Makefile	Sun Jul 29 08:10:38 2012	(r301677)
@@ -8,7 +8,7 @@
 PORTNAME=	openssl
 PORTVERSION=	1.0.1
 DISTVERSIONSUFFIX=	c
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -1105,17 +1105,17 @@ PLIST_SUB+=	WITH_RC5="@comment "
 .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 @@ post-patch:
 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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Dirk Meyer freebsd_committer 2012-07-29 09:24:44 UTC
State Changed
From-To: open->closed

committed, thanks.