summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-11-09 13:23:58 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2020-11-09 13:23:58 +0900
commitdb9ecf050165fd1033c6f81485917e229c4be537 (patch)
tree68a1e401823fc90fddae82e8858738b026ab8f89 /src/basic
parent21d8f2533db7c46b80f74bd147869eb4f10195a6 (diff)
downloadsystemd-db9ecf050165fd1033c6f81485917e229c4be537.tar.gz
license: LGPL-2.1+ -> LGPL-2.1-or-later
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/af-list.c2
-rw-r--r--src/basic/af-list.h2
-rw-r--r--src/basic/alloc-util.c2
-rw-r--r--src/basic/alloc-util.h2
-rw-r--r--src/basic/architecture.c2
-rw-r--r--src/basic/architecture.h2
-rw-r--r--src/basic/arphrd-list.c2
-rw-r--r--src/basic/arphrd-list.h2
-rw-r--r--src/basic/async.c2
-rw-r--r--src/basic/async.h2
-rw-r--r--src/basic/audit-util.c2
-rw-r--r--src/basic/audit-util.h2
-rw-r--r--src/basic/blockdev-util.c2
-rw-r--r--src/basic/blockdev-util.h2
-rw-r--r--src/basic/btrfs-util.c2
-rw-r--r--src/basic/btrfs-util.h2
-rw-r--r--src/basic/build.h2
-rw-r--r--src/basic/bus-label.c2
-rw-r--r--src/basic/bus-label.h2
-rw-r--r--src/basic/cap-list.c2
-rw-r--r--src/basic/cap-list.h2
-rw-r--r--src/basic/capability-util.c2
-rw-r--r--src/basic/capability-util.h2
-rw-r--r--src/basic/cgroup-util.c2
-rw-r--r--src/basic/cgroup-util.h2
-rw-r--r--src/basic/chattr-util.c2
-rw-r--r--src/basic/chattr-util.h2
-rw-r--r--src/basic/conf-files.c2
-rw-r--r--src/basic/conf-files.h2
-rw-r--r--src/basic/copy.c2
-rw-r--r--src/basic/copy.h2
-rw-r--r--src/basic/def.h2
-rw-r--r--src/basic/device-nodes.c2
-rw-r--r--src/basic/device-nodes.h2
-rw-r--r--src/basic/dirent-util.c2
-rw-r--r--src/basic/dirent-util.h2
-rw-r--r--src/basic/dlfcn-util.c2
-rw-r--r--src/basic/dlfcn-util.h2
-rw-r--r--src/basic/efivars.c2
-rw-r--r--src/basic/efivars.h2
-rw-r--r--src/basic/env-file.c2
-rw-r--r--src/basic/env-file.h2
-rw-r--r--src/basic/env-util.c2
-rw-r--r--src/basic/env-util.h2
-rw-r--r--src/basic/errno-list.c2
-rw-r--r--src/basic/errno-list.h2
-rw-r--r--src/basic/errno-util.h2
-rw-r--r--src/basic/escape.c2
-rw-r--r--src/basic/escape.h2
-rw-r--r--src/basic/ether-addr-util.c2
-rw-r--r--src/basic/ether-addr-util.h2
-rw-r--r--src/basic/extract-word.c2
-rw-r--r--src/basic/extract-word.h2
-rw-r--r--src/basic/fd-util.c2
-rw-r--r--src/basic/fd-util.h2
-rw-r--r--src/basic/fileio.c2
-rw-r--r--src/basic/fileio.h2
-rw-r--r--src/basic/format-util.c2
-rw-r--r--src/basic/format-util.h2
-rw-r--r--src/basic/fs-util.c2
-rw-r--r--src/basic/fs-util.h2
-rw-r--r--src/basic/gcrypt-util.c2
-rw-r--r--src/basic/gcrypt-util.h2
-rw-r--r--src/basic/glob-util.c2
-rw-r--r--src/basic/glob-util.h2
-rw-r--r--src/basic/gunicode.c2
-rw-r--r--src/basic/gunicode.h2
-rw-r--r--src/basic/hash-funcs.c2
-rw-r--r--src/basic/hash-funcs.h2
-rw-r--r--src/basic/hashmap.c2
-rw-r--r--src/basic/hashmap.h2
-rw-r--r--src/basic/hexdecoct.c2
-rw-r--r--src/basic/hexdecoct.h2
-rw-r--r--src/basic/hostname-util.c2
-rw-r--r--src/basic/hostname-util.h2
-rw-r--r--src/basic/in-addr-util.c2
-rw-r--r--src/basic/in-addr-util.h2
-rw-r--r--src/basic/io-util.c2
-rw-r--r--src/basic/io-util.h2
-rw-r--r--src/basic/kbd-util.c2
-rw-r--r--src/basic/kbd-util.h2
-rw-r--r--src/basic/khash.c2
-rw-r--r--src/basic/khash.h2
-rw-r--r--src/basic/label.c2
-rw-r--r--src/basic/label.h2
-rw-r--r--src/basic/limits-util.c2
-rw-r--r--src/basic/limits-util.h2
-rw-r--r--src/basic/list.h2
-rw-r--r--src/basic/locale-util.c2
-rw-r--r--src/basic/locale-util.h2
-rw-r--r--src/basic/log.c2
-rw-r--r--src/basic/log.h2
-rw-r--r--src/basic/login-util.c2
-rw-r--r--src/basic/login-util.h2
-rw-r--r--src/basic/macro.h2
-rw-r--r--src/basic/memfd-util.c2
-rw-r--r--src/basic/memfd-util.h2
-rw-r--r--src/basic/memory-util.c2
-rw-r--r--src/basic/memory-util.h2
-rw-r--r--src/basic/mempool.c2
-rw-r--r--src/basic/mempool.h2
-rw-r--r--src/basic/meson.build2
-rw-r--r--src/basic/missing_audit.h2
-rw-r--r--src/basic/missing_capability.h2
-rw-r--r--src/basic/missing_drm.h2
-rw-r--r--src/basic/missing_fcntl.h2
-rw-r--r--src/basic/missing_fs.h2
-rw-r--r--src/basic/missing_input.h2
-rw-r--r--src/basic/missing_keyctl.h2
-rw-r--r--src/basic/missing_loop.h2
-rw-r--r--src/basic/missing_magic.h2
-rw-r--r--src/basic/missing_mman.h2
-rw-r--r--src/basic/missing_network.h2
-rw-r--r--src/basic/missing_prctl.h2
-rw-r--r--src/basic/missing_random.h2
-rw-r--r--src/basic/missing_resource.h2
-rw-r--r--src/basic/missing_sched.h2
-rw-r--r--src/basic/missing_socket.h2
-rw-r--r--src/basic/missing_stat.h2
-rw-r--r--src/basic/missing_stdlib.h2
-rw-r--r--src/basic/missing_syscall.h2
-rw-r--r--src/basic/missing_timerfd.h2
-rw-r--r--src/basic/missing_type.h2
-rw-r--r--src/basic/missing_xfs.h2
-rw-r--r--src/basic/mkdir-label.c2
-rw-r--r--src/basic/mkdir.c2
-rw-r--r--src/basic/mkdir.h2
-rw-r--r--src/basic/mountpoint-util.c2
-rw-r--r--src/basic/mountpoint-util.h2
-rw-r--r--src/basic/namespace-util.c2
-rw-r--r--src/basic/namespace-util.h2
-rw-r--r--src/basic/nss-util.h2
-rw-r--r--src/basic/nulstr-util.c2
-rw-r--r--src/basic/nulstr-util.h2
-rw-r--r--src/basic/ordered-set.c2
-rw-r--r--src/basic/ordered-set.h2
-rw-r--r--src/basic/parse-util.c2
-rw-r--r--src/basic/parse-util.h2
-rw-r--r--src/basic/path-lookup.c2
-rw-r--r--src/basic/path-lookup.h2
-rw-r--r--src/basic/path-util.c2
-rw-r--r--src/basic/path-util.h2
-rw-r--r--src/basic/prioq.c2
-rw-r--r--src/basic/prioq.h2
-rw-r--r--src/basic/proc-cmdline.c2
-rw-r--r--src/basic/proc-cmdline.h2
-rw-r--r--src/basic/process-util.c2
-rw-r--r--src/basic/process-util.h2
-rw-r--r--src/basic/procfs-util.c2
-rw-r--r--src/basic/procfs-util.h2
-rw-r--r--src/basic/pthread-util.h2
-rw-r--r--src/basic/quota-util.c2
-rw-r--r--src/basic/quota-util.h2
-rw-r--r--src/basic/random-util.c2
-rw-r--r--src/basic/random-util.h2
-rw-r--r--src/basic/ratelimit.c2
-rw-r--r--src/basic/ratelimit.h2
-rw-r--r--src/basic/raw-clone.h2
-rw-r--r--src/basic/raw-reboot.h2
-rw-r--r--src/basic/replace-var.c2
-rw-r--r--src/basic/replace-var.h2
-rw-r--r--src/basic/rlimit-util.c2
-rw-r--r--src/basic/rlimit-util.h2
-rw-r--r--src/basic/rm-rf.c2
-rw-r--r--src/basic/rm-rf.h2
-rw-r--r--src/basic/selinux-util.c2
-rw-r--r--src/basic/selinux-util.h2
-rw-r--r--src/basic/set.h2
-rw-r--r--src/basic/sigbus.c2
-rw-r--r--src/basic/sigbus.h2
-rw-r--r--src/basic/signal-util.c2
-rw-r--r--src/basic/signal-util.h2
-rw-r--r--src/basic/smack-util.c2
-rw-r--r--src/basic/smack-util.h2
-rw-r--r--src/basic/socket-label.c2
-rw-r--r--src/basic/socket-util.c2
-rw-r--r--src/basic/socket-util.h2
-rw-r--r--src/basic/sort-util.c2
-rw-r--r--src/basic/sort-util.h2
-rw-r--r--src/basic/special.h2
-rw-r--r--src/basic/stat-util.c2
-rw-r--r--src/basic/stat-util.h2
-rw-r--r--src/basic/static-destruct.h2
-rw-r--r--src/basic/stdio-util.h2
-rw-r--r--src/basic/strbuf.c2
-rw-r--r--src/basic/strbuf.h2
-rw-r--r--src/basic/string-table.c2
-rw-r--r--src/basic/string-table.h2
-rw-r--r--src/basic/string-util.c2
-rw-r--r--src/basic/string-util.h2
-rw-r--r--src/basic/strv.c2
-rw-r--r--src/basic/strv.h2
-rw-r--r--src/basic/strxcpyx.c2
-rw-r--r--src/basic/strxcpyx.h2
-rw-r--r--src/basic/syslog-util.c2
-rw-r--r--src/basic/syslog-util.h2
-rw-r--r--src/basic/terminal-util.c2
-rw-r--r--src/basic/terminal-util.h2
-rw-r--r--src/basic/time-util.c2
-rw-r--r--src/basic/time-util.h2
-rw-r--r--src/basic/tmpfile-util.c2
-rw-r--r--src/basic/tmpfile-util.h2
-rw-r--r--src/basic/umask-util.h2
-rw-r--r--src/basic/unaligned.h2
-rw-r--r--src/basic/unit-def.c2
-rw-r--r--src/basic/unit-def.h2
-rw-r--r--src/basic/unit-name.c2
-rw-r--r--src/basic/unit-name.h2
-rw-r--r--src/basic/user-util.c2
-rw-r--r--src/basic/user-util.h2
-rw-r--r--src/basic/utf8.c2
-rw-r--r--src/basic/utf8.h2
-rw-r--r--src/basic/util.c2
-rw-r--r--src/basic/util.h2
-rw-r--r--src/basic/virt.c2
-rw-r--r--src/basic/virt.h2
-rw-r--r--src/basic/xattr-util.c2
-rw-r--r--src/basic/xattr-util.h2
218 files changed, 218 insertions, 218 deletions
diff --git a/src/basic/af-list.c b/src/basic/af-list.c
index abad221d58..7e819d6d11 100644
--- a/src/basic/af-list.c
+++ b/src/basic/af-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <string.h>
diff --git a/src/basic/af-list.h b/src/basic/af-list.h
index 8342323b8a..688ac63df7 100644
--- a/src/basic/af-list.h
+++ b/src/basic/af-list.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/socket.h>
diff --git a/src/basic/alloc-util.c b/src/basic/alloc-util.c
index 5951e8c3d5..bad15cc204 100644
--- a/src/basic/alloc-util.c
+++ b/src/basic/alloc-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <malloc.h>
#include <stdint.h>
diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index 34340e4a39..f3e192ddaf 100644
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <alloca.h>
diff --git a/src/basic/architecture.c b/src/basic/architecture.c
index 85837b5ebf..409632c3f4 100644
--- a/src/basic/architecture.c
+++ b/src/basic/architecture.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/utsname.h>
diff --git a/src/basic/architecture.h b/src/basic/architecture.h
index 443e890eab..1db625cf80 100644
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <endian.h>
diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
index 7e5570ab9f..99048d20c8 100644
--- a/src/basic/arphrd-list.c
+++ b/src/basic/arphrd-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <linux/if_arp.h>
diff --git a/src/basic/arphrd-list.h b/src/basic/arphrd-list.h
index aae56bc88c..bc95b4507b 100644
--- a/src/basic/arphrd-list.h
+++ b/src/basic/arphrd-list.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
const char *arphrd_to_name(int id);
diff --git a/src/basic/async.c b/src/basic/async.c
index daa95cd102..443cfa95ab 100644
--- a/src/basic/async.c
+++ b/src/basic/async.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <pthread.h>
diff --git a/src/basic/async.h b/src/basic/async.h
index 3160613184..9ada32c994 100644
--- a/src/basic/async.h
+++ b/src/basic/async.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int asynchronous_job(void* (*func)(void *p), void *arg);
diff --git a/src/basic/audit-util.c b/src/basic/audit-util.c
index 6eb224b2c8..1bf88b1e52 100644
--- a/src/basic/audit-util.c
+++ b/src/basic/audit-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <linux/netlink.h>
diff --git a/src/basic/audit-util.h b/src/basic/audit-util.h
index c9fc49871d..aa2177113b 100644
--- a/src/basic/audit-util.h
+++ b/src/basic/audit-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/blockdev-util.c b/src/basic/blockdev-util.c
index 21ff3ba1b1..0f1e30ccd9 100644
--- a/src/basic/blockdev-util.c
+++ b/src/basic/blockdev-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/file.h>
#include <unistd.h>
diff --git a/src/basic/blockdev-util.h b/src/basic/blockdev-util.h
index 58a7050f53..10048ff313 100644
--- a/src/basic/blockdev-util.h
+++ b/src/basic/blockdev-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 50a35268ea..2634659aa0 100644
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/btrfs-util.h b/src/basic/btrfs-util.h
index d9cb95af00..c8b44f6162 100644
--- a/src/basic/btrfs-util.h
+++ b/src/basic/btrfs-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/build.h b/src/basic/build.h
index e02ad391a9..4697639efa 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "version.h"
diff --git a/src/basic/bus-label.c b/src/basic/bus-label.c
index 1613cf7fd7..cd6c58a3d3 100644
--- a/src/basic/bus-label.c
+++ b/src/basic/bus-label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdlib.h>
diff --git a/src/basic/bus-label.h b/src/basic/bus-label.h
index 4a1b097a52..446daba7f2 100644
--- a/src/basic/bus-label.h
+++ b/src/basic/bus-label.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stddef.h>
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index b483833947..1e783a6f29 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <string.h>
diff --git a/src/basic/cap-list.h b/src/basic/cap-list.h
index 4bfb1a355b..71235d6a28 100644
--- a/src/basic/cap-list.h
+++ b/src/basic/cap-list.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index ae269e8a8a..c1520d9279 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index fdf6ef8462..f5ce290524 100644
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index d2655673fd..98329a954d 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <ftw.h>
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index eda2b16a1b..bdc0d0d086 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <dirent.h>
diff --git a/src/basic/chattr-util.c b/src/basic/chattr-util.c
index 235cfb9bd7..c724e17685 100644
--- a/src/basic/chattr-util.c
+++ b/src/basic/chattr-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/chattr-util.h b/src/basic/chattr-util.h
index 29070c848a..2fcdb64431 100644
--- a/src/basic/chattr-util.h
+++ b/src/basic/chattr-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/fs.h>
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index eb19516c2a..f8c997673a 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdarg.h>
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index 7d7be5c90f..7774ed7054 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/basic/copy.c b/src/basic/copy.c
index be4ca6288a..0494c9068d 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/copy.h b/src/basic/copy.h
index cf2efd8e7b..b583dff2c0 100644
--- a/src/basic/copy.h
+++ b/src/basic/copy.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <fcntl.h>
diff --git a/src/basic/def.h b/src/basic/def.h
index 9f1f3c229c..2e60abb4f1 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
diff --git a/src/basic/device-nodes.c b/src/basic/device-nodes.c
index 888ef23664..7eb9c351b6 100644
--- a/src/basic/device-nodes.c
+++ b/src/basic/device-nodes.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/basic/device-nodes.h b/src/basic/device-nodes.h
index 0dad8c9c68..9e5c79f67d 100644
--- a/src/basic/device-nodes.h
+++ b/src/basic/device-nodes.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stddef.h>
diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c
index d1d2c0ef46..48aced748a 100644
--- a/src/basic/dirent-util.c
+++ b/src/basic/dirent-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
index b1b87679dc..07750c39e0 100644
--- a/src/basic/dirent-util.h
+++ b/src/basic/dirent-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <dirent.h>
diff --git a/src/basic/dlfcn-util.c b/src/basic/dlfcn-util.c
index 08ded96965..2dbff0e358 100644
--- a/src/basic/dlfcn-util.c
+++ b/src/basic/dlfcn-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "dlfcn-util.h"
diff --git a/src/basic/dlfcn-util.h b/src/basic/dlfcn-util.h
index df66cdfd38..2c94ed51f3 100644
--- a/src/basic/dlfcn-util.h
+++ b/src/basic/dlfcn-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <dlfcn.h>
diff --git a/src/basic/efivars.c b/src/basic/efivars.c
index 007137cf01..5aeddef7e2 100644
--- a/src/basic/efivars.c
+++ b/src/basic/efivars.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/efivars.h b/src/basic/efivars.h
index cb341e452f..d310dde7d7 100644
--- a/src/basic/efivars.h
+++ b/src/basic/efivars.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if !ENABLE_EFI
diff --git a/src/basic/env-file.c b/src/basic/env-file.c
index dc92b13a6f..99c3e3f4a3 100644
--- a/src/basic/env-file.c
+++ b/src/basic/env-file.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "env-file.h"
diff --git a/src/basic/env-file.h b/src/basic/env-file.h
index e1ca195ff0..de475885ac 100644
--- a/src/basic/env-file.h
+++ b/src/basic/env-file.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdarg.h>
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 802dff2485..bf191044c0 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <limits.h>
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index 92802ed774..a37603dbd8 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index 44cc570539..2aeb38c438 100644
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <string.h>
diff --git a/src/basic/errno-list.h b/src/basic/errno-list.h
index 9c639b4f55..082b833e49 100644
--- a/src/basic/errno-list.h
+++ b/src/basic/errno-list.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h
index 383615c288..5609820b88 100644
--- a/src/basic/errno-util.h
+++ b/src/basic/errno-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdlib.h>
diff --git a/src/basic/escape.c b/src/basic/escape.c
index 7589d597a2..31f3cda472 100644
--- a/src/basic/escape.c
+++ b/src/basic/escape.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
diff --git a/src/basic/escape.h b/src/basic/escape.h
index fa267813b3..15e4df7ca1 100644
--- a/src/basic/escape.h
+++ b/src/basic/escape.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/ether-addr-util.c b/src/basic/ether-addr-util.c
index 2af2ce02e5..c8094b6e45 100644
--- a/src/basic/ether-addr-util.c
+++ b/src/basic/ether-addr-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <inttypes.h>
diff --git a/src/basic/ether-addr-util.h b/src/basic/ether-addr-util.h
index 462caded03..942ce55621 100644
--- a/src/basic/ether-addr-util.h
+++ b/src/basic/ether-addr-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/if_infiniband.h>
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c
index d64dddd641..76b3fe12e3 100644
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdarg.h>
diff --git a/src/basic/extract-word.h b/src/basic/extract-word.h
index f028577c40..d1de32e580 100644
--- a/src/basic/extract-word.h
+++ b/src/basic/extract-word.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index e37b6944a8..07a7b3a306 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 93ce95cd03..2162537b80 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <dirent.h>
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index e53e826b72..71a2654507 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <errno.h>
diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index d2901cdb61..b34ed5e88b 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <dirent.h>
diff --git a/src/basic/format-util.c b/src/basic/format-util.c
index b4144e0352..bf23037792 100644
--- a/src/basic/format-util.c
+++ b/src/basic/format-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "format-util.h"
#include "memory-util.h"
diff --git a/src/basic/format-util.h b/src/basic/format-util.h
index db37c16140..b7e18768e3 100644
--- a/src/basic/format-util.h
+++ b/src/basic/format-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 587b3504ee..fdd99467c7 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stddef.h>
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 241cc6ef62..5dc8853eac 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <dirent.h>
diff --git a/src/basic/gcrypt-util.c b/src/basic/gcrypt-util.c
index a82be979de..bf0d2106f8 100644
--- a/src/basic/gcrypt-util.c
+++ b/src/basic/gcrypt-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_GCRYPT
diff --git a/src/basic/gcrypt-util.h b/src/basic/gcrypt-util.h
index 87eb606891..c07b36cdb9 100644
--- a/src/basic/gcrypt-util.h
+++ b/src/basic/gcrypt-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index 1e7e301e09..bc0278e57f 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <sys/types.h>
diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h
index 3d5f543508..d2f8718d5a 100644
--- a/src/basic/glob-util.h
+++ b/src/basic/glob-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <glob.h>
diff --git a/src/basic/gunicode.c b/src/basic/gunicode.c
index 02637d74e9..36beb957e1 100644
--- a/src/basic/gunicode.c
+++ b/src/basic/gunicode.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/* gunicode.c - Unicode manipulation functions
*
* Copyright (C) 1999, 2000 Tom Tromey
diff --git a/src/basic/gunicode.h b/src/basic/gunicode.h
index 765077db83..6b7183986f 100644
--- a/src/basic/gunicode.h
+++ b/src/basic/gunicode.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/* gunicode.h - Unicode manipulation functions
*
* Copyright (C) 1999, 2000 Tom Tromey
diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c
index 83016c0fd6..e033de1ae1 100644
--- a/src/basic/hash-funcs.c
+++ b/src/basic/hash-funcs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <string.h>
diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h
index fb60200941..5672df1da4 100644
--- a/src/basic/hash-funcs.h
+++ b/src/basic/hash-funcs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "alloc-util.h"
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 61946cea32..dd1b18c878 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <pthread.h>
diff --git a/src/basic/hashmap.h b/src/basic/hashmap.h
index 6933c0b1e6..e99448375e 100644
--- a/src/basic/hashmap.h
+++ b/src/basic/hashmap.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <limits.h>
diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c
index 96f7b9ed0f..da60202e57 100644
--- a/src/basic/hexdecoct.c
+++ b/src/basic/hexdecoct.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <errno.h>
diff --git a/src/basic/hexdecoct.h b/src/basic/hexdecoct.h
index dfdff1e9bb..7e2a6892c0 100644
--- a/src/basic/hexdecoct.h
+++ b/src/basic/hexdecoct.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index 90a3dfc864..09e49ccb7d 100644
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <limits.h>
diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index cafd6f020b..c1e47a2a53 100644
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index c102504fdd..a4f13b620a 100644
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <arpa/inet.h>
#include <endian.h>
diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
index 45c93a0056..24308b702e 100644
--- a/src/basic/in-addr-util.h
+++ b/src/basic/in-addr-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <netinet/in.h>
diff --git a/src/basic/io-util.c b/src/basic/io-util.c
index 460649deda..247e37fd80 100644
--- a/src/basic/io-util.c
+++ b/src/basic/io-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <limits.h>
diff --git a/src/basic/io-util.h b/src/basic/io-util.h
index 719e19e85d..d817714b05 100644
--- a/src/basic/io-util.h
+++ b/src/basic/io-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/kbd-util.c b/src/basic/kbd-util.c
index 17d4022dbe..267803ec2c 100644
--- a/src/basic/kbd-util.c
+++ b/src/basic/kbd-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ftw.h>
diff --git a/src/basic/kbd-util.h b/src/basic/kbd-util.h
index 9efd2c7052..6714aeb9e0 100644
--- a/src/basic/kbd-util.h
+++ b/src/basic/kbd-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/khash.c b/src/basic/khash.c
index dbae418282..0e3a78388e 100644
--- a/src/basic/khash.c
+++ b/src/basic/khash.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/if_alg.h>
#include <stdbool.h>
diff --git a/src/basic/khash.h b/src/basic/khash.h
index a3013b9d61..a343d306e9 100644
--- a/src/basic/khash.h
+++ b/src/basic/khash.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/label.c b/src/basic/label.c
index 107028e068..1fc492fb31 100644
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <sys/stat.h>
diff --git a/src/basic/label.h b/src/basic/label.h
index d99d824b4a..b5118d96d3 100644
--- a/src/basic/label.h
+++ b/src/basic/label.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/limits-util.c b/src/basic/limits-util.c
index 9da767a570..259c311a67 100644
--- a/src/basic/limits-util.c
+++ b/src/basic/limits-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "cgroup-util.h"
diff --git a/src/basic/limits-util.h b/src/basic/limits-util.h
index 77895cbad4..d267fcf1d4 100644
--- a/src/basic/limits-util.h
+++ b/src/basic/limits-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/list.h b/src/basic/list.h
index b62c374985..256b7187c2 100644
--- a/src/basic/list.h
+++ b/src/basic/list.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "macro.h"
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index 8e6a12b602..4c81cb9440 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h
index aa25e17f15..2d672e2f95 100644
--- a/src/basic/locale-util.h
+++ b/src/basic/locale-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <libintl.h>
diff --git a/src/basic/log.c b/src/basic/log.c
index 1d796c5180..d4054cf46a 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/log.h b/src/basic/log.h
index ce8bb42ea1..a2aae16df2 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdarg.h>
diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index 9313926d5a..044e8b7650 100644
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "login-util.h"
#include "string-util.h"
diff --git a/src/basic/login-util.h b/src/basic/login-util.h
index e1e62e12b7..00a124dc9f 100644
--- a/src/basic/login-util.h
+++ b/src/basic/login-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/macro.h b/src/basic/macro.h
index cffc5ec59c..2782553756 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <assert.h>
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index e06bdcb0a8..0b8ecea1b1 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <sys/stat.h>
diff --git a/src/basic/memfd-util.h b/src/basic/memfd-util.h
index 5ebb519931..8596c1a369 100644
--- a/src/basic/memfd-util.h
+++ b/src/basic/memfd-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/memory-util.c b/src/basic/memory-util.c
index 0a5cf2797d..3338e355f7 100644
--- a/src/basic/memory-util.c
+++ b/src/basic/memory-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <unistd.h>
diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h
index 4f596cffb7..179edd247b 100644
--- a/src/basic/memory-util.h
+++ b/src/basic/memory-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/mempool.c b/src/basic/mempool.c
index 22df42105b..9eedc20c4f 100644
--- a/src/basic/mempool.c
+++ b/src/basic/mempool.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/basic/mempool.h b/src/basic/mempool.h
index 0eecca0f92..0fe2f2789c 100644
--- a/src/basic/mempool.h
+++ b/src/basic/mempool.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/meson.build b/src/basic/meson.build
index d83c1ae496..1183ea83ad 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
basic_sources = files('''
MurmurHash2.c
diff --git a/src/basic/missing_audit.h b/src/basic/missing_audit.h
index b00d537be2..62e3c292f5 100644
--- a/src/basic/missing_audit.h
+++ b/src/basic/missing_audit.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/audit.h>
diff --git a/src/basic/missing_capability.h b/src/basic/missing_capability.h
index 4d37618741..4cf31cb839 100644
--- a/src/basic/missing_capability.h
+++ b/src/basic/missing_capability.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/capability.h>
diff --git a/src/basic/missing_drm.h b/src/basic/missing_drm.h
index a64f74efda..0dec591146 100644
--- a/src/basic/missing_drm.h
+++ b/src/basic/missing_drm.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#ifndef DRM_IOCTL_SET_MASTER
diff --git a/src/basic/missing_fcntl.h b/src/basic/missing_fcntl.h
index 5d1c6352f4..00937d2af0 100644
--- a/src/basic/missing_fcntl.h
+++ b/src/basic/missing_fcntl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <fcntl.h>
diff --git a/src/basic/missing_fs.h b/src/basic/missing_fs.h
index c262a91812..79c1620e83 100644
--- a/src/basic/missing_fs.h
+++ b/src/basic/missing_fs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/* linux/fs.h */
diff --git a/src/basic/missing_input.h b/src/basic/missing_input.h
index b91ccb6485..6cf16ffb97 100644
--- a/src/basic/missing_input.h
+++ b/src/basic/missing_input.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/input.h>
diff --git a/src/basic/missing_keyctl.h b/src/basic/missing_keyctl.h
index 7eb709586c..5680483bb4 100644
--- a/src/basic/missing_keyctl.h
+++ b/src/basic/missing_keyctl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/keyctl.h>
diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h
index 5326777419..b22ebda9fd 100644
--- a/src/basic/missing_loop.h
+++ b/src/basic/missing_loop.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/loop.h>
diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h
index a05b5b5c3c..e7466cb6bc 100644
--- a/src/basic/missing_magic.h
+++ b/src/basic/missing_magic.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/magic.h>
diff --git a/src/basic/missing_mman.h b/src/basic/missing_mman.h
index 7ff12f770b..4a109128d0 100644
--- a/src/basic/missing_mman.h
+++ b/src/basic/missing_mman.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/mman.h>
diff --git a/src/basic/missing_network.h b/src/basic/missing_network.h
index a25a1480f0..f9db690d18 100644
--- a/src/basic/missing_network.h
+++ b/src/basic/missing_network.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/* linux/in6.h or netinet/in.h */
diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h
index f80cd17f34..ab851306ba 100644
--- a/src/basic/missing_prctl.h
+++ b/src/basic/missing_prctl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/prctl.h>
diff --git a/src/basic/missing_random.h b/src/basic/missing_random.h
index 17af87a3ae..443b913685 100644
--- a/src/basic/missing_random.h
+++ b/src/basic/missing_random.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if USE_SYS_RANDOM_H
diff --git a/src/basic/missing_resource.h b/src/basic/missing_resource.h
index 22ba8abfc6..6e7676527b 100644
--- a/src/basic/missing_resource.h
+++ b/src/basic/missing_resource.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/resource.h>
diff --git a/src/basic/missing_sched.h b/src/basic/missing_sched.h
index baa3913283..6a889f66d9 100644
--- a/src/basic/missing_sched.h
+++ b/src/basic/missing_sched.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sched.h>
diff --git a/src/basic/missing_socket.h b/src/basic/missing_socket.h
index c4f33449a3..17bc1a5a01 100644
--- a/src/basic/missing_socket.h
+++ b/src/basic/missing_socket.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/socket.h>
diff --git a/src/basic/missing_stat.h b/src/basic/missing_stat.h
index 7bdc8a7efa..372fdf90bd 100644
--- a/src/basic/missing_stat.h
+++ b/src/basic/missing_stat.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/types.h>
diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
index 188a8d4406..8c76f93eb2 100644
--- a/src/basic/missing_stdlib.h
+++ b/src/basic/missing_stdlib.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdlib.h>
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index 01fec6f2f5..d000e8717c 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/* Missing glibc definitions to access certain kernel APIs */
diff --git a/src/basic/missing_timerfd.h b/src/basic/missing_timerfd.h
index 6b0404453a..dba3043d22 100644
--- a/src/basic/missing_timerfd.h
+++ b/src/basic/missing_timerfd.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/timerfd.h>
diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
index bf8a6caa1b..f6233090a9 100644
--- a/src/basic/missing_type.h
+++ b/src/basic/missing_type.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <uchar.h>
diff --git a/src/basic/missing_xfs.h b/src/basic/missing_xfs.h
index 9eac76dd67..ba5fe81288 100644
--- a/src/basic/missing_xfs.h
+++ b/src/basic/missing_xfs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/* This is currently not exported in the public kernel headers, but the libxfs library code part of xfsprogs
diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index e844a59806..9565117b92 100644
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <sys/stat.h>
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index eea8f1c9aa..f91f8f7a08 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdbool.h>
diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h
index fc66a7d365..3c53d22db9 100644
--- a/src/basic/mkdir.h
+++ b/src/basic/mkdir.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
index 681da74024..8bed96069f 100644
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/mountpoint-util.h b/src/basic/mountpoint-util.h
index ab4ed19394..aadb2123d9 100644
--- a/src/basic/mountpoint-util.h
+++ b/src/basic/mountpoint-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <fcntl.h>
diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
index b34c532604..833a18a204 100644
--- a/src/basic/namespace-util.c
+++ b/src/basic/namespace-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/ioctl.h>
diff --git a/src/basic/namespace-util.h b/src/basic/namespace-util.h
index 99d9b977ed..7f7d066873 100644
--- a/src/basic/namespace-util.h
+++ b/src/basic/namespace-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/basic/nss-util.h b/src/basic/nss-util.h
index 29cf22676a..dfc0d3fb20 100644
--- a/src/basic/nss-util.h
+++ b/src/basic/nss-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <grp.h>
diff --git a/src/basic/nulstr-util.c b/src/basic/nulstr-util.c
index b12d020232..49fcbb0f03 100644
--- a/src/basic/nulstr-util.c
+++ b/src/basic/nulstr-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "nulstr-util.h"
#include "string-util.h"
diff --git a/src/basic/nulstr-util.h b/src/basic/nulstr-util.h
index 436b271f3c..ee9b632a64 100644
--- a/src/basic/nulstr-util.h
+++ b/src/basic/nulstr-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/ordered-set.c b/src/basic/ordered-set.c
index 83098435b2..58fa8af1b7 100644
--- a/src/basic/ordered-set.c
+++ b/src/basic/ordered-set.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "fileio.h"
#include "ordered-set.h"
diff --git a/src/basic/ordered-set.h b/src/basic/ordered-set.h
index c942aafe81..baf8202088 100644
--- a/src/basic/ordered-set.h
+++ b/src/basic/ordered-set.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index dca2ef9f92..5d4dafe3a5 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <inttypes.h>
diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index f22a19c5c6..81478ed059 100644
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
index e763fd7993..96b82170d0 100644
--- a/src/basic/path-lookup.c
+++ b/src/basic/path-lookup.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdio.h>
diff --git a/src/basic/path-lookup.h b/src/basic/path-lookup.h
index ee3d8102e0..088bb9b57c 100644
--- a/src/basic/path-lookup.h
+++ b/src/basic/path-lookup.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 95c9d5863c..794599a172 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <limits.h>
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index ced0d2af40..d613709f0b 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <alloca.h>
diff --git a/src/basic/prioq.c b/src/basic/prioq.c
index 76b27fa0a8..559e5d124d 100644
--- a/src/basic/prioq.c
+++ b/src/basic/prioq.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Priority Queue
diff --git a/src/basic/prioq.h b/src/basic/prioq.h
index 1fb57bfa4c..951576c021 100644
--- a/src/basic/prioq.h
+++ b/src/basic/prioq.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index ba47ca5812..0b6fb137bd 100644
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdbool.h>
#include <stddef.h>
diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index 077d3a99fb..45f3a27f27 100644
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 80f13048c1..0851613fc9 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <errno.h>
diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 49bb74ac0f..6144f142c4 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <errno.h>
diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
index 38f9fa1212..ccab71f7d2 100644
--- a/src/basic/procfs-util.c
+++ b/src/basic/procfs-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/basic/procfs-util.h b/src/basic/procfs-util.h
index 5a44e9eff7..8258c9e3ea 100644
--- a/src/basic/procfs-util.h
+++ b/src/basic/procfs-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/pthread-util.h b/src/basic/pthread-util.h
index dc3eaba436..113485d044 100644
--- a/src/basic/pthread-util.h
+++ b/src/basic/pthread-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <pthread.h>
diff --git a/src/basic/quota-util.c b/src/basic/quota-util.c
index 96ea9ee364..fbf8ee5064 100644
--- a/src/basic/quota-util.c
+++ b/src/basic/quota-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/quota.h>
diff --git a/src/basic/quota-util.h b/src/basic/quota-util.h
index ff99e342f9..a61bdcbae6 100644
--- a/src/basic/quota-util.h
+++ b/src/basic/quota-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/random-util.c b/src/basic/random-util.c
index 2031262389..c8c34a2034 100644
--- a/src/basic/random-util.c
+++ b/src/basic/random-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if defined(__i386__) || defined(__x86_64__)
#include <cpuid.h>
diff --git a/src/basic/random-util.h b/src/basic/random-util.h
index 7824ffaceb..f661fc093a 100644
--- a/src/basic/random-util.h
+++ b/src/basic/random-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/ratelimit.c b/src/basic/ratelimit.c
index 2e94eed843..90b3feb8dd 100644
--- a/src/basic/ratelimit.c
+++ b/src/basic/ratelimit.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/time.h>
diff --git a/src/basic/ratelimit.h b/src/basic/ratelimit.h
index 9d409b04b3..ee1d17c0e7 100644
--- a/src/basic/ratelimit.h
+++ b/src/basic/ratelimit.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h
index b12dea2aef..becf42e70b 100644
--- a/src/basic/raw-clone.h
+++ b/src/basic/raw-clone.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/***
diff --git a/src/basic/raw-reboot.h b/src/basic/raw-reboot.h
index 8ecefe9e21..e6bff300a5 100644
--- a/src/basic/raw-reboot.h
+++ b/src/basic/raw-reboot.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <linux/reboot.h>
diff --git a/src/basic/replace-var.c b/src/basic/replace-var.c
index 5b4737505c..01c26ce74c 100644
--- a/src/basic/replace-var.c
+++ b/src/basic/replace-var.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stddef.h>
diff --git a/src/basic/replace-var.h b/src/basic/replace-var.h
index e6a489feee..644d9dfce4 100644
--- a/src/basic/replace-var.h
+++ b/src/basic/replace-var.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
char *replace_var(const char *text, char *(*lookup)(const char *variable, void *userdata), void *userdata);
diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
index 2dc13eabc3..880976312c 100644
--- a/src/basic/rlimit-util.c
+++ b/src/basic/rlimit-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
diff --git a/src/basic/rlimit-util.h b/src/basic/rlimit-util.h
index d4fca2b855..59bc066798 100644
--- a/src/basic/rlimit-util.h
+++ b/src/basic/rlimit-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/resource.h>
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index ab331cd677..b0d682f764 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/rm-rf.h b/src/basic/rm-rf.h
index 0edf01ee1c..ec56232b5d 100644
--- a/src/basic/rm-rf.h
+++ b/src/basic/rm-rf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/stat.h>
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 72fa50ffdc..4989f4f37c 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/selinux-util.h b/src/basic/selinux-util.h
index 43d22b914f..1236d6efdf 100644
--- a/src/basic/selinux-util.h
+++ b/src/basic/selinux-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/set.h b/src/basic/set.h
index 7749c18c45..20abc8f0dc 100644
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "extract-word.h"
diff --git a/src/basic/sigbus.c b/src/basic/sigbus.c
index a065a45a8c..4c2e9ec33e 100644
--- a/src/basic/sigbus.c
+++ b/src/basic/sigbus.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <signal.h>
diff --git a/src/basic/sigbus.h b/src/basic/sigbus.h
index 459e19fcaa..a40b1a87aa 100644
--- a/src/basic/sigbus.h
+++ b/src/basic/sigbus.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
void sigbus_install(void);
diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index e976205d86..63b833b218 100644
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdarg.h>
diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h
index 3909ee341d..bdd39d429d 100644
--- a/src/basic/signal-util.h
+++ b/src/basic/signal-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <signal.h>
diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index 7bb0746b6c..3362ee3924 100644
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/***
Copyright © 2013 Intel Corporation
diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h
index df2ce37071..d0b2352428 100644
--- a/src/basic/smack-util.h
+++ b/src/basic/smack-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
/***
diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index 718a6953e5..ea78762e65 100644
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <netinet/in.h>
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 6f57b2a3c4..48d0718d5d 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <arpa/inet.h>
#include <errno.h>
diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index c36f90f75f..9f7928040d 100644
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/sort-util.c b/src/basic/sort-util.c
index 77342c4bdc..92d7b8588d 100644
--- a/src/basic/sort-util.c
+++ b/src/basic/sort-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sort-util.h"
#include "alloc-util.h"
diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
index a8dc3bb6ed..1d194a1f04 100644
--- a/src/basic/sort-util.h
+++ b/src/basic/sort-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdlib.h>
diff --git a/src/basic/special.h b/src/basic/special.h
index 19ee30cd41..b602bb097c 100644
--- a/src/basic/special.h
+++ b/src/basic/special.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#define SPECIAL_DEFAULT_TARGET "default.target"
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 574815bc43..0e196255cf 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 26ecd635f1..a566114f7c 100644
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <fcntl.h>
diff --git a/src/basic/static-destruct.h b/src/basic/static-destruct.h
index fbb8fa087b..0f961328ee 100644
--- a/src/basic/static-destruct.h
+++ b/src/basic/static-destruct.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
index c3b9448d4f..6dc1e72312 100644
--- a/src/basic/stdio-util.h
+++ b/src/basic/stdio-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <printf.h>
diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c
index 769b22aba0..aee6647e35 100644
--- a/src/basic/strbuf.c
+++ b/src/basic/strbuf.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
diff --git a/src/basic/strbuf.h b/src/basic/strbuf.h
index a36944ad39..82758d721b 100644
--- a/src/basic/strbuf.h
+++ b/src/basic/strbuf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stddef.h>
diff --git a/src/basic/string-table.c b/src/basic/string-table.c
index 0168cff886..116021df82 100644
--- a/src/basic/string-table.c
+++ b/src/basic/string-table.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "string-table.h"
#include "string-util.h"
diff --git a/src/basic/string-table.h b/src/basic/string-table.h
index 96924778f5..b6b3611ace 100644
--- a/src/basic/string-table.h
+++ b/src/basic/string-table.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 12c4ae177a..7ab460faa5 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdarg.h>
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index bad384a693..fdd3ce7363 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/strv.c b/src/basic/strv.c
index dd3a164879..492dfe4002 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fnmatch.h>
diff --git a/src/basic/strv.h b/src/basic/strv.h
index a85c289d73..6b3e8e7f86 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <fnmatch.h>
diff --git a/src/basic/strxcpyx.c b/src/basic/strxcpyx.c
index ef6d3fa324..dbbf7d08d2 100644
--- a/src/basic/strxcpyx.c
+++ b/src/basic/strxcpyx.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Concatenates/copies strings. In any case, terminates in all cases
diff --git a/src/basic/strxcpyx.h b/src/basic/strxcpyx.h
index 9b66841246..cdef492db1 100644
--- a/src/basic/strxcpyx.h
+++ b/src/basic/strxcpyx.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stddef.h>
diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c
index caeba46db4..4eb9eba97c 100644
--- a/src/basic/syslog-util.c
+++ b/src/basic/syslog-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <syslog.h>
diff --git a/src/basic/syslog-util.h b/src/basic/syslog-util.h
index 998641fa01..d7aa97fb7d 100644
--- a/src/basic/syslog-util.h
+++ b/src/basic/syslog-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index ac83688531..e00e9e8751 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index 42a129c7ac..5cb1e138f3 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdarg.h>
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 7fa3b48623..5318d6378d 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <errno.h>
diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 6feda5e155..89ee8b4a96 100644
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c
index a49f7eee70..49c343773c 100644
--- a/src/basic/tmpfile-util.c
+++ b/src/basic/tmpfile-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/mman.h>
diff --git a/src/basic/tmpfile-util.h b/src/basic/tmpfile-util.h
index 802c85d6d9..45255fc062 100644
--- a/src/basic/tmpfile-util.h
+++ b/src/basic/tmpfile-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
diff --git a/src/basic/umask-util.h b/src/basic/umask-util.h
index cad745170e..bd7c2bdb8c 100644
--- a/src/basic/umask-util.h
+++ b/src/basic/umask-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/unaligned.h b/src/basic/unaligned.h
index 00c17f8769..4100be0803 100644
--- a/src/basic/unaligned.h
+++ b/src/basic/unaligned.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <endian.h>
diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c
index 94ec1f3d19..145399c963 100644
--- a/src/basic/unit-def.c
+++ b/src/basic/unit-def.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "bus-label.h"
diff --git a/src/basic/unit-def.h b/src/basic/unit-def.h
index 1fab6c78ab..8535fbe062 100644
--- a/src/basic/unit-def.h
+++ b/src/basic/unit-def.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 43d8b3477e..c1529bbeed 100644
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stddef.h>
diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index 1cd33396d8..c25672fad2 100644
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 0e96a75797..933a398e73 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/user-util.h b/src/basic/user-util.h
index 13e2c99e6c..20ff415e2e 100644
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <grp.h>
diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index f0233397ef..59663c0350 100644
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
/* Parts of this file are based on the GLIB utf8 validation functions. The
* original license text follows. */
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index f315ea0f1e..a6ea942c62 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/util.c b/src/basic/util.c
index 2b3b3918a3..f98ecf3858 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/util.h b/src/basic/util.h
index 6fc7480fcb..942d773ff1 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdint.h>
diff --git a/src/basic/virt.c b/src/basic/virt.c
index bb908847f5..1b90f4b008 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if defined(__i386__) || defined(__x86_64__)
#include <cpuid.h>
diff --git a/src/basic/virt.h b/src/basic/virt.h
index 2f7f7203d2..42d63d5135 100644
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index fe0735ed3d..b9a0dc54c5 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
diff --git a/src/basic/xattr-util.h b/src/basic/xattr-util.h
index a69e913b7f..560e34babd 100644
--- a/src/basic/xattr-util.h
+++ b/src/basic/xattr-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>