From koobs.freebsd@gmail.com  Sat Jul 28 12:24:34 2012
Return-Path: <koobs.freebsd@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 669A81065670;
	Sat, 28 Jul 2012 12:24:34 +0000 (UTC)
	(envelope-from koobs.freebsd@gmail.com)
Received: from mail-pb0-f54.google.com (mail-pb0-f54.google.com [209.85.160.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 32DEB8FC08;
	Sat, 28 Jul 2012 12:24:34 +0000 (UTC)
Received: by pbbro2 with SMTP id ro2so7101042pbb.13
        for <multiple recipients>; Sat, 28 Jul 2012 05:24:33 -0700 (PDT)
Received: by 10.68.134.105 with SMTP id pj9mr16718936pbb.136.1343478273782;
        Sat, 28 Jul 2012 05:24:33 -0700 (PDT)
Received: from freebsd-90-amd64.localdomain (ppp59-167-128-11.static.internode.on.net. [59.167.128.11])
        by mx.google.com with ESMTPS id pe2sm3892965pbc.59.2012.07.28.05.24.31
        (version=TLSv1/SSLv3 cipher=OTHER);
        Sat, 28 Jul 2012 05:24:32 -0700 (PDT)
Received: by freebsd-90-amd64.localdomain (Postfix, from userid 1001)
	id 236F039F48; Sat, 28 Jul 2012 22:24:28 +1000 (EST)
Message-Id: <20120728122428.236F039F48@freebsd-90-amd64.localdomain>
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: [PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170231
>Category:       ports
>Synopsis:       [PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 28 12:30:07 UTC 2012
>Closed-Date:    Sun Jul 29 10:25:06 CEST 2012
>Last-Modified:  Sun Jul 29 10:25:06 CEST 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jul 28 12:30:19 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: koobs k <koobs.freebsd@gmail.com>
To: bug-followup@FreeBSD.org, koobs.freebsd@gmail.com
Cc:  
Subject: Re: ports/170231: [PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS
Date: Sat, 28 Jul 2012 23:58:35 +1000

 Original patch is missing a PORTREVISION bump, apologies.
 
 Also, Redports Build log:
 https://redports.org/buildarchive/20120728105301-39049/

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170231: commit references a PR
Date: Sun, 29 Jul 2012 08:10:54 +0000 (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"
 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Sun Jul 29 10:24:44 CEST 2012 
State-Changed-Why:  
committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170231 
>Unformatted:
