v0.12.18 release proposal

ChangeLog

@@ -1,3 +1,20 @@
+2016-12-21, Version 0.12.18 (Maintenance), @rvagg
+
+Notable changes:
+
+* npm: upgrade from v2.15.1 to v2.15.11, including accurate updated license (Jeremiah Senkpiel)
+* process: `process.versions.ares` now outputs the c-ares version (Johan Bergström)
+
+Commits:
+
+* [a47fd4549d] - build: add working lint-ci make target (Rod Vagg) https://github.com/nodejs/node/pull/9151
+* [830584ca59] - deps: define missing operator delete functions (John Barboza) https://github.com/nodejs/node/pull/10356
+* [c130b31cba] - deps: upgrade npm to 2.15.11 (Jeremiah Senkpiel) https://github.com/nodejs/node/pull/9619
+* [bc6766d847] - doc: update npm license in main LICENSE file (Rod Vagg) https://github.com/nodejs/node/pull/10352
+* [0cdf344c80] - (SEMVER-MINOR) process: reintroduce ares to versions (Johan Bergström) https://github.com/nodejs/node/pull/9191
+* [d8e27ec30a] - test: mark dgram-multicast-multi-process as flaky (Rod Vagg) https://github.com/nodejs/node/pull/9150
+* [c722335ead] - tls: fix minor jslint failure (Rod Vagg) https://github.com/nodejs/node/pull/9107
+
 2016-10-18, Version 0.12.17 (Maintenance), @rvagg
 
 This is a security release. All Node.js users should consult the security release summary at https://nodejs.org/en/blog/vulnerability/october-2016-security-releases/ for details on patched vulnerabilities.

LICENSE

@@ -322,11 +322,32 @@ maintained libraries. The externally maintained libraries used by Node are:
 - npm is a package manager program located at deps/npm.
   npm's license follows:
   """
-    Copyright (c) Isaac Z. Schlueter
-    All rights reserved.
+    The npm application
+    Copyright (c) npm, Inc. and Contributors
+    Licensed on the terms of The Artistic License 2.0
+
+    Node package dependencies of the npm application
+    Copyright (c) their respective copyright owners
+    Licensed on their respective license terms
+
+    The npm public registry at https://registry.npmjs.org
+    and the npm website at https://www.npmjs.com
+    Operated by npm, Inc.
+    Use governed by terms published on https://www.npmjs.com
+
+    "Node.js"
+    Trademark Joyent, Inc., https://joyent.com
+    Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
 
-    npm is released under the Artistic 2.0 License.
-    The text of the License follows:
+    The Node.js application
+    Project of Node Foundation, https://nodejs.org
+
+    The npm Logo
+    Copyright (c) Mathias Pettersson and Brian Hammond
+
+    "Gubblebum Blocky" typeface
+    Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
+    Used with permission
 
 
     --------
@@ -533,30 +554,6 @@ maintained libraries. The externally maintained libraries used by Node are:
     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
     DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
     ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-    --------
-
-
-    "Node.js" and "node" trademark Joyent, Inc. npm is not officially
-    part of the Node.js project, and is neither owned by nor
-    officially affiliated with Joyent, Inc.
-
-    Packages published in the npm registry (other than the Software and
-    its included dependencies) are not part of npm itself, are the sole
-    property of their respective maintainers, and are not covered by
-    this license.
-
-    "npm Logo" created by Mathias Pettersson and Brian Hammond,
-    used with permission.
-
-    "Gubblebum Blocky" font
-    Copyright (c) by Tjarda Koster, http://jelloween.deviantart.com
-    included for use in the npm website and documentation,
-    used with permission.
-
-    This program uses several Node modules contained in the node_modules/
-    subdirectory, according to the terms of their respective licenses.
   """
 
 - tools/doc/node_modules/marked. Marked is a Markdown parser. Marked's

Makefile

@@ -585,6 +585,17 @@ cpplint:
 
 lint: jslint cpplint
 
+CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
+lint-ci: jslint cpplint
+	@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
+		&& ! ( find . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
+		exit 0 ; \
+	else \
+		echo "" >&2 ; \
+		echo "Conflict marker detected in one or more files. Please fix them first." >&2 ; \
+		exit 1 ; \
+	fi
+
 .PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
 	check uninstall install install-includes install-bin all staticlib \
 	dynamiclib test test-all test-addons build-addons website-upload pkg \

deps/npm/.npmignore

@@ -28,3 +28,5 @@ html/*.png
 *.pyc
 
 /test/tap/builtin-config
+
+.nyc_output

deps/npm/.travis.yml

@@ -1,18 +1,33 @@
-language: node_js
 sudo: false
-node_js:
-  - "5"
-  - "4"
-  - iojs
-  - "0.12"
-  - "0.10"
-  - "0.8"
-env:
-  - DEPLOY_VERSION=testing
+# need to declare the language as well as the matrix below
+language: node_js
+# having top-level `env:` adds a phantom build
+# https://github.com/travis-ci/travis-ci/issues/4681
+#env: DEPLOY_VERSION=testing
+matrix:
+  include:
+    # LTS is our most important target
+    - node_js: "4"
+      # DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
+      # only gather coverage info for LTS
+      env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
+    # next LTS and master is next most important
+    - node_js: "6"
+      env: DEPLOY_VERSION=testing
+    # still in LTS maintenance until fall 2016 (also still in wide use)
+    - node_js: "0.10"
+      env: DEPLOY_VERSION=testing
+    # will be unsupported as soon as 6 becomes LTS and 7 released
+    - node_js: "5"
+      env: DEPLOY_VERSION=testing
+    # technically in LTS / distros, unbeloved
+    - node_js: "0.12"
+      env: DEPLOY_VERSION=testing
 before_install:
-  - "npm config set spin false"
-  - "npm install -g npm/npm#2.x"
+  # explicitly install rimraf for LTS self-install
+  - "npm install -g rimraf"
+  - "node . install -g ."
+  # required by test/tap/registry.js
   - "mkdir -p /var/run/couchdb"
-script: "npm test"
 notifications:
     slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

deps/npm/AUTHORS

@@ -355,3 +355,26 @@ Adam Byrne <misterbyrne@gmail.com>
 GriffinSchneider <griffinschneider@gmail.com>
 doug.wade <doug.wade@redfin.com>
 rhgb <kaiserdaemon@gmail.com>
+Yael <yaelz@users.noreply.github.com>
+Yann Odeyer <yann@odeyer.com>
+James Monger <jameskmonger@hotmail.co.uk>
+Paul Irish <paul.irish@gmail.com>
+Paul O'Leary McCann <polm@dampfkraft.com>
+Francis Gulotta <wizard@roborooter.com>
+Rachel Evans <git@rve.org.uk>
+Michael Jackson <majgis@gmail.com>
+Myles Borins <mborins@us.ibm.com>
+André Herculano <andresilveirah@gmail.com>
+Wyatt Preul <wpreul@gmail.com>
+Gianluca Casati <fibo@users.noreply.github.com>
+Tapani Moilanen <moilanen.tapani@gmail.com>
+Simon MacDonald <simon.macdonald@gmail.com>
+Adam Stankiewicz <sheerun@sher.pl>
+Julian Duque <julianduquej@gmail.com>
+Michael Hart <michael.hart.au@gmail.com>
+Daniel Paz-Soldan <daniel.pazsoldan@gmail.com>
+legodude17 <legodudejb@gmail.com>
+Andrew Meyer <andrewm.bpi@gmail.com>
+Michael Jasper <mdjasper@gmail.com>
+Max <contact@mstoiber.com>
+Jason Karns <jason.karns@gmail.com>