From 9c961141ac56d6bd8521785c46239630214e1f33 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 15 Mar 2026 17:05:05 +0100 Subject: [PATCH 1/3] update ltag module name The repository was moved to the containerd org; also fix some minor issues in the script to make it valid for POSIX shell. Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yaml | 2 +- scripts/validate/fileheader | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 18926a0..738605e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,7 @@ jobs: - name: Validate headers if: startsWith(matrix.go-version, '1.13') == false run: | - go install github.com/kunalkushwaha/ltag@latest \ + go install github.com/containerd/ltag@latest \ && ./scripts/validate/fileheader - name: Test run: go test -v ./... diff --git a/scripts/validate/fileheader b/scripts/validate/fileheader index 53b0d06..059c9bd 100755 --- a/scripts/validate/fileheader +++ b/scripts/validate/fileheader @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -eu -o +set -eu -if ! command -v ltag; then +if ! command -v ltag >/dev/null 2>&1; then echo >&2 "ERROR: ltag not found. Install with:" - echo >&2 " go get -u github.com/kunalkushwaha/ltag" + echo >&2 " go install github.com/containerd/ltag@latest" exit 1 fi From 750faf4e81b62f7cb7217bd3179b8347cf631a5d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 15 Mar 2026 16:31:42 +0100 Subject: [PATCH 2/3] spdy: fix duplicate license headers The Apache 2 headers were added in 0c4d6b80cad8e5427ed1a921ce7ae22e1b9a1ca7, which overlooked that these files were forked from the Go project, and BSD licensed. - Remove the Apache 2 headers - Update the validate script to ignore the spdy directory Signed-off-by: Sebastiaan van Stijn --- scripts/validate/fileheader | 2 +- spdy/dictionary.go | 16 ---------------- spdy/read.go | 16 ---------------- spdy/spdy_test.go | 18 ++---------------- spdy/types.go | 18 ++---------------- spdy/write.go | 16 ---------------- 6 files changed, 5 insertions(+), 81 deletions(-) diff --git a/scripts/validate/fileheader b/scripts/validate/fileheader index 059c9bd..d98d138 100755 --- a/scripts/validate/fileheader +++ b/scripts/validate/fileheader @@ -23,4 +23,4 @@ fi BASEPATH="${1-}" -ltag -t "${BASEPATH}scripts/validate/template" --excludes "vendor validate" --check -v +ltag -t "${BASEPATH}scripts/validate/template" --excludes "spdy vendor validate" --check -v diff --git a/spdy/dictionary.go b/spdy/dictionary.go index 392232f..5a5ff0e 100644 --- a/spdy/dictionary.go +++ b/spdy/dictionary.go @@ -1,19 +1,3 @@ -/* - Copyright 2014-2021 Docker Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Copyright 2013 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. diff --git a/spdy/read.go b/spdy/read.go index 75ea045..9359a95 100644 --- a/spdy/read.go +++ b/spdy/read.go @@ -1,19 +1,3 @@ -/* - Copyright 2014-2021 Docker Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Copyright 2011 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. diff --git a/spdy/spdy_test.go b/spdy/spdy_test.go index e260380..073b049 100644 --- a/spdy/spdy_test.go +++ b/spdy/spdy_test.go @@ -1,23 +1,9 @@ -/* - Copyright 2014-2021 Docker Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Copyright 2011 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// Modifications Copyright 2014-2021 Docker Inc. + package spdy import ( diff --git a/spdy/types.go b/spdy/types.go index a254a43..74d3d0d 100644 --- a/spdy/types.go +++ b/spdy/types.go @@ -1,23 +1,9 @@ -/* - Copyright 2014-2021 Docker Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Copyright 2011 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// Modifications Copyright 2014-2021 Docker Inc. + // Package spdy implements the SPDY protocol (currently SPDY/3), described in // http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3. package spdy diff --git a/spdy/write.go b/spdy/write.go index ab6d91f..b212f66 100644 --- a/spdy/write.go +++ b/spdy/write.go @@ -1,19 +1,3 @@ -/* - Copyright 2014-2021 Docker Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - // Copyright 2011 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. From 4160b6e2f57ac21f83a1de42e76e7f0e05f071de Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 15 Mar 2026 16:56:57 +0100 Subject: [PATCH 3/3] update NOTICE, add LICENSE and PATENTS in spdy directory Code in the spdy directory was derived from the Go project (golang.org/x/net) in commmit 866205ebbbb945b17b8e6d284f357d24efc353f4, because the code was removed in upstream in https://github.com/golang/net/commit/ff8eb9a34a5cbb9941ffc6f84a19a8014c2646ad This patch: - Adds the correct license and patents files to the directory. - Adds a mention to the NOTICE file at the root of the repository. Co-authored-by: Bob Badour Signed-off-by: Sebastiaan van Stijn --- NOTICE | 12 ++++++++++++ spdy/LICENSE | 27 +++++++++++++++++++++++++++ spdy/PATENTS | 22 ++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 spdy/LICENSE create mode 100644 spdy/PATENTS diff --git a/NOTICE b/NOTICE index b9b11c9..24e2e2a 100644 --- a/NOTICE +++ b/NOTICE @@ -3,3 +3,15 @@ Copyright 2014-2021 Docker Inc. This product includes software developed at Docker Inc. (https://www.docker.com/). + +SPDY implementation (spdy/) + +The spdy directory contains code derived from the Go project (golang.org/x/net). + +Copyright 2009-2013 The Go Authors. +Licensed under the BSD 3-Clause License. + +Modifications Copyright 2014-2021 Docker Inc. + +The BSD license text and Go patent grant are included in +spdy/LICENSE and spdy/PATENTS. diff --git a/spdy/LICENSE b/spdy/LICENSE new file mode 100644 index 0000000..6a66aea --- /dev/null +++ b/spdy/LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/spdy/PATENTS b/spdy/PATENTS new file mode 100644 index 0000000..7330990 --- /dev/null +++ b/spdy/PATENTS @@ -0,0 +1,22 @@ +Additional IP Rights Grant (Patents) + +"This implementation" means the copyrightable works distributed by +Google as part of the Go project. + +Google hereby grants to You a perpetual, worldwide, non-exclusive, +no-charge, royalty-free, irrevocable (except as stated in this section) +patent license to make, have made, use, offer to sell, sell, import, +transfer and otherwise run, modify and propagate the contents of this +implementation of Go, where such license applies only to those patent +claims, both currently owned or controlled by Google and acquired in +the future, licensable by Google that are necessarily infringed by this +implementation of Go. This grant does not include claims that would be +infringed only as a consequence of further modification of this +implementation. If you or your agent or exclusive licensee institute or +order or agree to the institution of patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging +that this implementation of Go or any code incorporated within this +implementation of Go constitutes direct or contributory patent +infringement, or inducement of patent infringement, then any patent +rights granted to you under this License for this implementation of Go +shall terminate as of the date such litigation is filed.