Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Oct 2016 13:49:09 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r424844 - in branches/2016Q4/www/node: . files
Message-ID:  <201610281349.u9SDn9Tv056842@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Fri Oct 28 13:49:09 2016
New Revision: 424844
URL: https://svnweb.freebsd.org/changeset/ports/424844

Log:
  MFH: r423979 r424843
  
  www/node: Update to 6.9.1
  
  Bump to the latest upstream 6.x release. Node.js v6 is now an LTS
  release, see the v6.9.0 release announcement for details. The v6.9.0
  release was also a security release, while v6.9.1 fixes a regression
  introduced in v6.8.0.
  
  Cleanup clang vs. gcc handling by using USES=compiler:c++-lib
  
  https://nodejs.org/en/blog/release/v6.9.0/
  https://nodejs.org/en/blog/release/v6.9.1/
  https://nodejs.org/en/blog/vulnerability/october-2016-security-releases/
  
  PR:		213604
  Security:	CVE-2016-5180
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2016Q4/www/node/files/patch-node.gyp
     - copied unchanged from r423979, head/www/node/files/patch-node.gyp
Modified:
  branches/2016Q4/www/node/Makefile
  branches/2016Q4/www/node/distinfo
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/www/node/Makefile
==============================================================================
--- branches/2016Q4/www/node/Makefile	Fri Oct 28 13:47:26 2016	(r424843)
+++ branches/2016Q4/www/node/Makefile	Fri Oct 28 13:49:09 2016	(r424844)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	node
-PORTVERSION=	6.7.0
+PORTVERSION=	6.9.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
@@ -22,11 +22,11 @@ BUNDLED_SSL_CONFIGURE_OFF+=	--shared-ope
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
-USES=		compiler execinfo gmake python:2,build pkgconfig localbase
+USES=		compiler:c++11-lib execinfo gmake python:2,build pkgconfig localbase
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFLICTS_INSTALL=	node4-* node-0.[02-9][0-9]* node-devel-0.[0-9]* node010-[0-9]* node012-[0-9]* iojs-[0-9]*
+CONFLICTS_INSTALL=	node4-4.* node012-0.12.* node010-0.10.* node-devel-[0-9]* iojs-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64 armv6
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
@@ -65,18 +65,7 @@ IGNORE=		cannot build node.js with Libre
 CONFIGURE_ARGS=	--openssl-no-asm
 .endif
 
-.if ${COMPILER_TYPE} == clang
-MAKE_ENV+=	LINK=clang++
-CFLAGS+=	-Wno-unused-private-field
-.if ${COMPILER_VERSION} >= 33
-CFLAGS+=	-Wno-nested-anon-types -Wno-unused-function
-.if ${COMPILER_VERSION} >= 34
-CFLAGS+=	-Wno-unused-const-variable
-.endif
-.endif
-.else
-MAKE_ARGS+=	strictaliasing=off
-USE_GCC=	yes
+.if ${COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif

Modified: branches/2016Q4/www/node/distinfo
==============================================================================
--- branches/2016Q4/www/node/distinfo	Fri Oct 28 13:47:26 2016	(r424843)
+++ branches/2016Q4/www/node/distinfo	Fri Oct 28 13:49:09 2016	(r424844)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475046238
-SHA256 (node-v6.7.0.tar.gz) = 02b8ee1719a11b9ab22bef9279519efaaf31dd0d39cba4c3a1176ccda400b8d6
-SIZE (node-v6.7.0.tar.gz) = 26431821
+TIMESTAMP = 1476953621
+SHA256 (node-v6.9.1.tar.gz) = a98997ca3a4d10751f0ebe97839b2308a31ae884b4203cda0c99cf36bc7fe3bf
+SIZE (node-v6.9.1.tar.gz) = 26504341

Copied: branches/2016Q4/www/node/files/patch-node.gyp (from r423979, head/www/node/files/patch-node.gyp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q4/www/node/files/patch-node.gyp	Fri Oct 28 13:49:09 2016	(r424844, copy of r423979, head/www/node/files/patch-node.gyp)
@@ -0,0 +1,11 @@
+--- node.gyp.orig	2016-10-12 21:30:37 UTC
++++ node.gyp
+@@ -477,6 +477,8 @@
+         }],
+         [ 'node_shared_zlib=="false"', {
+           'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
++        }, {
++          'defines': [ 'ZLIB_CONST' ],
+         }],
+ 
+         [ 'node_shared_http_parser=="false"', {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610281349.u9SDn9Tv056842>