Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools/licensegen: consider COPYING files #15239

Merged
merged 1 commit into from
Mar 8, 2021

Conversation

tklauser
Copy link
Member

@tklauser tklauser commented Mar 8, 2021

Some projects use a COPYING file for their license. Consider these as
well. Currently, the only vendored dependency using such a file is
github.com/BurntSushi/toml:

$ diff -u LICENSE.all LICENSE.all.new
--- LICENSE.all	2021-03-08 11:12:05.281088204 +0100
+++ LICENSE.all.new	2021-03-08 11:11:38.757023948 +0100
@@ -2132,6 +2132,29 @@
    See the License for the specific language governing permissions and
    limitations under the License.

+Name: vendor/github.com/BurntSushi/toml/COPYING
+License: The MIT License (MIT)
+
+Copyright (c) 2013 TOML authors
+
+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.
+
 Name: vendor/github.com/Microsoft/go-winio/LICENSE
 License: The MIT License (MIT)

Some projects use a COPYING file for their license. Consider these as
well. Currently, the only vendored dependency using such a file is
github.com/BurntSushi/toml:

$ diff -u LICENSE.all LICENSE.all.new
--- LICENSE.all	2021-03-08 11:12:05.281088204 +0100
+++ LICENSE.all.new	2021-03-08 11:11:38.757023948 +0100
@@ -2132,6 +2132,29 @@
    See the License for the specific language governing permissions and
    limitations under the License.

+Name: vendor/github.com/BurntSushi/toml/COPYING
+License: The MIT License (MIT)
+
+Copyright (c) 2013 TOML authors
+
+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.
+
 Name: vendor/github.com/Microsoft/go-winio/LICENSE
 License: The MIT License (MIT)

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser added the release-note/misc This PR makes changes that have no direct user impact. label Mar 8, 2021
@tklauser tklauser requested a review from a team as a code owner March 8, 2021 10:16
@tklauser tklauser requested a review from rolinh March 8, 2021 10:16
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Mar 8, 2021
Copy link
Member

@rolinh rolinh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.5 Mar 8, 2021
@aanm aanm merged commit 9ae3e30 into cilium:master Mar 8, 2021
1.10.0 automation moved this from In progress to Done Mar 8, 2021
@tklauser tklauser deleted the pr/tklauser/licensegen-copying branch March 8, 2021 11:43
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.5 Mar 8, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.5 Mar 8, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.5 Mar 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.9.5
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

4 participants