From owner-svn-ports-head@freebsd.org Wed Jan 23 21:22:58 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 981B914B3177; Wed, 23 Jan 2019 21:22:58 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3CE0A8C138; Wed, 23 Jan 2019 21:22:58 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B1621E661; Wed, 23 Jan 2019 21:22:58 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0NLMwL2025444; Wed, 23 Jan 2019 21:22:58 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0NLMw7n025443; Wed, 23 Jan 2019 21:22:58 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <201901232122.x0NLMw7n025443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Wed, 23 Jan 2019 21:22:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491060 - head/www/node X-SVN-Group: ports-head X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: head/www/node X-SVN-Commit-Revision: 491060 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3CE0A8C138 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2019 21:22:58 -0000 Author: bhughes Date: Wed Jan 23 21:22:57 2019 New Revision: 491060 URL: https://svnweb.freebsd.org/changeset/ports/491060 Log: www/node: disable BUNDLED_SSL by default on FreeBSD >=12 Change the default options on FreeBSD >=12 since OpenSSL 1.1.1 is available in the base system. Bump PORTREVISION due to the change in defaults. While here, convert the port to use BROKEN_SSL, taking care to set BROKEN_SSL+=base when appropriate. PR: 234762 Reported by: amdmi3 Sponsored by: Miles AS Modified: head/www/node/Makefile Modified: head/www/node/Makefile ============================================================================== --- head/www/node/Makefile Wed Jan 23 21:21:13 2019 (r491059) +++ head/www/node/Makefile Wed Jan 23 21:22:57 2019 (r491060) @@ -3,6 +3,7 @@ PORTNAME= node PORTVERSION= 11.7.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ @@ -13,10 +14,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to build: KeyError: 'action' +BROKEN_SSL= openssl libressl libressl-devel +BROKEN_SSL_REASON= Node.js 11.x requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE -OPTIONS_DEFAULT= BUNDLED_SSL DTRACE +OPTIONS_DEFAULT= DTRACE +OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL +OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) @@ -64,16 +69,8 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ .include -.if empty(PORT_OPTIONS:MBUNDLED_SSL) - -.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl111 -IGNORE= node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf or enable BUNDLED_SSL option -.endif - -.if !empty(SSL_DEFAULT:Mlibressl*) -IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL -.endif - +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 +BROKEN_SSL+= base .endif .include