mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-05 09:58:07 +02:00
Merge branch 'spdx-license-header' into 'main'
Migrate licenses in dbus source to SPDX format Closes #394 See merge request dbus/dbus!304
This commit is contained in:
commit
4fa66effb0
12 changed files with 136 additions and 9 deletions
|
|
@ -1,9 +0,0 @@
|
|||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: dbus
|
||||
Source: https://gitlab.freedesktop.org/dbus/dbus
|
||||
|
||||
Files:
|
||||
subprojects/*.wrap
|
||||
Copyright:
|
||||
© 2022-2023 Meson contributors
|
||||
License: MIT
|
||||
18
LICENSES/LicenseRef-unknown.txt
Normal file
18
LICENSES/LicenseRef-unknown.txt
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
Several older source files were contributed to dbus without explicitly
|
||||
specifying a license or a copyright holder. A reasonable assumption is
|
||||
that those files are probably intended to be licensed under
|
||||
"AFL-2.1 OR GPL-2.0-or-later".
|
||||
|
||||
Other projects wishing to reuse those source files should do whatever
|
||||
level of legal checking and research they consider to be appropriate.
|
||||
|
||||
A note explaining why this license is useful has been added at
|
||||
https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/304#note_2044026.
|
||||
The following text has been slightly modified as several files are
|
||||
affected:
|
||||
|
||||
...
|
||||
The fact that it’s not MIT-licensed would be machine-readable, and we
|
||||
would avoid the situation where someone accidentally does add
|
||||
SPDX-License-Identifier: MIT (or some other valid license) to the
|
||||
file(s) later on in a second pass without realising the history here.
|
||||
82
REUSE.toml
Normal file
82
REUSE.toml
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
version = 1
|
||||
SPDX-PackageName = "dbus"
|
||||
SPDX-PackageDownloadLocation = "https://gitlab.freedesktop.org/dbus/dbus"
|
||||
|
||||
[[annotations]]
|
||||
path = ["subprojects/**.wrap"]
|
||||
precedence = "aggregate"
|
||||
SPDX-FileCopyrightText = ["© 2022-2023 Meson contributors"]
|
||||
SPDX-License-Identifier = "MIT"
|
||||
|
||||
[[annotations]]
|
||||
path = ["test/data/invalid-config-files/*.conf"]
|
||||
precedence = "aggregate"
|
||||
SPDX-FileCopyrightText = ["Copyright © 2018 Collabora Ltd"]
|
||||
SPDX-License-Identifier = "AFL-2.1 OR GPL-2.0-or-later"
|
||||
|
||||
[[annotations]]
|
||||
path = [
|
||||
"doc/*.xml.in",
|
||||
"test/data/auth/*-script",
|
||||
"test/data/invalid-config-files/badselinux-2.conf",
|
||||
"test/data/invalid-config-files/truncated-file.conf",
|
||||
"test/data/invalid-config-files/badselinux-1.conf"
|
||||
]
|
||||
precedence = "aggregate"
|
||||
SPDX-FileCopyrightText = ["(c) 2003 Red Hat, Inc."]
|
||||
SPDX-License-Identifier = "AFL-2.1 OR GPL-2.0-or-later"
|
||||
|
||||
[[annotations]]
|
||||
path = [
|
||||
"test/data/invalid-config-files/circular-1.conf",
|
||||
"test/data/invalid-config-files/circular-2.conf",
|
||||
"test/data/invalid-config-files/circular-3.conf",
|
||||
"test/data/invalid-config-files/not-well-formed.conf"
|
||||
]
|
||||
precedence = "override"
|
||||
SPDX-License-Identifier = "LicenseRef-unknown"
|
||||
|
||||
[[annotations]]
|
||||
path = [
|
||||
"test/data/auth/external-username.auth-script",
|
||||
"test/data/auth/external-auto.auth-script"
|
||||
]
|
||||
precedence = "override"
|
||||
SPDX-FileCopyrightText = ["Copyright © 2018 Collabora Ltd"]
|
||||
SPDX-License-Identifier = "AFL-2.1 OR GPL-2.0-or-later"
|
||||
|
||||
[[annotations]]
|
||||
path = [
|
||||
"test/data/auth/cookie-sha1-username.auth-script",
|
||||
"test/data/auth/cookie-sha1.auth-script"
|
||||
]
|
||||
precedence = "override"
|
||||
SPDX-FileCopyrightText = ["Copyright © 2019 Collabora Ltd"]
|
||||
SPDX-License-Identifier = "AFL-2.1 OR GPL-2.0-or-later"
|
||||
|
||||
[[annotations]]
|
||||
path = ["test/data/auth/fallback.auth-script"]
|
||||
precedence = "override"
|
||||
SPDX-License-Identifier = "LicenseRef-unknown"
|
||||
|
||||
[[annotations]]
|
||||
path = [
|
||||
"bus/*.in",
|
||||
"test/data/equiv-config-files/*",
|
||||
"test/data/equiv-config-files/basic/*",
|
||||
"test/data/equiv-config-files/basic/basic.d/*",
|
||||
"test/data/equiv-config-files/entities/*",
|
||||
"test/data/equiv-config-files/entities/basic.d/*",
|
||||
"test/data/invalid-service-files-system/*",
|
||||
"test/data/sha-1/*",
|
||||
"test/data/systemd-activation/*",
|
||||
"test/data/valid-config-files-system/*",
|
||||
"test/data/valid-config-files-system/system.d/*",
|
||||
"test/data/valid-config-files/*",
|
||||
"test/data/valid-config-files/basic.d/*",
|
||||
"test/data/valid-service-files/*",
|
||||
"test/data/valid-service-files-system/*",
|
||||
"test/data/valid-service-files-system/system.d/*",
|
||||
]
|
||||
precedence = "aggregate"
|
||||
SPDX-License-Identifier = "LicenseRef-unknown"
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
/**
|
||||
* Test to make sure that pending calls succeed when given a default,
|
||||
* specific and infinite timeout.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <dbus/dbus-valgrind-internal.h>
|
||||
#include "../test-utils.h"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <dbus/dbus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "test-utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
/* This is simply a process that segfaults */
|
||||
#include <config.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "test-utils.h"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "test-utils.h"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
/* This is a process that just sleeps infinitely. */
|
||||
|
||||
#include <config.h>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue