From 188d57c2359ea50c5bcc1bac62881bd4f3440905 Mon Sep 17 00:00:00 2001 From: toxicphreAK Date: Tue, 18 Aug 2026 15:20:57 +0200 Subject: [PATCH] Make SPDX headers consistent and complete src/openvfs/ is one library in one directory but gave three different licensing answers: four files GPL-3.0-or-later, openvfs.cpp GPL-2.0-or-later, and three files in src/openvfsfuse/ with no SPDX tag at all. libopenvfs is what downstream sync clients link against, so its license determines the license of the combined binary they ship -- anyone doing that assessment got a different answer depending on which file they opened first. openvfs.cpp is aligned with the other four and with the top-level LICENSE, the missing tags are added to main.cpp and sharedmap.{h,cpp} (which already carried the full GPL-3 notice in prose), and the tag in strtools.h moves above the include guard like everywhere else. socketthread.{h,cpp} are deliberately left alone: they carry third-party MIT code by David Lafreniere alongside the GPL-3 notice, and pinning a single machine-readable expression on that combination is the maintainers' call, not a drive-by fix. A REUSE.toml would make the whole tree checkable with `reuse lint` and is worth doing as a follow-up. --- src/openvfs/openvfs.cpp | 2 +- src/openvfsfuse/main.cpp | 4 ++++ src/openvfsfuse/sharedmap.cpp | 3 +++ src/openvfsfuse/sharedmap.h | 3 +++ src/openvfsfuse/strtools.h | 6 +++--- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/openvfs/openvfs.cpp b/src/openvfs/openvfs.cpp index cbcaea8..34be212 100644 --- a/src/openvfs/openvfs.cpp +++ b/src/openvfs/openvfs.cpp @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2025 Hannah von Reth #include "openvfs/openvfs.h" diff --git a/src/openvfsfuse/main.cpp b/src/openvfsfuse/main.cpp index 0b5577e..0a61b49 100644 --- a/src/openvfsfuse/main.cpp +++ b/src/openvfsfuse/main.cpp @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: 2025 Hannah von Reth +// SPDX-FileCopyrightText: 2025 Klaas Freitag + #include "openvfsfuse.h" #include diff --git a/src/openvfsfuse/sharedmap.cpp b/src/openvfsfuse/sharedmap.cpp index bf8163c..3c9bf5e 100644 --- a/src/openvfsfuse/sharedmap.cpp +++ b/src/openvfsfuse/sharedmap.cpp @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: 2025 Klaas Freitag + /* * openvfsfuse - a Fuse layer to handle virtual filesystem items of cloud storage * Copyright (C) 2025 Klaas Freitag diff --git a/src/openvfsfuse/sharedmap.h b/src/openvfsfuse/sharedmap.h index f761ed7..c43151c 100644 --- a/src/openvfsfuse/sharedmap.h +++ b/src/openvfsfuse/sharedmap.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: 2025 Klaas Freitag + /* * openvfsfuse - a Fuse layer to handle virtual filesystem items of cloud storage * Copyright (C) 2025 Klaas Freitag diff --git a/src/openvfsfuse/strtools.h b/src/openvfsfuse/strtools.h index 7610994..0d6fa87 100644 --- a/src/openvfsfuse/strtools.h +++ b/src/openvfsfuse/strtools.h @@ -1,9 +1,9 @@ -#ifndef STRTOOLS_H -#define STRTOOLS_H - // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2026 Klaas Freitag +#ifndef STRTOOLS_H +#define STRTOOLS_H + #pragma once #include #include