Attachment 179983 Details for Bug 217095 – www/node*: enable BUNDLED_SSL by default only on FreeBSD 10

[patch] www/node*: enable BUNDLED_SSL by default only on FreeBSD 10

0001-www-node-enable-BUNDLED_SSL-by-default-only-on-FreeBS.diff (text/plain), 3.32 KB, created by Bradley T. Hughes on 2017-02-14 12:59:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bradley T. Hughes

Created: 2017-02-14 12:59:59 UTC

Size: 3.32 KB

patch

obsolete

>From f4cbfc9a6415ff08199c048e9614ca4aea0c7e18 Mon Sep 17 00:00:00 2001
>From: "Bradley T. Hughes" <bradleythughes@fastmail.fm>
>Date: Mon, 13 Feb 2017 21:51:54 +0000
>Subject: [PATCH 1/2] www/node*: enable BUNDLED_SSL by default only on FreeBSD
> 10
>
>Do not enable BUNDLED_SSL by default where base openssl is new enough,
>meaning FreeBSD 11 and up. Include a message in UPDATING about the
>change. Bump PORTREVISION due to the change in defaults.
>---
> UPDATING           | 7 +++++++
> www/node/Makefile  | 7 +++++--
> www/node4/Makefile | 7 +++++--
> www/node6/Makefile | 7 +++++--
> 4 files changed, 22 insertions(+), 6 deletions(-)
>
>diff --git UPDATING UPDATING
>index a9a18868b9dd..3b16e21d08df 100644
>--- UPDATING
>+++ UPDATING
>@@ -6,6 +6,13 @@ You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
> 20170213:
>+  AFFECTS: users of www/node, www/node6, and www/node4
>+  AUTHOR: bradleythughes@fastmail.fm
>+
>+  The BUNDLED_SSL option is now enabled by default on FreeBSD 10, since
>+  Node.js requires OpenSSL 1.0.2, and FreeBSD 10 is shipped with 1.0.1.
>+
>+20170213:
>   AFFECTS: users of graphics/libGL, graphics/libEGL, graphics/libglesv2
>   AUTHOR: kwm@FreeBSD.org
> 
>diff --git www/node/Makefile www/node/Makefile
>index 5cd175fb769c..d85de0b33de2 100644
>--- www/node/Makefile
>+++ www/node/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	node
> PORTVERSION=	7.5.0
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> 
>@@ -14,9 +14,12 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS DTRACE
>-OPTIONS_DEFAULT=BUNDLED_SSL DTRACE
>+OPTIONS_DEFAULT=DTRACE
> OPTIONS_SUB=	yes
> 
>+OPTIONS_DEFAULT_FreeBSD_10=	BUNDLED_SSL
>+OPTIONS_DEFAULT+=		${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
>+
> .if !exists(/usr/sbin/dtrace)
> OPTIONS_EXCLUDE+=	DTRACE
> .endif
>diff --git www/node4/Makefile www/node4/Makefile
>index 6aa16c0c2c03..f84f415c46e5 100644
>--- www/node4/Makefile
>+++ www/node4/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	node
> PORTVERSION=	4.7.3
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> PKGNAMESUFFIX=	4
>@@ -16,9 +16,12 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS
>-OPTIONS_DEFAULT=BUNDLED_SSL
>+OPTIONS_DEFAULT=
> OPTIONS_SUB=	yes
> 
>+OPTIONS_DEFAULT_FreeBSD_10=	BUNDLED_SSL
>+OPTIONS_DEFAULT+=		${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
>+
> BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation #'
> BUNDLED_SSL_USES_OFF=		ssl
> BUNDLED_SSL_CONFIGURE_OFF=	--shared-openssl
>diff --git www/node6/Makefile www/node6/Makefile
>index b16436ed1977..c851338f2177 100644
>--- www/node6/Makefile
>+++ www/node6/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	node
> PORTVERSION=	6.9.5
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> PKGNAMESUFFIX=	6
>@@ -15,9 +15,12 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS DTRACE
>-OPTIONS_DEFAULT=BUNDLED_SSL DTRACE
>+OPTIONS_DEFAULT=DTRACE
> OPTIONS_SUB=	yes
> 
>+OPTIONS_DEFAULT_FreeBSD_10=     BUNDLED_SSL
>+OPTIONS_DEFAULT+=               ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
>+
> .if !exists(/usr/sbin/dtrace)
> OPTIONS_EXCLUDE+=	DTRACE
> .endif
>-- 
>2.11.1
>

Flags:

bhughes: maintainer-approval+

Actions: View | Diff

Attachments on bug 217095: 179983