From d0d1eba872f4b6165af4c39fb2f044de27695c48 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Sat, 29 Oct 2016 14:33:15 +1100 Subject: deps: update license-builder & LICENSE for c-ares c-ares now includes a LICENSE file so we no longer need to pull from the heading of a file. PR-URL: https://github.com/nodejs/node/pull/15378 Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater --- LICENSE | 25 ++++++++++++------------- tools/license-builder.sh | 3 +-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index 159d96ba56..9257e71df6 100644 --- a/LICENSE +++ b/LICENSE @@ -53,20 +53,19 @@ The externally maintained libraries used by Node.js are: - c-ares, located at deps/cares, is licensed as follows: """ + Copyright (c) 2007 - 2016, Daniel Stenberg with many contributors, see AUTHORS + file. + Copyright 1998 by the Massachusetts Institute of Technology. - Copyright (C) 2007-2013 by Daniel Stenberg - - Permission to use, copy, modify, and distribute this - software and its documentation for any purpose and without - fee is hereby granted, provided that the above copyright - notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting - documentation, and that the name of M.I.T. not be used in - advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - M.I.T. makes no representations about the suitability of - this software for any purpose. It is provided "as is" - without express or implied warranty. + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided that + the above copyright notice appear in all copies and that both that copyright + notice and this permission notice appear in supporting documentation, and that + the name of M.I.T. not be used in advertising or publicity pertaining to + distribution of the software without specific, written prior permission. + M.I.T. makes no representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied warranty. """ - HTTP Parser, located at deps/http_parser, is licensed as follows: diff --git a/tools/license-builder.sh b/tools/license-builder.sh index 62eabf0e1f..3e8cc01f65 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -29,8 +29,7 @@ fi # Dependencies bundled in distributions -addlicense "c-ares" "deps/cares" \ - "$(sed -e '/^ \*\/$/,$d' -e '/^$/d' -e 's/^[/ ]\* *//' ${rootdir}/deps/cares/src/ares_init.c)" +addlicense "c-ares" "deps/cares" "$(tail -n +3 ${rootdir}/deps/cares/LICENSE.md)" addlicense "HTTP Parser" "deps/http_parser" "$(cat deps/http_parser/LICENSE-MIT)" if [ -f "${rootdir}/deps/icu/LICENSE" ]; then # ICU 57 and following. Drop the BOM -- cgit v1.2.3