From 049673f17c58b1f55d4f55c4763de603772eb4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miles=20St=C3=B6tzner?= Date: Thu, 6 Jul 2023 19:16:17 +0200 Subject: [PATCH] fix MIT license at dreamopt.js --- docs/cmds/licenses/template.ejs | 2 +- docs/docs/assets/documents/licenses.csv | 2 +- docs/docs/dependencies.md | 5 ++-- docs/docs/development/index.md | 2 +- docs/docs/sofdcar/profile.md | 2 +- patches/dreamopt+0.8.0.patch | 40 +++++++++++++++++++++++++ 6 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 patches/dreamopt+0.8.0.patch diff --git a/docs/cmds/licenses/template.ejs b/docs/cmds/licenses/template.ejs index dd6be23a8b..a7d34d7697 100644 --- a/docs/cmds/licenses/template.ejs +++ b/docs/cmds/licenses/template.ejs @@ -20,4 +20,4 @@ We fixed some of them by patching the dependencies using [`patch-package`](https 1. The release of [dreamopt@0.8.0](https://www.npmjs.com/package/dreamopt){target=_blank} has no license. However, the project is according to the author licensed under MIT as stated in [#2](https://github.com/andreyvit/dreamopt.js/issues/2){target=_blank}. -1. We moved the dependency [@types/yauzl](https://www.npmjs.com/package/@types/yauzl){target=_blank} at [extract-zip@2.0.1](https://github.com/maxogden/extract-zip){target=_blank} to the development dependencies. \ No newline at end of file +1. We moved the optional dependency [@types/yauzl](https://www.npmjs.com/package/@types/yauzl){target=_blank} at [extract-zip@2.0.1](https://github.com/maxogden/extract-zip){target=_blank} to the development dependencies. \ No newline at end of file diff --git a/docs/docs/assets/documents/licenses.csv b/docs/docs/assets/documents/licenses.csv index e729bd7c7f..1206d87288 100644 --- a/docs/docs/assets/documents/licenses.csv +++ b/docs/docs/assets/documents/licenses.csv @@ -40,7 +40,7 @@ debug,4.3.4,MIT,https://github.com/debug-js/debug delayed-stream,1.0.0,MIT,https://github.com/felixge/node-delayed-stream depd,2.0.0,MIT,https://github.com/dougwilson/nodejs-depd destroy,1.2.0,MIT,https://github.com/stream-utils/destroy -dreamopt,0.8.0,UNKNOWN,https://github.com/andreyvit/dreamopt.js +dreamopt,0.8.0,MIT,https://github.com/andreyvit/dreamopt.js ee-first,1.1.1,MIT,https://github.com/jonathanong/ee-first ejs,3.1.9,Apache-2.0,https://github.com/mde/ejs encodeurl,1.0.2,MIT,https://github.com/pillarjs/encodeurl diff --git a/docs/docs/dependencies.md b/docs/docs/dependencies.md index 802109a21f..4b680dcf7c 100644 --- a/docs/docs/dependencies.md +++ b/docs/docs/dependencies.md @@ -49,7 +49,7 @@ We ensure, that only the licenses [0BSD](https://choosealicense.com/licenses/0bs | 39 | [delayed-stream](https://github.com/felixge/node-delayed-stream){target=_blank} | 1.0.0 | [MIT](https://choosealicense.com/licenses/mit){target=_blank} | | 40 | [depd](https://github.com/dougwilson/nodejs-depd){target=_blank} | 2.0.0 | [MIT](https://choosealicense.com/licenses/mit){target=_blank} | | 41 | [destroy](https://github.com/stream-utils/destroy){target=_blank} | 1.2.0 | [MIT](https://choosealicense.com/licenses/mit){target=_blank} | -| 42 | [dreamopt](https://github.com/andreyvit/dreamopt.js){target=_blank} | 0.8.0 | [UNKNOWN](){target=_blank} | +| 42 | [dreamopt](https://github.com/andreyvit/dreamopt.js){target=_blank} | 0.8.0 | [MIT](https://choosealicense.com/licenses/mit){target=_blank} | | 43 | [ee-first](https://github.com/jonathanong/ee-first){target=_blank} | 1.1.1 | [MIT](https://choosealicense.com/licenses/mit){target=_blank} | | 44 | [ejs](https://github.com/mde/ejs){target=_blank} | 3.1.9 | [Apache-2.0](https://choosealicense.com/licenses/apache-2.0){target=_blank} | | 45 | [encodeurl](https://github.com/pillarjs/encodeurl){target=_blank} | 1.0.2 | [MIT](https://choosealicense.com/licenses/mit){target=_blank} | @@ -170,5 +170,4 @@ We fixed some of them by patching the dependencies using [`patch-package`](https 1. The release of [dreamopt@0.8.0](https://www.npmjs.com/package/dreamopt){target=_blank} has no license. However, the project is according to the author licensed under MIT as stated in [#2](https://github.com/andreyvit/dreamopt.js/issues/2){target=_blank}. - -1. We moved the dependency [@types/yauzl](https://www.npmjs.com/package/@types/yauzl){target=_blank} at [extract-zip@2.0.1](https://github.com/maxogden/extract-zip){target=_blank} to the development dependencies. \ No newline at end of file +1. We moved the optional dependency [@types/yauzl](https://www.npmjs.com/package/@types/yauzl){target=_blank} at [extract-zip@2.0.1](https://github.com/maxogden/extract-zip){target=_blank} to the development dependencies. \ No newline at end of file diff --git a/docs/docs/development/index.md b/docs/docs/development/index.md index 9c74efdfe1..c6f557fd1a 100644 --- a/docs/docs/development/index.md +++ b/docs/docs/development/index.md @@ -356,7 +356,7 @@ Therefore, make changes to the package inside `node_modules`, then run the follo yarn patch-package ${package-name} ``` -If you need to patch the `package.json`, then append the option `--option 'nothing'` as stated in [#311](https://github.com/ds300/patch-package/issues/311){target=_blank}. +If you need to patch the `package.json`, then append the option `--exclude 'nothing'` as stated in [#311](https://github.com/ds300/patch-package/issues/311){target=_blank}. ## Build diff --git a/docs/docs/sofdcar/profile.md b/docs/docs/sofdcar/profile.md index 475df6bcf3..dc21cf7046 100644 --- a/docs/docs/sofdcar/profile.md +++ b/docs/docs/sofdcar/profile.md @@ -21,7 +21,7 @@ The specification is under active development and is not backwards compatible wi The core normative TOSCA type definitions contain high-level type definitions which are mainly derived from the normative TOSCA type definitions of the [TOSCA Simple Profile in YAML 1.3](https://docs.oasis-open.org/tosca/TOSCA-Simple-Profile-YAML/v1.3/os/TOSCA-Simple-Profile-YAML-v1.3-os.html){target=_blank}. These types mainly concern the following topics. -- Hardware and software of electronic computing units (ECUs) which are typically microcontroller +- Hardware and software of electronic computing units (ECUs) which are typically microcontrollers - Hardware and software of high performance computing platforms (HPCs) which are typically microprocessors - Sensors and actuators - Communication channels diff --git a/patches/dreamopt+0.8.0.patch b/patches/dreamopt+0.8.0.patch new file mode 100644 index 0000000000..bb09059724 --- /dev/null +++ b/patches/dreamopt+0.8.0.patch @@ -0,0 +1,40 @@ +diff --git a/node_modules/dreamopt/LICENSE b/node_modules/dreamopt/LICENSE +new file mode 100644 +index 0000000..d0d6667 +--- /dev/null ++++ b/node_modules/dreamopt/LICENSE +@@ -0,0 +1,21 @@ ++The MIT License (MIT) ++ ++Copyright (c) 2013-2014 Andrey Tarantsov ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in all ++copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. +\ No newline at end of file +diff --git a/node_modules/dreamopt/package.json b/node_modules/dreamopt/package.json +index 12ab109..1bdd374 100644 +--- a/node_modules/dreamopt/package.json ++++ b/node_modules/dreamopt/package.json +@@ -4,6 +4,7 @@ + "description": "Command-line parser with readable syntax from your sweetest dreams", + "version": "0.8.0", + "homepage": "https://github.com/andreyvit/dreamopt.js", ++ "license": "MIT", + "repository": { + "type": "git", + "url": "git://github.com/andreyvit/dreamopt.js.git"