summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2023-01-04 07:54:16 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2023-01-04 07:54:16 +0000
commita33ce73f1fe1a460ad59053a0578b9fafae81343 (patch)
tree5041ba9b1315ae44671b113a690d9f185f832978
parent53733fcc58ddc3ab4448c003360875cc2b0e4bd2 (diff)
parentdcf62703d9a6d48ef8f27829e34cee2963795fa4 (diff)
Merge branch 'spdx-afl-2.1-or-gpl-2.0' into 'master'
Add SPDX license marker for the AFL-2.1 OR GPL-2.0-or-later license See merge request dbus/dbus!375
-rw-r--r--bus/activation-exit-codes.h2
-rw-r--r--bus/activation-helper-bin.c2
-rw-r--r--bus/activation-helper.c2
-rw-r--r--bus/activation-helper.h2
-rw-r--r--bus/activation.c2
-rw-r--r--bus/activation.h2
-rw-r--r--bus/apparmor.c2
-rw-r--r--bus/apparmor.h2
-rw-r--r--bus/audit.c2
-rw-r--r--bus/audit.h2
-rw-r--r--bus/bus.c2
-rw-r--r--bus/bus.h2
-rw-r--r--bus/config-loader-expat.c2
-rw-r--r--bus/config-parser-common.c2
-rw-r--r--bus/config-parser-common.h2
-rw-r--r--bus/config-parser-trivial.c2
-rw-r--r--bus/config-parser-trivial.h2
-rw-r--r--bus/config-parser.c2
-rw-r--r--bus/config-parser.h2
-rw-r--r--bus/connection.c2
-rw-r--r--bus/connection.h2
-rw-r--r--bus/containers.c2
-rw-r--r--bus/containers.h2
-rw-r--r--bus/desktop-file.c2
-rw-r--r--bus/desktop-file.h2
-rw-r--r--bus/dir-watch-default.c2
-rw-r--r--bus/dir-watch-inotify.c2
-rw-r--r--bus/dir-watch-kqueue.c2
-rw-r--r--bus/dir-watch.h2
-rw-r--r--bus/dispatch.c2
-rw-r--r--bus/dispatch.h2
-rw-r--r--bus/driver.c2
-rw-r--r--bus/driver.h2
-rw-r--r--bus/expirelist.c2
-rw-r--r--bus/expirelist.h2
-rw-r--r--bus/main.c2
-rw-r--r--bus/policy.c2
-rw-r--r--bus/policy.h2
-rw-r--r--bus/selinux.c2
-rw-r--r--bus/selinux.h2
-rw-r--r--bus/services.c2
-rw-r--r--bus/services.h2
-rw-r--r--bus/signals.c2
-rw-r--r--bus/signals.h2
-rw-r--r--bus/stats.c2
-rw-r--r--bus/stats.h2
-rw-r--r--bus/test.c2
-rw-r--r--bus/test.h2
-rw-r--r--bus/utils.c2
-rw-r--r--bus/utils.h2
-rw-r--r--dbus/dbus-address.c2
-rw-r--r--dbus/dbus-address.h2
-rw-r--r--dbus/dbus-asv-util.c2
-rw-r--r--dbus/dbus-asv-util.h2
-rw-r--r--dbus/dbus-auth.c2
-rw-r--r--dbus/dbus-auth.h2
-rw-r--r--dbus/dbus-bus.c2
-rw-r--r--dbus/dbus-bus.h2
-rw-r--r--dbus/dbus-connection-internal.h2
-rw-r--r--dbus/dbus-connection.c2
-rw-r--r--dbus/dbus-connection.h2
-rw-r--r--dbus/dbus-credentials.c2
-rw-r--r--dbus/dbus-credentials.h2
-rw-r--r--dbus/dbus-dataslot.c2
-rw-r--r--dbus/dbus-dataslot.h2
-rw-r--r--dbus/dbus-errors.c2
-rw-r--r--dbus/dbus-errors.h2
-rw-r--r--dbus/dbus-file-unix.c2
-rw-r--r--dbus/dbus-file-win.c2
-rw-r--r--dbus/dbus-file.c2
-rw-r--r--dbus/dbus-file.h2
-rw-r--r--dbus/dbus-hash.h2
-rw-r--r--dbus/dbus-init-win.cpp2
-rw-r--r--dbus/dbus-internals.c2
-rw-r--r--dbus/dbus-internals.h2
-rw-r--r--dbus/dbus-keyring.c2
-rw-r--r--dbus/dbus-keyring.h2
-rw-r--r--dbus/dbus-list.c2
-rw-r--r--dbus/dbus-list.h2
-rw-r--r--dbus/dbus-macros-internal.h1
-rw-r--r--dbus/dbus-macros.h2
-rw-r--r--dbus/dbus-mainloop.c2
-rw-r--r--dbus/dbus-mainloop.h2
-rw-r--r--dbus/dbus-marshal-basic.c2
-rw-r--r--dbus/dbus-marshal-basic.h2
-rw-r--r--dbus/dbus-marshal-byteswap.c2
-rw-r--r--dbus/dbus-marshal-byteswap.h2
-rw-r--r--dbus/dbus-marshal-header.c2
-rw-r--r--dbus/dbus-marshal-header.h2
-rw-r--r--dbus/dbus-marshal-recursive.c2
-rw-r--r--dbus/dbus-marshal-recursive.h2
-rw-r--r--dbus/dbus-marshal-validate.c2
-rw-r--r--dbus/dbus-marshal-validate.h2
-rw-r--r--dbus/dbus-memory.c2
-rw-r--r--dbus/dbus-memory.h2
-rw-r--r--dbus/dbus-mempool.c2
-rw-r--r--dbus/dbus-mempool.h2
-rw-r--r--dbus/dbus-message-internal.h2
-rw-r--r--dbus/dbus-message-private.h2
-rw-r--r--dbus/dbus-message-util.c2
-rw-r--r--dbus/dbus-message.c2
-rw-r--r--dbus/dbus-message.h2
-rw-r--r--dbus/dbus-misc.c2
-rw-r--r--dbus/dbus-misc.h2
-rw-r--r--dbus/dbus-nonce.c2
-rw-r--r--dbus/dbus-nonce.h2
-rw-r--r--dbus/dbus-object-tree.c2
-rw-r--r--dbus/dbus-object-tree.h2
-rw-r--r--dbus/dbus-pending-call-internal.h2
-rw-r--r--dbus/dbus-pending-call.c2
-rw-r--r--dbus/dbus-pending-call.h2
-rw-r--r--dbus/dbus-pipe-unix.c2
-rw-r--r--dbus/dbus-pipe-win.c2
-rw-r--r--dbus/dbus-pipe.c2
-rw-r--r--dbus/dbus-pipe.h2
-rw-r--r--dbus/dbus-pollable-set-epoll.c2
-rw-r--r--dbus/dbus-pollable-set-poll.c2
-rw-r--r--dbus/dbus-pollable-set.c2
-rw-r--r--dbus/dbus-pollable-set.h2
-rw-r--r--dbus/dbus-protocol.h2
-rw-r--r--dbus/dbus-resources.c2
-rw-r--r--dbus/dbus-resources.h2
-rw-r--r--dbus/dbus-server-debug-pipe.c2
-rw-r--r--dbus/dbus-server-debug-pipe.h2
-rw-r--r--dbus/dbus-server-protected.h2
-rw-r--r--dbus/dbus-server-socket.c2
-rw-r--r--dbus/dbus-server-socket.h2
-rw-r--r--dbus/dbus-server-unix.c2
-rw-r--r--dbus/dbus-server-win.c2
-rw-r--r--dbus/dbus-server-win.h2
-rw-r--r--dbus/dbus-server.c2
-rw-r--r--dbus/dbus-server.h2
-rw-r--r--dbus/dbus-sha.h2
-rw-r--r--dbus/dbus-shared.h2
-rw-r--r--dbus/dbus-shell.c2
-rw-r--r--dbus/dbus-shell.h2
-rw-r--r--dbus/dbus-signature.c2
-rw-r--r--dbus/dbus-signature.h2
-rw-r--r--dbus/dbus-sockets-win.h2
-rw-r--r--dbus/dbus-spawn-unix.c2
-rw-r--r--dbus/dbus-spawn-win.c2
-rw-r--r--dbus/dbus-spawn.h2
-rw-r--r--dbus/dbus-string-private.h2
-rw-r--r--dbus/dbus-string-util.c2
-rw-r--r--dbus/dbus-string.c2
-rw-r--r--dbus/dbus-string.h2
-rw-r--r--dbus/dbus-syntax.c2
-rw-r--r--dbus/dbus-syntax.h2
-rw-r--r--dbus/dbus-sysdeps-pthread.c2
-rw-r--r--dbus/dbus-sysdeps-thread-win.c2
-rw-r--r--dbus/dbus-sysdeps-unix.c2
-rw-r--r--dbus/dbus-sysdeps-unix.h2
-rw-r--r--dbus/dbus-sysdeps-util-unix.c2
-rw-r--r--dbus/dbus-sysdeps-util-win.c2
-rw-r--r--dbus/dbus-sysdeps-util.c2
-rw-r--r--dbus/dbus-sysdeps-win.c2
-rw-r--r--dbus/dbus-sysdeps-win.h2
-rw-r--r--dbus/dbus-sysdeps-wince-glue.c2
-rw-r--r--dbus/dbus-sysdeps-wince-glue.h2
-rw-r--r--dbus/dbus-sysdeps.c2
-rw-r--r--dbus/dbus-sysdeps.h2
-rw-r--r--dbus/dbus-test.h2
-rw-r--r--dbus/dbus-threads-internal.h2
-rw-r--r--dbus/dbus-threads.c2
-rw-r--r--dbus/dbus-threads.h2
-rw-r--r--dbus/dbus-timeout.c2
-rw-r--r--dbus/dbus-timeout.h2
-rw-r--r--dbus/dbus-transport-protected.h2
-rw-r--r--dbus/dbus-transport-socket.c2
-rw-r--r--dbus/dbus-transport-socket.h2
-rw-r--r--dbus/dbus-transport-unix.c2
-rw-r--r--dbus/dbus-transport-unix.h2
-rw-r--r--dbus/dbus-transport-win.c2
-rw-r--r--dbus/dbus-transport-win.h2
-rw-r--r--dbus/dbus-transport.c2
-rw-r--r--dbus/dbus-transport.h2
-rw-r--r--dbus/dbus-types.h2
-rw-r--r--dbus/dbus-userdb-util.c2
-rw-r--r--dbus/dbus-userdb.c2
-rw-r--r--dbus/dbus-userdb.h2
-rw-r--r--dbus/dbus-uuidgen.c2
-rw-r--r--dbus/dbus-uuidgen.h2
-rw-r--r--dbus/dbus-valgrind-internal.h2
-rw-r--r--dbus/dbus-watch.c2
-rw-r--r--dbus/dbus-watch.h2
-rw-r--r--dbus/dbus.h2
-rw-r--r--doc/file-boilerplate.c2
-rw-r--r--doc/introspect.xsl2
-rw-r--r--test/bus/dispatch-sha1.c2
-rw-r--r--test/bus/failed-helper-activation.c2
-rw-r--r--test/bus/helper-activation.c2
-rw-r--r--test/bus/launch-helper-oom.c2
-rw-r--r--test/bus/main.c2
-rw-r--r--test/bus/normal-activation.c2
-rw-r--r--test/bus/system.c2
-rw-r--r--test/disable-crash-handling.c2
-rw-r--r--test/disable-crash-handling.h2
-rw-r--r--test/internals/address.c2
-rw-r--r--test/internals/dbus-auth-script.c2
-rw-r--r--test/internals/dbus-auth-script.h2
-rw-r--r--test/internals/dbus-auth-util.c2
-rw-r--r--test/internals/dbus-credentials-util.c2
-rw-r--r--test/internals/dbus-marshal-byteswap-util.c2
-rw-r--r--test/internals/dbus-marshal-recursive-util.c2
-rw-r--r--test/internals/dbus-marshal-recursive-util.h2
-rw-r--r--test/internals/dbus-marshal-validate-util.c2
-rw-r--r--test/internals/dbus-message-factory.c2
-rw-r--r--test/internals/dbus-message-factory.h2
-rw-r--r--test/internals/dbus-message-util.c2
-rw-r--r--test/internals/dbus-message-util.h2
-rw-r--r--test/internals/dbus-string-util.c2
-rw-r--r--test/internals/dbus-sysdeps-util.c2
-rw-r--r--test/internals/marshal-recursive.c2
-rw-r--r--test/internals/mempool.c2
-rw-r--r--test/internals/message-internals.c2
-rw-r--r--test/internals/misc-internals.c2
-rw-r--r--test/internals/misc-internals.h2
-rw-r--r--test/internals/sha.c2
-rw-r--r--test/internals/spawn-oom.c2
-rw-r--r--test/manual-backtrace.c2
-rw-r--r--test/test-platform-mutex.c2
-rw-r--r--test/thread-blocking.c2
-rw-r--r--tools/dbus-launch-win.c2
-rw-r--r--tools/dbus-launch-x11.c2
-rw-r--r--tools/dbus-launch.c2
-rw-r--r--tools/dbus-launch.h2
-rw-r--r--tools/dbus-run-session.c2
227 files changed, 453 insertions, 0 deletions
diff --git a/bus/activation-exit-codes.h b/bus/activation-exit-codes.h
index ffedb86b..0a093372 100644
--- a/bus/activation-exit-codes.h
+++ b/bus/activation-exit-codes.h
@@ -4,6 +4,8 @@
*
* Copyright (C) 2007 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/activation-helper-bin.c b/bus/activation-helper-bin.c
index 0446ee23..cefc8d33 100644
--- a/bus/activation-helper-bin.c
+++ b/bus/activation-helper-bin.c
@@ -4,6 +4,8 @@
*
* Copyright (C) 2007 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index df0472ce..1b640cfb 100644
--- a/bus/activation-helper.c
+++ b/bus/activation-helper.c
@@ -4,6 +4,8 @@
*
* Copyright (C) 2007 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/activation-helper.h b/bus/activation-helper.h
index 4b85ccb0..d5bc7ef8 100644
--- a/bus/activation-helper.h
+++ b/bus/activation-helper.h
@@ -4,6 +4,8 @@
*
* Copyright (C) 2007 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/activation.c b/bus/activation.c
index 48a44a30..68cbaae1 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -5,6 +5,8 @@
* Copyright (C) 2003 Red Hat, Inc.
* Copyright (C) 2004 Imendio HB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/activation.h b/bus/activation.h
index 7ae8ade9..e9f102af 100644
--- a/bus/activation.h
+++ b/bus/activation.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/apparmor.c b/bus/apparmor.c
index 985f5e9f..fe6cb305 100644
--- a/bus/apparmor.c
+++ b/bus/apparmor.c
@@ -5,6 +5,8 @@
*
* Copyright © 2014-2015 Canonical, Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/apparmor.h b/bus/apparmor.h
index ed465f71..9c3356f3 100644
--- a/bus/apparmor.h
+++ b/bus/apparmor.h
@@ -5,6 +5,8 @@
* Tyler Hicks <tyhicks@canonical.com>
* Based on: selinux.h by Matthew Rickard
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/audit.c b/bus/audit.c
index 9bfe456a..7287c61b 100644
--- a/bus/audit.c
+++ b/bus/audit.c
@@ -6,6 +6,8 @@
* Copyright © 2014-2015 Canonical, Ltd.
* Copyright © 2015 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/audit.h b/bus/audit.h
index e17016f3..dd41577c 100644
--- a/bus/audit.h
+++ b/bus/audit.h
@@ -1,6 +1,8 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
* audit.h - libaudit integration for SELinux and AppArmor
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/bus.c b/bus/bus.c
index 9003860e..26fdba4b 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/bus.h b/bus/bus.h
index b4411180..4aec1659 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
index 6cbd37eb..36cdef96 100644
--- a/bus/config-loader-expat.c
+++ b/bus/config-loader-expat.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/config-parser-common.c b/bus/config-parser-common.c
index 627c9013..12a01b47 100644
--- a/bus/config-parser-common.c
+++ b/bus/config-parser-common.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2007 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/config-parser-common.h b/bus/config-parser-common.h
index 1c601e97..be55bcd9 100644
--- a/bus/config-parser-common.h
+++ b/bus/config-parser-common.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2007 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
index a2174556..2325ac62 100644
--- a/bus/config-parser-trivial.c
+++ b/bus/config-parser-trivial.c
@@ -4,6 +4,8 @@
*
* Copyright (C) 2003, 2004, 2007 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/config-parser-trivial.h b/bus/config-parser-trivial.h
index ffd7d12e..32bf21bc 100644
--- a/bus/config-parser-trivial.h
+++ b/bus/config-parser-trivial.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/config-parser.c b/bus/config-parser.c
index 2d2a7ccd..de9a1398 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/config-parser.h b/bus/config-parser.h
index 7f4d2f47..6c05a073 100644
--- a/bus/config-parser.h
+++ b/bus/config-parser.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/connection.c b/bus/connection.c
index add1c8b8..a41b790b 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/connection.h b/bus/connection.h
index a48ab46b..0ce60d11 100644
--- a/bus/connection.h
+++ b/bus/connection.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/containers.c b/bus/containers.c
index 1a95a4a5..470177c0 100644
--- a/bus/containers.c
+++ b/bus/containers.c
@@ -2,6 +2,8 @@
*
* Copyright © 2017 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/containers.h b/bus/containers.h
index 7046bcbc..842a43f4 100644
--- a/bus/containers.h
+++ b/bus/containers.h
@@ -2,6 +2,8 @@
*
* Copyright © 2017 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/desktop-file.c b/bus/desktop-file.c
index b8491146..010e20b3 100644
--- a/bus/desktop-file.c
+++ b/bus/desktop-file.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/desktop-file.h b/bus/desktop-file.h
index 82c7e269..7caa3fd3 100644
--- a/bus/desktop-file.h
+++ b/bus/desktop-file.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/dir-watch-default.c b/bus/dir-watch-default.c
index c123817b..c476e496 100644
--- a/bus/dir-watch-default.c
+++ b/bus/dir-watch-default.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
index 9beadb0e..c8462c74 100644
--- a/bus/dir-watch-inotify.c
+++ b/bus/dir-watch-inotify.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003 Red Hat, Inc.
* (c) 2006 Mandriva
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
index a4ed7ca5..b419606e 100644
--- a/bus/dir-watch-kqueue.c
+++ b/bus/dir-watch-kqueue.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/dir-watch.h b/bus/dir-watch.h
index 537d2d1d..c0acefaa 100644
--- a/bus/dir-watch.h
+++ b/bus/dir-watch.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/dispatch.c b/bus/dispatch.c
index c7803b42..9bfdf795 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -5,6 +5,8 @@
* Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
* Copyright (C) 2004 Imendio HB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/dispatch.h b/bus/dispatch.h
index 32093dcb..befe4c1b 100644
--- a/bus/dispatch.h
+++ b/bus/dispatch.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/driver.c b/bus/driver.c
index 8ea2955b..b1d34f68 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/driver.h b/bus/driver.h
index d9d6d20d..2c03a4ae 100644
--- a/bus/driver.h
+++ b/bus/driver.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/expirelist.c b/bus/expirelist.c
index 77dbf718..684387ca 100644
--- a/bus/expirelist.c
+++ b/bus/expirelist.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/expirelist.h b/bus/expirelist.h
index 887cb97b..456cff71 100644
--- a/bus/expirelist.h
+++ b/bus/expirelist.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/main.c b/bus/main.c
index ddd9d952..c1ae5e72 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/policy.c b/bus/policy.c
index 74cb41bd..8c59cf0c 100644
--- a/bus/policy.c
+++ b/bus/policy.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/policy.h b/bus/policy.h
index df59d090..482f5fe4 100644
--- a/bus/policy.h
+++ b/bus/policy.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/selinux.c b/bus/selinux.c
index 42017e7a..359f69a7 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -3,6 +3,8 @@
*
* Author: Matthew Rickard <mjricka@epoch.ncsc.mil>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/selinux.h b/bus/selinux.h
index 471f2629..22d63caf 100644
--- a/bus/selinux.h
+++ b/bus/selinux.h
@@ -2,6 +2,8 @@
*
* Author: Matthew Rickard <mjricka@epoch.ncsc.mil>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/services.c b/bus/services.c
index cd2fb1c4..8a2bb61a 100644
--- a/bus/services.c
+++ b/bus/services.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/services.h b/bus/services.h
index 962db904..0a56b851 100644
--- a/bus/services.h
+++ b/bus/services.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/signals.c b/bus/signals.c
index d7314878..10230b3a 100644
--- a/bus/signals.c
+++ b/bus/signals.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/signals.h b/bus/signals.h
index 027e921c..fd90d81c 100644
--- a/bus/signals.h
+++ b/bus/signals.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/stats.c b/bus/stats.c
index 15822556..dacbd186 100644
--- a/bus/stats.c
+++ b/bus/stats.c
@@ -3,6 +3,8 @@
* Copyright © 2011-2012 Nokia Corporation
* Copyright © 2012-2013 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/stats.h b/bus/stats.h
index dcb022c4..ce283961 100644
--- a/bus/stats.h
+++ b/bus/stats.h
@@ -1,5 +1,7 @@
/* stats.h - statistics from the bus driver
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/test.c b/bus/test.c
index 8d413fb5..6c9e62c1 100644
--- a/bus/test.c
+++ b/bus/test.c
@@ -5,6 +5,8 @@
* Copyright 2011 Collabora Ltd.
* Copyright 2018 Laurent Bigonville
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/test.h b/bus/test.h
index a6658cab..3a4fab47 100644
--- a/bus/test.h
+++ b/bus/test.h
@@ -6,6 +6,8 @@
* Copyright 2009 Lennart Poettering
* Copyright 2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/utils.c b/bus/utils.c
index 1972b756..922c8e0f 100644
--- a/bus/utils.c
+++ b/bus/utils.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/bus/utils.h b/bus/utils.h
index 30d7e0f8..5657e4f4 100644
--- a/bus/utils.h
+++ b/bus/utils.h
@@ -4,6 +4,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-address.c b/dbus/dbus-address.c
index 0eafdb2a..1093d7d1 100644
--- a/dbus/dbus-address.c
+++ b/dbus/dbus-address.c
@@ -6,6 +6,8 @@
* Copyright (C) 2007 Ralf Habacker
* Copyright (C) 2013 Chengwei Yang / Intel
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-address.h b/dbus/dbus-address.h
index 30df4463..c0303430 100644
--- a/dbus/dbus-address.h
+++ b/dbus/dbus-address.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-asv-util.c b/dbus/dbus-asv-util.c
index 31cc10ae..ace8f503 100644
--- a/dbus/dbus-asv-util.c
+++ b/dbus/dbus-asv-util.c
@@ -3,6 +3,8 @@
* Copyright © 2011-2012 Nokia Corporation
* Copyright © 2012-2013 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-asv-util.h b/dbus/dbus-asv-util.h
index f717ae9a..da1ef25b 100644
--- a/dbus/dbus-asv-util.h
+++ b/dbus/dbus-asv-util.h
@@ -3,6 +3,8 @@
* Copyright © 2011-2012 Nokia Corporation
* Copyright © 2012-2013 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index d4faa737..bcb612a8 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-auth.h b/dbus/dbus-auth.h
index 96a8a17c..4612d5a8 100644
--- a/dbus/dbus-auth.h
+++ b/dbus/dbus-auth.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 35fc135e..f0c790df 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-bus.h b/dbus/dbus-bus.h
index c4c602ab..31ade9a6 100644
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index de4e55b1..912b546e 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 5841d817..105bdf4e 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002-2006 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index 5d9f244d..b79fda83 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-credentials.c b/dbus/dbus-credentials.c
index 79f0c770..d932865e 100644
--- a/dbus/dbus-credentials.c
+++ b/dbus/dbus-credentials.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2007 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-credentials.h b/dbus/dbus-credentials.h
index 92a469f0..6da0d1ae 100644
--- a/dbus/dbus-credentials.h
+++ b/dbus/dbus-credentials.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2007 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
index a4503a29..776f9278 100644
--- a/dbus/dbus-dataslot.c
+++ b/dbus/dbus-dataslot.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-dataslot.h b/dbus/dbus-dataslot.h
index dccf6f45..08322c1c 100644
--- a/dbus/dbus-dataslot.h
+++ b/dbus/dbus-dataslot.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c
index 0f228dc1..24e54a82 100644
--- a/dbus/dbus-errors.c
+++ b/dbus/dbus-errors.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2004 Red Hat Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h
index 945ddb4c..003f583b 100644
--- a/dbus/dbus-errors.h
+++ b/dbus/dbus-errors.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002 Red Hat Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-file-unix.c b/dbus/dbus-file-unix.c
index dd7cfbad..6da44504 100644
--- a/dbus/dbus-file-unix.c
+++ b/dbus/dbus-file-unix.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c
index 5385f856..a17e0869 100644
--- a/dbus/dbus-file-win.c
+++ b/dbus/dbus-file-win.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-file.c b/dbus/dbus-file.c
index c0eb1aca..5b122189 100644
--- a/dbus/dbus-file.c
+++ b/dbus/dbus-file.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-file.h b/dbus/dbus-file.h
index eb149656..90fc5295 100644
--- a/dbus/dbus-file.h
+++ b/dbus/dbus-file.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h
index dc36633a..290fb1a2 100644
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-init-win.cpp b/dbus/dbus-init-win.cpp
index 687f248c..3464c88f 100644
--- a/dbus/dbus-init-win.cpp
+++ b/dbus/dbus-init-win.cpp
@@ -3,6 +3,8 @@
*
* Copyright © 2013 Intel Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index 3e578eb5..03635329 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 4643053b..cc98c92a 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index d2df3d86..9dd45310 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2004 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h
index e7b2de83..fe122b8e 100644
--- a/dbus/dbus-keyring.h
+++ b/dbus/dbus-keyring.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
index d3ca20f7..b3b76c75 100644
--- a/dbus/dbus-list.c
+++ b/dbus/dbus-list.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-list.h b/dbus/dbus-list.h
index f59a4a23..49217df2 100644
--- a/dbus/dbus-list.h
+++ b/dbus/dbus-list.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-macros-internal.h b/dbus/dbus-macros-internal.h
index c8df79f2..3d7c0683 100644
--- a/dbus/dbus-macros-internal.h
+++ b/dbus/dbus-macros-internal.h
@@ -1,6 +1,7 @@
/*
* Copyright © 2010-2015 Ralf Habacker
* Copyright © 2015-2019 Collabora Ltd.
+ *
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
*
* Licensed under the Academic Free License version 2.1
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
index 2dd9fcd3..5ca7bf0a 100644
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
index ffc692fb..3bfc0e9b 100644
--- a/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@ -4,6 +4,8 @@
* Copyright © 2003, 2004 Red Hat, Inc.
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-mainloop.h b/dbus/dbus-mainloop.h
index 40350977..4d5994fb 100644
--- a/dbus/dbus-mainloop.h
+++ b/dbus/dbus-mainloop.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
index 1f5d54a4..64d68dae 100644
--- a/dbus/dbus-marshal-basic.c
+++ b/dbus/dbus-marshal-basic.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002 CodeFactory AB
* Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-basic.h b/dbus/dbus-marshal-basic.h
index 15971b32..48b90d6a 100644
--- a/dbus/dbus-marshal-basic.h
+++ b/dbus/dbus-marshal-basic.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002 CodeFactory AB
* Copyright (C) 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-byteswap.c b/dbus/dbus-marshal-byteswap.c
index 9dd1246f..1aea5d07 100644
--- a/dbus/dbus-marshal-byteswap.c
+++ b/dbus/dbus-marshal-byteswap.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-byteswap.h b/dbus/dbus-marshal-byteswap.h
index f66f2e21..b64ba385 100644
--- a/dbus/dbus-marshal-byteswap.h
+++ b/dbus/dbus-marshal-byteswap.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c
index b2461749..30636d79 100644
--- a/dbus/dbus-marshal-header.c
+++ b/dbus/dbus-marshal-header.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-header.h b/dbus/dbus-marshal-header.h
index b838e039..c59033ad 100644
--- a/dbus/dbus-marshal-header.h
+++ b/dbus/dbus-marshal-header.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
index 6aa513cf..a85aabd8 100644
--- a/dbus/dbus-marshal-recursive.c
+++ b/dbus/dbus-marshal-recursive.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h
index 5822e058..4aa61ba1 100644
--- a/dbus/dbus-marshal-recursive.h
+++ b/dbus/dbus-marshal-recursive.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
index c2f7030e..53378b61 100644
--- a/dbus/dbus-marshal-validate.c
+++ b/dbus/dbus-marshal-validate.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-marshal-validate.h b/dbus/dbus-marshal-validate.h
index bc7c8174..94737872 100644
--- a/dbus/dbus-marshal-validate.h
+++ b/dbus/dbus-marshal-validate.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index ce177bea..be7e4ef6 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-memory.h b/dbus/dbus-memory.h
index 4dcf2f92..5b5a41e1 100644
--- a/dbus/dbus-memory.h
+++ b/dbus/dbus-memory.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index dc0b4467..5bc4a97b 100644
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -5,6 +5,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2011-2012 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-mempool.h b/dbus/dbus-mempool.h
index 8ec3acd5..fe7efd1d 100644
--- a/dbus/dbus-mempool.h
+++ b/dbus/dbus-mempool.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
index adc07f98..55f473f4 100644
--- a/dbus/dbus-message-internal.h
+++ b/dbus/dbus-message-internal.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-message-private.h b/dbus/dbus-message-private.h
index fed06ce0..eb52f44f 100644
--- a/dbus/dbus-message-private.h
+++ b/dbus/dbus-message-private.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
index be8b63d4..f48f8625 100644
--- a/dbus/dbus-message-util.c
+++ b/dbus/dbus-message-util.c
@@ -3,6 +3,8 @@
*
* Copyright 2017 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index b43d5f75..d82e335e 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2004, 2005 Red Hat Inc.
* Copyright (C) 2002, 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index 931917f5..0bbad3d1 100644
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-misc.c b/dbus/dbus-misc.c
index 67a28403..0f6c2e6d 100644
--- a/dbus/dbus-misc.c
+++ b/dbus/dbus-misc.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2006 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-misc.h b/dbus/dbus-misc.h
index ff2a7e4b..3442ab78 100644
--- a/dbus/dbus-misc.h
+++ b/dbus/dbus-misc.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2006 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index c6e0a086..5ac9a013 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2009 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-nonce.h b/dbus/dbus-nonce.h
index bf32af80..d26dc397 100644
--- a/dbus/dbus-nonce.h
+++ b/dbus/dbus-nonce.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2009 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 6038a63c..bb7d5479 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-object-tree.h b/dbus/dbus-object-tree.h
index 1cba2a04..245f9336 100644
--- a/dbus/dbus-object-tree.h
+++ b/dbus/dbus-object-tree.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pending-call-internal.h b/dbus/dbus-pending-call-internal.h
index dc53003d..a3734937 100644
--- a/dbus/dbus-pending-call-internal.h
+++ b/dbus/dbus-pending-call-internal.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index 84fdcb58..f0b39d90 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pending-call.h b/dbus/dbus-pending-call.h
index f5122f19..3539a1f2 100644
--- a/dbus/dbus-pending-call.h
+++ b/dbus/dbus-pending-call.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pipe-unix.c b/dbus/dbus-pipe-unix.c
index cbf793fb..314c7293 100644
--- a/dbus/dbus-pipe-unix.c
+++ b/dbus/dbus-pipe-unix.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pipe-win.c b/dbus/dbus-pipe-win.c
index f12e834a..5667ad91 100644
--- a/dbus/dbus-pipe-win.c
+++ b/dbus/dbus-pipe-win.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pipe.c b/dbus/dbus-pipe.c
index c9b78c7e..f1fb19ff 100644
--- a/dbus/dbus-pipe.c
+++ b/dbus/dbus-pipe.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pipe.h b/dbus/dbus-pipe.h
index a0ff072b..1e579aa4 100644
--- a/dbus/dbus-pipe.h
+++ b/dbus/dbus-pipe.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pollable-set-epoll.c b/dbus/dbus-pollable-set-epoll.c
index 7bd200b3..24f00935 100644
--- a/dbus/dbus-pollable-set-epoll.c
+++ b/dbus/dbus-pollable-set-epoll.c
@@ -3,6 +3,8 @@
*
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pollable-set-poll.c b/dbus/dbus-pollable-set-poll.c
index 24c2c961..46a31fc2 100644
--- a/dbus/dbus-pollable-set-poll.c
+++ b/dbus/dbus-pollable-set-poll.c
@@ -3,6 +3,8 @@
*
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pollable-set.c b/dbus/dbus-pollable-set.c
index e3aaedc5..862ae25a 100644
--- a/dbus/dbus-pollable-set.c
+++ b/dbus/dbus-pollable-set.c
@@ -4,6 +4,8 @@
*
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-pollable-set.h b/dbus/dbus-pollable-set.h
index b92d776a..5335cdfc 100644
--- a/dbus/dbus-pollable-set.h
+++ b/dbus/dbus-pollable-set.h
@@ -4,6 +4,8 @@
*
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h
index b3db8c61..33e39df3 100644
--- a/dbus/dbus-protocol.h
+++ b/dbus/dbus-protocol.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 CodeFactory AB
* Copyright (C) 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-resources.c b/dbus/dbus-resources.c
index 9ed663ad..782cb452 100644
--- a/dbus/dbus-resources.c
+++ b/dbus/dbus-resources.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-resources.h b/dbus/dbus-resources.h
index 9ac4d334..4c7342ee 100644
--- a/dbus/dbus-resources.h
+++ b/dbus/dbus-resources.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c
index 4f9f4ffb..bf91939a 100644
--- a/dbus/dbus-server-debug-pipe.c
+++ b/dbus/dbus-server-debug-pipe.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-debug-pipe.h b/dbus/dbus-server-debug-pipe.h
index 68490391..4284dc57 100644
--- a/dbus/dbus-server-debug-pipe.h
+++ b/dbus/dbus-server-debug-pipe.h
@@ -4,6 +4,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h
index d9254f47..d5aee150 100644
--- a/dbus/dbus-server-protected.h
+++ b/dbus/dbus-server-protected.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
index 56cab0b5..5dc1b54e 100644
--- a/dbus/dbus-server-socket.c
+++ b/dbus/dbus-server-socket.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2004, 2006 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-socket.h b/dbus/dbus-server-socket.h
index 64a51dc2..31b086e8 100644
--- a/dbus/dbus-server-socket.h
+++ b/dbus/dbus-server-socket.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2006 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
index 3a0a75cd..dd1cb525 100644
--- a/dbus/dbus-server-unix.c
+++ b/dbus/dbus-server-unix.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-win.c b/dbus/dbus-server-win.c
index 890ee328..af0b697e 100644
--- a/dbus/dbus-server-win.c
+++ b/dbus/dbus-server-win.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
* Copyright (C) 2007 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server-win.h b/dbus/dbus-server-win.h
index df7bf0d1..e690404d 100644
--- a/dbus/dbus-server-win.h
+++ b/dbus/dbus-server-win.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002 Red Hat Inc.
* Copyright (C) 2007 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index b58c4e75..27c31477 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2004, 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-server.h b/dbus/dbus-server.h
index 0d84f796..1f8c5949 100644
--- a/dbus/dbus-server.h
+++ b/dbus/dbus-server.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sha.h b/dbus/dbus-sha.h
index 988cd5a9..e0677844 100644
--- a/dbus/dbus-sha.h
+++ b/dbus/dbus-sha.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-shared.h b/dbus/dbus-shared.h
index d6a3c989..87c0bd84 100644
--- a/dbus/dbus-shared.h
+++ b/dbus/dbus-shared.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2004 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-shell.c b/dbus/dbus-shell.c
index fb00523f..50e8909c 100644
--- a/dbus/dbus-shell.c
+++ b/dbus/dbus-shell.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-shell.h b/dbus/dbus-shell.h
index e6f6b595..49eddc0b 100644
--- a/dbus/dbus-shell.h
+++ b/dbus/dbus-shell.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index 01a456bc..85d4fc49 100644
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-signature.h b/dbus/dbus-signature.h
index c9571cd0..a8a0486b 100644
--- a/dbus/dbus-signature.h
+++ b/dbus/dbus-signature.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sockets-win.h b/dbus/dbus-sockets-win.h
index 50d59a53..0924179c 100644
--- a/dbus/dbus-sockets-win.h
+++ b/dbus/dbus-sockets-win.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Novell, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-spawn-unix.c b/dbus/dbus-spawn-unix.c
index fb5b4267..0bf476bd 100644
--- a/dbus/dbus-spawn-unix.c
+++ b/dbus/dbus-spawn-unix.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2004 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index c879688d..3b4bc052 100644
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@ -17,6 +17,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2005 Novell, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-spawn.h b/dbus/dbus-spawn.h
index 03458d0a..56059b7f 100644
--- a/dbus/dbus-spawn.h
+++ b/dbus/dbus-spawn.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h
index 0524849d..24e1e610 100644
--- a/dbus/dbus-string-private.h
+++ b/dbus/dbus-string-private.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c
index 5b433102..2c627c17 100644
--- a/dbus/dbus-string-util.c
+++ b/dbus/dbus-string-util.c
@@ -10,6 +10,8 @@
* Copyright 2011 Roberto Guido
* Copyright 2016-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
index 1fecd6dd..b3826fe1 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -11,6 +11,8 @@
* Copyright 2011 Roberto Guido
* Copyright 2013 Chengwei Yang / Intel
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index dc223c61..4689154f 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2006 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-syntax.c b/dbus/dbus-syntax.c
index 7ef659cb..288824fe 100644
--- a/dbus/dbus-syntax.c
+++ b/dbus/dbus-syntax.c
@@ -4,6 +4,8 @@
* Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-syntax.h b/dbus/dbus-syntax.h
index daf20f06..57459b17 100644
--- a/dbus/dbus-syntax.h
+++ b/dbus/dbus-syntax.h
@@ -4,6 +4,8 @@
* Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c
index 3199e31d..f9c25604 100644
--- a/dbus/dbus-sysdeps-pthread.c
+++ b/dbus/dbus-sysdeps-pthread.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c
index c8f0b308..48262306 100644
--- a/dbus/dbus-sysdeps-thread-win.c
+++ b/dbus/dbus-sysdeps-thread-win.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2006 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 901c5c68..dbc459ce 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h
index 06614ecc..b400cf86 100644
--- a/dbus/dbus-sysdeps-unix.h
+++ b/dbus/dbus-sysdeps-unix.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index baf6b8a2..bda0198b 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
index c572fcd0..12d7b369 100644
--- a/dbus/dbus-sysdeps-util-win.c
+++ b/dbus/dbus-sysdeps-util-win.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c
index 66af910e..a9ed47d6 100644
--- a/dbus/dbus-sysdeps-util.c
+++ b/dbus/dbus-sysdeps-util.c
@@ -7,6 +7,8 @@
* Copyright 2006 Sjoerd Simons
* Copyright 2016-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 3e6bdfd6..11064bb4 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -8,6 +8,8 @@
* Copyright (C) 2006 Christian Ehrlicher <ch.ehrlicher@gmx.de>
* Copyright (C) 2006-2021 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-win.h b/dbus/dbus-sysdeps-win.h
index 5027f180..be9cbe15 100644
--- a/dbus/dbus-sysdeps-win.h
+++ b/dbus/dbus-sysdeps-win.h
@@ -5,6 +5,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2005 Novell, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-wince-glue.c b/dbus/dbus-sysdeps-wince-glue.c
index f35e4db2..182262c6 100644
--- a/dbus/dbus-sysdeps-wince-glue.c
+++ b/dbus/dbus-sysdeps-wince-glue.c
@@ -8,6 +8,8 @@
* Copyright (C) 2006 Peter Kümmel <syntheticpp@gmx.net>
* Copyright (C) 2006 Christian Ehrlicher <ch.ehrlicher@gmx.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps-wince-glue.h b/dbus/dbus-sysdeps-wince-glue.h
index 4765627a..88b9b104 100644
--- a/dbus/dbus-sysdeps-wince-glue.h
+++ b/dbus/dbus-sysdeps-wince-glue.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 4c9b286d..537e7635 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2006 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 7023ea71..36ababdb 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003 Red Hat, Inc.
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index a8601932..8eac0041 100644
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-threads-internal.h b/dbus/dbus-threads-internal.h
index 681b5d88..4c7bde63 100644
--- a/dbus/dbus-threads-internal.h
+++ b/dbus/dbus-threads-internal.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
index 8d7c03cd..b22cc031 100644
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2006 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-threads.h b/dbus/dbus-threads.h
index d30200d8..33e1e327 100644
--- a/dbus/dbus-threads.h
+++ b/dbus/dbus-threads.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-timeout.c b/dbus/dbus-timeout.c
index 131d3f8b..5ee9808a 100644
--- a/dbus/dbus-timeout.c
+++ b/dbus/dbus-timeout.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-timeout.h b/dbus/dbus-timeout.h
index 6b2fb339..73fdb952 100644
--- a/dbus/dbus-timeout.h
+++ b/dbus/dbus-timeout.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 CodeFactory AB
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport-protected.h b/dbus/dbus-transport-protected.h
index a42c5a34..136c4031 100644
--- a/dbus/dbus-transport-protected.h
+++ b/dbus/dbus-transport-protected.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2004 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index baf5b813..d3c2b914 100644
--- a/dbus/dbus-transport-socket.c
+++ b/dbus/dbus-transport-socket.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2004, 2006 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport-socket.h b/dbus/dbus-transport-socket.h
index 7c8efd2a..65de3c15 100644
--- a/dbus/dbus-transport-socket.h
+++ b/dbus/dbus-transport-socket.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2006 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index f2e7228d..a8dfaa52 100644
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport-unix.h b/dbus/dbus-transport-unix.h
index 7d3741a5..df30a179 100644
--- a/dbus/dbus-transport-unix.h
+++ b/dbus/dbus-transport-unix.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport-win.c b/dbus/dbus-transport-win.c
index 5fbe6fda..6a0dddce 100644
--- a/dbus/dbus-transport-win.c
+++ b/dbus/dbus-transport-win.c
@@ -4,6 +4,8 @@
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
* Copyright (C) 2007 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport-win.h b/dbus/dbus-transport-win.h
index aca99452..28ccfa85 100644
--- a/dbus/dbus-transport-win.h
+++ b/dbus/dbus-transport-win.h
@@ -4,6 +4,8 @@
* Copyright (C) 2002 Red Hat Inc.
* Copyright (C) 2007 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 0a18db16..dd31a82b 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-transport.h b/dbus/dbus-transport.h
index 4028726f..24fd1ac8 100644
--- a/dbus/dbus-transport.h
+++ b/dbus/dbus-transport.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2004 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-types.h b/dbus/dbus-types.h
index b953b580..5ace2733 100644
--- a/dbus/dbus-types.h
+++ b/dbus/dbus-types.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-userdb-util.c b/dbus/dbus-userdb-util.c
index 0eadc78a..4bb5c533 100644
--- a/dbus/dbus-userdb-util.c
+++ b/dbus/dbus-userdb-util.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index ddf41a3c..452ff9d7 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003, 2004 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-userdb.h b/dbus/dbus-userdb.h
index fcb515c8..1853a430 100644
--- a/dbus/dbus-userdb.h
+++ b/dbus/dbus-userdb.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-uuidgen.c b/dbus/dbus-uuidgen.c
index 79159106..4a5aa13f 100644
--- a/dbus/dbus-uuidgen.c
+++ b/dbus/dbus-uuidgen.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2006 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-uuidgen.h b/dbus/dbus-uuidgen.h
index bd098b03..b74d9e0e 100644
--- a/dbus/dbus-uuidgen.h
+++ b/dbus/dbus-uuidgen.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2006 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-valgrind-internal.h b/dbus/dbus-valgrind-internal.h
index 6760b40d..4c3f3ff7 100644
--- a/dbus/dbus-valgrind-internal.h
+++ b/dbus/dbus-valgrind-internal.h
@@ -3,6 +3,8 @@
*
* Copyright © 2011 Nokia Corporation
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
index 6644bf15..76298ba1 100644
--- a/dbus/dbus-watch.c
+++ b/dbus/dbus-watch.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus-watch.h b/dbus/dbus-watch.h
index b8fe6a84..2b278461 100644
--- a/dbus/dbus-watch.h
+++ b/dbus/dbus-watch.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/dbus/dbus.h b/dbus/dbus.h
index dbfe6761..53998c54 100644
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/doc/file-boilerplate.c b/doc/file-boilerplate.c
index bc365f80..1baaf96b 100644
--- a/doc/file-boilerplate.c
+++ b/doc/file-boilerplate.c
@@ -3,6 +3,8 @@
*
* Copyright (C) YEAR COPYRIGHT HOLDER
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/doc/introspect.xsl b/doc/introspect.xsl
index 89b68441..edc9d795 100644
--- a/doc/introspect.xsl
+++ b/doc/introspect.xsl
@@ -4,6 +4,8 @@
<!--
Copyright (C) 2005 Lennart Poettering.
+ SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+
Licensed under the Academic Free License version 2.1
This program is free software; you can redistribute it and/or modify
diff --git a/test/bus/dispatch-sha1.c b/test/bus/dispatch-sha1.c
index dc2dcb5d..d36cb70c 100644
--- a/test/bus/dispatch-sha1.c
+++ b/test/bus/dispatch-sha1.c
@@ -3,6 +3,8 @@
* Copyright 2003-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/bus/failed-helper-activation.c b/test/bus/failed-helper-activation.c
index 044ab42d..ee740054 100644
--- a/test/bus/failed-helper-activation.c
+++ b/test/bus/failed-helper-activation.c
@@ -3,6 +3,8 @@
* Copyright 2003-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/bus/helper-activation.c b/test/bus/helper-activation.c
index f4c9a37d..9cb3907a 100644
--- a/test/bus/helper-activation.c
+++ b/test/bus/helper-activation.c
@@ -3,6 +3,8 @@
* Copyright 2003-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/bus/launch-helper-oom.c b/test/bus/launch-helper-oom.c
index 8a9879e1..415eb8ce 100644
--- a/test/bus/launch-helper-oom.c
+++ b/test/bus/launch-helper-oom.c
@@ -4,6 +4,8 @@
* Copyright 2007 Red Hat, Inc.
* Copyright 2013-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/bus/main.c b/test/bus/main.c
index 16c0ac20..013be480 100644
--- a/test/bus/main.c
+++ b/test/bus/main.c
@@ -4,6 +4,8 @@
* Copyright 2003-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/bus/normal-activation.c b/test/bus/normal-activation.c
index ce935a5f..326f777e 100644
--- a/test/bus/normal-activation.c
+++ b/test/bus/normal-activation.c
@@ -3,6 +3,8 @@
* Copyright 2003-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/bus/system.c b/test/bus/system.c
index 38307e1f..d6cf33f6 100644
--- a/test/bus/system.c
+++ b/test/bus/system.c
@@ -4,6 +4,8 @@
* Copyright 2003-2007 Red Hat, Inc.
* Copyright 2013-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/disable-crash-handling.c b/test/disable-crash-handling.c
index 14295071..8ac5b5d5 100644
--- a/test/disable-crash-handling.c
+++ b/test/disable-crash-handling.c
@@ -4,6 +4,8 @@
* Copyright 2014-2018 Collabora Ltd.
* Copyright 2016 Yiyang Fei
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/disable-crash-handling.h b/test/disable-crash-handling.h
index 28ca33cf..f300b018 100644
--- a/test/disable-crash-handling.h
+++ b/test/disable-crash-handling.h
@@ -4,6 +4,8 @@
* Copyright 2014-2018 Collabora Ltd.
* Copyright 2016 Yiyang Fei
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/address.c b/test/internals/address.c
index dbc8bca2..9923fe28 100644
--- a/test/internals/address.c
+++ b/test/internals/address.c
@@ -6,6 +6,8 @@
* Copyright (C) 2007 Ralf Habacker
* Copyright (C) 2013 Chengwei Yang / Intel
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-auth-script.c b/test/internals/dbus-auth-script.c
index de81ffb3..41b03998 100644
--- a/test/internals/dbus-auth-script.c
+++ b/test/internals/dbus-auth-script.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-auth-script.h b/test/internals/dbus-auth-script.h
index fd5d9cc3..5fce78ac 100644
--- a/test/internals/dbus-auth-script.h
+++ b/test/internals/dbus-auth-script.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2003 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-auth-util.c b/test/internals/dbus-auth-util.c
index d1916b6e..980fe801 100644
--- a/test/internals/dbus-auth-util.c
+++ b/test/internals/dbus-auth-util.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2002, 2003, 2004 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-credentials-util.c b/test/internals/dbus-credentials-util.c
index 8c497b22..06400925 100644
--- a/test/internals/dbus-credentials-util.c
+++ b/test/internals/dbus-credentials-util.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2007 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-marshal-byteswap-util.c b/test/internals/dbus-marshal-byteswap-util.c
index 40b1780a..72abfc4c 100644
--- a/test/internals/dbus-marshal-byteswap-util.c
+++ b/test/internals/dbus-marshal-byteswap-util.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-marshal-recursive-util.c b/test/internals/dbus-marshal-recursive-util.c
index f05232f9..a7113304 100644
--- a/test/internals/dbus-marshal-recursive-util.c
+++ b/test/internals/dbus-marshal-recursive-util.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-marshal-recursive-util.h b/test/internals/dbus-marshal-recursive-util.h
index ab069e4c..20cee97e 100644
--- a/test/internals/dbus-marshal-recursive-util.h
+++ b/test/internals/dbus-marshal-recursive-util.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2004, 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-marshal-validate-util.c b/test/internals/dbus-marshal-validate-util.c
index 4179928b..41012f46 100644
--- a/test/internals/dbus-marshal-validate-util.c
+++ b/test/internals/dbus-marshal-validate-util.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-message-factory.c b/test/internals/dbus-message-factory.c
index db02737a..b6f97d76 100644
--- a/test/internals/dbus-message-factory.c
+++ b/test/internals/dbus-message-factory.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-message-factory.h b/test/internals/dbus-message-factory.h
index 636e4709..f57b2972 100644
--- a/test/internals/dbus-message-factory.h
+++ b/test/internals/dbus-message-factory.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2005 Red Hat Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-message-util.c b/test/internals/dbus-message-util.c
index 8e6fa373..310822d6 100644
--- a/test/internals/dbus-message-util.c
+++ b/test/internals/dbus-message-util.c
@@ -12,6 +12,8 @@
* Copyright 2014 Ralf Habacker
* Copyright 2017 Endless Mobile, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-message-util.h b/test/internals/dbus-message-util.h
index d65be2d9..f9c4a537 100644
--- a/test/internals/dbus-message-util.h
+++ b/test/internals/dbus-message-util.h
@@ -11,6 +11,8 @@
* Copyright 2014 Ralf Habacker
* Copyright 2017 Endless Mobile, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-string-util.c b/test/internals/dbus-string-util.c
index b4a3aa68..d5a740c4 100644
--- a/test/internals/dbus-string-util.c
+++ b/test/internals/dbus-string-util.c
@@ -10,6 +10,8 @@
* Copyright 2011 Roberto Guido
* Copyright 2016-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/dbus-sysdeps-util.c b/test/internals/dbus-sysdeps-util.c
index 7e2dc064..3c8c5cc1 100644
--- a/test/internals/dbus-sysdeps-util.c
+++ b/test/internals/dbus-sysdeps-util.c
@@ -7,6 +7,8 @@
* Copyright 2006 Sjoerd Simons
* Copyright 2016-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/marshal-recursive.c b/test/internals/marshal-recursive.c
index 5866657a..137d52a6 100644
--- a/test/internals/marshal-recursive.c
+++ b/test/internals/marshal-recursive.c
@@ -3,6 +3,8 @@
* Copyright 2002-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/mempool.c b/test/internals/mempool.c
index 53a606fd..dd65889f 100644
--- a/test/internals/mempool.c
+++ b/test/internals/mempool.c
@@ -5,6 +5,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2013 Chengwei Yang / Intel
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/message-internals.c b/test/internals/message-internals.c
index 547947ae..6698d509 100644
--- a/test/internals/message-internals.c
+++ b/test/internals/message-internals.c
@@ -3,6 +3,8 @@
* Copyright 2002-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/misc-internals.c b/test/internals/misc-internals.c
index e8abbb57..0dfbabe5 100644
--- a/test/internals/misc-internals.c
+++ b/test/internals/misc-internals.c
@@ -6,6 +6,8 @@
* Copyright 2011-2019 Collabora Ltd.
* Copyright 2012 Lennart Poettering
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/misc-internals.h b/test/internals/misc-internals.h
index 7f4d2cdf..999590fc 100644
--- a/test/internals/misc-internals.h
+++ b/test/internals/misc-internals.h
@@ -3,6 +3,8 @@
* Copyright 2002-2009 Red Hat, Inc.
* Copyright 2011-2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/sha.c b/test/internals/sha.c
index 3954bb70..47a7ccc6 100644
--- a/test/internals/sha.c
+++ b/test/internals/sha.c
@@ -5,6 +5,8 @@
* Copyright (C) 1995 A. M. Kuchling
* Copyright (C) 2017 Thomas Zimmermann
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/internals/spawn-oom.c b/test/internals/spawn-oom.c
index b24df7fd..7884f607 100644
--- a/test/internals/spawn-oom.c
+++ b/test/internals/spawn-oom.c
@@ -5,6 +5,8 @@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2005 Novell, Inc.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/manual-backtrace.c b/test/manual-backtrace.c
index 0cc1499d..0b89d1c6 100644
--- a/test/manual-backtrace.c
+++ b/test/manual-backtrace.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2015 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/test-platform-mutex.c b/test/test-platform-mutex.c
index 03bac3b9..af3a8070 100644
--- a/test/test-platform-mutex.c
+++ b/test/test-platform-mutex.c
@@ -4,6 +4,8 @@
* Copyright © 2022 Ralf Habacker <ralf.habacker@freenet.de>
* SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/test/thread-blocking.c b/test/thread-blocking.c
index 0aa54483..883015cd 100644
--- a/test/thread-blocking.c
+++ b/test/thread-blocking.c
@@ -6,6 +6,8 @@
* Copyright © 2018 Manish Narang <manrock007@gmail.com>
* Copyright © 2018 Collabora Ltd.
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/tools/dbus-launch-win.c b/tools/dbus-launch-win.c
index 34837c12..ae055c56 100644
--- a/tools/dbus-launch-win.c
+++ b/tools/dbus-launch-win.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2007 Ralf Habacker <ralf.habacker@freenet.de>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/tools/dbus-launch-x11.c b/tools/dbus-launch-x11.c
index 59694c31..6b1fc476 100644
--- a/tools/dbus-launch-x11.c
+++ b/tools/dbus-launch-x11.c
@@ -3,6 +3,8 @@
*
* Copyright (C) 2006 Thiago Macieira <thiago@kde.org>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 5637e414..45eca5ec 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -4,6 +4,8 @@
* Copyright (C) 2003, 2006 Red Hat, Inc.
* Copyright (C) 2006 Thiago Macieira <thiago@kde.org>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/tools/dbus-launch.h b/tools/dbus-launch.h
index 56596d26..81dde587 100644
--- a/tools/dbus-launch.h
+++ b/tools/dbus-launch.h
@@ -3,6 +3,8 @@
*
* Copyright (C) 2006 Thiago Macieira <thiago@kde.org>
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
diff --git a/tools/dbus-run-session.c b/tools/dbus-run-session.c
index a622fb3d..8e9bd24a 100644
--- a/tools/dbus-run-session.c
+++ b/tools/dbus-run-session.c
@@ -6,6 +6,8 @@
* Copyright © 2011-2012 Nokia Corporation
* Copyright © 2018, 2021 Ralf Habacker
*
+ * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later
+ *
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify