From 78b4aab42aa512066a3e7bfba06613cb390578b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Thu, 11 Jun 2026 14:15:21 +0200 Subject: [PATCH 1/6] Add REUSE compliance for software licensing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add .reuse/dep5 with per-file copyright and license information, LICENSES/ directory with BSD-3-Clause, BSD-2-Clause, and FSFAP license texts, and a CI workflow to verify compliance. Signed-off-by: Björn Svensson --- .github/workflows/reuse.yml | 13 ++++++ .reuse/dep5 | 90 +++++++++++++++++++++++++++++++++++++ LICENSES/BSD-2-Clause.txt | 24 ++++++++++ LICENSES/BSD-3-Clause.txt | 28 ++++++++++++ LICENSES/FSFAP.txt | 4 ++ 5 files changed, 159 insertions(+) create mode 100644 .github/workflows/reuse.yml create mode 100644 .reuse/dep5 create mode 100644 LICENSES/BSD-2-Clause.txt create mode 100644 LICENSES/BSD-3-Clause.txt create mode 100644 LICENSES/FSFAP.txt diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml new file mode 100644 index 00000000..167a3dcc --- /dev/null +++ b/.github/workflows/reuse.yml @@ -0,0 +1,13 @@ +name: REUSE Compliance + +on: [push, pull_request] + +permissions: + contents: read + +jobs: + reuse: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 # v6.0.0 diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 00000000..05cc3f07 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,90 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libvalkey +Upstream-Contact: https://github.com/valkey-io/libvalkey + +Files: * +Copyright: 2024-present libvalkey contributors +License: BSD-3-Clause + +Files: src/valkey.c include/valkey/valkey.h src/net.c include/valkey/net.h +Copyright: 2009-2011 Salvatore Sanfilippo + 2010-2014 Pieter Noordhuis + 2015 Matt Stancliff + 2015 Jan-Erik Rediger +License: BSD-3-Clause + +Files: src/async.c include/valkey/async.h src/async_private.h src/read.c include/valkey/read.h +Copyright: 2009-2011 Salvatore Sanfilippo + 2010-2011 Pieter Noordhuis +License: BSD-3-Clause + +Files: src/tls.c include/valkey/tls.h +Copyright: 2009-2011 Salvatore Sanfilippo + 2010-2011 Pieter Noordhuis + 2019 Redis Labs +License: BSD-3-Clause + +Files: src/sds.c src/sds.h src/sdsalloc.h +Copyright: 2006-2015 Salvatore Sanfilippo + 2015 Oran Agra + 2015 Redis Labs, Inc +License: BSD-3-Clause + +Files: src/adlist.c src/adlist.h src/dict.c src/dict.h +Copyright: 2009-2011 Salvatore Sanfilippo + 2010-2011 Pieter Noordhuis +License: BSD-3-Clause + +Files: src/cluster.c include/valkey/cluster.h src/vkutil.c src/vkutil.h src/command.c src/command.h src/win32.h +Copyright: 2015-2017 Ieshen Zheng + 2020 Nick + 2020-2022 Bjorn Svensson + 2020-2022 Viktor Söderqvist + 2021 Red Hat +License: BSD-3-Clause + +Files: src/rdma.c src/conn.c src/valkey_private.h +Copyright: 2024 zhenwei pi +License: BSD-3-Clause + +Files: include/valkey/rdma.h +Copyright: 2021-2024 zhenwei pi +License: BSD-3-Clause + +Files: src/alloc.c include/valkey/alloc.h +Copyright: 2020 Michael Grunder +License: BSD-3-Clause + +Files: src/sockcompat.c include/valkey/sockcompat.h +Copyright: 2019 Marcus Geelnard +License: BSD-3-Clause + +Files: src/crc16.c +Copyright: 2001-2010 Georges Menie (www.menie.org) + 2010-2012 Salvatore Sanfilippo +License: BSD-3-Clause + +Files: include/valkey/adapters/libuv.h +Copyright: 2013 Erik Dubbelboer + 2021 Red Hat +License: BSD-3-Clause + +Files: include/valkey/adapters/ae.h include/valkey/adapters/libev.h include/valkey/adapters/libevent.h +Copyright: 2010-2011 Pieter Noordhuis +License: BSD-3-Clause + +Files: include/valkey/adapters/macosx.h examples/async-macosx.c +Copyright: 2015 Dmitry Bakhvalov +License: BSD-3-Clause + +Files: include/valkey/adapters/qt.h +Copyright: 2014 Pietro Cerutti +License: BSD-2-Clause + +Files: examples/blocking-push.c +Copyright: 2020 Michael Grunder +License: BSD-3-Clause + +Files: tests/scripts/simulated-valkey.pl +Copyright: 2020 Ericsson Software Technology +License: FSFAP diff --git a/LICENSES/BSD-2-Clause.txt b/LICENSES/BSD-2-Clause.txt new file mode 100644 index 00000000..f7eb17ab --- /dev/null +++ b/LICENSES/BSD-2-Clause.txt @@ -0,0 +1,24 @@ +BSD 2-Clause License + +Copyright (c) . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. 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. + +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 HOLDER 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/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt new file mode 100644 index 00000000..d900bf51 --- /dev/null +++ b/LICENSES/BSD-3-Clause.txt @@ -0,0 +1,28 @@ +BSD 3-Clause License + +Copyright (c) . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. 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. + +3. Neither the name of the copyright holder 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 HOLDER 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/LICENSES/FSFAP.txt b/LICENSES/FSFAP.txt new file mode 100644 index 00000000..77e9f451 --- /dev/null +++ b/LICENSES/FSFAP.txt @@ -0,0 +1,4 @@ +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without any warranty. From 2418bcec123614cd2872a5e286f747dc27523c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Thu, 11 Jun 2026 14:29:52 +0200 Subject: [PATCH 2/6] fixup: add instructions in CONTRIBUTING.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- CONTRIBUTING.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dcf67018..5145c794 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,6 +60,19 @@ If you're contributing code to the libvalkey project in any other form, includin sending a code fragment or patch via private email or public discussion groups, you need to ensure that the contribution is in accordance with the DCO. +## Licensing and REUSE compliance + +This project follows the [REUSE specification](https://reuse.software/) for licensing. +Copyright and license information for all files is declared in `.reuse/dep5`. + +When adding new files: + +- If the file is a new contribution by the project (libvalkey contributors), no action is needed — the wildcard entry covers it. +- If the file originates from another project or has a different copyright holder, add a corresponding entry in `.reuse/dep5`. +- If the file uses a license not already in `LICENSES/`, add the license text as `LICENSES/.txt`. + +The CI runs `reuse lint` to verify compliance on every push and pull request. + ## Coding conventions ### Code style From f38fa61d2b6ebe1ff155e5e16af35d104c3710b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Fri, 12 Jun 2026 10:47:57 +0200 Subject: [PATCH 3/6] fixup: replace deprecated .reuse/dep5 with REUSE.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- .reuse/dep5 | 90 -------------------------- CONTRIBUTING.md | 4 +- REUSE.toml | 167 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+), 92 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 05cc3f07..00000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,90 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: libvalkey -Upstream-Contact: https://github.com/valkey-io/libvalkey - -Files: * -Copyright: 2024-present libvalkey contributors -License: BSD-3-Clause - -Files: src/valkey.c include/valkey/valkey.h src/net.c include/valkey/net.h -Copyright: 2009-2011 Salvatore Sanfilippo - 2010-2014 Pieter Noordhuis - 2015 Matt Stancliff - 2015 Jan-Erik Rediger -License: BSD-3-Clause - -Files: src/async.c include/valkey/async.h src/async_private.h src/read.c include/valkey/read.h -Copyright: 2009-2011 Salvatore Sanfilippo - 2010-2011 Pieter Noordhuis -License: BSD-3-Clause - -Files: src/tls.c include/valkey/tls.h -Copyright: 2009-2011 Salvatore Sanfilippo - 2010-2011 Pieter Noordhuis - 2019 Redis Labs -License: BSD-3-Clause - -Files: src/sds.c src/sds.h src/sdsalloc.h -Copyright: 2006-2015 Salvatore Sanfilippo - 2015 Oran Agra - 2015 Redis Labs, Inc -License: BSD-3-Clause - -Files: src/adlist.c src/adlist.h src/dict.c src/dict.h -Copyright: 2009-2011 Salvatore Sanfilippo - 2010-2011 Pieter Noordhuis -License: BSD-3-Clause - -Files: src/cluster.c include/valkey/cluster.h src/vkutil.c src/vkutil.h src/command.c src/command.h src/win32.h -Copyright: 2015-2017 Ieshen Zheng - 2020 Nick - 2020-2022 Bjorn Svensson - 2020-2022 Viktor Söderqvist - 2021 Red Hat -License: BSD-3-Clause - -Files: src/rdma.c src/conn.c src/valkey_private.h -Copyright: 2024 zhenwei pi -License: BSD-3-Clause - -Files: include/valkey/rdma.h -Copyright: 2021-2024 zhenwei pi -License: BSD-3-Clause - -Files: src/alloc.c include/valkey/alloc.h -Copyright: 2020 Michael Grunder -License: BSD-3-Clause - -Files: src/sockcompat.c include/valkey/sockcompat.h -Copyright: 2019 Marcus Geelnard -License: BSD-3-Clause - -Files: src/crc16.c -Copyright: 2001-2010 Georges Menie (www.menie.org) - 2010-2012 Salvatore Sanfilippo -License: BSD-3-Clause - -Files: include/valkey/adapters/libuv.h -Copyright: 2013 Erik Dubbelboer - 2021 Red Hat -License: BSD-3-Clause - -Files: include/valkey/adapters/ae.h include/valkey/adapters/libev.h include/valkey/adapters/libevent.h -Copyright: 2010-2011 Pieter Noordhuis -License: BSD-3-Clause - -Files: include/valkey/adapters/macosx.h examples/async-macosx.c -Copyright: 2015 Dmitry Bakhvalov -License: BSD-3-Clause - -Files: include/valkey/adapters/qt.h -Copyright: 2014 Pietro Cerutti -License: BSD-2-Clause - -Files: examples/blocking-push.c -Copyright: 2020 Michael Grunder -License: BSD-3-Clause - -Files: tests/scripts/simulated-valkey.pl -Copyright: 2020 Ericsson Software Technology -License: FSFAP diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5145c794..f220d699 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,12 +63,12 @@ you need to ensure that the contribution is in accordance with the DCO. ## Licensing and REUSE compliance This project follows the [REUSE specification](https://reuse.software/) for licensing. -Copyright and license information for all files is declared in `.reuse/dep5`. +Copyright and license information for all files is declared in `REUSE.toml`. When adding new files: - If the file is a new contribution by the project (libvalkey contributors), no action is needed — the wildcard entry covers it. -- If the file originates from another project or has a different copyright holder, add a corresponding entry in `.reuse/dep5`. +- If the file originates from another project or has a different copyright holder, add a corresponding entry in `REUSE.toml`. - If the file uses a license not already in `LICENSES/`, add the license text as `LICENSES/.txt`. The CI runs `reuse lint` to verify compliance on every push and pull request. diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 00000000..aba06a42 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,167 @@ +version = 1 + +[[annotations]] +path = "**" +SPDX-FileCopyrightText = "2024-present libvalkey contributors" +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/valkey.c", "include/valkey/valkey.h", "src/net.c", "include/valkey/net.h"] +SPDX-FileCopyrightText = [ + "2009-2011 Salvatore Sanfilippo ", + "2010-2014 Pieter Noordhuis ", + "2015 Matt Stancliff ", + "2015 Jan-Erik Rediger ", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/async.c", "include/valkey/async.h", "src/async_private.h", "src/read.c", "include/valkey/read.h"] +SPDX-FileCopyrightText = [ + "2009-2011 Salvatore Sanfilippo ", + "2010-2011 Pieter Noordhuis ", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "include/valkey/tls.h" +SPDX-FileCopyrightText = "2019 Redis Labs" +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "src/tls.c" +SPDX-FileCopyrightText = [ + "2009-2011 Salvatore Sanfilippo ", + "2010-2011 Pieter Noordhuis ", + "2019 Redis Labs", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/sds.c", "src/sds.h", "src/sdsalloc.h"] +SPDX-FileCopyrightText = [ + "2006-2015 Salvatore Sanfilippo ", + "2015 Oran Agra", + "2015 Redis Labs, Inc", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "src/adlist.c" +SPDX-FileCopyrightText = "2006-2010 Salvatore Sanfilippo " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "src/adlist.h" +SPDX-FileCopyrightText = "2006-2012 Salvatore Sanfilippo " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/dict.c", "src/dict.h"] +SPDX-FileCopyrightText = "2006-2010 Salvatore Sanfilippo " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "src/cluster.c" +SPDX-FileCopyrightText = [ + "2015-2017 Ieshen Zheng ", + "2020 Nick ", + "2020-2021 Bjorn Svensson ", + "2020-2021 Viktor Söderqvist ", + "2021 Red Hat", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "include/valkey/cluster.h" +SPDX-FileCopyrightText = [ + "2015-2017 Ieshen Zheng ", + "2020 Nick ", + "2020-2021 Bjorn Svensson ", + "2021 Red Hat", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/vkutil.c", "src/command.c", "src/command.h"] +SPDX-FileCopyrightText = [ + "2015-2017 Ieshen Zheng ", + "2020 Nick ", + "2020-2021 Bjorn Svensson ", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "src/vkutil.h" +SPDX-FileCopyrightText = [ + "2015-2017 Ieshen Zheng ", + "2020 Nick ", + "2020-2021 Bjorn Svensson ", + "2020-2021 Viktor Söderqvist ", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "src/win32.h" +SPDX-FileCopyrightText = [ + "2015 Ieshen Zheng ", + "2020 Nick ", + "2020 Bjorn Svensson ", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/rdma.c", "src/conn.c", "src/valkey_private.h"] +SPDX-FileCopyrightText = "2024 zhenwei pi " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "include/valkey/rdma.h" +SPDX-FileCopyrightText = "2021-2024 zhenwei pi " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/alloc.c", "include/valkey/alloc.h", "examples/blocking-push.c"] +SPDX-FileCopyrightText = "2020 Michael Grunder " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["src/sockcompat.c", "include/valkey/sockcompat.h"] +SPDX-FileCopyrightText = "2019 Marcus Geelnard " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "src/crc16.c" +SPDX-FileCopyrightText = [ + "2001-2010 Georges Menie (www.menie.org)", + "2010-2012 Salvatore Sanfilippo", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "include/valkey/adapters/libuv.h" +SPDX-FileCopyrightText = [ + "2013 Erik Dubbelboer", + "2021 Red Hat", +] +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["include/valkey/adapters/ae.h", "include/valkey/adapters/libev.h", "include/valkey/adapters/libevent.h"] +SPDX-FileCopyrightText = "2010-2011 Pieter Noordhuis " +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["include/valkey/adapters/macosx.h", "examples/async-macosx.c"] +SPDX-FileCopyrightText = "2015 Dmitry Bakhvalov" +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = "include/valkey/adapters/qt.h" +SPDX-FileCopyrightText = "2014 Pietro Cerutti " +SPDX-License-Identifier = "BSD-2-Clause" + +[[annotations]] +path = "tests/scripts/simulated-valkey.pl" +SPDX-FileCopyrightText = "2020 Ericsson Software Technology " +SPDX-License-Identifier = "FSFAP" From 42ed9f64dd9a149a485a7df724b0029589fe457e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Mon, 15 Jun 2026 10:26:07 +0200 Subject: [PATCH 4/6] fixup: add new file src/ffc.h and missing scripts/gencommands.py to REUSE.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- LICENSES/MIT.txt | 21 +++++++++++++++++++++ REUSE.toml | 10 ++++++++++ 2 files changed, 31 insertions(+) create mode 100644 LICENSES/MIT.txt diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 00000000..242da623 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) + +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. diff --git a/REUSE.toml b/REUSE.toml index aba06a42..48051745 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -161,6 +161,16 @@ path = "include/valkey/adapters/qt.h" SPDX-FileCopyrightText = "2014 Pietro Cerutti " SPDX-License-Identifier = "BSD-2-Clause" +[[annotations]] +path = "src/ffc.h" +SPDX-FileCopyrightText = "2021 The fast_float authors" +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "scripts/gencommands.py" +SPDX-FileCopyrightText = "2023 Viktor Soderqvist " +SPDX-License-Identifier = "BSD-3-Clause" + [[annotations]] path = "tests/scripts/simulated-valkey.pl" SPDX-FileCopyrightText = "2020 Ericsson Software Technology " From 5fe564138f4414bf6f38d7aea2d17526ed777c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Mon, 22 Jun 2026 13:35:47 +0200 Subject: [PATCH 5/6] fixup: simplify REUSE.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Individual files already satisfy the BSD-3-Clause retention requirement, and the REUSE.toml just needs to be compliant. Signed-off-by: Björn Svensson --- REUSE.toml | 175 +++++++---------------------------------------------- 1 file changed, 21 insertions(+), 154 deletions(-) diff --git a/REUSE.toml b/REUSE.toml index 48051745..10a54e70 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -1,177 +1,44 @@ version = 1 +# Based on hiredis (https://github.com/redis/hiredis) +# See individual files for detailed copyright information. [[annotations]] path = "**" -SPDX-FileCopyrightText = "2024-present libvalkey contributors" +SPDX-FileCopyrightText = "2024-present, libvalkey contributors" SPDX-License-Identifier = "BSD-3-Clause" +# Files originating from hiredis-vip (https://github.com/vipshop/hiredis-vip) [[annotations]] -path = ["src/valkey.c", "include/valkey/valkey.h", "src/net.c", "include/valkey/net.h"] -SPDX-FileCopyrightText = [ - "2009-2011 Salvatore Sanfilippo ", - "2010-2014 Pieter Noordhuis ", - "2015 Matt Stancliff ", - "2015 Jan-Erik Rediger ", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["src/async.c", "include/valkey/async.h", "src/async_private.h", "src/read.c", "include/valkey/read.h"] -SPDX-FileCopyrightText = [ - "2009-2011 Salvatore Sanfilippo ", - "2010-2011 Pieter Noordhuis ", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "include/valkey/tls.h" -SPDX-FileCopyrightText = "2019 Redis Labs" -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "src/tls.c" -SPDX-FileCopyrightText = [ - "2009-2011 Salvatore Sanfilippo ", - "2010-2011 Pieter Noordhuis ", - "2019 Redis Labs", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["src/sds.c", "src/sds.h", "src/sdsalloc.h"] -SPDX-FileCopyrightText = [ - "2006-2015 Salvatore Sanfilippo ", - "2015 Oran Agra", - "2015 Redis Labs, Inc", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "src/adlist.c" -SPDX-FileCopyrightText = "2006-2010 Salvatore Sanfilippo " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "src/adlist.h" -SPDX-FileCopyrightText = "2006-2012 Salvatore Sanfilippo " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["src/dict.c", "src/dict.h"] -SPDX-FileCopyrightText = "2006-2010 Salvatore Sanfilippo " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "src/cluster.c" -SPDX-FileCopyrightText = [ - "2015-2017 Ieshen Zheng ", - "2020 Nick ", - "2020-2021 Bjorn Svensson ", - "2020-2021 Viktor Söderqvist ", - "2021 Red Hat", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "include/valkey/cluster.h" -SPDX-FileCopyrightText = [ - "2015-2017 Ieshen Zheng ", - "2020 Nick ", - "2020-2021 Bjorn Svensson ", - "2021 Red Hat", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["src/vkutil.c", "src/command.c", "src/command.h"] -SPDX-FileCopyrightText = [ - "2015-2017 Ieshen Zheng ", - "2020 Nick ", - "2020-2021 Bjorn Svensson ", +path = [ + "src/cluster.c", + "include/valkey/cluster.h", + "src/vkutil.c", + "src/vkutil.h", + "src/command.c", + "src/command.h", + "src/win32.h", ] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "src/vkutil.h" +precedence = "aggregate" SPDX-FileCopyrightText = [ - "2015-2017 Ieshen Zheng ", - "2020 Nick ", - "2020-2021 Bjorn Svensson ", - "2020-2021 Viktor Söderqvist ", + "2015-2017, Ieshen Zheng ", + "2020, Nick ", + "2020-2021, Bjorn Svensson ", + "2020-2021, Viktor Söderqvist ", + "2021, Red Hat", ] SPDX-License-Identifier = "BSD-3-Clause" -[[annotations]] -path = "src/win32.h" -SPDX-FileCopyrightText = [ - "2015 Ieshen Zheng ", - "2020 Nick ", - "2020 Bjorn Svensson ", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["src/rdma.c", "src/conn.c", "src/valkey_private.h"] -SPDX-FileCopyrightText = "2024 zhenwei pi " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "include/valkey/rdma.h" -SPDX-FileCopyrightText = "2021-2024 zhenwei pi " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["src/alloc.c", "include/valkey/alloc.h", "examples/blocking-push.c"] -SPDX-FileCopyrightText = "2020 Michael Grunder " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["src/sockcompat.c", "include/valkey/sockcompat.h"] -SPDX-FileCopyrightText = "2019 Marcus Geelnard " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "src/crc16.c" -SPDX-FileCopyrightText = [ - "2001-2010 Georges Menie (www.menie.org)", - "2010-2012 Salvatore Sanfilippo", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = "include/valkey/adapters/libuv.h" -SPDX-FileCopyrightText = [ - "2013 Erik Dubbelboer", - "2021 Red Hat", -] -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["include/valkey/adapters/ae.h", "include/valkey/adapters/libev.h", "include/valkey/adapters/libevent.h"] -SPDX-FileCopyrightText = "2010-2011 Pieter Noordhuis " -SPDX-License-Identifier = "BSD-3-Clause" - -[[annotations]] -path = ["include/valkey/adapters/macosx.h", "examples/async-macosx.c"] -SPDX-FileCopyrightText = "2015 Dmitry Bakhvalov" -SPDX-License-Identifier = "BSD-3-Clause" - [[annotations]] path = "include/valkey/adapters/qt.h" -SPDX-FileCopyrightText = "2014 Pietro Cerutti " +SPDX-FileCopyrightText = "2014, Pietro Cerutti " SPDX-License-Identifier = "BSD-2-Clause" [[annotations]] path = "src/ffc.h" -SPDX-FileCopyrightText = "2021 The fast_float authors" +SPDX-FileCopyrightText = "2021, The fast_float authors" SPDX-License-Identifier = "MIT" -[[annotations]] -path = "scripts/gencommands.py" -SPDX-FileCopyrightText = "2023 Viktor Soderqvist " -SPDX-License-Identifier = "BSD-3-Clause" - [[annotations]] path = "tests/scripts/simulated-valkey.pl" -SPDX-FileCopyrightText = "2020 Ericsson Software Technology " +SPDX-FileCopyrightText = "2020, Ericsson Software Technology " SPDX-License-Identifier = "FSFAP" From 82c8fdf955cb7ab7f94929ad1e8316179a5e5090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Mon, 22 Jun 2026 15:24:05 +0200 Subject: [PATCH 6/6] fixup: use precedence = "aggregate" to get aggregated SPDX-FileCopyrightText for each group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Svensson --- REUSE.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/REUSE.toml b/REUSE.toml index 10a54e70..c821dad1 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -4,6 +4,7 @@ version = 1 # See individual files for detailed copyright information. [[annotations]] path = "**" +precedence = "aggregate" SPDX-FileCopyrightText = "2024-present, libvalkey contributors" SPDX-License-Identifier = "BSD-3-Clause" @@ -25,20 +26,24 @@ SPDX-FileCopyrightText = [ "2020-2021, Bjorn Svensson ", "2020-2021, Viktor Söderqvist ", "2021, Red Hat", + "2024-present, libvalkey contributors", ] SPDX-License-Identifier = "BSD-3-Clause" [[annotations]] path = "include/valkey/adapters/qt.h" +precedence = "aggregate" SPDX-FileCopyrightText = "2014, Pietro Cerutti " SPDX-License-Identifier = "BSD-2-Clause" [[annotations]] path = "src/ffc.h" +precedence = "aggregate" SPDX-FileCopyrightText = "2021, The fast_float authors" SPDX-License-Identifier = "MIT" [[annotations]] path = "tests/scripts/simulated-valkey.pl" +precedence = "aggregate" SPDX-FileCopyrightText = "2020, Ericsson Software Technology " SPDX-License-Identifier = "FSFAP"