Skip to content

Add SPDX licensing information for the uncommon licenses (not AFL-2.1|GPL-2.0+ and not MIT)

Simon McVittie requested to merge smcv/dbus:spdx into master

Based on !304 (with thanks to @rhabacker), but with a considerably smaller diffstat.

I'm deliberately taking several steps to make this more reviewable than !304:

  • concentrating on documenting the exceptional cases (files under unusual licenses), rather than the common case of AFL-2.1 OR GPL-2.0-or-later

  • not reformatting copyright notices from Copyright © ... to SPDX-FileCopyrightText: ...

  • not removing license boilerplate

See also !359 (merged) which was previously part of this MR.

  • dbus/versioninfo.rc.in: add LicenseRef-GAP SPDX license marker

    From: @rhabacker

    This permissive license does not appear to be a match for anything on the SPDX license list, so we need to use the LicenseRef- prefix for a custom license.

    It's referred to as GAP (presumably short for "GNU all-permissive") in https://sources.debian.org/src/libassuan/2.5.5-1/debian/copyright/ so use the same abbreviation here.

    Co-authored-by: @smcv

  • dbus/dbus-sha.c: add LicenseRef-pycrypto-orig SPDX license marker

    From: @rhabacker

    This permissive license does not appear to be a match for anything on the SPDX license list, so we need to use the LicenseRef- prefix for a custom license.

    Co-authored-by: @smcv

  • dbus-hash: Add (AFL-2.1 OR GPL-2.0-or-later) AND TCL SPDX license identifier

    The TCL-derived code is under its own license, so the overall license of the file is (AFL-2.1 OR GPL-2.0-or-later) AND TCL.

  • dbus-arch-deps: Mark as AFL-2.0 OR GPL-2.0-or-later

    This was probably meant to be relicensed from AFL-2.0 to AFL-2.1 at the same time as the rest of the codebase, but it wasn't. For now, just convert its documented license status into machine-readable form.

    The history of this file seems to be completely Red Hat and Collabora, so we should be able to relicense it to (AFL-2.1 OR GPL-2.0-or-later) or even to MIT, but let's start by making the stated license more obvious.

  • tools: Mark GPL-only files with SPDX license identifier

    These files are licensed under the GPL only, without the AFL dual-license of most of the dbus codebase.

  • dbus/dbus-backtrace-win.c: New file with backtrace generator for Windows

    From: @rhabacker

    This file was added to simplify the license documentation, because the code moved from dbus-sysdeps-win.c is subject to a different license.

    [smcv: keep license grant; add to Meson build system]

  • cmake: Add BSD-style licenses

    I've erred on the side of caution and treated the COPYING-CMAKE-SCRIPTS license (a BSD-3-Clause variation) as its own distinct license.

    Co-authored-by: @rhabacker

  • tools/cmake-format: Relicense to BSD-3-Clause

    From: @rhabacker

Edited by Simon McVittie

Merge request reports