From a1454e115e06b56ad6f6fb62f93eacb370110eea Mon Sep 17 00:00:00 2001 From: David Li Date: Mon, 30 Oct 2023 13:18:11 -0400 Subject: [PATCH] chore: regenerate LICENSE.txt (#1239) Fixes #1236. --- CONTRIBUTING.md | 8 +++++- LICENSE.txt | 35 ++++++++++++++++++++++----- docs/source/development/releasing.rst | 3 +++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8981fef402..6c5ccaf219 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -339,14 +339,20 @@ non-go licenses, and then you can install `go-licenses` with: $ go install github.com/google/go-licenses@latest ``` -Finally, you can generate the LICENSE.txt with the following command: +You can generate the LICENSE.txt with the following command: ```shell $ cd go/adbc && go-licenses report ./... \ --ignore github.com/apache/arrow-adbc/go/adbc \ --ignore github.com/apache/arrow/go/v11 \ --ignore github.com/apache/arrow/go/v12 \ + --ignore github.com/apache/arrow/go/v13 \ + --ignore github.com/apache/arrow/go/v14 \ --template ../../license.tpl > ../../LICENSE.txt 2> /dev/null ``` +You will have to manually fix up the license, since some packages do not +fill out their metadata correctly and things like READMEs may end up in +the license. + [conventional-commits]: https://www.conventionalcommits.org/en/v1.0.0/ diff --git a/LICENSE.txt b/LICENSE.txt index 7eb6402119..49f8560e32 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -439,6 +439,7 @@ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob is under the MIT license. 3rdparty dependency github.com/JohnCGriffin/overflow is statically linked in certain binary distributions, like the Python wheels. github.com/JohnCGriffin/overflow is under the MIT license. + MIT License Copyright (c) 2017 John C. Griffin, @@ -461,10 +462,6 @@ 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. - - - - -------------------------------------------------------------------------------- 3rdparty dependency github.com/andybalholm/brotli @@ -1203,6 +1200,32 @@ SOFTWARE. -------------------------------------------------------------------------------- +3rdparty dependency github.com/youmark/pkcs8 +is statically linked in certain binary distributions, like the Python wheels. +github.com/youmark/pkcs8 is under the MIT license. +The MIT License (MIT) + +Copyright (c) 2014 youmark + +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. +-------------------------------------------------------------------------------- + 3rdparty dependency github.com/zeebo/xxh3 is statically linked in certain binary distributions, like the Python wheels. github.com/zeebo/xxh3 is under the BSD-2-Clause license. @@ -1234,9 +1257,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -3rdparty dependency golang.org/x/crypto/ocsp +3rdparty dependency golang.org/x/crypto is statically linked in certain binary distributions, like the Python wheels. -golang.org/x/crypto/ocsp is under the BSD-3-Clause license. +golang.org/x/crypto is under the BSD-3-Clause license. Copyright (c) 2009 The Go Authors. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/source/development/releasing.rst b/docs/source/development/releasing.rst index 6408b10bb4..bac560da22 100644 --- a/docs/source/development/releasing.rst +++ b/docs/source/development/releasing.rst @@ -70,6 +70,9 @@ Some steps of the release require being a committer or a PMC member. Before creating a Release Candidate =================================== +Regenerate the LICENSE.txt (see CONTRIBUTING.md) and create a pull request if +any changes were needed. + .. code-block:: # Setup gpg agent for signing artifacts