From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 28 12:30:08 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 041531065742 for ; Sat, 28 Jul 2012 12:30:08 +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 CC90D8FC0C for ; Sat, 28 Jul 2012 12:30:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6SCU7N2043637 for ; Sat, 28 Jul 2012 12:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6SCU7w8043634; Sat, 28 Jul 2012 12:30:07 GMT (envelope-from gnats) Resent-Date: Sat, 28 Jul 2012 12:30:07 GMT Resent-Message-Id: <201207281230.q6SCU7w8043634@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, "Kubilay Kocak " 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 ; 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 " To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dinoex@FreeBSD.org Subject: ports/170231: [PATCH] security/openssl: Fix the reverse logic of PORT_OPTIONS:MTHREADS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2012 12:30:08 -0000 >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 >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: