diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-11-09 13:23:58 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-11-09 13:23:58 +0900 |
| commit | db9ecf050165fd1033c6f81485917e229c4be537 (patch) | |
| tree | 68a1e401823fc90fddae82e8858738b026ab8f89 /src | |
| parent | 21d8f2533db7c46b80f74bd147869eb4f10195a6 (diff) | |
| download | systemd-db9ecf050165fd1033c6f81485917e229c4be537.tar.gz | |
license: LGPL-2.1+ -> LGPL-2.1-or-later
Diffstat (limited to 'src')
1843 files changed, 1843 insertions, 1843 deletions
diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c index 90ba5d2b68..9fabdb9e9f 100644 --- a/src/ac-power/ac-power.c +++ b/src/ac-power/ac-power.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/activate/activate.c b/src/activate/activate.c index bca845ad83..1f7a2490e7 100644 --- a/src/activate/activate.c +++ b/src/activate/activate.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <sys/epoll.h> diff --git a/src/analyze/analyze-condition.c b/src/analyze/analyze-condition.c index e1365e1805..241c188ed6 100644 --- a/src/analyze/analyze-condition.c +++ b/src/analyze/analyze-condition.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/analyze/analyze-condition.h b/src/analyze/analyze-condition.h index 2ef278eb5c..7b52669d05 100644 --- a/src/analyze/analyze-condition.h +++ b/src/analyze/analyze-condition.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "install.h" diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c index 9c1d63030d..8d94fbc5d7 100644 --- a/src/analyze/analyze-security.c +++ b/src/analyze/analyze-security.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/analyze/analyze-security.h b/src/analyze/analyze-security.h index c00ae7c80a..e8de39f3bc 100644 --- a/src/analyze/analyze-security.h +++ b/src/analyze/analyze-security.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c index 93506482e8..a9c89173bf 100644 --- a/src/analyze/analyze-verify.c +++ b/src/analyze/analyze-verify.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/analyze/analyze-verify.h b/src/analyze/analyze-verify.h index 3da2cf7097..43bfbcbc8c 100644 --- a/src/analyze/analyze-verify.h +++ b/src/analyze/analyze-verify.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/analyze/analyze.c b/src/analyze/analyze.c index 9a0b1a7bbf..9920f2a856 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Simon Peeters ***/ diff --git a/src/analyze/meson.build b/src/analyze/meson.build index 58760d609b..9e4d95b036 100644 --- a/src/analyze/meson.build +++ b/src/analyze/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_analyze_sources = files(''' analyze.c diff --git a/src/analyze/test-verify.c b/src/analyze/test-verify.c index dcbb6394c6..12c32159e5 100644 --- a/src/analyze/test-verify.c +++ b/src/analyze/test-verify.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "analyze-verify.h" #include "tests.h" diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index ca6da40bbc..a24ee9af1c 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c index 9ee2c23683..83b168532a 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> 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> diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index 06aee22dc0..43ed2f385b 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/boot/bless-boot-generator.c b/src/boot/bless-boot-generator.c index c59d8aed90..001c85a238 100644 --- a/src/boot/bless-boot-generator.c +++ b/src/boot/bless-boot-generator.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/boot/bless-boot.c b/src/boot/bless-boot.c index 0824266a80..cd34f88bb9 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <stdlib.h> diff --git a/src/boot/boot-check-no-failures.c b/src/boot/boot-check-no-failures.c index 038ce29535..92f3cd4ed0 100644 --- a/src/boot/boot-check-no-failures.c +++ b/src/boot/boot-check-no-failures.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index bb8c7398f0..511b0105f3 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.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/boot/efi/boot.c b/src/boot/efi/boot.c index 5189d86d1a..938e5645f9 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efigpt.h> diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c index 7f6bad1538..2dd4543d51 100644 --- a/src/boot/efi/console.c +++ b/src/boot/efi/console.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/console.h b/src/boot/efi/console.h index b9ed6c70b3..41df3a406e 100644 --- a/src/boot/efi/console.h +++ b/src/boot/efi/console.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #define EFI_SHIFT_STATE_VALID 0x80000000 diff --git a/src/boot/efi/disk.c b/src/boot/efi/disk.c index 49ee81b4d7..89508f86de 100644 --- a/src/boot/efi/disk.c +++ b/src/boot/efi/disk.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/disk.h b/src/boot/efi/disk.h index 41c4cce434..551a9ae639 100644 --- a/src/boot/efi/disk.h +++ b/src/boot/efi/disk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once EFI_STATUS disk_get_part_uuid(EFI_HANDLE *handle, CHAR16 uuid[static 37]); diff --git a/src/boot/efi/graphics.c b/src/boot/efi/graphics.c index 9b5003a85d..f36ecb35b5 100644 --- a/src/boot/efi/graphics.c +++ b/src/boot/efi/graphics.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Copyright © 2013 Intel Corporation * Authored by Joonas Lahtinen <joonas.lahtinen@linux.intel.com> diff --git a/src/boot/efi/graphics.h b/src/boot/efi/graphics.h index 809e878d16..116aae28c5 100644 --- a/src/boot/efi/graphics.h +++ b/src/boot/efi/graphics.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Copyright © 2013 Intel Corporation * Authored by Joonas Lahtinen <joonas.lahtinen@linux.intel.com> diff --git a/src/boot/efi/linux.c b/src/boot/efi/linux.c index 00a3551e09..4d44671315 100644 --- a/src/boot/efi/linux.c +++ b/src/boot/efi/linux.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/linux.h b/src/boot/efi/linux.h index ec655ce647..b92c27c8b9 100644 --- a/src/boot/efi/linux.h +++ b/src/boot/efi/linux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #define SETUP_MAGIC 0x53726448 /* "HdrS" */ diff --git a/src/boot/efi/loader-features.h b/src/boot/efi/loader-features.h index b3a1f79dfd..f07dacb859 100644 --- a/src/boot/efi/loader-features.h +++ b/src/boot/efi/loader-features.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #ifndef UINT64_C diff --git a/src/boot/efi/measure.c b/src/boot/efi/measure.c index 4d87117b00..ff876a6c5b 100644 --- a/src/boot/efi/measure.c +++ b/src/boot/efi/measure.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if ENABLE_TPM diff --git a/src/boot/efi/measure.h b/src/boot/efi/measure.h index ebb6406eca..19e148d922 100644 --- a/src/boot/efi/measure.h +++ b/src/boot/efi/measure.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once EFI_STATUS tpm_log_event(UINT32 pcrindex, const EFI_PHYSICAL_ADDRESS buffer, UINTN buffer_size, const CHAR16 *description); diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index ed81cefcd5..c853f8e951 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later efi_headers = files(''' console.h diff --git a/src/boot/efi/missing_efi.h b/src/boot/efi/missing_efi.h index cf301a1342..1b838af2a4 100644 --- a/src/boot/efi/missing_efi.h +++ b/src/boot/efi/missing_efi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <efi.h> diff --git a/src/boot/efi/pe.c b/src/boot/efi/pe.c index 68f50aec41..f99ecd0eda 100644 --- a/src/boot/efi/pe.c +++ b/src/boot/efi/pe.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/pe.h b/src/boot/efi/pe.h index bfbb8d9baf..3e97d43f66 100644 --- a/src/boot/efi/pe.h +++ b/src/boot/efi/pe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once EFI_STATUS pe_memory_locate_sections(CHAR8 *base, diff --git a/src/boot/efi/random-seed.c b/src/boot/efi/random-seed.c index 6e2a6f1d32..eda9260ae0 100644 --- a/src/boot/efi/random-seed.c +++ b/src/boot/efi/random-seed.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/random-seed.h b/src/boot/efi/random-seed.h index 0f750716fd..0f443e6a87 100644 --- a/src/boot/efi/random-seed.h +++ b/src/boot/efi/random-seed.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <efi.h> diff --git a/src/boot/efi/sha256.c b/src/boot/efi/sha256.c index 005e1902d4..f23066d0ac 100644 --- a/src/boot/efi/sha256.c +++ b/src/boot/efi/sha256.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Stolen from glibc and converted to UEFI style. In glibc it comes with the following copyright blurb: */ diff --git a/src/boot/efi/sha256.h b/src/boot/efi/sha256.h index ca9f285937..464be59c25 100644 --- a/src/boot/efi/sha256.h +++ b/src/boot/efi/sha256.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <efi.h> diff --git a/src/boot/efi/shim.c b/src/boot/efi/shim.c index 8db27547cc..3dc10089c6 100644 --- a/src/boot/efi/shim.c +++ b/src/boot/efi/shim.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Port to systemd-boot * Copyright © 2017 Max Resch <resch.max@gmail.com> diff --git a/src/boot/efi/shim.h b/src/boot/efi/shim.h index 209c9d4cf0..72ecf2ed97 100644 --- a/src/boot/efi/shim.h +++ b/src/boot/efi/shim.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Port to systemd-boot * Copyright © 2017 Max Resch <resch.max@gmail.com> diff --git a/src/boot/efi/splash.c b/src/boot/efi/splash.c index ba4a2c5da0..e166fec57a 100644 --- a/src/boot/efi/splash.c +++ b/src/boot/efi/splash.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/splash.h b/src/boot/efi/splash.h index 8928b069a2..0ba45a0370 100644 --- a/src/boot/efi/splash.h +++ b/src/boot/efi/splash.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once EFI_STATUS graphics_splash(UINT8 *content, UINTN len, const EFI_GRAPHICS_OUTPUT_BLT_PIXEL *background); diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c index 02aab1ec7f..a09f47c711 100644 --- a/src/boot/efi/stub.c +++ b/src/boot/efi/stub.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c index b44f051d95..2712c2d3f0 100644 --- a/src/boot/efi/util.c +++ b/src/boot/efi/util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <efi.h> #include <efilib.h> diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h index b13f22476c..916519cdf8 100644 --- a/src/boot/efi/util.h +++ b/src/boot/efi/util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <efi.h> diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c index 7016c90ddc..7a5d57f8c8 100644 --- a/src/busctl/busctl-introspect.c +++ b/src/busctl/busctl-introspect.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/busctl/busctl-introspect.h b/src/busctl/busctl-introspect.h index b17800e83e..1a045bea1d 100644 --- a/src/busctl/busctl-introspect.h +++ b/src/busctl/busctl-introspect.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/busctl/busctl.c b/src/busctl/busctl.c index 446e474112..06a15ddd80 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index e09adb8b5b..693b5047f2 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c index ace7d6c5ae..eeb4ba80f5 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/cgroups-agent/cgroups-agent.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/cgtop/cgtop.c b/src/cgtop/cgtop.c index 0efaf3873e..e9e7ed2734 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/core/all-units.h b/src/core/all-units.h index 23c1999b69..fad814bf20 100644 --- a/src/core/all-units.h +++ b/src/core/all-units.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "unit.h" diff --git a/src/core/apparmor-setup.c b/src/core/apparmor-setup.c index 6cba841a6c..e856f5c183 100644 --- a/src/core/apparmor-setup.c +++ b/src/core/apparmor-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #if HAVE_APPARMOR diff --git a/src/core/apparmor-setup.h b/src/core/apparmor-setup.h index 100680a595..f3b73825ce 100644 --- a/src/core/apparmor-setup.h +++ b/src/core/apparmor-setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int mac_apparmor_setup(void); diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c index fdef433923..097bea39b3 100644 --- a/src/core/audit-fd.c +++ b/src/core/audit-fd.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/core/audit-fd.h b/src/core/audit-fd.h index 8c1e471b96..5cdf61e52d 100644 --- a/src/core/audit-fd.h +++ b/src/core/audit-fd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int get_audit_fd(void); diff --git a/src/core/automount.c b/src/core/automount.c index df32b8e6fb..a84cddbdbd 100644 --- a/src/core/automount.c +++ b/src/core/automount.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/core/automount.h b/src/core/automount.h index 7a1234b88c..fe668d9774 100644 --- a/src/core/automount.h +++ b/src/core/automount.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Automount Automount; diff --git a/src/core/bpf-devices.c b/src/core/bpf-devices.c index 34320e88fb..1ad7ade306 100644 --- a/src/core/bpf-devices.c +++ b/src/core/bpf-devices.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fnmatch.h> #include <linux/bpf_insn.h> diff --git a/src/core/bpf-devices.h b/src/core/bpf-devices.h index e2a08016e3..19b4d392cc 100644 --- a/src/core/bpf-devices.h +++ b/src/core/bpf-devices.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/core/bpf-firewall.c b/src/core/bpf-firewall.c index 5da0106a33..31c2dcf37d 100644 --- a/src/core/bpf-firewall.c +++ b/src/core/bpf-firewall.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <assert.h> diff --git a/src/core/bpf-firewall.h b/src/core/bpf-firewall.h index f1460d982d..08d7742193 100644 --- a/src/core/bpf-firewall.h +++ b/src/core/bpf-firewall.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/core/cgroup.c b/src/core/cgroup.c index 5d31214461..6b34363d9a 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> diff --git a/src/core/cgroup.h b/src/core/cgroup.h index 4a748f6ddd..66f3a63b82 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.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/core/core-varlink.c b/src/core/core-varlink.c index 411c8557d9..dd6c11ab4d 100644 --- a/src/core/core-varlink.c +++ b/src/core/core-varlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "core-varlink.h" #include "mkdir.h" diff --git a/src/core/core-varlink.h b/src/core/core-varlink.h index 0b191ae6c4..20507a4187 100644 --- a/src/core/core-varlink.h +++ b/src/core/core-varlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "manager.h" diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c index 70b85d8023..3f74488dad 100644 --- a/src/core/dbus-automount.c +++ b/src/core/dbus-automount.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "automount.h" #include "bus-get-properties.h" diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h index 3e165b0566..cfceaecc04 100644 --- a/src/core/dbus-automount.h +++ b/src/core/dbus-automount.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index 584d974f1a..37c581fb22 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h index 5ca68a63bf..5bf45eb972 100644 --- a/src/core/dbus-cgroup.h +++ b/src/core/dbus-cgroup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c index 6cf7f58e02..b5e18d80a4 100644 --- a/src/core/dbus-device.c +++ b/src/core/dbus-device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dbus-device.h" #include "device.h" diff --git a/src/core/dbus-device.h b/src/core/dbus-device.h index 077a2bf128..bfb57707d4 100644 --- a/src/core/dbus-device.h +++ b/src/core/dbus-device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus-vtable.h" diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 488af98cd3..abe009c395 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> #include <sys/prctl.h> diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h index cbb2f97cf1..c53834140e 100644 --- a/src/core/dbus-execute.h +++ b/src/core/dbus-execute.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index 06443a4be4..1526b316cc 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/core/dbus-job.h b/src/core/dbus-job.h index 96c5b66309..6f005811cb 100644 --- a/src/core/dbus-job.h +++ b/src/core/dbus-job.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-kill.c b/src/core/dbus-kill.c index eda3410375..6333f3bcfe 100644 --- a/src/core/dbus-kill.c +++ b/src/core/dbus-kill.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-get-properties.h" #include "dbus-kill.h" diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h index 8192e94fbb..5a9028795c 100644 --- a/src/core/dbus-kill.h +++ b/src/core/dbus-kill.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 0ac87b56a8..b37ed7c862 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/prctl.h> diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h index 83854b0f59..f3862fca83 100644 --- a/src/core/dbus-manager.h +++ b/src/core/dbus-manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus-vtable.h" diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c index a4fa44dbc9..73702b1a16 100644 --- a/src/core/dbus-mount.c +++ b/src/core/dbus-mount.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-get-properties.h" #include "dbus-cgroup.h" diff --git a/src/core/dbus-mount.h b/src/core/dbus-mount.h index f7112a9f02..5a848d3104 100644 --- a/src/core/dbus-mount.h +++ b/src/core/dbus-mount.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c index 76cd9d3260..14e77d783d 100644 --- a/src/core/dbus-path.c +++ b/src/core/dbus-path.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-get-properties.h" diff --git a/src/core/dbus-path.h b/src/core/dbus-path.h index ad42b23662..b5018b0116 100644 --- a/src/core/dbus-path.h +++ b/src/core/dbus-path.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c index d752cd58aa..1bcb4836f6 100644 --- a/src/core/dbus-scope.c +++ b/src/core/dbus-scope.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-common-errors.h" diff --git a/src/core/dbus-scope.h b/src/core/dbus-scope.h index 702f55898d..8f1bc02e31 100644 --- a/src/core/dbus-scope.h +++ b/src/core/dbus-scope.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 73052fac6d..64f9d4ab36 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> diff --git a/src/core/dbus-service.h b/src/core/dbus-service.h index 22d2b887b4..69311675c9 100644 --- a/src/core/dbus-service.h +++ b/src/core/dbus-service.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c index 28a6a4fe5a..de41d651da 100644 --- a/src/core/dbus-slice.c +++ b/src/core/dbus-slice.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dbus-cgroup.h" #include "dbus-slice.h" diff --git a/src/core/dbus-slice.h b/src/core/dbus-slice.h index 88cc48c808..eb71916abd 100644 --- a/src/core/dbus-slice.h +++ b/src/core/dbus-slice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c index a5d15d80cd..2c9da7412a 100644 --- a/src/core/dbus-socket.c +++ b/src/core/dbus-socket.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-get-properties.h" diff --git a/src/core/dbus-socket.h b/src/core/dbus-socket.h index 9aa8133d18..f9f36a2448 100644 --- a/src/core/dbus-socket.h +++ b/src/core/dbus-socket.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c index d132c08f0e..0fa8dd10e2 100644 --- a/src/core/dbus-swap.c +++ b/src/core/dbus-swap.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2010 Maarten Lankhorst ***/ diff --git a/src/core/dbus-swap.h b/src/core/dbus-swap.h index b114fe04c7..9d651b5654 100644 --- a/src/core/dbus-swap.h +++ b/src/core/dbus-swap.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/core/dbus-target.c b/src/core/dbus-target.c index ba50113641..e979fb7267 100644 --- a/src/core/dbus-target.c +++ b/src/core/dbus-target.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dbus-target.h" #include "unit.h" diff --git a/src/core/dbus-target.h b/src/core/dbus-target.h index ad02a1db74..fedd4a93ea 100644 --- a/src/core/dbus-target.h +++ b/src/core/dbus-target.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus-vtable.h" diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c index da35fa8678..9720237140 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.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-get-properties.h" diff --git a/src/core/dbus-timer.h b/src/core/dbus-timer.h index bb126b22dc..ac436f15aa 100644 --- a/src/core/dbus-timer.h +++ b/src/core/dbus-timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index d38c0f0582..427152a757 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h index f21f236025..1da3cfeb96 100644 --- a/src/core/dbus-unit.h +++ b/src/core/dbus-unit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c index f534001a9c..d6223db305 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-util.h" #include "dbus-util.h" diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h index 7781a425be..4e7c68e843 100644 --- a/src/core/dbus-util.h +++ b/src/core/dbus-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/dbus.c b/src/core/dbus.c index 774ee5632f..3e435c98ca 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/epoll.h> diff --git a/src/core/dbus.h b/src/core/dbus.h index 812f56ea2a..369d9f56a2 100644 --- a/src/core/dbus.h +++ b/src/core/dbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/device.c b/src/core/device.c index 134c6ee5bb..9a1d88270d 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/epoll.h> diff --git a/src/core/device.h b/src/core/device.h index 3062be782d..dfe8a13aff 100644 --- a/src/core/device.h +++ b/src/core/device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "unit.h" diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c index 8388d53dd1..7da87fd818 100644 --- a/src/core/dynamic-user.c +++ b/src/core/dynamic-user.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/file.h> #include <sys/stat.h> diff --git a/src/core/dynamic-user.h b/src/core/dynamic-user.h index 0a55630ab9..847ef475ca 100644 --- a/src/core/dynamic-user.h +++ b/src/core/dynamic-user.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct DynamicUser DynamicUser; diff --git a/src/core/efi-random.c b/src/core/efi-random.c index b6609e63e5..2bc74fab98 100644 --- a/src/core/efi-random.c +++ b/src/core/efi-random.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/core/efi-random.h b/src/core/efi-random.h index c1de8671d8..7d20fff57d 100644 --- a/src/core/efi-random.h +++ b/src/core/efi-random.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int efi_take_random_seed(void); diff --git a/src/core/emergency-action.c b/src/core/emergency-action.c index 1565a79927..9e8c79e67a 100644 --- a/src/core/emergency-action.c +++ b/src/core/emergency-action.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/reboot.h> diff --git a/src/core/emergency-action.h b/src/core/emergency-action.h index 706c38a7d7..95d49a8166 100644 --- a/src/core/emergency-action.h +++ b/src/core/emergency-action.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef enum EmergencyAction { diff --git a/src/core/execute.c b/src/core/execute.c index e0062eed40..c992b8d5d3 100644 --- a/src/core/execute.c +++ b/src/core/execute.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/core/execute.h b/src/core/execute.h index 12ea849e1c..33d7e1693d 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct ExecStatus ExecStatus; diff --git a/src/core/generator-setup.c b/src/core/generator-setup.c index 78ff590902..9173951735 100644 --- a/src/core/generator-setup.c +++ b/src/core/generator-setup.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/core/generator-setup.h b/src/core/generator-setup.h index 9688601a76..1cc816b3f5 100644 --- a/src/core/generator-setup.h +++ b/src/core/generator-setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "path-lookup.h" diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c index 6d047db838..867ea19905 100644 --- a/src/core/hostname-setup.c +++ b/src/core/hostname-setup.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/core/hostname-setup.h b/src/core/hostname-setup.h index dc7b9a6262..7fd0a02747 100644 --- a/src/core/hostname-setup.h +++ b/src/core/hostname-setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int hostname_setup(void); diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c index 17072b09af..7f517a0909 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2012 Roberto Sassu - Politecnico di Torino, Italy TORSEC group — http://security.polito.it diff --git a/src/core/ima-setup.h b/src/core/ima-setup.h index cf478795a1..f964c7b1fb 100644 --- a/src/core/ima-setup.h +++ b/src/core/ima-setup.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/core/ip-address-access.c b/src/core/ip-address-access.c index db87b12a78..a11251e94e 100644 --- a/src/core/ip-address-access.c +++ b/src/core/ip-address-access.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <stdlib.h> diff --git a/src/core/ip-address-access.h b/src/core/ip-address-access.h index 8d3ab731f1..71b5459e2a 100644 --- a/src/core/ip-address-access.h +++ b/src/core/ip-address-access.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/core/job.c b/src/core/job.c index 063f3f7892..f3c1a02831 100644 --- a/src/core/job.c +++ b/src/core/job.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/core/job.h b/src/core/job.h index 03ad640618..1b3ddc7b4b 100644 --- a/src/core/job.h +++ b/src/core/job.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/core/kill.c b/src/core/kill.c index a9f468e29e..e858ae9607 100644 --- a/src/core/kill.c +++ b/src/core/kill.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "kill.h" #include "signal-util.h" diff --git a/src/core/kill.h b/src/core/kill.h index 1deb0aff9b..012e433b61 100644 --- a/src/core/kill.h +++ b/src/core/kill.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct KillContext KillContext; diff --git a/src/core/killall.c b/src/core/killall.c index 2b259985dc..6f60f09c4e 100644 --- a/src/core/killall.c +++ b/src/core/killall.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2010 ProFUSION embedded systems ***/ diff --git a/src/core/killall.h b/src/core/killall.h index 08ae28d073..d8ef96f7d1 100644 --- a/src/core/killall.h +++ b/src/core/killall.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "time-util.h" diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 1286743273..8a7f82812a 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ftw.h> #include <unistd.h> diff --git a/src/core/kmod-setup.h b/src/core/kmod-setup.h index 801c7bf699..1c842d3617 100644 --- a/src/core/kmod-setup.h +++ b/src/core/kmod-setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int kmod_setup(void); diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c index fb3f68561b..d1c85e23bf 100644 --- a/src/core/load-dropin.c +++ b/src/core/load-dropin.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-parser.h" #include "fs-util.h" diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h index 5e2ec0d80a..f0b87d3e9f 100644 --- a/src/core/load-dropin.h +++ b/src/core/load-dropin.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "dropin.h" diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 0ab64e1708..3b0f93b821 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2012 Holger Hans Peter Freyther ***/ diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h index 47036145c8..6b2175cd2a 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index 33728b0ff2..64761ddb11 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.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/core/locale-setup.h b/src/core/locale-setup.h index 01fadd06c7..d554ad3060 100644 --- a/src/core/locale-setup.h +++ b/src/core/locale-setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int locale_setup(char ***environment); diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c index 27d5a11d78..76022ce423 100644 --- a/src/core/loopback-setup.c +++ b/src/core/loopback-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <stdlib.h> diff --git a/src/core/loopback-setup.h b/src/core/loopback-setup.h index c0eea100ed..a7ee2dadb0 100644 --- a/src/core/loopback-setup.h +++ b/src/core/loopback-setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int loopback_setup(void); diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index c55e0b5321..6d15f9cd09 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sched.h> diff --git a/src/core/machine-id-setup.h b/src/core/machine-id-setup.h index e207ccf9c1..cce58192e5 100644 --- a/src/core/machine-id-setup.h +++ b/src/core/machine-id-setup.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/core/macros.systemd.in b/src/core/macros.systemd.in index 8832c4a6f4..6988500f4c 100644 --- a/src/core/macros.systemd.in +++ b/src/core/macros.systemd.in @@ -1,5 +1,5 @@ # -*- Mode: rpm-spec; indent-tabs-mode: nil -*- */ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. diff --git a/src/core/main.c b/src/core/main.c index 728e1578b1..c08f541bc1 100644 --- a/src/core/main.c +++ b/src/core/main.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/core/manager.c b/src/core/manager.c index eed3ab7541..1f1450b97c 100644 --- a/src/core/manager.c +++ b/src/core/manager.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/core/manager.h b/src/core/manager.h index 073cc74a85..d22c801da8 100644 --- a/src/core/manager.h +++ b/src/core/manager.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/core/meson.build b/src/core/meson.build index 72a00f1955..552590393d 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later libcore_shared_sources = ''' killall.c diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c index f745df7c95..915b1016b8 100644 --- a/src/core/mount-setup.c +++ b/src/core/mount-setup.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/core/mount-setup.h b/src/core/mount-setup.h index bccd094961..29bd62f6bf 100644 --- a/src/core/mount-setup.h +++ b/src/core/mount-setup.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/core/mount.c b/src/core/mount.c index dbbb73f3d5..c96c137d29 100644 --- a/src/core/mount.c +++ b/src/core/mount.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/core/mount.h b/src/core/mount.h index a1bc2d71a6..ad0e016083 100644 --- a/src/core/mount.h +++ b/src/core/mount.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Mount Mount; diff --git a/src/core/namespace.c b/src/core/namespace.c index 05bd4da154..0d30f17b9a 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <linux/loop.h> diff --git a/src/core/namespace.h b/src/core/namespace.h index 908e57c42c..da0861c406 100644 --- a/src/core/namespace.h +++ b/src/core/namespace.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/core/org.freedesktop.systemd1.conf b/src/core/org.freedesktop.systemd1.conf index 9a5912c10f..8b32379835 100644 --- a/src/core/org.freedesktop.systemd1.conf +++ b/src/core/org.freedesktop.systemd1.conf @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/core/org.freedesktop.systemd1.policy.in b/src/core/org.freedesktop.systemd1.policy.in index 001408d34a..a6d40d7e8f 100644 --- a/src/core/org.freedesktop.systemd1.policy.in +++ b/src/core/org.freedesktop.systemd1.policy.in @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/core/org.freedesktop.systemd1.service b/src/core/org.freedesktop.systemd1.service index 8bd7302d6c..082125f52e 100644 --- a/src/core/org.freedesktop.systemd1.service +++ b/src/core/org.freedesktop.systemd1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/core/path.c b/src/core/path.c index 4f4e7100cf..ca3a91df27 100644 --- a/src/core/path.c +++ b/src/core/path.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/epoll.h> diff --git a/src/core/path.h b/src/core/path.h index 4043650fe0..fb33b12ab1 100644 --- a/src/core/path.h +++ b/src/core/path.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Path Path; diff --git a/src/core/scope.c b/src/core/scope.c index 13cd2e6c3c..a4db272f93 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/core/scope.h b/src/core/scope.h index ae2bb80e55..5f791b7d19 100644 --- a/src/core/scope.h +++ b/src/core/scope.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Scope Scope; diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c index b81714faa6..18f6fb59bc 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "selinux-access.h" diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h index 58f737de09..c6bfb32544 100644 --- a/src/core/selinux-access.h +++ b/src/core/selinux-access.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c index 8c67352ddb..1ac05b81e8 100644 --- a/src/core/selinux-setup.c +++ b/src/core/selinux-setup.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/core/selinux-setup.h b/src/core/selinux-setup.h index ad0d4f65dc..cdff51d747 100644 --- a/src/core/selinux-setup.h +++ b/src/core/selinux-setup.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/core/service.c b/src/core/service.c index af7534546d..d7bdeb7cca 100644 --- a/src/core/service.c +++ b/src/core/service.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/core/service.h b/src/core/service.h index 4423f893bb..11c3d3f370 100644 --- a/src/core/service.h +++ b/src/core/service.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Service Service; diff --git a/src/core/show-status.c b/src/core/show-status.c index 9d7358a9c1..a74423cb85 100644 --- a/src/core/show-status.c +++ b/src/core/show-status.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/core/show-status.h b/src/core/show-status.h index 178f624d6c..c37ccd9087 100644 --- a/src/core/show-status.h +++ b/src/core/show-status.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/core/slice.c b/src/core/slice.c index 36e5d6a40f..ee5c25932f 100644 --- a/src/core/slice.c +++ b/src/core/slice.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/core/slice.h b/src/core/slice.h index 4678c085c3..e2f9274655 100644 --- a/src/core/slice.h +++ b/src/core/slice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "unit.h" diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index 4427397f27..1fe592af70 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation Authors: diff --git a/src/core/smack-setup.h b/src/core/smack-setup.h index b65daafcd8..d29370d1e9 100644 --- a/src/core/smack-setup.h +++ b/src/core/smack-setup.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/core/socket.c b/src/core/socket.c index f045eed5b5..7b3827ae87 100644 --- a/src/core/socket.c +++ b/src/core/socket.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/core/socket.h b/src/core/socket.h index 90839de9fa..ebe85c2aa4 100644 --- a/src/core/socket.h +++ b/src/core/socket.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Socket Socket; diff --git a/src/core/swap.c b/src/core/swap.c index fa600a9797..d984ac0f2d 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/epoll.h> diff --git a/src/core/swap.h b/src/core/swap.h index cb24cec7aa..6ce9bfd9b4 100644 --- a/src/core/swap.h +++ b/src/core/swap.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/core/systemd.pc.in b/src/core/systemd.pc.in index c0554649de..f2c045511d 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/core/target.c b/src/core/target.c index 3f85773b24..a422056803 100644 --- a/src/core/target.c +++ b/src/core/target.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dbus-target.h" #include "dbus-unit.h" diff --git a/src/core/target.h b/src/core/target.h index 28f78888dc..bb909d664f 100644 --- a/src/core/target.h +++ b/src/core/target.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "unit.h" diff --git a/src/core/timer.c b/src/core/timer.c index 94388f0727..886655a78e 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/core/timer.h b/src/core/timer.h index ab66a201ad..46d9b9b262 100644 --- a/src/core/timer.h +++ b/src/core/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Timer Timer; diff --git a/src/core/transaction.c b/src/core/transaction.c index f4cdbfe6f5..ae77bae65e 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/core/transaction.h b/src/core/transaction.h index ba42f58e07..c431271eb2 100644 --- a/src/core/transaction.h +++ b/src/core/transaction.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Transaction Transaction; diff --git a/src/core/triggers.systemd.in b/src/core/triggers.systemd.in index 10b1889b57..2d25db3696 100644 --- a/src/core/triggers.systemd.in +++ b/src/core/triggers.systemd.in @@ -1,5 +1,5 @@ # -*- Mode: rpm-spec; indent-tabs-mode: nil -*- */ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # Copyright © 2018 Neal Gompa diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 4fee5dc6dc..27f09b3491 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.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/core/unit-printf.h b/src/core/unit-printf.h index cb75448ae5..de5183c113 100644 --- a/src/core/unit-printf.h +++ b/src/core/unit-printf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "unit.h" diff --git a/src/core/unit.c b/src/core/unit.c index 680f4c569b..1d9691fb57 100644 --- a/src/core/unit.c +++ b/src/core/unit.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/core/unit.h b/src/core/unit.h index 1e6d7ccf6b..8cb7135723 100644 --- a/src/core/unit.h +++ b/src/core/unit.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/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c index 35885dfb47..30c67ffe7c 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/statvfs.h> #include <sys/stat.h> diff --git a/src/coredump/coredump-vacuum.h b/src/coredump/coredump-vacuum.h index 0db116736c..8ad5bafc15 100644 --- a/src/coredump/coredump-vacuum.h +++ b/src/coredump/coredump-vacuum.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/coredump/coredump.c b/src/coredump/coredump.c index 104a051688..0a1cb9103a 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.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/coredump/coredumpctl.c b/src/coredump/coredumpctl.c index f252c81758..91356ad3c9 100644 --- a/src/coredump/coredumpctl.c +++ b/src/coredump/coredumpctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <getopt.h> diff --git a/src/coredump/meson.build b/src/coredump/meson.build index 7fa5942697..663c6c7a07 100644 --- a/src/coredump/meson.build +++ b/src/coredump/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_coredump_sources = files(''' coredump.c diff --git a/src/coredump/stacktrace.c b/src/coredump/stacktrace.c index 4e0d3e7698..a29ab1211c 100644 --- a/src/coredump/stacktrace.c +++ b/src/coredump/stacktrace.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <dwarf.h> #include <elfutils/libdwfl.h> diff --git a/src/coredump/stacktrace.h b/src/coredump/stacktrace.h index 2462c763f9..b935748404 100644 --- a/src/coredump/stacktrace.h +++ b/src/coredump/stacktrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once void coredump_make_stack_trace(int fd, const char *executable, char **ret); diff --git a/src/coredump/test-coredump-vacuum.c b/src/coredump/test-coredump-vacuum.c index 75fb442873..ac212ea23b 100644 --- a/src/coredump/test-coredump-vacuum.c +++ b/src/coredump/test-coredump-vacuum.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/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index df589ec3e4..68c73499ce 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.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/cryptsetup/cryptsetup-keyfile.c b/src/cryptsetup/cryptsetup-keyfile.c index ebf4cb1b6b..f849123563 100644 --- a/src/cryptsetup/cryptsetup-keyfile.c +++ b/src/cryptsetup/cryptsetup-keyfile.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/cryptsetup/cryptsetup-keyfile.h b/src/cryptsetup/cryptsetup-keyfile.h index 7bb78227dc..308f5ebd68 100644 --- a/src/cryptsetup/cryptsetup-keyfile.h +++ b/src/cryptsetup/cryptsetup-keyfile.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/cryptsetup/cryptsetup-pkcs11.c b/src/cryptsetup/cryptsetup-pkcs11.c index bbc0122002..50db46f8d1 100644 --- a/src/cryptsetup/cryptsetup-pkcs11.c +++ b/src/cryptsetup/cryptsetup-pkcs11.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/cryptsetup/cryptsetup-pkcs11.h b/src/cryptsetup/cryptsetup-pkcs11.h index af2487e75b..266c8e1b3e 100644 --- a/src/cryptsetup/cryptsetup-pkcs11.h +++ b/src/cryptsetup/cryptsetup-pkcs11.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/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index fb08b4a1a0..6ccb152d10 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <mntent.h> diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c index 4e41eca352..c6e4d79e3a 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/debug-generator/debug-generator.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/delta/delta.c b/src/delta/delta.c index a88eed098d..4295abdc30 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c index 4f38de8e29..14d649c6ed 100644 --- a/src/detect-virt/detect-virt.c +++ b/src/detect-virt/detect-virt.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 237395a444..dc7e9dc626 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <getopt.h> diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c index 4a14c23f11..1c51cf6b2c 100644 --- a/src/environment-d-generator/environment-d-generator.c +++ b/src/environment-d-generator/environment-d-generator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-path.h" diff --git a/src/escape/escape.c b/src/escape/escape.c index 3f3dc0a894..05d03ad762 100644 --- a/src/escape/escape.c +++ b/src/escape/escape.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <stdio.h> diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 3109f9cdfc..742b43f9fc 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <getopt.h> diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 472ba6d549..04752fe9dc 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Holger Hans Peter Freyther ***/ diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 6c560d547b..15f5892228 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.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/fuzz/fuzz-bus-label.c b/src/fuzz/fuzz-bus-label.c index 46a3d23dc4..93bac9adf4 100644 --- a/src/fuzz/fuzz-bus-label.c +++ b/src/fuzz/fuzz-bus-label.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/fuzz/fuzz-bus-message.c b/src/fuzz/fuzz-bus-message.c index 3d1ac7e68a..af3dbf4d57 100644 --- a/src/fuzz/fuzz-bus-message.c +++ b/src/fuzz/fuzz-bus-message.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-dump.h" diff --git a/src/fuzz/fuzz-calendarspec.c b/src/fuzz/fuzz-calendarspec.c index 8f031503e9..80801723fd 100644 --- a/src/fuzz/fuzz-calendarspec.c +++ b/src/fuzz/fuzz-calendarspec.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "calendarspec.h" diff --git a/src/fuzz/fuzz-catalog.c b/src/fuzz/fuzz-catalog.c index ecf25b18d7..f013455730 100644 --- a/src/fuzz/fuzz-catalog.c +++ b/src/fuzz/fuzz-catalog.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "catalog.h" #include "fd-util.h" diff --git a/src/fuzz/fuzz-compress.c b/src/fuzz/fuzz-compress.c index 9c5dfc92c0..f94fd0673e 100644 --- a/src/fuzz/fuzz-compress.c +++ b/src/fuzz/fuzz-compress.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/fuzz/fuzz-dhcp-server.c b/src/fuzz/fuzz-dhcp-server.c index 71bb99a381..c854d921c0 100644 --- a/src/fuzz/fuzz-dhcp-server.c +++ b/src/fuzz/fuzz-dhcp-server.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/fuzz/fuzz-dhcp6-client.c b/src/fuzz/fuzz-dhcp6-client.c index 6d887eaf1f..e5e70dd606 100644 --- a/src/fuzz/fuzz-dhcp6-client.c +++ b/src/fuzz/fuzz-dhcp6-client.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/fuzz/fuzz-dns-packet.c b/src/fuzz/fuzz-dns-packet.c index 9bf95b9c76..b9a0aa1216 100644 --- a/src/fuzz/fuzz-dns-packet.c +++ b/src/fuzz/fuzz-dns-packet.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fuzz.h" #include "memory-util.h" diff --git a/src/fuzz/fuzz-env-file.c b/src/fuzz/fuzz-env-file.c index d945dfc02c..e0dac260b0 100644 --- a/src/fuzz/fuzz-env-file.c +++ b/src/fuzz/fuzz-env-file.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/fuzz/fuzz-hostname-util.c b/src/fuzz/fuzz-hostname-util.c index 2130a4a811..0a81e74424 100644 --- a/src/fuzz/fuzz-hostname-util.c +++ b/src/fuzz/fuzz-hostname-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 "fd-util.h" diff --git a/src/fuzz/fuzz-journal-remote.c b/src/fuzz/fuzz-journal-remote.c index 3ab4eb07fa..9adbd43748 100644 --- a/src/fuzz/fuzz-journal-remote.c +++ b/src/fuzz/fuzz-journal-remote.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fuzz.h" diff --git a/src/fuzz/fuzz-journald-audit.c b/src/fuzz/fuzz-journald-audit.c index 3f3ce7e8ee..6e8e18048e 100644 --- a/src/fuzz/fuzz-journald-audit.c +++ b/src/fuzz/fuzz-journald-audit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fuzz.h" #include "fuzz-journald.h" diff --git a/src/fuzz/fuzz-journald-kmsg.c b/src/fuzz/fuzz-journald-kmsg.c index f7426c8400..1b423d5cba 100644 --- a/src/fuzz/fuzz-journald-kmsg.c +++ b/src/fuzz/fuzz-journald-kmsg.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fuzz.h" #include "fuzz-journald.h" diff --git a/src/fuzz/fuzz-journald-native-fd.c b/src/fuzz/fuzz-journald-native-fd.c index 8e3e850fbb..fcfc5dfaba 100644 --- a/src/fuzz/fuzz-journald-native-fd.c +++ b/src/fuzz/fuzz-journald-native-fd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" #include "fs-util.h" diff --git a/src/fuzz/fuzz-journald-native.c b/src/fuzz/fuzz-journald-native.c index f4de5fd8eb..6531c4f668 100644 --- a/src/fuzz/fuzz-journald-native.c +++ b/src/fuzz/fuzz-journald-native.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fuzz.h" #include "fuzz-journald.h" diff --git a/src/fuzz/fuzz-journald-stream.c b/src/fuzz/fuzz-journald-stream.c index 0991b287c9..038b335cb3 100644 --- a/src/fuzz/fuzz-journald-stream.c +++ b/src/fuzz/fuzz-journald-stream.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/sockios.h> #include <sys/ioctl.h> diff --git a/src/fuzz/fuzz-journald-syslog.c b/src/fuzz/fuzz-journald-syslog.c index 100f0ce691..72ec610fbf 100644 --- a/src/fuzz/fuzz-journald-syslog.c +++ b/src/fuzz/fuzz-journald-syslog.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fuzz.h" #include "fuzz-journald.h" diff --git a/src/fuzz/fuzz-journald.c b/src/fuzz/fuzz-journald.c index 950e885cae..e2f73ffa7e 100644 --- a/src/fuzz/fuzz-journald.c +++ b/src/fuzz/fuzz-journald.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fuzz-journald.h" diff --git a/src/fuzz/fuzz-journald.h b/src/fuzz/fuzz-journald.h index 77e3b0c064..4abb1005ca 100644 --- a/src/fuzz/fuzz-journald.h +++ b/src/fuzz/fuzz-journald.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journald-server.h" diff --git a/src/fuzz/fuzz-json.c b/src/fuzz/fuzz-json.c index c01e2a570c..f9a0e818c4 100644 --- a/src/fuzz/fuzz-json.c +++ b/src/fuzz/fuzz-json.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fileio.h" diff --git a/src/fuzz/fuzz-lldp.c b/src/fuzz/fuzz-lldp.c index 7f252309cd..5747135b32 100644 --- a/src/fuzz/fuzz-lldp.c +++ b/src/fuzz/fuzz-lldp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/fuzz/fuzz-main.c b/src/fuzz/fuzz-main.c index d5c9984989..2df2993cbf 100644 --- a/src/fuzz/fuzz-main.c +++ b/src/fuzz/fuzz-main.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "log.h" diff --git a/src/fuzz/fuzz-ndisc-rs.c b/src/fuzz/fuzz-ndisc-rs.c index d8d256d127..d74cd2fffc 100644 --- a/src/fuzz/fuzz-ndisc-rs.c +++ b/src/fuzz/fuzz-ndisc-rs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <netinet/icmp6.h> diff --git a/src/fuzz/fuzz-nspawn-oci.c b/src/fuzz/fuzz-nspawn-oci.c index 004230eafe..cfebf65c00 100644 --- a/src/fuzz/fuzz-nspawn-oci.c +++ b/src/fuzz/fuzz-nspawn-oci.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fd-util.h" diff --git a/src/fuzz/fuzz-nspawn-settings.c b/src/fuzz/fuzz-nspawn-settings.c index aa0a8225b4..bd98ed26e8 100644 --- a/src/fuzz/fuzz-nspawn-settings.c +++ b/src/fuzz/fuzz-nspawn-settings.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fd-util.h" diff --git a/src/fuzz/fuzz-time-util.c b/src/fuzz/fuzz-time-util.c index 22b2496fcb..bf2a66336c 100644 --- a/src/fuzz/fuzz-time-util.c +++ b/src/fuzz/fuzz-time-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 "fd-util.h" diff --git a/src/fuzz/fuzz-udev-database.c b/src/fuzz/fuzz-udev-database.c index 9d7c0fa3e1..2a48c14961 100644 --- a/src/fuzz/fuzz-udev-database.c +++ b/src/fuzz/fuzz-udev-database.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "device-internal.h" #include "device-private.h" diff --git a/src/fuzz/fuzz-udev-rule-parse-value.c b/src/fuzz/fuzz-udev-rule-parse-value.c index f1d36669c4..404d0cd142 100644 --- a/src/fuzz/fuzz-udev-rule-parse-value.c +++ b/src/fuzz/fuzz-udev-rule-parse-value.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/fuzz/fuzz-udev-rules.c b/src/fuzz/fuzz-udev-rules.c index 7530d80bef..e1140bc68e 100644 --- a/src/fuzz/fuzz-udev-rules.c +++ b/src/fuzz/fuzz-udev-rules.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/fuzz/fuzz-unit-file.c b/src/fuzz/fuzz-unit-file.c index c0661433a3..e67f6e9199 100644 --- a/src/fuzz/fuzz-unit-file.c +++ b/src/fuzz/fuzz-unit-file.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-parser.h" #include "fd-util.h" diff --git a/src/fuzz/fuzz-varlink.c b/src/fuzz/fuzz-varlink.c index 31c13e2bea..f26050cf0e 100644 --- a/src/fuzz/fuzz-varlink.c +++ b/src/fuzz/fuzz-varlink.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/fuzz/fuzz-xdg-desktop.c b/src/fuzz/fuzz-xdg-desktop.c index f8a1b5b28b..23077e48dc 100644 --- a/src/fuzz/fuzz-xdg-desktop.c +++ b/src/fuzz/fuzz-xdg-desktop.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fd-util.h" diff --git a/src/fuzz/fuzz.h b/src/fuzz/fuzz.h index 1e56526259..579b0eed73 100644 --- a/src/fuzz/fuzz.h +++ b/src/fuzz/fuzz.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/fuzz/meson.build b/src/fuzz/meson.build index 9b5491940d..a5fac5980e 100644 --- a/src/fuzz/meson.build +++ b/src/fuzz/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later fuzzers += [ [['src/fuzz/fuzz-bus-message.c'], diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c index 04dcacfd59..2f26214ec3 100644 --- a/src/getty-generator/getty-generator.c +++ b/src/getty-generator/getty-generator.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/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 0d18c91c62..f9d0ca5421 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdlib.h> #include <unistd.h> diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c index 95af8efa7e..04a28c9053 100644 --- a/src/hibernate-resume/hibernate-resume-generator.c +++ b/src/hibernate-resume/hibernate-resume-generator.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/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c index 17e7cd1a00..d8f91f4e66 100644 --- a/src/hibernate-resume/hibernate-resume.c +++ b/src/hibernate-resume/hibernate-resume.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/home/home-util.c b/src/home/home-util.c index 8e28e3ab76..cd971b7cda 100644 --- a/src/home/home-util.c +++ b/src/home/home-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-domain.h" #include "home-util.h" diff --git a/src/home/home-util.h b/src/home/home-util.h index 73602e4f8e..fba1c7d8f1 100644 --- a/src/home/home-util.h +++ b/src/home/home-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/home/homectl-fido2.c b/src/home/homectl-fido2.c index 0019f59f0f..5557b70e67 100644 --- a/src/home/homectl-fido2.c +++ b/src/home/homectl-fido2.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_LIBFIDO2 #include <fido.h> diff --git a/src/home/homectl-fido2.h b/src/home/homectl-fido2.h index 0d9faefa81..d0349f5405 100644 --- a/src/home/homectl-fido2.h +++ b/src/home/homectl-fido2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "json.h" diff --git a/src/home/homectl-pkcs11.c b/src/home/homectl-pkcs11.c index 592a6413e1..4b7f8336aa 100644 --- a/src/home/homectl-pkcs11.c +++ b/src/home/homectl-pkcs11.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "errno-util.h" #include "format-table.h" diff --git a/src/home/homectl-pkcs11.h b/src/home/homectl-pkcs11.h index 0403c73ea1..5c30feeed4 100644 --- a/src/home/homectl-pkcs11.h +++ b/src/home/homectl-pkcs11.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "json.h" diff --git a/src/home/homectl-recovery-key.c b/src/home/homectl-recovery-key.c index 3311205db5..4a6649d25c 100644 --- a/src/home/homectl-recovery-key.c +++ b/src/home/homectl-recovery-key.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "errno-util.h" #include "homectl-recovery-key.h" diff --git a/src/home/homectl-recovery-key.h b/src/home/homectl-recovery-key.h index 489d35fa5b..ab195f94db 100644 --- a/src/home/homectl-recovery-key.h +++ b/src/home/homectl-recovery-key.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "json.h" diff --git a/src/home/homectl.c b/src/home/homectl.c index 486aec066d..470e05b24e 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/home/homed-bus.c b/src/home/homed-bus.c index a5627d0a1f..d70fda5f44 100644 --- a/src/home/homed-bus.c +++ b/src/home/homed-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "homed-bus.h" #include "strv.h" diff --git a/src/home/homed-bus.h b/src/home/homed-bus.h index 20f13b43ad..977679b10a 100644 --- a/src/home/homed-bus.h +++ b/src/home/homed-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/home/homed-conf.c b/src/home/homed-conf.c index c6c2e1787f..4f46b0c886 100644 --- a/src/home/homed-conf.c +++ b/src/home/homed-conf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-parser.h" #include "def.h" diff --git a/src/home/homed-conf.h b/src/home/homed-conf.h index 00eb3fdb68..1defaa998b 100644 --- a/src/home/homed-conf.h +++ b/src/home/homed-conf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/home/homed-home-bus.c b/src/home/homed-home-bus.c index 08f77b4f51..5643a9a6e4 100644 --- a/src/home/homed-home-bus.c +++ b/src/home/homed-home-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/capability.h> diff --git a/src/home/homed-home-bus.h b/src/home/homed-home-bus.h index 8ac7ff9995..5522178055 100644 --- a/src/home/homed-home-bus.h +++ b/src/home/homed-home-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/home/homed-home.c b/src/home/homed-home.c index 6d0f0fbd0e..7f4532e0cc 100644 --- a/src/home/homed-home.c +++ b/src/home/homed-home.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_LINUX_MEMFD_H #include <linux/memfd.h> diff --git a/src/home/homed-home.h b/src/home/homed-home.h index 97879940df..4c24ee72a7 100644 --- a/src/home/homed-home.h +++ b/src/home/homed-home.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Home Home; diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c index a599c58297..d3ac98f901 100644 --- a/src/home/homed-manager-bus.c +++ b/src/home/homed-manager-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/capability.h> diff --git a/src/home/homed-manager-bus.h b/src/home/homed-manager-bus.h index 93bef9df8e..7db29fa88f 100644 --- a/src/home/homed-manager-bus.h +++ b/src/home/homed-manager-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "bus-util.h" diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c index 0490032416..a73ea2dd3f 100644 --- a/src/home/homed-manager.c +++ b/src/home/homed-manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <grp.h> #include <linux/fs.h> diff --git a/src/home/homed-manager.h b/src/home/homed-manager.h index c86bf4300b..851b302f59 100644 --- a/src/home/homed-manager.h +++ b/src/home/homed-manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <openssl/evp.h> diff --git a/src/home/homed-operation.c b/src/home/homed-operation.c index 156a25ec81..3847fc5d68 100644 --- a/src/home/homed-operation.c +++ b/src/home/homed-operation.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" #include "homed-operation.h" diff --git a/src/home/homed-operation.h b/src/home/homed-operation.h index 0771dc6be0..6721363b2a 100644 --- a/src/home/homed-operation.h +++ b/src/home/homed-operation.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <sd-bus.h> diff --git a/src/home/homed-varlink.c b/src/home/homed-varlink.c index dfc615a097..c42908349a 100644 --- a/src/home/homed-varlink.c +++ b/src/home/homed-varlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "group-record.h" #include "homed-varlink.h" diff --git a/src/home/homed-varlink.h b/src/home/homed-varlink.h index 4454d23442..2e404f02fa 100644 --- a/src/home/homed-varlink.h +++ b/src/home/homed-varlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "homed-manager.h" diff --git a/src/home/homed.c b/src/home/homed.c index eb5a4a2ea5..e4d64bdfda 100644 --- a/src/home/homed.c +++ b/src/home/homed.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c index cfceaed742..2736095f93 100644 --- a/src/home/homework-cifs.c +++ b/src/home/homework-cifs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dirent-util.h" #include "fd-util.h" diff --git a/src/home/homework-cifs.h b/src/home/homework-cifs.h index ee799e2a4b..da2e50a795 100644 --- a/src/home/homework-cifs.h +++ b/src/home/homework-cifs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "homework.h" diff --git a/src/home/homework-directory.c b/src/home/homework-directory.c index bffeac0a5e..2d800033ee 100644 --- a/src/home/homework-directory.c +++ b/src/home/homework-directory.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> diff --git a/src/home/homework-directory.h b/src/home/homework-directory.h index 717837f348..27d640f380 100644 --- a/src/home/homework-directory.h +++ b/src/home/homework-directory.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "homework.h" diff --git a/src/home/homework-fido2.c b/src/home/homework-fido2.c index 36fe059ab3..2f717a5938 100644 --- a/src/home/homework-fido2.c +++ b/src/home/homework-fido2.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fido.h> diff --git a/src/home/homework-fido2.h b/src/home/homework-fido2.h index d3b142a923..a1dcba2d86 100644 --- a/src/home/homework-fido2.h +++ b/src/home/homework-fido2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "user-record.h" diff --git a/src/home/homework-fscrypt.c b/src/home/homework-fscrypt.c index da9bb64b71..d0676f8ae6 100644 --- a/src/home/homework-fscrypt.c +++ b/src/home/homework-fscrypt.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/fs.h> #include <openssl/evp.h> diff --git a/src/home/homework-fscrypt.h b/src/home/homework-fscrypt.h index e5cf7baaaa..50b03993e0 100644 --- a/src/home/homework-fscrypt.h +++ b/src/home/homework-fscrypt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "homework.h" diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 947a559c26..b0b2d8029f 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <libfdisk.h> #include <linux/loop.h> diff --git a/src/home/homework-luks.h b/src/home/homework-luks.h index af0ad4b504..c43bdfcba3 100644 --- a/src/home/homework-luks.h +++ b/src/home/homework-luks.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "cryptsetup-util.h" diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c index 853181b80d..5e737687d1 100644 --- a/src/home/homework-mount.c +++ b/src/home/homework-mount.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sched.h> #include <sys/mount.h> diff --git a/src/home/homework-mount.h b/src/home/homework-mount.h index cf7c8cfcab..2a4591c1f4 100644 --- a/src/home/homework-mount.h +++ b/src/home/homework-mount.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/home/homework-pkcs11.c b/src/home/homework-pkcs11.c index 3a03fb7200..15402b1002 100644 --- a/src/home/homework-pkcs11.c +++ b/src/home/homework-pkcs11.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hexdecoct.h" #include "homework-pkcs11.h" diff --git a/src/home/homework-pkcs11.h b/src/home/homework-pkcs11.h index 469ba7152f..c8674e0bc7 100644 --- a/src/home/homework-pkcs11.h +++ b/src/home/homework-pkcs11.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if HAVE_P11KIT diff --git a/src/home/homework-quota.c b/src/home/homework-quota.c index ba3917b9ce..7001870dfb 100644 --- a/src/home/homework-quota.c +++ b/src/home/homework-quota.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/quota.h> #include "blockdev-util.h" diff --git a/src/home/homework-quota.h b/src/home/homework-quota.h index e6cc16df50..a21c9ba8b1 100644 --- a/src/home/homework-quota.h +++ b/src/home/homework-quota.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "user-record.h" diff --git a/src/home/homework.c b/src/home/homework.c index 4b924b2a7c..b61f650662 100644 --- a/src/home/homework.c +++ b/src/home/homework.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> #include <sys/mount.h> diff --git a/src/home/homework.h b/src/home/homework.h index c9b0d3b432..fb53fd49b0 100644 --- a/src/home/homework.h +++ b/src/home/homework.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/home/meson.build b/src/home/meson.build index 69bacacf80..7847449c43 100644 --- a/src/home/meson.build +++ b/src/home/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_homework_sources = files(''' home-util.c diff --git a/src/home/modhex.c b/src/home/modhex.c index 82a5b20d3f..ae5f895722 100644 --- a/src/home/modhex.c +++ b/src/home/modhex.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/home/modhex.h b/src/home/modhex.h index e0067ae44b..7776ed0ee1 100644 --- a/src/home/modhex.h +++ b/src/home/modhex.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once /* 256 bit keys = 32 bytes */ diff --git a/src/home/org.freedesktop.home1.conf b/src/home/org.freedesktop.home1.conf index d615501054..1975d5f1a2 100644 --- a/src/home/org.freedesktop.home1.conf +++ b/src/home/org.freedesktop.home1.conf @@ -2,7 +2,7 @@ <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<!-- SPDX-License-Identifier: LGPL-2.1+ --> +<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <busconfig> diff --git a/src/home/org.freedesktop.home1.policy b/src/home/org.freedesktop.home1.policy index 43a373d633..10ad7c283a 100644 --- a/src/home/org.freedesktop.home1.policy +++ b/src/home/org.freedesktop.home1.policy @@ -2,7 +2,7 @@ <!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> -<!-- SPDX-License-Identifier: LGPL-2.1+ --> +<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <policyconfig> diff --git a/src/home/org.freedesktop.home1.service b/src/home/org.freedesktop.home1.service index cff19b3861..fb03914592 100644 --- a/src/home/org.freedesktop.home1.service +++ b/src/home/org.freedesktop.home1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later [D-BUS Service] Name=org.freedesktop.home1 diff --git a/src/home/pam_systemd_home.c b/src/home/pam_systemd_home.c index 4d7c99733e..a5279453f3 100644 --- a/src/home/pam_systemd_home.c +++ b/src/home/pam_systemd_home.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <security/pam_ext.h> #include <security/pam_modules.h> diff --git a/src/home/pam_systemd_home.sym b/src/home/pam_systemd_home.sym index daec0499e1..293c06fe2c 100644 --- a/src/home/pam_systemd_home.sym +++ b/src/home/pam_systemd_home.sym @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ { global: diff --git a/src/home/test-modhex.c b/src/home/test-modhex.c index 4eebeeaaea..1bd9061a7b 100644 --- a/src/home/test-modhex.c +++ b/src/home/test-modhex.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "modhex.h" #include "alloc-util.h" diff --git a/src/home/user-record-pwquality.c b/src/home/user-record-pwquality.c index 08d7dc0169..23c3357836 100644 --- a/src/home/user-record-pwquality.c +++ b/src/home/user-record-pwquality.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-common-errors.h" #include "errno-util.h" diff --git a/src/home/user-record-pwquality.h b/src/home/user-record-pwquality.h index a37d369181..b3b2690f7e 100644 --- a/src/home/user-record-pwquality.h +++ b/src/home/user-record-pwquality.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/home/user-record-sign.c b/src/home/user-record-sign.c index 6ef0c27c54..8cd3a46251 100644 --- a/src/home/user-record-sign.c +++ b/src/home/user-record-sign.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <openssl/pem.h> diff --git a/src/home/user-record-sign.h b/src/home/user-record-sign.h index f045c8837b..87c6813e92 100644 --- a/src/home/user-record-sign.h +++ b/src/home/user-record-sign.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <openssl/evp.h> diff --git a/src/home/user-record-util.c b/src/home/user-record-util.c index 3ed64128b2..6bcbb56aac 100644 --- a/src/home/user-record-util.c +++ b/src/home/user-record-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/xattr.h> diff --git a/src/home/user-record-util.h b/src/home/user-record-util.h index f8bae707bc..302e7a5dff 100644 --- a/src/home/user-record-util.h +++ b/src/home/user-record-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index c38600b9c3..0d39e9176f 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 44c2b9a631..a1794bdab1 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/utsname.h> diff --git a/src/hostname/meson.build b/src/hostname/meson.build index db66ba5531..718a7bd4f1 100644 --- a/src/hostname/meson.build +++ b/src/hostname/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later if conf.get('ENABLE_HOSTNAMED') == 1 install_data('org.freedesktop.hostname1.conf', diff --git a/src/hostname/org.freedesktop.hostname1.conf b/src/hostname/org.freedesktop.hostname1.conf index e2658c6c95..2f34102e98 100644 --- a/src/hostname/org.freedesktop.hostname1.conf +++ b/src/hostname/org.freedesktop.hostname1.conf @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/hostname/org.freedesktop.hostname1.policy b/src/hostname/org.freedesktop.hostname1.policy index 5969a82b29..7d28c395cf 100644 --- a/src/hostname/org.freedesktop.hostname1.policy +++ b/src/hostname/org.freedesktop.hostname1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/src/hostname/org.freedesktop.hostname1.service b/src/hostname/org.freedesktop.hostname1.service index 98c7bcbd84..1d6b9c8fe7 100644 --- a/src/hostname/org.freedesktop.hostname1.service +++ b/src/hostname/org.freedesktop.hostname1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # systemd is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index eb038a8b55..1246d68969 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/id128/id128.c b/src/id128/id128.c index 236043bf8a..086f398108 100644 --- a/src/id128/id128.c +++ b/src/id128/id128.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <stdio.h> diff --git a/src/import/curl-util.c b/src/import/curl-util.c index a1b3147f65..bb81f97b09 100644 --- a/src/import/curl-util.c +++ b/src/import/curl-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> diff --git a/src/import/curl-util.h b/src/import/curl-util.h index fa80b23342..f4a882d234 100644 --- a/src/import/curl-util.h +++ b/src/import/curl-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <curl/curl.h> diff --git a/src/import/export-raw.c b/src/import/export-raw.c index a0ac6bc7f4..3e0348f4c1 100644 --- a/src/import/export-raw.c +++ b/src/import/export-raw.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/sendfile.h> diff --git a/src/import/export-raw.h b/src/import/export-raw.h index 196b8ef28f..27009e4e35 100644 --- a/src/import/export-raw.h +++ b/src/import/export-raw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/import/export-tar.c b/src/import/export-tar.c index 5f89880ed6..b8b650f01e 100644 --- a/src/import/export-tar.c +++ b/src/import/export-tar.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-daemon.h" diff --git a/src/import/export-tar.h b/src/import/export-tar.h index 6abb7d383a..3b55d12c1f 100644 --- a/src/import/export-tar.h +++ b/src/import/export-tar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/import/export.c b/src/import/export.c index 77d24b8635..83990df64c 100644 --- a/src/import/export.c +++ b/src/import/export.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/import/import-common.c b/src/import/import-common.c index ebd7472892..250270511d 100644 --- a/src/import/import-common.c +++ b/src/import/import-common.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sched.h> #include <sys/prctl.h> diff --git a/src/import/import-common.h b/src/import/import-common.h index 94d224f412..b27a980839 100644 --- a/src/import/import-common.h +++ b/src/import/import-common.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/import/import-compress.c b/src/import/import-compress.c index 3fbd067790..b89ffb1b2a 100644 --- a/src/import/import-compress.c +++ b/src/import/import-compress.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "import-compress.h" #include "string-table.h" diff --git a/src/import/import-compress.h b/src/import/import-compress.h index 859bd0e1a4..e40f4dba0a 100644 --- a/src/import/import-compress.h +++ b/src/import/import-compress.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if HAVE_BZIP2 diff --git a/src/import/import-fs.c b/src/import/import-fs.c index f631f857fc..3b43ea112d 100644 --- a/src/import/import-fs.c +++ b/src/import/import-fs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/import/import-raw.c b/src/import/import-raw.c index 7e9f3441f4..9f5c13ba16 100644 --- a/src/import/import-raw.c +++ b/src/import/import-raw.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/fs.h> diff --git a/src/import/import-raw.h b/src/import/import-raw.h index de4c3ea337..4612a9ffef 100644 --- a/src/import/import-raw.h +++ b/src/import/import-raw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/import/import-tar.c b/src/import/import-tar.c index 5d2bf22fb2..9f68d45eac 100644 --- a/src/import/import-tar.c +++ b/src/import/import-tar.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/fs.h> diff --git a/src/import/import-tar.h b/src/import/import-tar.h index 347f522614..afbe98ad05 100644 --- a/src/import/import-tar.h +++ b/src/import/import-tar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/import/import.c b/src/import/import.c index 64ec066a8f..eade0f0ec8 100644 --- a/src/import/import.c +++ b/src/import/import.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/import/importd.c b/src/import/importd.c index 17944b8dd3..63f80e0e38 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/prctl.h> #include <sys/wait.h> diff --git a/src/import/meson.build b/src/import/meson.build index 1c15fd883f..2207b8620e 100644 --- a/src/import/meson.build +++ b/src/import/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_importd_sources = files(''' importd.c diff --git a/src/import/org.freedesktop.import1.conf b/src/import/org.freedesktop.import1.conf index 2fdb2ba77c..4838e79a15 100644 --- a/src/import/org.freedesktop.import1.conf +++ b/src/import/org.freedesktop.import1.conf @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/import/org.freedesktop.import1.policy b/src/import/org.freedesktop.import1.policy index beea5fea67..9736816e33 100644 --- a/src/import/org.freedesktop.import1.policy +++ b/src/import/org.freedesktop.import1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/import/org.freedesktop.import1.service b/src/import/org.freedesktop.import1.service index 34d26d0732..4fe921f26e 100644 --- a/src/import/org.freedesktop.import1.service +++ b/src/import/org.freedesktop.import1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/import/pull-common.c b/src/import/pull-common.c index fdc70447e1..33be609aec 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/prctl.h> diff --git a/src/import/pull-common.h b/src/import/pull-common.h index 65f239da2e..025bcee2bd 100644 --- a/src/import/pull-common.h +++ b/src/import/pull-common.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/import/pull-job.c b/src/import/pull-job.c index 4561794548..eea00380a4 100644 --- a/src/import/pull-job.c +++ b/src/import/pull-job.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/import/pull-job.h b/src/import/pull-job.h index c907e74060..719196caec 100644 --- a/src/import/pull-job.h +++ b/src/import/pull-job.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <gcrypt.h> diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index c32b77f14b..7956ef0395 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <curl/curl.h> #include <linux/fs.h> diff --git a/src/import/pull-raw.h b/src/import/pull-raw.h index 4ccd65b7e6..e1d450d9df 100644 --- a/src/import/pull-raw.h +++ b/src/import/pull-raw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index ede28bee1b..72e5b8be27 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <curl/curl.h> #include <sys/prctl.h> diff --git a/src/import/pull-tar.h b/src/import/pull-tar.h index 76f920eea9..78d982cf5a 100644 --- a/src/import/pull-tar.h +++ b/src/import/pull-tar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/import/pull.c b/src/import/pull.c index 9b27ec2630..9aff377b93 100644 --- a/src/import/pull.c +++ b/src/import/pull.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c index e927b60fce..5a7232d3ed 100644 --- a/src/import/qcow2-util.c +++ b/src/import/qcow2-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <zlib.h> diff --git a/src/import/qcow2-util.h b/src/import/qcow2-util.h index 7393d9837a..f17c159ee4 100644 --- a/src/import/qcow2-util.h +++ b/src/import/qcow2-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int qcow2_detect(int fd); diff --git a/src/import/test-qcow2.c b/src/import/test-qcow2.c index 1703cfd167..77fed01dd3 100644 --- a/src/import/test-qcow2.c +++ b/src/import/test-qcow2.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/initctl/initctl.c b/src/initctl/initctl.c index 050424e66c..e0b78334f5 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.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/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index a0de0fa9b5..0723f7d8bb 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <getopt.h> diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 6eea8acb05..d2aa1815c2 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <unistd.h> diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c index dc047b2d49..7bc349c304 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fd-util.h" diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h index d6c77360a6..a5b51ad4d1 100644 --- a/src/journal-remote/journal-remote-parse.h +++ b/src/journal-remote/journal-remote-parse.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c index ab5e03ab5a..764a3ec70b 100644 --- a/src/journal-remote/journal-remote-write.c +++ b/src/journal-remote/journal-remote-write.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "journal-remote.h" diff --git a/src/journal-remote/journal-remote-write.h b/src/journal-remote/journal-remote-write.h index d42256e673..46b55219d7 100644 --- a/src/journal-remote/journal-remote-write.h +++ b/src/journal-remote/journal-remote-write.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journal-file.h" diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index b241d3355d..0cee844452 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.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/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h index 4c25d43abf..247ffa9765 100644 --- a/src/journal-remote/journal-remote.h +++ b/src/journal-remote/journal-remote.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c index da37b3416f..3296c2268e 100644 --- a/src/journal-remote/journal-upload-journal.c +++ b/src/journal-remote/journal-upload-journal.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <curl/curl.h> #include <stdbool.h> diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 13ca90f957..bf362d0919 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <curl/curl.h> #include <fcntl.h> diff --git a/src/journal-remote/journal-upload.h b/src/journal-remote/journal-upload.h index 95af35db05..9ff5a7ba58 100644 --- a/src/journal-remote/journal-upload.h +++ b/src/journal-remote/journal-upload.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/journal-remote/meson.build b/src/journal-remote/meson.build index 87b8ba6495..66cbcc69df 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_journal_upload_sources = files(''' journal-upload.h diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c index 027f2c8ff5..d3fb0b8b19 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> #include <stdio.h> diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h index 4ca9a5c4f1..7f90a09c77 100644 --- a/src/journal-remote/microhttpd-util.h +++ b/src/journal-remote/microhttpd-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <microhttpd.h> diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c index 7b3dc1e9ab..122cdf5d3f 100644 --- a/src/journal/audit-type.c +++ b/src/journal/audit-type.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "audit-type.h" #include "missing_audit.h" diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h index 39d917894e..f2c489856c 100644 --- a/src/journal/audit-type.h +++ b/src/journal/audit-type.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/journal/cat.c b/src/journal/cat.c index 2faaa2e284..bccf615189 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.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/journal/catalog.c b/src/journal/catalog.c index b0416da0c6..0f6ad8a29e 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.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/journal/catalog.h b/src/journal/catalog.h index 092a014651..df27869fb3 100644 --- a/src/journal/catalog.h +++ b/src/journal/catalog.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/journal/compress.c b/src/journal/compress.c index a1bd4a379e..aaf186ba69 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <inttypes.h> #include <stdlib.h> diff --git a/src/journal/compress.h b/src/journal/compress.h index ab44ff06ed..db7f3999ed 100644 --- a/src/journal/compress.h +++ b/src/journal/compress.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <unistd.h> diff --git a/src/journal/fsprg.c b/src/journal/fsprg.c index 0ef3df89df..7ea72495ef 100644 --- a/src/journal/fsprg.c +++ b/src/journal/fsprg.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * * fsprg v0.1 - (seekable) forward-secure pseudorandom generator * Copyright © 2012 B. Poettering diff --git a/src/journal/fsprg.h b/src/journal/fsprg.h index 33412675b8..dfe2d79222 100644 --- a/src/journal/fsprg.h +++ b/src/journal/fsprg.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/journal/journal-authenticate.c b/src/journal/journal-authenticate.c index da275c2512..a5ff987d6e 100644 --- a/src/journal/journal-authenticate.c +++ b/src/journal/journal-authenticate.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/mman.h> diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h index 2ef0133040..e895722865 100644 --- a/src/journal/journal-authenticate.h +++ b/src/journal/journal-authenticate.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/journal/journal-def.h b/src/journal/journal-def.h index e9ddbb9dab..bd924bda8a 100644 --- a/src/journal/journal-def.h +++ b/src/journal/journal-def.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-id128.h" diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index feff3bd9f0..1dbe81849c 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.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/journal/journal-file.h b/src/journal/journal-file.h index f80bf5d26b..3bdf551287 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.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/journal/journal-internal.h b/src/journal/journal-internal.h index d87b0a11e5..c2d29aae78 100644 --- a/src/journal/journal-internal.h +++ b/src/journal/journal-internal.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/journal/journal-send.c b/src/journal/journal-send.c index 64882eb4ee..fd3fd7ef9c 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.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/journal/journal-vacuum.c b/src/journal/journal-vacuum.c index 87d65896c6..c173664146 100644 --- a/src/journal/journal-vacuum.c +++ b/src/journal/journal-vacuum.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/journal/journal-vacuum.h b/src/journal/journal-vacuum.h index 0b336ac013..d87c847da6 100644 --- a/src/journal/journal-vacuum.h +++ b/src/journal/journal-vacuum.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/journal/journal-verify.c b/src/journal/journal-verify.c index eddb8054bf..6ea2f4c898 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stddef.h> diff --git a/src/journal/journal-verify.h b/src/journal/journal-verify.h index f0ea31abc1..579033069b 100644 --- a/src/journal/journal-verify.h +++ b/src/journal/journal-verify.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journal-file.h" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index d1ed682985..74412ef17a 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.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/journal/journald-audit.c b/src/journal/journald-audit.c index a5a78b7746..744f750ca3 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "audit-type.h" diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h index df41f81435..79f3da90c1 100644 --- a/src/journal/journald-audit.h +++ b/src/journal/journald-audit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journald-server.h" diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c index 9497ef9a4a..2035e2d9b6 100644 --- a/src/journal/journald-console.c +++ b/src/journal/journald-console.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/socket.h> diff --git a/src/journal/journald-console.h b/src/journal/journald-console.h index 3def00ad5d..0a26f9c876 100644 --- a/src/journal/journald-console.h +++ b/src/journal/journald-console.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journald-server.h" diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c index bac67036b0..8736495a4b 100644 --- a/src/journal/journald-context.c +++ b/src/journal/journald-context.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_SELINUX #include <selinux/selinux.h> diff --git a/src/journal/journald-context.h b/src/journal/journald-context.h index 91f0302be4..9bf74b2347 100644 --- a/src/journal/journald-context.h +++ b/src/journal/journald-context.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/journal/journald-kmsg.c b/src/journal/journald-kmsg.c index ca60f398c8..e7255b0355 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/epoll.h> diff --git a/src/journal/journald-kmsg.h b/src/journal/journald-kmsg.h index 2326bc8c93..bd288c57a2 100644 --- a/src/journal/journald-kmsg.h +++ b/src/journal/journald-kmsg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journald-server.h" diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index fed81161e0..1c5849ed55 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> #include <sys/epoll.h> diff --git a/src/journal/journald-native.h b/src/journal/journald-native.h index 8d06636262..7bbaaed181 100644 --- a/src/journal/journald-native.h +++ b/src/journal/journald-native.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journald-server.h" diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c index fa21e7da29..f464b6e0d8 100644 --- a/src/journal/journald-rate-limit.c +++ b/src/journal/journald-rate-limit.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/journal/journald-rate-limit.h b/src/journal/journald-rate-limit.h index 0fff8767ac..8def60f052 100644 --- a/src/journal/journald-rate-limit.h +++ b/src/journal/journald-rate-limit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "time-util.h" diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index ab6aadcb78..10ebc3e22e 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_SELINUX #include <selinux/selinux.h> diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index b01ade5aee..5fb145e254 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.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/journal/journald-stream.c b/src/journal/journald-stream.c index b1c35a1af2..3241ef2bf7 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> #include <unistd.h> diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h index 7ab0016618..0a033b4dce 100644 --- a/src/journal/journald-stream.h +++ b/src/journal/journald-stream.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct StdoutStream StdoutStream; diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 91ea41fa78..925bd502d3 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> #include <sys/epoll.h> diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h index 5ad601001c..3bc3ffddb8 100644 --- a/src/journal/journald-syslog.h +++ b/src/journal/journald-syslog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "journald-server.h" diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c index 6134ba7414..21ec5a785b 100644 --- a/src/journal/journald-wall.c +++ b/src/journal/journald-wall.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "format-util.h" diff --git a/src/journal/journald-wall.h b/src/journal/journald-wall.h index 026649eb7c..3f98c35bde 100644 --- a/src/journal/journald-wall.h +++ b/src/journal/journald-wall.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/journal/journald.c b/src/journal/journald.c index 9a7cb3e1fc..ef7cebce34 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.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/journal/meson.build b/src/journal/meson.build index 215ba949e7..520e33c0b8 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later journal_client_sources = files(''' audit-type.c diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c index f627630c9c..9882016436 100644 --- a/src/journal/mmap-cache.c +++ b/src/journal/mmap-cache.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/journal/mmap-cache.h b/src/journal/mmap-cache.h index bf70d32027..28d5ab1a56 100644 --- a/src/journal/mmap-cache.h +++ b/src/journal/mmap-cache.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/journal/pcre2-dlopen.c b/src/journal/pcre2-dlopen.c index 1e1108c657..fbe81f99eb 100644 --- a/src/journal/pcre2-dlopen.c +++ b/src/journal/pcre2-dlopen.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "dlfcn-util.h" diff --git a/src/journal/pcre2-dlopen.h b/src/journal/pcre2-dlopen.h index e7cb0a5907..1306334144 100644 --- a/src/journal/pcre2-dlopen.h +++ b/src/journal/pcre2-dlopen.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if HAVE_PCRE2 diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 731fc51212..dbbf919b75 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.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/journal/test-audit-type.c b/src/journal/test-audit-type.c index a8315d0633..5adbf0d5b6 100644 --- a/src/journal/test-audit-type.c +++ b/src/journal/test-audit-type.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <linux/audit.h> diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c index 0f1447af28..982fec0d8d 100644 --- a/src/journal/test-catalog.c +++ b/src/journal/test-catalog.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/journal/test-compress-benchmark.c b/src/journal/test-compress-benchmark.c index 35823a8da5..001976076e 100644 --- a/src/journal/test-compress-benchmark.c +++ b/src/journal/test-compress-benchmark.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "compress.h" diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c index 96a441a5a6..ccd4605016 100644 --- a/src/journal/test-compress.c +++ b/src/journal/test-compress.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> diff --git a/src/journal/test-journal-config.c b/src/journal/test-journal-config.c index 1482490411..4f29e1b310 100644 --- a/src/journal/test-journal-config.c +++ b/src/journal/test-journal-config.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdbool.h> diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c index 8e839920b9..03fe8e2b30 100644 --- a/src/journal/test-journal-enum.c +++ b/src/journal/test-journal-enum.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c index 5fedd3ed20..dad277dd66 100644 --- a/src/journal/test-journal-flush.c +++ b/src/journal/test-journal-flush.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c index d10e61080d..80aff75bb9 100644 --- a/src/journal/test-journal-init.c +++ b/src/journal/test-journal-init.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-journal.h" diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index c0bda68811..8c78c3bbf0 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c index b17527916c..ded67563d7 100644 --- a/src/journal/test-journal-match.c +++ b/src/journal/test-journal-match.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c index 4265735f0f..75bd8e7b85 100644 --- a/src/journal/test-journal-send.c +++ b/src/journal/test-journal-send.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/journal/test-journal-stream.c b/src/journal/test-journal-stream.c index 924d727d97..a121859e08 100644 --- a/src/journal/test-journal-stream.c +++ b/src/journal/test-journal-stream.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c index 45be7e5bc4..33f412956b 100644 --- a/src/journal/test-journal-syslog.c +++ b/src/journal/test-journal-syslog.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "journald-syslog.h" diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c index 2893a7c00f..d208e4650c 100644 --- a/src/journal/test-journal-verify.c +++ b/src/journal/test-journal-verify.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stdio.h> diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c index 5850bb8eaa..f8f08b5afc 100644 --- a/src/journal/test-journal.c +++ b/src/journal/test-journal.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c index 8f755efdde..d1d28768f5 100644 --- a/src/journal/test-mmap-cache.c +++ b/src/journal/test-mmap-cache.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stdlib.h> diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install index 0ae07fcf32..e7457e9d06 100755 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build index 9ae342dfba..851e827590 100644 --- a/src/kernel-install/meson.build +++ b/src/kernel-install/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later want_kernel_install = get_option('kernel-install') diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c index 4fbf2bbc96..327fb2ff3e 100644 --- a/src/libsystemd-network/arp-util.c +++ b/src/libsystemd-network/arp-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Axis Communications AB. All rights reserved. ***/ diff --git a/src/libsystemd-network/arp-util.h b/src/libsystemd-network/arp-util.h index 9a4427e831..2dac8cfbaa 100644 --- a/src/libsystemd-network/arp-util.h +++ b/src/libsystemd-network/arp-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/libsystemd-network/dhcp-client-internal.h b/src/libsystemd-network/dhcp-client-internal.h index 2c48d095f4..a6f37522d1 100644 --- a/src/libsystemd-network/dhcp-client-internal.h +++ b/src/libsystemd-network/dhcp-client-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once extern const struct hash_ops dhcp_option_hash_ops; diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index e7dbec1511..ea9c77aa9d 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/if_infiniband.h> #include <net/if_arp.h> diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h index 76abd6583e..e9f2ea7e95 100644 --- a/src/libsystemd-network/dhcp-identifier.h +++ b/src/libsystemd-network/dhcp-identifier.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-id128.h" diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h index d0c99f985b..40e6b1f26f 100644 --- a/src/libsystemd-network/dhcp-internal.h +++ b/src/libsystemd-network/dhcp-internal.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/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h index 66222eaddb..49392d1bea 100644 --- a/src/libsystemd-network/dhcp-lease-internal.h +++ b/src/libsystemd-network/dhcp-lease-internal.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/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c index c5ee7e7ef2..6c82d5508e 100644 --- a/src/libsystemd-network/dhcp-network.c +++ b/src/libsystemd-network/dhcp-network.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c index 6fe8a3779d..70753c68d8 100644 --- a/src/libsystemd-network/dhcp-option.c +++ b/src/libsystemd-network/dhcp-option.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c index fe7d51703b..cace916f44 100644 --- a/src/libsystemd-network/dhcp-packet.c +++ b/src/libsystemd-network/dhcp-packet.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/dhcp-protocol.h b/src/libsystemd-network/dhcp-protocol.h index f03663248a..11f4201ab2 100644 --- a/src/libsystemd-network/dhcp-protocol.h +++ b/src/libsystemd-network/dhcp-protocol.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/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h index 64c18ed570..b57737ee25 100644 --- a/src/libsystemd-network/dhcp-server-internal.h +++ b/src/libsystemd-network/dhcp-server-internal.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/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h index 9ce6dcd02c..24d8a314a4 100644 --- a/src/libsystemd-network/dhcp6-internal.h +++ b/src/libsystemd-network/dhcp6-internal.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/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h index df6c95e0b3..e9e2362d6f 100644 --- a/src/libsystemd-network/dhcp6-lease-internal.h +++ b/src/libsystemd-network/dhcp6-lease-internal.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/libsystemd-network/dhcp6-network.c b/src/libsystemd-network/dhcp6-network.c index e2efa8bbe3..4f7bd53de4 100644 --- a/src/libsystemd-network/dhcp6-network.c +++ b/src/libsystemd-network/dhcp6-network.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c index 030173a58a..e2bf4f7e36 100644 --- a/src/libsystemd-network/dhcp6-option.c +++ b/src/libsystemd-network/dhcp6-option.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014-2015 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/dhcp6-protocol.h b/src/libsystemd-network/dhcp6-protocol.h index f7a2702860..c700363803 100644 --- a/src/libsystemd-network/dhcp6-protocol.h +++ b/src/libsystemd-network/dhcp6-protocol.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/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index d9690293f1..4af012534a 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/icmp6-util.h b/src/libsystemd-network/icmp6-util.h index ac68ded1fe..50d21b5b59 100644 --- a/src/libsystemd-network/icmp6-util.h +++ b/src/libsystemd-network/icmp6-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/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-internal.h index 9598438dba..f23695f974 100644 --- a/src/libsystemd-network/lldp-internal.h +++ b/src/libsystemd-network/lldp-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/libsystemd-network/lldp-neighbor.c b/src/libsystemd-network/lldp-neighbor.c index 02645b2bcd..546ae1c980 100644 --- a/src/libsystemd-network/lldp-neighbor.c +++ b/src/libsystemd-network/lldp-neighbor.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "escape.h" diff --git a/src/libsystemd-network/lldp-neighbor.h b/src/libsystemd-network/lldp-neighbor.h index 74175edf54..a5718c8c31 100644 --- a/src/libsystemd-network/lldp-neighbor.h +++ b/src/libsystemd-network/lldp-neighbor.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/libsystemd-network/lldp-network.c b/src/libsystemd-network/lldp-network.c index de7e2bf847..9616cb6250 100644 --- a/src/libsystemd-network/lldp-network.c +++ b/src/libsystemd-network/lldp-network.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/filter.h> #include <netinet/if_ether.h> diff --git a/src/libsystemd-network/lldp-network.h b/src/libsystemd-network/lldp-network.h index e4ed2898a5..bc69b324c2 100644 --- a/src/libsystemd-network/lldp-network.h +++ b/src/libsystemd-network/lldp-network.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build index 7fa0c67956..604cfd999b 100644 --- a/src/libsystemd-network/meson.build +++ b/src/libsystemd-network/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later sources = files(''' sd-dhcp-client.c diff --git a/src/libsystemd-network/ndisc-internal.h b/src/libsystemd-network/ndisc-internal.h index c66dc3d443..65f9371b20 100644 --- a/src/libsystemd-network/ndisc-internal.h +++ b/src/libsystemd-network/ndisc-internal.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/libsystemd-network/ndisc-router.c b/src/libsystemd-network/ndisc-router.c index a2a9366338..3cb71dbdac 100644 --- a/src/libsystemd-network/ndisc-router.c +++ b/src/libsystemd-network/ndisc-router.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/ndisc-router.h b/src/libsystemd-network/ndisc-router.h index 2e2c1afd12..cb3a56452b 100644 --- a/src/libsystemd-network/ndisc-router.h +++ b/src/libsystemd-network/ndisc-router.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/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index 459d13ad7d..e4a07419e4 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <linux/if.h> diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index e4c11235b6..5dae5ab306 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <linux/nl80211.h> diff --git a/src/libsystemd-network/radv-internal.h b/src/libsystemd-network/radv-internal.h index fb6617bedd..3dbeffe0c6 100644 --- a/src/libsystemd-network/radv-internal.h +++ b/src/libsystemd-network/radv-internal.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/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index d95bbd3167..3ce45b2b0d 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 5f89d00452..8a138ff4b6 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index cab7707017..dfced720c2 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 6d27c4685e..566dd5b2c4 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014-2015 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c index 9aad22124d..d6f0708c94 100644 --- a/src/libsystemd-network/sd-dhcp6-lease.c +++ b/src/libsystemd-network/sd-dhcp6-lease.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014-2015 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c index ff333914e9..2e1e46c1c5 100644 --- a/src/libsystemd-network/sd-ipv4acd.c +++ b/src/libsystemd-network/sd-ipv4acd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Axis Communications AB. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c index 293a4644a2..09f2bda7f0 100644 --- a/src/libsystemd-network/sd-ipv4ll.c +++ b/src/libsystemd-network/sd-ipv4ll.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Axis Communications AB. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index e536f90d19..8b666522cb 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <linux/sockios.h> diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c index 92e772d352..db7ada60a8 100644 --- a/src/libsystemd-network/sd-ndisc.c +++ b/src/libsystemd-network/sd-ndisc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index 9656d7c969..5cef06a8a8 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2017 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c index 27a1a21400..f4aab85ed4 100644 --- a/src/libsystemd-network/test-acd.c +++ b/src/libsystemd-network/test-acd.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/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index b916212d6f..d39d1f57a0 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c index 086f8b5fd9..1eebe3a10f 100644 --- a/src/libsystemd-network/test-dhcp-option.c +++ b/src/libsystemd-network/test-dhcp-option.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <net/if_arp.h> diff --git a/src/libsystemd-network/test-dhcp-server.c b/src/libsystemd-network/test-dhcp-server.c index 16a4f16bfa..e91b440fe9 100644 --- a/src/libsystemd-network/test-dhcp-server.c +++ b/src/libsystemd-network/test-dhcp-server.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index e198814ba0..e6a43dcd5e 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c index fd827ff401..a253acbd83 100644 --- a/src/libsystemd-network/test-ipv4ll-manual.c +++ b/src/libsystemd-network/test-ipv4ll-manual.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <net/if.h> diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c index 310b658e18..b213f41889 100644 --- a/src/libsystemd-network/test-ipv4ll.c +++ b/src/libsystemd-network/test-ipv4ll.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Axis Communications AB. All rights reserved. ***/ diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c index a2ac65095f..c52d422fce 100644 --- a/src/libsystemd-network/test-lldp.c +++ b/src/libsystemd-network/test-lldp.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/libsystemd-network/test-ndisc-ra.c b/src/libsystemd-network/test-ndisc-ra.c index 942a128cae..927e21b3cd 100644 --- a/src/libsystemd-network/test-ndisc-ra.c +++ b/src/libsystemd-network/test-ndisc-ra.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2017 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c index 2c4ffb94dd..1b2bba889d 100644 --- a/src/libsystemd-network/test-ndisc-rs.c +++ b/src/libsystemd-network/test-ndisc-rs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/libsystemd-network/test-sd-dhcp-lease.c b/src/libsystemd-network/test-sd-dhcp-lease.c index 91eaf814e4..9f13226889 100644 --- a/src/libsystemd-network/test-sd-dhcp-lease.c +++ b/src/libsystemd-network/test-sd-dhcp-lease.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/libsystemd/disable-mempool.c b/src/libsystemd/disable-mempool.c index 034bd24dc4..1baf91f05b 100644 --- a/src/libsystemd/disable-mempool.c +++ b/src/libsystemd/disable-mempool.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "mempool.h" diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in index a010dea2e9..74f33b70e6 100644 --- a/src/libsystemd/libsystemd.pc.in +++ b/src/libsystemd/libsystemd.pc.in @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index 6e7f2eee53..f83b364c96 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -1,5 +1,5 @@ /*** - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index aa1ed9b7dd..50716f7b94 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later id128_sources = files(''' sd-id128/id128-util.c diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c index dc9a2fdc3a..ef1fa3711b 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.c +++ b/src/libsystemd/sd-bus/bus-common-errors.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/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h index 965f6dd134..7e5be17d53 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.h +++ b/src/libsystemd/sd-bus/bus-common-errors.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "bus-error.h" diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c index e85a9eda2b..f09d5e7fd1 100644 --- a/src/libsystemd/sd-bus/bus-container.c +++ b/src/libsystemd/sd-bus/bus-container.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/libsystemd/sd-bus/bus-container.h b/src/libsystemd/sd-bus/bus-container.h index f6ef688032..cb503a5970 100644 --- a/src/libsystemd/sd-bus/bus-container.h +++ b/src/libsystemd/sd-bus/bus-container.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index b7ca79bb58..a63937e1ce 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> diff --git a/src/libsystemd/sd-bus/bus-control.h b/src/libsystemd/sd-bus/bus-control.h index eb1ae75c14..8182b9cd63 100644 --- a/src/libsystemd/sd-bus/bus-control.h +++ b/src/libsystemd/sd-bus/bus-control.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c index a5672a831f..4bf228b436 100644 --- a/src/libsystemd/sd-bus/bus-convenience.c +++ b/src/libsystemd/sd-bus/bus-convenience.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <unistd.h> #include <sys/types.h> diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index 88d679f64c..3896d94111 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/capability.h> #include <stdlib.h> diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h index 508ef9d352..7806d9e362 100644 --- a/src/libsystemd/sd-bus/bus-creds.h +++ b/src/libsystemd/sd-bus/bus-creds.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/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 94107c297f..3ff87be67c 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.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/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h index f138791c04..aeb4616e9a 100644 --- a/src/libsystemd/sd-bus/bus-dump.h +++ b/src/libsystemd/sd-bus/bus-dump.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/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 83de996b25..53a8cf343e 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.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/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h index a6523e57a2..557284faf8 100644 --- a/src/libsystemd/sd-bus/bus-error.h +++ b/src/libsystemd/sd-bus/bus-error.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/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c index ba503b3213..850540a785 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.c +++ b/src/libsystemd/sd-bus/bus-gvariant.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/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h index 644b5f4b20..213fa97083 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.h +++ b/src/libsystemd/sd-bus/bus-gvariant.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/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c index 5c3e955c20..3f03ad7c41 100644 --- a/src/libsystemd/sd-bus/bus-internal.c +++ b/src/libsystemd/sd-bus/bus-internal.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-internal.h" diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h index ef2c3dbc4f..233a228315 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/sd-bus/bus-internal.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/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c index 734abcf3fd..866fca7acb 100644 --- a/src/libsystemd/sd-bus/bus-introspect.c +++ b/src/libsystemd/sd-bus/bus-introspect.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-internal.h" #include "bus-introspect.h" diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h index 19d39923e5..34f32a4cf9 100644 --- a/src/libsystemd/sd-bus/bus-introspect.h +++ b/src/libsystemd/sd-bus/bus-introspect.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/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index b74cfa6ab8..6bba446932 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h index fbbc43f6fa..be8e0ceb9b 100644 --- a/src/libsystemd/sd-bus/bus-kernel.h +++ b/src/libsystemd/sd-bus/bus-kernel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index 20a4b46773..d7da4bf009 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/sd-bus/bus-match.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-internal.h" diff --git a/src/libsystemd/sd-bus/bus-match.h b/src/libsystemd/sd-bus/bus-match.h index a6f67ce089..e44e40644e 100644 --- a/src/libsystemd/sd-bus/bus-match.h +++ b/src/libsystemd/sd-bus/bus-match.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index f966dda229..79019aa3a1 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.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/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h index 5d869213ab..3561737e2f 100644 --- a/src/libsystemd/sd-bus/bus-message.h +++ b/src/libsystemd/sd-bus/bus-message.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <byteswap.h> diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index 33284d7301..275c4318a1 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.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-internal.h" diff --git a/src/libsystemd/sd-bus/bus-objects.h b/src/libsystemd/sd-bus/bus-objects.h index f650196a54..20fccfa1d8 100644 --- a/src/libsystemd/sd-bus/bus-objects.h +++ b/src/libsystemd/sd-bus/bus-objects.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h index 7e1cd3c31e..c41ab58faa 100644 --- a/src/libsystemd/sd-bus/bus-protocol.h +++ b/src/libsystemd/sd-bus/bus-protocol.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/libsystemd/sd-bus/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c index b420ba3688..bd0842fdbc 100644 --- a/src/libsystemd/sd-bus/bus-signature.c +++ b/src/libsystemd/sd-bus/bus-signature.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <util.h> diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h index b87bec8329..314fcc27c5 100644 --- a/src/libsystemd/sd-bus/bus-signature.h +++ b/src/libsystemd/sd-bus/bus-signature.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/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c index f90a7f05cc..a0009a7a87 100644 --- a/src/libsystemd/sd-bus/bus-slot.c +++ b/src/libsystemd/sd-bus/bus-slot.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-slot.h b/src/libsystemd/sd-bus/bus-slot.h index 48eb0453dc..8116195d4d 100644 --- a/src/libsystemd/sd-bus/bus-slot.h +++ b/src/libsystemd/sd-bus/bus-slot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index 1a040157f4..4881fd0d32 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <endian.h> #include <poll.h> diff --git a/src/libsystemd/sd-bus/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h index f8d24556c9..52bc404625 100644 --- a/src/libsystemd/sd-bus/bus-socket.h +++ b/src/libsystemd/sd-bus/bus-socket.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c index 13fd52ffd5..5f8716e2aa 100644 --- a/src/libsystemd/sd-bus/bus-track.c +++ b/src/libsystemd/sd-bus/bus-track.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-track.h b/src/libsystemd/sd-bus/bus-track.h index 209b989d27..8dae1f3902 100644 --- a/src/libsystemd/sd-bus/bus-track.h +++ b/src/libsystemd/sd-bus/bus-track.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once void bus_track_dispatch(sd_bus_track *track); diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/sd-bus/bus-type.c index 585f8424b3..6a0f53d1d1 100644 --- a/src/libsystemd/sd-bus/bus-type.c +++ b/src/libsystemd/sd-bus/bus-type.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/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h index 0ecd8513fd..490108a2c6 100644 --- a/src/libsystemd/sd-bus/bus-type.h +++ b/src/libsystemd/sd-bus/bus-type.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/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 2337a4b3de..b8d4dc8d95 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <endian.h> #include <netdb.h> diff --git a/src/libsystemd/sd-bus/test-bus-address.c b/src/libsystemd/sd-bus/test-bus-address.c index 1316d376e1..b92558fea9 100644 --- a/src/libsystemd/sd-bus/test-bus-address.c +++ b/src/libsystemd/sd-bus/test-bus-address.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c index 8de0a859ee..8c6711797a 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/wait.h> #include <unistd.h> diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index 1497dc696f..c3c31c65e6 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <pthread.h> diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/sd-bus/test-bus-cleanup.c index 86a2407507..ece0a12bab 100644 --- a/src/libsystemd/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/sd-bus/test-bus-cleanup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c index 7f7bc491d2..6551e692f8 100644 --- a/src/libsystemd/sd-bus/test-bus-creds.c +++ b/src/libsystemd/sd-bus/test-bus-creds.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c index 14e3c9c40d..2e3803c9b2 100644 --- a/src/libsystemd/sd-bus/test-bus-error.c +++ b/src/libsystemd/sd-bus/test-bus-error.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c index d248bd4da1..b0033f1d13 100644 --- a/src/libsystemd/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/sd-bus/test-bus-gvariant.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_GLIB #include <glib.h> diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c index cbc3158924..fb247c4d14 100644 --- a/src/libsystemd/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/sd-bus/test-bus-introspect.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-introspect.h" #include "log.h" diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c index 107eea390e..9feeaf48fd 100644 --- a/src/libsystemd/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/sd-bus/test-bus-marshal.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <math.h> #include <stdlib.h> diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c index 47014c403b..aa6ddd336a 100644 --- a/src/libsystemd/sd-bus/test-bus-match.c +++ b/src/libsystemd/sd-bus/test-bus-match.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-match.h" #include "bus-message.h" diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c index 41cf8c1670..9116211886 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/sd-bus/test-bus-objects.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <pthread.h> #include <stdlib.h> diff --git a/src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c b/src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c index 17598f3d63..7c2fa72e84 100644 --- a/src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c +++ b/src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" #include "main-func.h" diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c index 1302fdbb5a..5cb100b2f0 100644 --- a/src/libsystemd/sd-bus/test-bus-server.c +++ b/src/libsystemd/sd-bus/test-bus-server.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <pthread.h> #include <stdlib.h> diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c index 84648dbc2a..ea7efe68e4 100644 --- a/src/libsystemd/sd-bus/test-bus-signature.c +++ b/src/libsystemd/sd-bus/test-bus-signature.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-internal.h" #include "bus-signature.h" diff --git a/src/libsystemd/sd-bus/test-bus-track.c b/src/libsystemd/sd-bus/test-bus-track.c index 5adcf948dd..64aa88bb4f 100644 --- a/src/libsystemd/sd-bus/test-bus-track.c +++ b/src/libsystemd/sd-bus/test-bus-track.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/socket.h> diff --git a/src/libsystemd/sd-bus/test-bus-vtable.c b/src/libsystemd/sd-bus/test-bus-vtable.c index b6350027dd..fe122381e7 100644 --- a/src/libsystemd/sd-bus/test-bus-vtable.c +++ b/src/libsystemd/sd-bus/test-bus-vtable.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/libsystemd/sd-bus/test-bus-watch-bind.c b/src/libsystemd/sd-bus/test-bus-watch-bind.c index 7ded9386b7..fdc8772f84 100644 --- a/src/libsystemd/sd-bus/test-bus-watch-bind.c +++ b/src/libsystemd/sd-bus/test-bus-watch-bind.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <pthread.h> diff --git a/src/libsystemd/sd-bus/test-vtable-data.h b/src/libsystemd/sd-bus/test-vtable-data.h index bc89893814..7269a49945 100644 --- a/src/libsystemd/sd-bus/test-vtable-data.h +++ b/src/libsystemd/sd-bus/test-vtable-data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* This is meant to be included in other files, hence no headers */ diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index bdcbb106ce..6336a0cce4 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.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/libsystemd/sd-device/device-enumerator-private.h b/src/libsystemd/sd-device/device-enumerator-private.h index cf2b261482..9c6437dbed 100644 --- a/src/libsystemd/sd-device/device-enumerator-private.h +++ b/src/libsystemd/sd-device/device-enumerator-private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-device.h" diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c index 2d1ce79888..b9d4db323a 100644 --- a/src/libsystemd/sd-device/device-enumerator.c +++ b/src/libsystemd/sd-device/device-enumerator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/libsystemd/sd-device/device-internal.h b/src/libsystemd/sd-device/device-internal.h index 9c6b8a345f..3f81cef796 100644 --- a/src/libsystemd/sd-device/device-internal.h +++ b/src/libsystemd/sd-device/device-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-device.h" diff --git a/src/libsystemd/sd-device/device-monitor-private.h b/src/libsystemd/sd-device/device-monitor-private.h index 2659cc3c46..2ca3a313b6 100644 --- a/src/libsystemd/sd-device/device-monitor-private.h +++ b/src/libsystemd/sd-device/device-monitor-private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-device.h" diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c index 43646e1880..fd5900704d 100644 --- a/src/libsystemd/sd-device/device-monitor.c +++ b/src/libsystemd/sd-device/device-monitor.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <linux/filter.h> diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index dc16d555a1..c5bf9b3323 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ctype.h> #include <net/if.h> diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h index 1f1c4ca107..db81934f32 100644 --- a/src/libsystemd/sd-device/device-private.h +++ b/src/libsystemd/sd-device/device-private.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/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h index 032d1dc8b8..122620953a 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/sd-device/device-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #define FOREACH_DEVICE_PROPERTY(device, key, value) \ diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 634c9a24f8..bfa0781773 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ctype.h> #include <net/if.h> diff --git a/src/libsystemd/sd-device/test-sd-device-monitor.c b/src/libsystemd/sd-device/test-sd-device-monitor.c index aa1edaaf3c..fddd1c152c 100644 --- a/src/libsystemd/sd-device/test-sd-device-monitor.c +++ b/src/libsystemd/sd-device/test-sd-device-monitor.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdbool.h> #include <unistd.h> diff --git a/src/libsystemd/sd-device/test-sd-device-thread.c b/src/libsystemd/sd-device/test-sd-device-thread.c index 9f1c02373f..6f3015515b 100644 --- a/src/libsystemd/sd-device/test-sd-device-thread.c +++ b/src/libsystemd/sd-device/test-sd-device-thread.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <pthread.h> #include <stdbool.h> diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c index ca9662b851..9f48d2bf1e 100644 --- a/src/libsystemd/sd-device/test-sd-device.c +++ b/src/libsystemd/sd-device/test-sd-device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "device-enumerator-private.h" #include "device-private.h" diff --git a/src/libsystemd/sd-device/test-udev-device-thread.c b/src/libsystemd/sd-device/test-udev-device-thread.c index 2fc0f59185..a493152d4a 100644 --- a/src/libsystemd/sd-device/test-udev-device-thread.c +++ b/src/libsystemd/sd-device/test-udev-device-thread.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <pthread.h> #include <stdbool.h> diff --git a/src/libsystemd/sd-event/event-source.h b/src/libsystemd/sd-event/event-source.h index a8a30d825e..62d07187a2 100644 --- a/src/libsystemd/sd-event/event-source.h +++ b/src/libsystemd/sd-event/event-source.h @@ -1,5 +1,5 @@ #pragma once -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/epoll.h> #include <sys/timerfd.h> diff --git a/src/libsystemd/sd-event/event-util.c b/src/libsystemd/sd-event/event-util.c index 43e73d55e1..132796fc6c 100644 --- a/src/libsystemd/sd-event/event-util.c +++ b/src/libsystemd/sd-event/event-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/libsystemd/sd-event/event-util.h b/src/libsystemd/sd-event/event-util.h index 00180955f9..c8f97bc8d6 100644 --- a/src/libsystemd/sd-event/event-util.h +++ b/src/libsystemd/sd-event/event-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/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index 50ee29ae97..bbb2b6bfd7 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/epoll.h> #include <sys/timerfd.h> diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c index b623972365..1c4d0e25ab 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/sd-event/test-event.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/wait.h> diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h index d82b8c1279..5c20688cd4 100644 --- a/src/libsystemd/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/sd-hwdb/hwdb-internal.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/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c index 2266b67adb..4c94ba9c88 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.c +++ b/src/libsystemd/sd-hwdb/hwdb-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ctype.h> #include <stdio.h> diff --git a/src/libsystemd/sd-hwdb/hwdb-util.h b/src/libsystemd/sd-hwdb/hwdb-util.h index 425b4b3e13..5afde74723 100644 --- a/src/libsystemd/sd-hwdb/hwdb-util.h +++ b/src/libsystemd/sd-hwdb/hwdb-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/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c index 0e326f3d22..cb3c77ce96 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/sd-hwdb/sd-hwdb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2008 Alan Jenkins <alan.christopher.jenkins@googlemail.com> ***/ diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c index ebbfb2d32e..a3f6da6381 100644 --- a/src/libsystemd/sd-id128/id128-util.c +++ b/src/libsystemd/sd-id128/id128-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/libsystemd/sd-id128/id128-util.h b/src/libsystemd/sd-id128/id128-util.h index 1453c00f2f..6b09bcd96a 100644 --- a/src/libsystemd/sd-id128/id128-util.h +++ b/src/libsystemd/sd-id128/id128-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/libsystemd/sd-id128/sd-id128.c b/src/libsystemd/sd-id128/sd-id128.c index 9b38ef0c56..d5de935c77 100644 --- a/src/libsystemd/sd-id128/sd-id128.c +++ b/src/libsystemd/sd-id128/sd-id128.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/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c index 70ed8188a2..1fc379512f 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/sd-login/sd-login.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <poll.h> diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c index 5f61a8f8b6..5b2ff93e1c 100644 --- a/src/libsystemd/sd-login/test-login.c +++ b/src/libsystemd/sd-login/test-login.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <poll.h> diff --git a/src/libsystemd/sd-netlink/generic-netlink.c b/src/libsystemd/sd-netlink/generic-netlink.c index b4971da323..f295fa9e83 100644 --- a/src/libsystemd/sd-netlink/generic-netlink.c +++ b/src/libsystemd/sd-netlink/generic-netlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/genetlink.h> diff --git a/src/libsystemd/sd-netlink/generic-netlink.h b/src/libsystemd/sd-netlink/generic-netlink.h index e9ae5591f2..72001e88d2 100644 --- a/src/libsystemd/sd-netlink/generic-netlink.h +++ b/src/libsystemd/sd-netlink/generic-netlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-netlink.h" diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/sd-netlink/netlink-internal.h index b14ce435ee..1240f0d66d 100644 --- a/src/libsystemd/sd-netlink/netlink-internal.h +++ b/src/libsystemd/sd-netlink/netlink-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <linux/netlink.h> diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c index 2ffff861b2..bd56536062 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/sd-netlink/netlink-message.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <stdbool.h> diff --git a/src/libsystemd/sd-netlink/netlink-slot.c b/src/libsystemd/sd-netlink/netlink-slot.c index 94a80a8067..fa951bf941 100644 --- a/src/libsystemd/sd-netlink/netlink-slot.c +++ b/src/libsystemd/sd-netlink/netlink-slot.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/libsystemd/sd-netlink/netlink-slot.h b/src/libsystemd/sd-netlink/netlink-slot.h index 2641ec6b4a..79de817262 100644 --- a/src/libsystemd/sd-netlink/netlink-slot.h +++ b/src/libsystemd/sd-netlink/netlink-slot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-netlink.h" diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index bcd82fe164..228e38df90 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <stdbool.h> diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c index 5f5a1558a1..6fb6c147d9 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <stdint.h> diff --git a/src/libsystemd/sd-netlink/netlink-types.h b/src/libsystemd/sd-netlink/netlink-types.h index 959845ccac..b14e66fbb1 100644 --- a/src/libsystemd/sd-netlink/netlink-types.h +++ b/src/libsystemd/sd-netlink/netlink-types.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/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/sd-netlink/netlink-util.c index f893400580..09e2158c9e 100644 --- a/src/libsystemd/sd-netlink/netlink-util.c +++ b/src/libsystemd/sd-netlink/netlink-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-netlink.h" diff --git a/src/libsystemd/sd-netlink/netlink-util.h b/src/libsystemd/sd-netlink/netlink-util.h index 8f6c06af6e..d28d07a9f5 100644 --- a/src/libsystemd/sd-netlink/netlink-util.h +++ b/src/libsystemd/sd-netlink/netlink-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <linux/rtnetlink.h> diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c index 268150044c..4cabbabba6 100644 --- a/src/libsystemd/sd-netlink/rtnl-message.c +++ b/src/libsystemd/sd-netlink/rtnl-message.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if_addrlabel.h> diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index 6f283e31ff..7801101807 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <poll.h> diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c index be7a4f7835..41787c5a3e 100644 --- a/src/libsystemd/sd-netlink/test-netlink.c +++ b/src/libsystemd/sd-netlink/test-netlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <netinet/ether.h> diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c index 0addabe10a..7753431fc0 100644 --- a/src/libsystemd/sd-network/network-util.c +++ b/src/libsystemd/sd-network/network-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 "fd-util.h" diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h index 425d192f64..8cfd894b5a 100644 --- a/src/libsystemd/sd-network/network-util.h +++ b/src/libsystemd/sd-network/network-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-network.h" diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index 832ec1703e..b9b1099399 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <poll.h> diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c index 26d2341c2b..61ed7cb2da 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-path.h" diff --git a/src/libsystemd/sd-resolve/resolve-private.h b/src/libsystemd/sd-resolve/resolve-private.h index a0feb36f7c..7a339f7a35 100644 --- a/src/libsystemd/sd-resolve/resolve-private.h +++ b/src/libsystemd/sd-resolve/resolve-private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-resolve.h" diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index 1dc3203813..2cfa22d280 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <poll.h> diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c index 627b86b3cb..b973dfd90d 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/sd-resolve/test-resolve.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/libsystemd/sd-utf8/sd-utf8.c b/src/libsystemd/sd-utf8/sd-utf8.c index 78323cf7cb..82fa125ade 100644 --- a/src/libsystemd/sd-utf8/sd-utf8.c +++ b/src/libsystemd/sd-utf8/sd-utf8.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-utf8.h" diff --git a/src/libudev/libudev-device-internal.h b/src/libudev/libudev-device-internal.h index cd6c2a5bc5..437d431c90 100644 --- a/src/libudev/libudev-device-internal.h +++ b/src/libudev/libudev-device-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "libudev.h" diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index 704a09d01c..34543a8b2e 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ctype.h> #include <dirent.h> diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c index a8b3f53572..33bd360188 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/libudev-enumerate.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <dirent.h> #include <errno.h> diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c index 5299e0a16f..8e9ea97a2d 100644 --- a/src/libudev/libudev-hwdb.c +++ b/src/libudev/libudev-hwdb.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/libudev/libudev-list-internal.h b/src/libudev/libudev-list-internal.h index a15b385343..c23735e359 100644 --- a/src/libudev/libudev-list-internal.h +++ b/src/libudev/libudev-list-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "libudev.h" diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c index 3b22976c9f..3b2a2cdee4 100644 --- a/src/libudev/libudev-list.c +++ b/src/libudev/libudev-list.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "hashmap.h" diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index 5bec7418b8..a93adbd7a2 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <poll.h> diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c index 4e055bbc37..01b237fde4 100644 --- a/src/libudev/libudev-queue.c +++ b/src/libudev/libudev-queue.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2009 Alan Jenkins <alan-jenkins@tuffmail.co.uk> ***/ diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c index 4a471fb90d..bbb2879764 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-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/libudev/libudev-util.h b/src/libudev/libudev-util.h index 32b626ebc9..15e6214b0d 100644 --- a/src/libudev/libudev-util.h +++ b/src/libudev/libudev-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "libudev.h" diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index aa187b2b4c..73574874ca 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ctype.h> #include <stdarg.h> diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h index c9d0bf233e..55036de867 100644 --- a/src/libudev/libudev.h +++ b/src/libudev/libudev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef _LIBUDEV_H_ #define _LIBUDEV_H_ diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in index 40b340362e..b657b7d068 100644 --- a/src/libudev/libudev.pc.in +++ b/src/libudev/libudev.pc.in @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym index bad8313904..6aa6768f2d 100644 --- a/src/libudev/libudev.sym +++ b/src/libudev/libudev.sym @@ -1,5 +1,5 @@ /*** - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/src/libudev/meson.build b/src/libudev/meson.build index 88189748d3..3bd00ff4cc 100644 --- a/src/libudev/meson.build +++ b/src/libudev/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later libudev_sources = files(''' libudev.c diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c index 8e0cb74775..cb8153f4fe 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-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/locale/keymap-util.h b/src/locale/keymap-util.h index 6eced84240..49976472ef 100644 --- a/src/locale/keymap-util.h +++ b/src/locale/keymap-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 4895c292e4..7d2e887660 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ftw.h> #include <getopt.h> diff --git a/src/locale/localed.c b/src/locale/localed.c index 715ce5cac7..736dacdee9 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.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/locale/meson.build b/src/locale/meson.build index 314b0a3d37..6e3500d099 100644 --- a/src/locale/meson.build +++ b/src/locale/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_localed_sources = files(''' localed.c diff --git a/src/locale/org.freedesktop.locale1.conf b/src/locale/org.freedesktop.locale1.conf index d74cbc11ab..a0905573e1 100644 --- a/src/locale/org.freedesktop.locale1.conf +++ b/src/locale/org.freedesktop.locale1.conf @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/locale/org.freedesktop.locale1.policy b/src/locale/org.freedesktop.locale1.policy index f9241749e6..f12ca0970a 100644 --- a/src/locale/org.freedesktop.locale1.policy +++ b/src/locale/org.freedesktop.locale1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/locale/org.freedesktop.locale1.service b/src/locale/org.freedesktop.locale1.service index b15d39540c..2d812cbe39 100644 --- a/src/locale/org.freedesktop.locale1.service +++ b/src/locale/org.freedesktop.locale1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c index f96f5b07ec..bded122399 100644 --- a/src/locale/test-keymap-util.c +++ b/src/locale/test-keymap-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 "keymap-util.h" diff --git a/src/login/70-power-switch.rules b/src/login/70-power-switch.rules index d69e65b3d5..3fb954a4f0 100644 --- a/src/login/70-power-switch.rules +++ b/src/login/70-power-switch.rules @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/login/70-uaccess.rules.m4 b/src/login/70-uaccess.rules.m4 index 4bb144a93c..45e4adfa0f 100644 --- a/src/login/70-uaccess.rules.m4 +++ b/src/login/70-uaccess.rules.m4 @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in index 60dd6add60..3ccd52415f 100644 --- a/src/login/71-seat.rules.in +++ b/src/login/71-seat.rules.in @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/login/73-seat-late.rules.m4 b/src/login/73-seat-late.rules.m4 index 4db8d4dd4c..e56cd61603 100644 --- a/src/login/73-seat-late.rules.m4 +++ b/src/login/73-seat-late.rules.m4 @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 399f70fbc7..e18dbc5132 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <getopt.h> diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 28afc1bd09..695d18bba5 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c index 0cb3b0bec3..ed615e23f8 100644 --- a/src/login/logind-acl.c +++ b/src/login/logind-acl.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/login/logind-acl.h b/src/login/logind-acl.h index 00e286d76d..c88f3c0cf3 100644 --- a/src/login/logind-acl.h +++ b/src/login/logind-acl.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/login/logind-action.c b/src/login/logind-action.c index 1aeacfaf2b..1a017c8414 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.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/login/logind-action.h b/src/login/logind-action.h index a45aab7854..73aa20bbb4 100644 --- a/src/login/logind-action.h +++ b/src/login/logind-action.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c index 450ec32044..a6a1603396 100644 --- a/src/login/logind-brightness.c +++ b/src/login/logind-brightness.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-util.h" #include "device-util.h" diff --git a/src/login/logind-brightness.h b/src/login/logind-brightness.h index b22ee37ba7..f1c77757a8 100644 --- a/src/login/logind-brightness.h +++ b/src/login/logind-brightness.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/login/logind-button.c b/src/login/logind-button.c index 096cf70c9a..f9e6e43b81 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.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/login/logind-button.h b/src/login/logind-button.h index d009851cf4..041d66521c 100644 --- a/src/login/logind-button.h +++ b/src/login/logind-button.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Button Button; diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 370604f936..3595d7a773 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.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/login/logind-dbus.c b/src/login/logind-dbus.c index 0f83ed99bc..b95af1a9fd 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.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/login/logind-dbus.h b/src/login/logind-dbus.h index 3e0f3805ef..6b5d3abcd6 100644 --- a/src/login/logind-dbus.h +++ b/src/login/logind-dbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/login/logind-device.c b/src/login/logind-device.c index 9a62217290..982a772194 100644 --- a/src/login/logind-device.c +++ b/src/login/logind-device.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/login/logind-device.h b/src/login/logind-device.h index cc6e523675..0d89613d77 100644 --- a/src/login/logind-device.h +++ b/src/login/logind-device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Device Device; diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index f52d5babd7..57198ce652 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.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/login/logind-inhibit.h b/src/login/logind-inhibit.h index e5d4426191..124bdb662f 100644 --- a/src/login/logind-inhibit.h +++ b/src/login/logind-inhibit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Inhibitor Inhibitor; diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c index a945132284..a60ed2d3c2 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.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/login/logind-seat-dbus.h b/src/login/logind-seat-dbus.h index 6169cfe1ed..258db91d40 100644 --- a/src/login/logind-seat-dbus.h +++ b/src/login/logind-seat-dbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 157fc9423c..10cc7d960b 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.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/login/logind-seat.h b/src/login/logind-seat.h index f4b57ce8d2..ddc45f4870 100644 --- a/src/login/logind-seat.h +++ b/src/login/logind-seat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Seat Seat; diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index ccc5ac8df2..b5d240be6a 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.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/login/logind-session-dbus.h b/src/login/logind-session-dbus.h index 97f7c413cb..751ca86c0d 100644 --- a/src/login/logind-session-dbus.h +++ b/src/login/logind-session-dbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index 1a266605be..f2adb969d4 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <string.h> diff --git a/src/login/logind-session-device.h b/src/login/logind-session-device.h index 6c20403d12..4da3fe6533 100644 --- a/src/login/logind-session-device.h +++ b/src/login/logind-session-device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef enum DeviceType DeviceType; diff --git a/src/login/logind-session.c b/src/login/logind-session.c index d1527380ec..34fcde92aa 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.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/login/logind-session.h b/src/login/logind-session.h index b87c731672..1b59bdbe74 100644 --- a/src/login/logind-session.h +++ b/src/login/logind-session.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Session Session; diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c index 307462f749..414d431217 100644 --- a/src/login/logind-user-dbus.c +++ b/src/login/logind-user-dbus.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/login/logind-user-dbus.h b/src/login/logind-user-dbus.h index b3f990c5af..d2f24ced63 100644 --- a/src/login/logind-user-dbus.h +++ b/src/login/logind-user-dbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 9cb4dce641..9b3ec07906 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/login/logind-user.h b/src/login/logind-user.h index f8f172cb0f..2c5f993faa 100644 --- a/src/login/logind-user.h +++ b/src/login/logind-user.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct User User; diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index d2a5890277..dfbbb641f3 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/login/logind.c b/src/login/logind.c index 82163343d3..3ddc7a074a 100644 --- a/src/login/logind.c +++ b/src/login/logind.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/login/logind.h b/src/login/logind.h index 82d319a9a2..49d1f5f957 100644 --- a/src/login/logind.h +++ b/src/login/logind.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/login/meson.build b/src/login/meson.build index 0a7d3d5440..fd3202cd98 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_logind_sources = files(''' logind.c diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf index df46e417c8..ac14942ba9 100644 --- a/src/login/org.freedesktop.login1.conf +++ b/src/login/org.freedesktop.login1.conf @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/login/org.freedesktop.login1.policy b/src/login/org.freedesktop.login1.policy index 1d269c1070..80ebb39f30 100644 --- a/src/login/org.freedesktop.login1.policy +++ b/src/login/org.freedesktop.login1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/login/org.freedesktop.login1.service b/src/login/org.freedesktop.login1.service index 68f1ed0f48..6d443cf69f 100644 --- a/src/login/org.freedesktop.login1.service +++ b/src/login/org.freedesktop.login1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c index 16f4289585..8e7a94db55 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <endian.h> #include <errno.h> diff --git a/src/login/pam_systemd.sym b/src/login/pam_systemd.sym index 030a00ecb7..130cf6a971 100644 --- a/src/login/pam_systemd.sym +++ b/src/login/pam_systemd.sym @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ { global: diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c index 9b7fc20396..5a19dbfeff 100644 --- a/src/login/sysfs-show.c +++ b/src/login/sysfs-show.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/login/sysfs-show.h b/src/login/sysfs-show.h index c05b977532..32ccbf3de4 100644 --- a/src/login/sysfs-show.h +++ b/src/login/sysfs-show.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/login/test-inhibit.c b/src/login/test-inhibit.c index 7f9013bf93..dbe79c7074 100644 --- a/src/login/test-inhibit.c +++ b/src/login/test-inhibit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <unistd.h> #include <fcntl.h> diff --git a/src/login/test-login-shared.c b/src/login/test-login-shared.c index 02ff57ab10..d3de9c4958 100644 --- a/src/login/test-login-shared.c +++ b/src/login/test-login-shared.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "login-util.h" #include "macro.h" diff --git a/src/login/test-login-tables.c b/src/login/test-login-tables.c index 02b871968e..9d16685082 100644 --- a/src/login/test-login-tables.c +++ b/src/login/test-login-tables.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "logind-action.h" #include "logind-session.h" diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c index 84d8f1e8fd..9b5bdcc3ff 100644 --- a/src/login/user-runtime-dir.c +++ b/src/login/user-runtime-dir.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdint.h> #include <sys/mount.h> diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index 2bcd99109e..c35da05ffc 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c index 740684ce33..c157aaf33c 100644 --- a/src/machine/image-dbus.c +++ b/src/machine/image-dbus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/file.h> #include <sys/mount.h> diff --git a/src/machine/image-dbus.h b/src/machine/image-dbus.h index d785c10817..4b00203bff 100644 --- a/src/machine/image-dbus.h +++ b/src/machine/image-dbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "bus-object.h" diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 931e6d7232..bb67beb665 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sys/mount.h> diff --git a/src/machine/machine-dbus.h b/src/machine/machine-dbus.h index 7080092bcf..1c114f47c3 100644 --- a/src/machine/machine-dbus.h +++ b/src/machine/machine-dbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/machine/machine.c b/src/machine/machine.c index ace84edbb4..537b0cd779 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/machine/machine.h b/src/machine/machine.h index 634c5fc648..2f627157a3 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Machine Machine; diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 4869797b1e..4a3279d264 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.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/machine/machined-core.c b/src/machine/machined-core.c index 2ff155d47c..1416fbf823 100644 --- a/src/machine/machined-core.c +++ b/src/machine/machined-core.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "machined.h" #include "nscd-flush.h" diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index 6d4a705c47..494813e334 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c index de8cdeb87d..2d6c1991a4 100644 --- a/src/machine/machined-varlink.c +++ b/src/machine/machined-varlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "format-util.h" #include "machined-varlink.h" diff --git a/src/machine/machined-varlink.h b/src/machine/machined-varlink.h index 42e1c3f4a5..f26bbe588c 100644 --- a/src/machine/machined-varlink.h +++ b/src/machine/machined-varlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "machined.h" diff --git a/src/machine/machined.c b/src/machine/machined.c index 2828ed61b0..c3c08d181d 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.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/machine/machined.h b/src/machine/machined.h index c83017acb8..6e4182bbd6 100644 --- a/src/machine/machined.h +++ b/src/machine/machined.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/machine/meson.build b/src/machine/meson.build index 291630ece9..ebbd46d4f2 100644 --- a/src/machine/meson.build +++ b/src/machine/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_machined_sources = files(''' machined.c diff --git a/src/machine/operation.c b/src/machine/operation.c index 42c51f3654..34565e3e69 100644 --- a/src/machine/operation.c +++ b/src/machine/operation.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/wait.h> diff --git a/src/machine/operation.h b/src/machine/operation.h index 0e3302856f..fd4828878d 100644 --- a/src/machine/operation.h +++ b/src/machine/operation.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/machine/org.freedesktop.machine1.policy b/src/machine/org.freedesktop.machine1.policy index 039c3d4513..ddf5ec05c6 100644 --- a/src/machine/org.freedesktop.machine1.policy +++ b/src/machine/org.freedesktop.machine1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/machine/org.freedesktop.machine1.service b/src/machine/org.freedesktop.machine1.service index d07bcae6eb..64b73c1f24 100644 --- a/src/machine/org.freedesktop.machine1.service +++ b/src/machine/org.freedesktop.machine1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/machine/test-machine-tables.c b/src/machine/test-machine-tables.c index 04db7d8259..0e51755087 100644 --- a/src/machine/test-machine-tables.c +++ b/src/machine/test-machine-tables.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "machine.h" #include "test-tables.h" diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 337a460318..2f0cef5ff9 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 9e57033999..673f855198 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/network/fuzz-netdev-parser.c b/src/network/fuzz-netdev-parser.c index 78c8d0c2b5..ddabe1c27b 100644 --- a/src/network/fuzz-netdev-parser.c +++ b/src/network/fuzz-netdev-parser.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" #include "fs-util.h" diff --git a/src/network/fuzz-network-parser.c b/src/network/fuzz-network-parser.c index 732b5b21f4..1292ebacd1 100644 --- a/src/network/fuzz-network-parser.c +++ b/src/network/fuzz-network-parser.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" #include "fs-util.h" diff --git a/src/network/generator/main.c b/src/network/generator/main.c index 61a741e5d2..f9cace70f7 100644 --- a/src/network/generator/main.c +++ b/src/network/generator/main.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c index 465b3eddc2..2fa21a067a 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "ether-addr-util.h" #include "fd-util.h" diff --git a/src/network/generator/network-generator.h b/src/network/generator/network-generator.h index 3d75b132de..86bcaec119 100644 --- a/src/network/generator/network-generator.h +++ b/src/network/generator/network-generator.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <net/ethernet.h> diff --git a/src/network/generator/test-network-generator.c b/src/network/generator/test-network-generator.c index efcbdefda0..e658d89333 100644 --- a/src/network/generator/test-network-generator.c +++ b/src/network/generator/test-network-generator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "macro.h" #include "network-generator.h" diff --git a/src/network/meson.build b/src/network/meson.build index c2a197162f..cd1a897199 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later sources = files(''' netdev/bareudp.c diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c index 03c3ce5311..22c0e49d94 100644 --- a/src/network/netdev/bareudp.c +++ b/src/network/netdev/bareudp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include "bareudp.h" diff --git a/src/network/netdev/bareudp.h b/src/network/netdev/bareudp.h index 105475038d..ea80bbf800 100644 --- a/src/network/netdev/bareudp.h +++ b/src/network/netdev/bareudp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c index 3007d6913a..8c777b3a06 100644 --- a/src/network/netdev/bond.c +++ b/src/network/netdev/bond.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "bond.h" diff --git a/src/network/netdev/bond.h b/src/network/netdev/bond.h index 64b2dd04a2..11d3e9ba26 100644 --- a/src/network/netdev/bond.h +++ b/src/network/netdev/bond.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/network/netdev/bridge.c b/src/network/netdev/bridge.c index 45d97ac15e..1f59cd8b42 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/network/netdev/bridge.h b/src/network/netdev/bridge.h index ed4f484c94..d6abda99e8 100644 --- a/src/network/netdev/bridge.h +++ b/src/network/netdev/bridge.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/network/netdev/dummy.c b/src/network/netdev/dummy.c index e06dc02f3a..754ee98952 100644 --- a/src/network/netdev/dummy.c +++ b/src/network/netdev/dummy.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dummy.h" diff --git a/src/network/netdev/dummy.h b/src/network/netdev/dummy.h index f935414772..eafdf4b5bf 100644 --- a/src/network/netdev/dummy.h +++ b/src/network/netdev/dummy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "netdev.h" diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c index 832cf57dea..6863257a58 100644 --- a/src/network/netdev/fou-tunnel.c +++ b/src/network/netdev/fou-tunnel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/fou.h> #include <net/if.h> diff --git a/src/network/netdev/fou-tunnel.h b/src/network/netdev/fou-tunnel.h index caa3b7600e..a6f10dfca4 100644 --- a/src/network/netdev/fou-tunnel.h +++ b/src/network/netdev/fou-tunnel.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/network/netdev/geneve.c b/src/network/netdev/geneve.c index b4f865a538..edf92ec93c 100644 --- a/src/network/netdev/geneve.c +++ b/src/network/netdev/geneve.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/network/netdev/geneve.h b/src/network/netdev/geneve.h index 2ac3c1e835..b62eb7b76d 100644 --- a/src/network/netdev/geneve.h +++ b/src/network/netdev/geneve.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Geneve Geneve; diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c index 7736a162f9..16ff49d7f0 100644 --- a/src/network/netdev/ifb.c +++ b/src/network/netdev/ifb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include "ifb.h" diff --git a/src/network/netdev/ifb.h b/src/network/netdev/ifb.h index 761d215894..badfb4ad10 100644 --- a/src/network/netdev/ifb.h +++ b/src/network/netdev/ifb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c index bd14f625de..92a8f583e3 100644 --- a/src/network/netdev/ipvlan.c +++ b/src/network/netdev/ipvlan.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/network/netdev/ipvlan.h b/src/network/netdev/ipvlan.h index 8e658184ff..633b0bd94f 100644 --- a/src/network/netdev/ipvlan.h +++ b/src/network/netdev/ipvlan.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/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c index 949f124ccd..eeea19764e 100644 --- a/src/network/netdev/l2tp-tunnel.c +++ b/src/network/netdev/l2tp-tunnel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/l2tp.h> diff --git a/src/network/netdev/l2tp-tunnel.h b/src/network/netdev/l2tp-tunnel.h index d314b98703..048318d6df 100644 --- a/src/network/netdev/l2tp-tunnel.h +++ b/src/network/netdev/l2tp-tunnel.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/network/netdev/macsec.c b/src/network/netdev/macsec.c index e84a18ffae..82e71c3920 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if_ether.h> diff --git a/src/network/netdev/macsec.h b/src/network/netdev/macsec.h index 26ad2b7cca..4d88e49514 100644 --- a/src/network/netdev/macsec.h +++ b/src/network/netdev/macsec.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/network/netdev/macvlan.c b/src/network/netdev/macvlan.c index 8f38217789..9bdcf627b4 100644 --- a/src/network/netdev/macvlan.c +++ b/src/network/netdev/macvlan.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/network/netdev/macvlan.h b/src/network/netdev/macvlan.h index 7bc6eef12d..cb7eece67f 100644 --- a/src/network/netdev/macvlan.h +++ b/src/network/netdev/macvlan.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct MacVlan MacVlan; diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 7bbc5ad3c2..ba9039006b 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <netinet/in.h> diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h index 0ab9a8e3f3..468fae591c 100644 --- a/src/network/netdev/netdev.h +++ b/src/network/netdev/netdev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-netlink.h" diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c index bfd2a16035..b2814284a4 100644 --- a/src/network/netdev/netdevsim.c +++ b/src/network/netdev/netdevsim.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "netdevsim.h" diff --git a/src/network/netdev/netdevsim.h b/src/network/netdev/netdevsim.h index 4622f4a0c5..27adc594ad 100644 --- a/src/network/netdev/netdevsim.h +++ b/src/network/netdev/netdevsim.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct NetDevSim NetDevSim; diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c index 30e49a55ab..a8faed5b24 100644 --- a/src/network/netdev/nlmon.c +++ b/src/network/netdev/nlmon.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "nlmon.h" diff --git a/src/network/netdev/nlmon.h b/src/network/netdev/nlmon.h index b5f65f6140..edfc504bca 100644 --- a/src/network/netdev/nlmon.h +++ b/src/network/netdev/nlmon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct NLMon NLMon; diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index 852aa423b6..66e8868284 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/fou.h> diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h index 6480d93e65..d58ded757d 100644 --- a/src/network/netdev/tunnel.h +++ b/src/network/netdev/tunnel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "in-addr-util.h" diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c index aef72e7bbb..d9d654495e 100644 --- a/src/network/netdev/tuntap.c +++ b/src/network/netdev/tuntap.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/network/netdev/tuntap.h b/src/network/netdev/tuntap.h index 8a80b633da..4d1e643f43 100644 --- a/src/network/netdev/tuntap.h +++ b/src/network/netdev/tuntap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct TunTap TunTap; diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c index 9a0f87b1e1..3621d4c5d8 100644 --- a/src/network/netdev/vcan.c +++ b/src/network/netdev/vcan.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "vcan.h" diff --git a/src/network/netdev/vcan.h b/src/network/netdev/vcan.h index d8af07e3ce..843984fbee 100644 --- a/src/network/netdev/vcan.h +++ b/src/network/netdev/vcan.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct VCan VCan; diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c index 8c7c1d053f..840a3277b1 100644 --- a/src/network/netdev/veth.c +++ b/src/network/netdev/veth.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <net/if.h> diff --git a/src/network/netdev/veth.h b/src/network/netdev/veth.h index 6a0728b1c4..643f737a88 100644 --- a/src/network/netdev/veth.h +++ b/src/network/netdev/veth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Veth Veth; diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c index a4c7192c7d..e7f03f06f0 100644 --- a/src/network/netdev/vlan.c +++ b/src/network/netdev/vlan.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <net/if.h> diff --git a/src/network/netdev/vlan.h b/src/network/netdev/vlan.h index 7f6cb14787..9dff924cd0 100644 --- a/src/network/netdev/vlan.h +++ b/src/network/netdev/vlan.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct VLan VLan; diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c index a8ed3fadcb..ae71ae916c 100644 --- a/src/network/netdev/vrf.c +++ b/src/network/netdev/vrf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/network/netdev/vrf.h b/src/network/netdev/vrf.h index a0bff913bd..87977e230c 100644 --- a/src/network/netdev/vrf.h +++ b/src/network/netdev/vrf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct Vrf Vrf; diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c index 9614af1068..e4e32ff390 100644 --- a/src/network/netdev/vxcan.c +++ b/src/network/netdev/vxcan.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/can/vxcan.h> diff --git a/src/network/netdev/vxcan.h b/src/network/netdev/vxcan.h index 4531a67370..47be3f017d 100644 --- a/src/network/netdev/vxcan.h +++ b/src/network/netdev/vxcan.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct VxCan VxCan; diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c index d941b7d633..6748f67f8f 100644 --- a/src/network/netdev/vxlan.c +++ b/src/network/netdev/vxlan.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h index d836215c46..371653cade 100644 --- a/src/network/netdev/vxlan.h +++ b/src/network/netdev/vxlan.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct VxLan VxLan; diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c index e7683892a5..416e9b92d1 100644 --- a/src/network/netdev/wireguard.c +++ b/src/network/netdev/wireguard.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. ***/ diff --git a/src/network/netdev/wireguard.h b/src/network/netdev/wireguard.h index e2c06f0377..b9b5ae9871 100644 --- a/src/network/netdev/wireguard.h +++ b/src/network/netdev/wireguard.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/network/netdev/xfrm.c b/src/network/netdev/xfrm.c index ff8ff35689..a407c54da4 100644 --- a/src/network/netdev/xfrm.c +++ b/src/network/netdev/xfrm.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "missing_network.h" #include "xfrm.h" diff --git a/src/network/netdev/xfrm.h b/src/network/netdev/xfrm.h index 889d3619b1..f56c4f272a 100644 --- a/src/network/netdev/xfrm.h +++ b/src/network/netdev/xfrm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "netdev.h" diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 142ffc33e1..63a90bc13d 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <getopt.h> diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c index 66b192256e..f933a1da94 100644 --- a/src/network/networkd-address-label.c +++ b/src/network/networkd-address-label.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <linux/if_addrlabel.h> diff --git a/src/network/networkd-address-label.h b/src/network/networkd-address-label.h index b92828c72e..11fdd9abfe 100644 --- a/src/network/networkd-address-label.h +++ b/src/network/networkd-address-label.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/network/networkd-address-pool.c b/src/network/networkd-address-pool.c index c732b6c56e..7e27db6611 100644 --- a/src/network/networkd-address-pool.c +++ b/src/network/networkd-address-pool.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "networkd-address-pool.h" diff --git a/src/network/networkd-address-pool.h b/src/network/networkd-address-pool.h index c53fe7407f..93bdec82e3 100644 --- a/src/network/networkd-address-pool.h +++ b/src/network/networkd-address-pool.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "in-addr-util.h" diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index d24104d55a..bc09e3c403 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <net/if_arp.h> diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h index 0104747d9a..56e81da822 100644 --- a/src/network/networkd-address.h +++ b/src/network/networkd-address.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/network/networkd-brvlan.c b/src/network/networkd-brvlan.c index 23ca4f9fac..e53c73c30c 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2016 BISDN GmbH. All rights reserved. ***/ diff --git a/src/network/networkd-brvlan.h b/src/network/networkd-brvlan.h index d13ea30151..938b7901f1 100644 --- a/src/network/networkd-brvlan.h +++ b/src/network/networkd-brvlan.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/network/networkd-can.c b/src/network/networkd-can.c index e5504f7738..7e31d2fc82 100644 --- a/src/network/networkd-can.c +++ b/src/network/networkd-can.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <linux/can/netlink.h> diff --git a/src/network/networkd-can.h b/src/network/networkd-can.h index 30e99b189d..7a2705bf9a 100644 --- a/src/network/networkd-can.h +++ b/src/network/networkd-can.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c index 233ef9f4f6..bf51624ec4 100644 --- a/src/network/networkd-conf.c +++ b/src/network/networkd-conf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Vinay Kulkarni <kulkarniv@vmware.com> ***/ diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h index 88a2c64031..b485e9e541 100644 --- a/src/network/networkd-conf.h +++ b/src/network/networkd-conf.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/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index a41bd348dc..2537561265 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if_arp.h> diff --git a/src/network/networkd-dhcp-common.h b/src/network/networkd-dhcp-common.h index fc84450e5e..78c149ebcc 100644 --- a/src/network/networkd-dhcp-common.h +++ b/src/network/networkd-dhcp-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-dhcp-server-bus.c b/src/network/networkd-dhcp-server-bus.c index 3de8c16d89..32f4baed78 100644 --- a/src/network/networkd-dhcp-server-bus.c +++ b/src/network/networkd-dhcp-server-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-dhcp-server.h" diff --git a/src/network/networkd-dhcp-server-bus.h b/src/network/networkd-dhcp-server-bus.h index 49164ff0bb..7191478200 100644 --- a/src/network/networkd-dhcp-server-bus.h +++ b/src/network/networkd-dhcp-server-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c index 0155ab2de2..cf279c640d 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if_arp.h> diff --git a/src/network/networkd-dhcp-server.h b/src/network/networkd-dhcp-server.h index 2250a30af4..4bd5120ea0 100644 --- a/src/network/networkd-dhcp-server.h +++ b/src/network/networkd-dhcp-server.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 319ef61593..02d33841b6 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <netinet/ip.h> diff --git a/src/network/networkd-dhcp4.h b/src/network/networkd-dhcp4.h index 8aa6ac9453..daab5b1d7d 100644 --- a/src/network/networkd-dhcp4.h +++ b/src/network/networkd-dhcp4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index e7dc10c2be..d4d4182ee5 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/network/networkd-dhcp6.h b/src/network/networkd-dhcp6.h index 4956c90915..65b35fd1e8 100644 --- a/src/network/networkd-dhcp6.h +++ b/src/network/networkd-dhcp6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index 2e35f7d1bf..283dece04f 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/network/networkd-fdb.h b/src/network/networkd-fdb.h index 935406e022..48f4e40b37 100644 --- a/src/network/networkd-fdb.h +++ b/src/network/networkd-fdb.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/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index 2f4107580b..295abe866e 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if.h> diff --git a/src/network/networkd-ipv4ll.h b/src/network/networkd-ipv4ll.h index 4833e304b6..fae48cd921 100644 --- a/src/network/networkd-ipv4ll.h +++ b/src/network/networkd-ipv4ll.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c index ce193c0e50..0b57c6c4db 100644 --- a/src/network/networkd-ipv6-proxy-ndp.c +++ b/src/network/networkd-ipv6-proxy-ndp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if.h> diff --git a/src/network/networkd-ipv6-proxy-ndp.h b/src/network/networkd-ipv6-proxy-ndp.h index e58b17ec94..27313efa0c 100644 --- a/src/network/networkd-ipv6-proxy-ndp.h +++ b/src/network/networkd-ipv6-proxy-ndp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c index 072dfac93d..9f4c719e31 100644 --- a/src/network/networkd-link-bus.c +++ b/src/network/networkd-link-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <netinet/in.h> diff --git a/src/network/networkd-link-bus.h b/src/network/networkd-link-bus.h index 94474f22ff..45594dfac9 100644 --- a/src/network/networkd-link-bus.h +++ b/src/network/networkd-link-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 1eca07771a..ced18de425 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if.h> diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 159e7e705b..cd541920cb 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.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/network/networkd-lldp-rx.c b/src/network/networkd-lldp-rx.c index 4d431ac840..c22852ff50 100644 --- a/src/network/networkd-lldp-rx.c +++ b/src/network/networkd-lldp-rx.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <net/if_arp.h> diff --git a/src/network/networkd-lldp-rx.h b/src/network/networkd-lldp-rx.h index 8e1a6a0b62..78c522893b 100644 --- a/src/network/networkd-lldp-rx.h +++ b/src/network/networkd-lldp-rx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c index 4a1b5fb5f8..b03d948bd8 100644 --- a/src/network/networkd-lldp-tx.c +++ b/src/network/networkd-lldp-tx.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <endian.h> #include <inttypes.h> diff --git a/src/network/networkd-lldp-tx.h b/src/network/networkd-lldp-tx.h index 1409984ac0..aae30cba0f 100644 --- a/src/network/networkd-lldp-tx.h +++ b/src/network/networkd-lldp-tx.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/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c index 8dbcdff826..a0ac8b51fb 100644 --- a/src/network/networkd-manager-bus.c +++ b/src/network/networkd-manager-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <netinet/in.h> diff --git a/src/network/networkd-manager-bus.h b/src/network/networkd-manager-bus.h index e19d706927..08ddfbdb73 100644 --- a/src/network/networkd-manager-bus.h +++ b/src/network/networkd-manager-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index ff00d86509..e8b6615afa 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <sys/socket.h> diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h index ac7de58c64..b67116be59 100644 --- a/src/network/networkd-manager.h +++ b/src/network/networkd-manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/network/networkd-mdb.c b/src/network/networkd-mdb.c index bca3e620dd..0300dced62 100644 --- a/src/network/networkd-mdb.c +++ b/src/network/networkd-mdb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/network/networkd-mdb.h b/src/network/networkd-mdb.h index 563a9e6d99..ea8841275e 100644 --- a/src/network/networkd-mdb.h +++ b/src/network/networkd-mdb.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/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index a61eaa9fc8..f4bea08070 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Intel Corporation. All rights reserved. ***/ diff --git a/src/network/networkd-ndisc.h b/src/network/networkd-ndisc.h index 4e9a704995..1562411224 100644 --- a/src/network/networkd-ndisc.h +++ b/src/network/networkd-ndisc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c index b553f1707e..c805d52cf3 100644 --- a/src/network/networkd-neighbor.c +++ b/src/network/networkd-neighbor.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "hashmap.h" diff --git a/src/network/networkd-neighbor.h b/src/network/networkd-neighbor.h index bb403ef2da..8ad790be2d 100644 --- a/src/network/networkd-neighbor.h +++ b/src/network/networkd-neighbor.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/network/networkd-network-bus.c b/src/network/networkd-network-bus.c index 70fddd56a5..0e5f1488d8 100644 --- a/src/network/networkd-network-bus.c +++ b/src/network/networkd-network-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "ether-addr-util.h" diff --git a/src/network/networkd-network-bus.h b/src/network/networkd-network-bus.h index 650e145d42..cca1e0af33 100644 --- a/src/network/networkd-network-bus.h +++ b/src/network/networkd-network-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 426dd0a8f0..75bf474e9b 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <netinet/in.h> diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 92c7a4636f..fd0fe056b2 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <linux/nl80211.h> diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index 6edeaabf88..4a09b4c912 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ diff --git a/src/network/networkd-nexthop.h b/src/network/networkd-nexthop.h index 3cdb068efd..75714e7ef5 100644 --- a/src/network/networkd-nexthop.h +++ b/src/network/networkd-nexthop.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index a4162cf874..817c15764a 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2017 Intel Corporation. All rights reserved. ***/ diff --git a/src/network/networkd-radv.h b/src/network/networkd-radv.h index 75c606d15e..4dfbefef95 100644 --- a/src/network/networkd-radv.h +++ b/src/network/networkd-radv.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/network/networkd-route.c b/src/network/networkd-route.c index cd0f0aa707..10f30c1a7e 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/icmpv6.h> #include <linux/ipv6_route.h> diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h index e896719e13..f59369392f 100644 --- a/src/network/networkd-route.h +++ b/src/network/networkd-route.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/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c index de60bd9555..a31fb31fa4 100644 --- a/src/network/networkd-routing-policy-rule.c +++ b/src/network/networkd-routing-policy-rule.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <linux/fib_rules.h> diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h index bc1193a111..baf086f25e 100644 --- a/src/network/networkd-routing-policy-rule.h +++ b/src/network/networkd-routing-policy-rule.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/network/networkd-speed-meter.c b/src/network/networkd-speed-meter.c index ecf0346344..e7f0682c3e 100644 --- a/src/network/networkd-speed-meter.c +++ b/src/network/networkd-speed-meter.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/network/networkd-speed-meter.h b/src/network/networkd-speed-meter.h index f5727784a9..4dd024b62a 100644 --- a/src/network/networkd-speed-meter.h +++ b/src/network/networkd-speed-meter.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once /* Default interval is 10sec. The speed meter periodically make networkd diff --git a/src/network/networkd-sriov.c b/src/network/networkd-sriov.c index 61382a8993..68f43b5ce6 100644 --- a/src/network/networkd-sriov.c +++ b/src/network/networkd-sriov.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include "alloc-util.h" diff --git a/src/network/networkd-sriov.h b/src/network/networkd-sriov.h index 8a48545d64..dae5ff0306 100644 --- a/src/network/networkd-sriov.h +++ b/src/network/networkd-sriov.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c index b6839f86ee..518fe8e131 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <linux/if.h> diff --git a/src/network/networkd-sysctl.h b/src/network/networkd-sysctl.h index 552b55226a..3568900a1f 100644 --- a/src/network/networkd-sysctl.h +++ b/src/network/networkd-sysctl.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/network/networkd-util.c b/src/network/networkd-util.c index bae4ee5cba..8ddcbb2fce 100644 --- a/src/network/networkd-util.c +++ b/src/network/networkd-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "condition.h" #include "conf-parser.h" diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h index ce169fa731..6100a0031c 100644 --- a/src/network/networkd-util.h +++ b/src/network/networkd-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-dhcp-lease.h" diff --git a/src/network/networkd-wifi.c b/src/network/networkd-wifi.c index 53b65286b3..0f2def7a16 100644 --- a/src/network/networkd-wifi.c +++ b/src/network/networkd-wifi.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/ethernet.h> #include <linux/nl80211.h> diff --git a/src/network/networkd-wifi.h b/src/network/networkd-wifi.h index 57aa153370..ab868eba27 100644 --- a/src/network/networkd-wifi.h +++ b/src/network/networkd-wifi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/network/networkd.c b/src/network/networkd.c index f78ff9db54..b448d9b011 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <sys/stat.h> diff --git a/src/network/org.freedesktop.network1.policy b/src/network/org.freedesktop.network1.policy index 50b0ef0814..9e27f728bc 100644 --- a/src/network/org.freedesktop.network1.policy +++ b/src/network/org.freedesktop.network1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/network/org.freedesktop.network1.service b/src/network/org.freedesktop.network1.service index 641a1a5cc1..ddbf3eb4ee 100644 --- a/src/network/org.freedesktop.network1.service +++ b/src/network/org.freedesktop.network1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/network/tc/cake.c b/src/network/tc/cake.c index 1da1ec40c3..76fb718f9c 100644 --- a/src/network/tc/cake.c +++ b/src/network/tc/cake.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/cake.h b/src/network/tc/cake.h index 36de5110dd..1da28b7d20 100644 --- a/src/network/tc/cake.h +++ b/src/network/tc/cake.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/codel.c b/src/network/tc/codel.c index cba6faf376..807c247b57 100644 --- a/src/network/tc/codel.c +++ b/src/network/tc/codel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/codel.h b/src/network/tc/codel.h index 4023a7dee5..4fe52831a0 100644 --- a/src/network/tc/codel.h +++ b/src/network/tc/codel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/drr.c b/src/network/tc/drr.c index 9810a120d1..86b7f43311 100644 --- a/src/network/tc/drr.c +++ b/src/network/tc/drr.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/drr.h b/src/network/tc/drr.h index ff2b658acc..c96cc4db00 100644 --- a/src/network/tc/drr.h +++ b/src/network/tc/drr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/ets.c b/src/network/tc/ets.c index ece1f369d5..8214a575bf 100644 --- a/src/network/tc/ets.c +++ b/src/network/tc/ets.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/ets.h b/src/network/tc/ets.h index c35d5976d8..b6dd42811c 100644 --- a/src/network/tc/ets.h +++ b/src/network/tc/ets.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <linux/pkt_sched.h> diff --git a/src/network/tc/fifo.c b/src/network/tc/fifo.c index e955223a89..8b1fa6ee40 100644 --- a/src/network/tc/fifo.c +++ b/src/network/tc/fifo.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/fifo.h b/src/network/tc/fifo.h index e4c976b942..b9bbd0994c 100644 --- a/src/network/tc/fifo.h +++ b/src/network/tc/fifo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/fq-codel.c b/src/network/tc/fq-codel.c index 17a2915143..958f65a28b 100644 --- a/src/network/tc/fq-codel.c +++ b/src/network/tc/fq-codel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/fq-codel.h b/src/network/tc/fq-codel.h index 1a80963df6..2553c59886 100644 --- a/src/network/tc/fq-codel.h +++ b/src/network/tc/fq-codel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/fq-pie.c b/src/network/tc/fq-pie.c index 3065ac0150..c7d7623b47 100644 --- a/src/network/tc/fq-pie.c +++ b/src/network/tc/fq-pie.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/fq-pie.h b/src/network/tc/fq-pie.h index 8de9593c44..51fb626a7a 100644 --- a/src/network/tc/fq-pie.h +++ b/src/network/tc/fq-pie.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/fq.c b/src/network/tc/fq.c index d3218203b9..d48aea86fb 100644 --- a/src/network/tc/fq.c +++ b/src/network/tc/fq.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/fq.h b/src/network/tc/fq.h index 5a8ed6d651..77469c4103 100644 --- a/src/network/tc/fq.h +++ b/src/network/tc/fq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/gred.c b/src/network/tc/gred.c index 7c9e01aba7..46a9eadf87 100644 --- a/src/network/tc/gred.c +++ b/src/network/tc/gred.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/gred.h b/src/network/tc/gred.h index 4fb2b37c11..c084ff12ec 100644 --- a/src/network/tc/gred.h +++ b/src/network/tc/gred.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/hhf.c b/src/network/tc/hhf.c index 324a975aa8..69c02f4810 100644 --- a/src/network/tc/hhf.c +++ b/src/network/tc/hhf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/hhf.h b/src/network/tc/hhf.h index a555998eee..04caaa8aa4 100644 --- a/src/network/tc/hhf.h +++ b/src/network/tc/hhf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/htb.c b/src/network/tc/htb.c index 65481a76bc..0969587c40 100644 --- a/src/network/tc/htb.c +++ b/src/network/tc/htb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/htb.h b/src/network/tc/htb.h index b385872e0a..55644dbdd2 100644 --- a/src/network/tc/htb.h +++ b/src/network/tc/htb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/tc/netem.c b/src/network/tc/netem.c index a94a9a369e..454e556d2e 100644 --- a/src/network/tc/netem.c +++ b/src/network/tc/netem.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/netem.h b/src/network/tc/netem.h index 6319c72521..d58d5ac765 100644 --- a/src/network/tc/netem.h +++ b/src/network/tc/netem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/pie.c b/src/network/tc/pie.c index eccbaa2cf5..695a38171d 100644 --- a/src/network/tc/pie.c +++ b/src/network/tc/pie.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/pie.h b/src/network/tc/pie.h index 7c764742ad..40a114e7d1 100644 --- a/src/network/tc/pie.h +++ b/src/network/tc/pie.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c index 619a2f4b98..2add12816a 100644 --- a/src/network/tc/qdisc.c +++ b/src/network/tc/qdisc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h index a92460faf9..f9a9954861 100644 --- a/src/network/tc/qdisc.h +++ b/src/network/tc/qdisc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/qfq.c b/src/network/tc/qfq.c index 2104067f3b..320f2c1c52 100644 --- a/src/network/tc/qfq.c +++ b/src/network/tc/qfq.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/qfq.h b/src/network/tc/qfq.h index 10bab3e642..0f013a9863 100644 --- a/src/network/tc/qfq.h +++ b/src/network/tc/qfq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/sfb.c b/src/network/tc/sfb.c index 3692a50ed8..674fdf6ac7 100644 --- a/src/network/tc/sfb.c +++ b/src/network/tc/sfb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/sfb.h b/src/network/tc/sfb.h index 3cc87d7373..628df358e8 100644 --- a/src/network/tc/sfb.h +++ b/src/network/tc/sfb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2020 VMware, Inc. */ #pragma once diff --git a/src/network/tc/sfq.c b/src/network/tc/sfq.c index d671281c46..387be83a99 100644 --- a/src/network/tc/sfq.c +++ b/src/network/tc/sfq.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/sfq.h b/src/network/tc/sfq.h index 19c8decf13..1626775d63 100644 --- a/src/network/tc/sfq.h +++ b/src/network/tc/sfq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/tbf.c b/src/network/tc/tbf.c index cb3c3bcc15..2d84c5a833 100644 --- a/src/network/tc/tbf.c +++ b/src/network/tc/tbf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/tbf.h b/src/network/tc/tbf.h index a785be25e0..6b4b017c7c 100644 --- a/src/network/tc/tbf.h +++ b/src/network/tc/tbf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/tc-util.c b/src/network/tc/tc-util.c index 8a5afeab2d..3e10b50c96 100644 --- a/src/network/tc/tc-util.c +++ b/src/network/tc/tc-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include "alloc-util.h" diff --git a/src/network/tc/tc-util.h b/src/network/tc/tc-util.h index 6287b35a76..83bad8e3b7 100644 --- a/src/network/tc/tc-util.h +++ b/src/network/tc/tc-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/tc.c b/src/network/tc/tc.c index 974bb8c822..c32b040919 100644 --- a/src/network/tc/tc.c +++ b/src/network/tc/tc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "macro.h" #include "qdisc.h" diff --git a/src/network/tc/tc.h b/src/network/tc/tc.h index 916ad3300a..7fbd744142 100644 --- a/src/network/tc/tc.h +++ b/src/network/tc/tc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "networkd-link.h" diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c index 9a39713b32..21b26b01a0 100644 --- a/src/network/tc/tclass.c +++ b/src/network/tc/tclass.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #include <linux/pkt_sched.h> diff --git a/src/network/tc/tclass.h b/src/network/tc/tclass.h index dc6886ac3f..f02a6a734a 100644 --- a/src/network/tc/tclass.h +++ b/src/network/tc/tclass.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * Copyright © 2019 VMware, Inc. */ #pragma once diff --git a/src/network/tc/teql.c b/src/network/tc/teql.c index f727d14341..0da2fc357e 100644 --- a/src/network/tc/teql.c +++ b/src/network/tc/teql.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "macro.h" #include "netlink-util.h" diff --git a/src/network/tc/teql.h b/src/network/tc/teql.h index 5b091aaf0f..8d0085ea54 100644 --- a/src/network/tc/teql.h +++ b/src/network/tc/teql.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index 7743c63d4a..475cac7527 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bond.h" #include "dhcp6-internal.h" diff --git a/src/network/test-network.c b/src/network/test-network.c index f6168fc3fa..bb67c74e9b 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <sys/param.h> diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c index 030e50688a..0fe81886bd 100644 --- a/src/network/test-networkd-conf.c +++ b/src/network/test-networkd-conf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "ether-addr-util.h" #include "hexdecoct.h" diff --git a/src/network/test-routing-policy-rule.c b/src/network/test-routing-policy-rule.c index 40341d6073..8d87cdf9c9 100644 --- a/src/network/test-routing-policy-rule.c +++ b/src/network/test-routing-policy-rule.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" #include "fileio.h" diff --git a/src/network/wait-online/link.c b/src/network/wait-online/link.c index 69b0057707..529fc9f22a 100644 --- a/src/network/wait-online/link.c +++ b/src/network/wait-online/link.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-network.h" diff --git a/src/network/wait-online/link.h b/src/network/wait-online/link.h index 73d9f9cc3e..3aa8357293 100644 --- a/src/network/wait-online/link.h +++ b/src/network/wait-online/link.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-netlink.h" diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c index e84eed46ac..79994bd49c 100644 --- a/src/network/wait-online/manager.c +++ b/src/network/wait-online/manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/ether.h> #include <linux/if.h> diff --git a/src/network/wait-online/manager.h b/src/network/wait-online/manager.h index 7398783df7..f5e83532ae 100644 --- a/src/network/wait-online/manager.h +++ b/src/network/wait-online/manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c index cfd9093f1a..c2bdcd4907 100644 --- a/src/network/wait-online/wait-online.c +++ b/src/network/wait-online/wait-online.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <sys/stat.h> diff --git a/src/notify/notify.c b/src/notify/notify.c index 69d473401d..6a506db3a4 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build index ae3d72faca..539ed56c36 100644 --- a/src/nspawn/meson.build +++ b/src/nspawn/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later libnspawn_core_sources = files(''' nspawn-cgroup.c diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index f7b34ccc58..cb01b25bc6 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> diff --git a/src/nspawn/nspawn-cgroup.h b/src/nspawn/nspawn-cgroup.h index 035e8fbd0f..3f5ba622d8 100644 --- a/src/nspawn/nspawn-cgroup.h +++ b/src/nspawn/nspawn-cgroup.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/nspawn/nspawn-creds.c b/src/nspawn/nspawn-creds.c index 41a38d37ea..0900d8c211 100644 --- a/src/nspawn/nspawn-creds.c +++ b/src/nspawn/nspawn-creds.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "macro.h" diff --git a/src/nspawn/nspawn-creds.h b/src/nspawn/nspawn-creds.h index b3c90bb17a..de0661b204 100644 --- a/src/nspawn/nspawn-creds.h +++ b/src/nspawn/nspawn-creds.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/nspawn/nspawn-def.h b/src/nspawn/nspawn-def.h index ac3a1a02c4..32a20aabd5 100644 --- a/src/nspawn/nspawn-def.h +++ b/src/nspawn/nspawn-def.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/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c index 69f36691fb..d8a37a3399 100644 --- a/src/nspawn/nspawn-expose-ports.c +++ b/src/nspawn/nspawn-expose-ports.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-netlink.h" diff --git a/src/nspawn/nspawn-expose-ports.h b/src/nspawn/nspawn-expose-ports.h index 7ed7bee03f..cc834a4197 100644 --- a/src/nspawn/nspawn-expose-ports.h +++ b/src/nspawn/nspawn-expose-ports.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/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 065099cf39..2ea1bed361 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> #include <linux/magic.h> diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h index 8f9d094fae..e8b75fba60 100644 --- a/src/nspawn/nspawn-mount.h +++ b/src/nspawn/nspawn-mount.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/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index a9aff9a67f..d6b7d8e1d8 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <linux/if.h> diff --git a/src/nspawn/nspawn-network.h b/src/nspawn/nspawn-network.h index 4999b172c4..5c2d983418 100644 --- a/src/nspawn/nspawn-network.h +++ b/src/nspawn/nspawn-network.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <net/if.h> diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index 9445dc5b0e..ca708be755 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/oom.h> #if HAVE_SECCOMP diff --git a/src/nspawn/nspawn-oci.h b/src/nspawn/nspawn-oci.h index d23a2f3dae..ee72c91732 100644 --- a/src/nspawn/nspawn-oci.h +++ b/src/nspawn/nspawn-oci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "nspawn-settings.h" diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c index 112c3562ac..785332e091 100644 --- a/src/nspawn/nspawn-patch-uid.c +++ b/src/nspawn/nspawn-patch-uid.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/statvfs.h> diff --git a/src/nspawn/nspawn-patch-uid.h b/src/nspawn/nspawn-patch-uid.h index b7c6ce2b73..5c7349bc73 100644 --- a/src/nspawn/nspawn-patch-uid.h +++ b/src/nspawn/nspawn-patch-uid.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/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c index 50867f3843..2e6c12b3b7 100644 --- a/src/nspawn/nspawn-register.c +++ b/src/nspawn/nspawn-register.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/nspawn/nspawn-register.h b/src/nspawn/nspawn-register.h index 07cca7fadc..59fdd1bd61 100644 --- a/src/nspawn/nspawn-register.h +++ b/src/nspawn/nspawn-register.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/nspawn/nspawn-seccomp.c b/src/nspawn/nspawn-seccomp.c index 76f2bfe77e..1da719124c 100644 --- a/src/nspawn/nspawn-seccomp.c +++ b/src/nspawn/nspawn-seccomp.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/nspawn/nspawn-seccomp.h b/src/nspawn/nspawn-seccomp.h index 6a48e6459b..2690fba686 100644 --- a/src/nspawn/nspawn-seccomp.h +++ b/src/nspawn/nspawn-seccomp.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/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index bd8062d3ec..92bb5120ab 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "cap-list.h" diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h index b8fa145f77..4a83e55202 100644 --- a/src/nspawn/nspawn-settings.h +++ b/src/nspawn/nspawn-settings.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/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c index 62b949f58c..c224fd0b2f 100644 --- a/src/nspawn/nspawn-setuid.c +++ b/src/nspawn/nspawn-setuid.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/types.h> diff --git a/src/nspawn/nspawn-setuid.h b/src/nspawn/nspawn-setuid.h index c82d50bdf1..192471143f 100644 --- a/src/nspawn/nspawn-setuid.h +++ b/src/nspawn/nspawn-setuid.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int change_uid_gid_raw(uid_t uid, gid_t gid, const gid_t *supplementary_gids, size_t n_supplementary_gids, bool chown_stdio); diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c index 60d7439fb1..3cbe4ef5a6 100644 --- a/src/nspawn/nspawn-stub-pid1.c +++ b/src/nspawn/nspawn-stub-pid1.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/ioctl.h> #include <sys/reboot.h> diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/nspawn/nspawn-stub-pid1.h index 8982d5034e..e0810fee12 100644 --- a/src/nspawn/nspawn-stub-pid1.h +++ b/src/nspawn/nspawn-stub-pid1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-id128.h" diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index e59237e227..0842731c18 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_BLKID #endif diff --git a/src/nspawn/test-nspawn-tables.c b/src/nspawn/test-nspawn-tables.c index 2c5f2ef6db..3baf5d301f 100644 --- a/src/nspawn/test-nspawn-tables.c +++ b/src/nspawn/test-nspawn-tables.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "nspawn-settings.h" #include "test-tables.h" diff --git a/src/nspawn/test-patch-uid.c b/src/nspawn/test-patch-uid.c index a6829629b4..f8f44b0b0b 100644 --- a/src/nspawn/test-patch-uid.c +++ b/src/nspawn/test-patch-uid.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/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 9aa6debc16..ffabc60c70 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <net/if.h> diff --git a/src/nss-myhostname/nss-myhostname.sym b/src/nss-myhostname/nss-myhostname.sym index fc7aa99574..21ab637eca 100644 --- a/src/nss-myhostname/nss-myhostname.sym +++ b/src/nss-myhostname/nss-myhostname.sym @@ -1,5 +1,5 @@ /*** - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c index 5db0dcef76..53f0492116 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netdb.h> #include <nss.h> diff --git a/src/nss-mymachines/nss-mymachines.sym b/src/nss-mymachines/nss-mymachines.sym index ade64474a2..258244e765 100644 --- a/src/nss-mymachines/nss-mymachines.sym +++ b/src/nss-mymachines/nss-mymachines.sym @@ -1,5 +1,5 @@ /*** - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index a8e6ce97a1..566b319484 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <netdb.h> diff --git a/src/nss-resolve/nss-resolve.sym b/src/nss-resolve/nss-resolve.sym index e690a0092f..ecc958ed6a 100644 --- a/src/nss-resolve/nss-resolve.sym +++ b/src/nss-resolve/nss-resolve.sym @@ -1,5 +1,5 @@ /*** - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c index 06ac335b29..758f3816e0 100644 --- a/src/nss-systemd/nss-systemd.c +++ b/src/nss-systemd/nss-systemd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <nss.h> #include <pthread.h> diff --git a/src/nss-systemd/nss-systemd.h b/src/nss-systemd/nss-systemd.h index ffa75c12c4..e97b801575 100644 --- a/src/nss-systemd/nss-systemd.h +++ b/src/nss-systemd/nss-systemd.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/nss-systemd/nss-systemd.sym b/src/nss-systemd/nss-systemd.sym index f86d7643d1..7caf217144 100644 --- a/src/nss-systemd/nss-systemd.sym +++ b/src/nss-systemd/nss-systemd.sym @@ -1,5 +1,5 @@ /*** - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/src/nss-systemd/userdb-glue.c b/src/nss-systemd/userdb-glue.c index 2ac299d9a7..22af0fde60 100644 --- a/src/nss-systemd/userdb-glue.c +++ b/src/nss-systemd/userdb-glue.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "env-util.h" #include "fd-util.h" diff --git a/src/nss-systemd/userdb-glue.h b/src/nss-systemd/userdb-glue.h index 02add24b6b..cb0dcb9302 100644 --- a/src/nss-systemd/userdb-glue.h +++ b/src/nss-systemd/userdb-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <nss.h> diff --git a/src/oom/meson.build b/src/oom/meson.build index 78c92deff3..a250d2a62a 100644 --- a/src/oom/meson.build +++ b/src/oom/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_oomd_sources = files(''' oomd-manager-bus.c diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c index 01e43d3560..dd393fcac9 100644 --- a/src/oom/oomctl.c +++ b/src/oom/oomctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <unistd.h> diff --git a/src/oom/oomd-manager-bus.c b/src/oom/oomd-manager-bus.c index 0f39a60d9e..4ea2a338fc 100644 --- a/src/oom/oomd-manager-bus.c +++ b/src/oom/oomd-manager-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/capability.h> diff --git a/src/oom/oomd-manager-bus.h b/src/oom/oomd-manager-bus.h index 6dd576d5af..7935b357a4 100644 --- a/src/oom/oomd-manager-bus.h +++ b/src/oom/oomd-manager-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "bus-object.h" diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c index 6b75fc326d..fec96519e0 100644 --- a/src/oom/oomd-manager.c +++ b/src/oom/oomd-manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-log-control-api.h" #include "bus-util.h" diff --git a/src/oom/oomd-manager.h b/src/oom/oomd-manager.h index b5c249799b..3f3eb5aa4b 100644 --- a/src/oom/oomd-manager.h +++ b/src/oom/oomd-manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c index 6cd4ba4f93..cec656f6fa 100644 --- a/src/oom/oomd-util.c +++ b/src/oom/oomd-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/xattr.h> #include <unistd.h> diff --git a/src/oom/oomd-util.h b/src/oom/oomd-util.h index cfd717a018..87ecda80fb 100644 --- a/src/oom/oomd-util.h +++ b/src/oom/oomd-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/oom/oomd.c b/src/oom/oomd.c index 203395c1e7..8cf776ec0f 100644 --- a/src/oom/oomd.c +++ b/src/oom/oomd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/oom/org.freedesktop.oom1.conf b/src/oom/org.freedesktop.oom1.conf index 48b526f0aa..cc1143aa15 100644 --- a/src/oom/org.freedesktop.oom1.conf +++ b/src/oom/org.freedesktop.oom1.conf @@ -2,7 +2,7 @@ <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<!-- SPDX-License-Identifier: LGPL-2.1+ --> +<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <busconfig> diff --git a/src/oom/org.freedesktop.oom1.service b/src/oom/org.freedesktop.oom1.service index 78150716ed..4fd5138d31 100644 --- a/src/oom/org.freedesktop.oom1.service +++ b/src/oom/org.freedesktop.oom1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c index 5e7c187154..68c498e2d1 100644 --- a/src/oom/test-oomd-util.c +++ b/src/oom/test-oomd-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/partition/growfs.c b/src/partition/growfs.c index 3f34ad3f7c..9406ae8373 100644 --- a/src/partition/growfs.c +++ b/src/partition/growfs.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/partition/makefs.c b/src/partition/makefs.c index 30dcef2075..fd924d2231 100644 --- a/src/partition/makefs.c +++ b/src/partition/makefs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/file.h> diff --git a/src/partition/meson.build b/src/partition/meson.build index 3a75d5712d..d2729daba4 100644 --- a/src/partition/meson.build +++ b/src/partition/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_repart_sources = files(''' repart.c diff --git a/src/partition/repart.c b/src/partition/repart.c index 0f3d3b3c75..40e0d6895c 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> diff --git a/src/path/path.c b/src/path/path.c index 33018999bf..5f1bb14e45 100644 --- a/src/path/path.c +++ b/src/path/path.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/portable/meson.build b/src/portable/meson.build index dc57163460..8f866f57e4 100644 --- a/src/portable/meson.build +++ b/src/portable/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_portabled_sources = files(''' portable.c diff --git a/src/portable/org.freedesktop.portable1.conf b/src/portable/org.freedesktop.portable1.conf index 31d41af12a..1343e1d544 100644 --- a/src/portable/org.freedesktop.portable1.conf +++ b/src/portable/org.freedesktop.portable1.conf @@ -2,7 +2,7 @@ <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<!-- SPDX-License-Identifier: LGPL-2.1+ --> +<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <busconfig> diff --git a/src/portable/org.freedesktop.portable1.policy b/src/portable/org.freedesktop.portable1.policy index 50bb44c4a4..17e22b0155 100644 --- a/src/portable/org.freedesktop.portable1.policy +++ b/src/portable/org.freedesktop.portable1.policy @@ -2,7 +2,7 @@ <!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> -<!-- SPDX-License-Identifier: LGPL-2.1+ --> +<!-- SPDX-License-Identifier: LGPL-2.1-or-later --> <policyconfig> diff --git a/src/portable/org.freedesktop.portable1.service b/src/portable/org.freedesktop.portable1.service index eff37b0183..873746e2d8 100644 --- a/src/portable/org.freedesktop.portable1.service +++ b/src/portable/org.freedesktop.portable1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later [D-BUS Service] Name=org.freedesktop.portable1 diff --git a/src/portable/portable.c b/src/portable/portable.c index 55ea6759e9..ed7eac0291 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/loop.h> diff --git a/src/portable/portable.h b/src/portable/portable.h index ad81b584a5..fd9605ed84 100644 --- a/src/portable/portable.h +++ b/src/portable/portable.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c index 7a4f60163e..457170e684 100644 --- a/src/portable/portablectl.c +++ b/src/portable/portablectl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c index 0169dcb463..cf50d58c71 100644 --- a/src/portable/portabled-bus.c +++ b/src/portable/portabled-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "btrfs-util.h" diff --git a/src/portable/portabled-bus.h b/src/portable/portabled-bus.h index 5810517ca3..e8e4c3a600 100644 --- a/src/portable/portabled-bus.h +++ b/src/portable/portabled-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index b9914f5940..eb0786e4bb 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.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/portable/portabled-image-bus.h b/src/portable/portabled-image-bus.h index 825dea2682..aa2a3ade77 100644 --- a/src/portable/portabled-image-bus.h +++ b/src/portable/portabled-image-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/portable/portabled-image.c b/src/portable/portabled-image.c index e498ba318e..b025c20549 100644 --- a/src/portable/portabled-image.c +++ b/src/portable/portabled-image.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "portable.h" #include "portabled-image.h" diff --git a/src/portable/portabled-image.h b/src/portable/portabled-image.h index 26ce2f6b59..eeefffee64 100644 --- a/src/portable/portabled-image.h +++ b/src/portable/portabled-image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "hashmap.h" diff --git a/src/portable/portabled-operation.c b/src/portable/portabled-operation.c index 305c96ca6f..848b784908 100644 --- a/src/portable/portabled-operation.c +++ b/src/portable/portabled-operation.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fd-util.h" diff --git a/src/portable/portabled-operation.h b/src/portable/portabled-operation.h index 701f399bbb..f64740e9b8 100644 --- a/src/portable/portabled-operation.h +++ b/src/portable/portabled-operation.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/portable/portabled.c b/src/portable/portabled.c index 265f7a7440..f008f84e53 100644 --- a/src/portable/portabled.c +++ b/src/portable/portabled.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/portable/portabled.h b/src/portable/portabled.h index 00461edfca..03a9996916 100644 --- a/src/portable/portabled.h +++ b/src/portable/portabled.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/pstore/meson.build b/src/pstore/meson.build index adbac24b54..3b3a37c777 100644 --- a/src/pstore/meson.build +++ b/src/pstore/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_pstore_sources = files(''' pstore.c diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c index 9b888a2baa..05046b57ea 100644 --- a/src/pstore/pstore.c +++ b/src/pstore/pstore.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Copyright © 2019 Oracle and/or its affiliates. */ diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c index 4e83fc83d5..d617b0bf3d 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.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/random-seed/random-seed.c b/src/random-seed/random-seed.c index 63ad977514..8f8766cdd7 100644 --- a/src/random-seed/random-seed.c +++ b/src/random-seed/random-seed.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/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c index 75bb875b79..ad8dfabb54 100644 --- a/src/rc-local-generator/rc-local-generator.c +++ b/src/rc-local-generator/rc-local-generator.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/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c index 7386f70529..19f5bd0d11 100644 --- a/src/remount-fs/remount-fs.c +++ b/src/remount-fs/remount-fs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <mntent.h> diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c index 3a0eb5c4b8..a73334e2b8 100644 --- a/src/reply-password/reply-password.c +++ b/src/reply-password/reply-password.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/resolve/dns-type.c b/src/resolve/dns-type.c index c96f60a064..1f7334723e 100644 --- a/src/resolve/dns-type.c +++ b/src/resolve/dns-type.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/socket.h> #include <errno.h> diff --git a/src/resolve/dns-type.h b/src/resolve/dns-type.h index 8721536b5d..4370db9cff 100644 --- a/src/resolve/dns-type.h +++ b/src/resolve/dns-type.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/resolve/meson.build b/src/resolve/meson.build index a145117efd..eb6fabea95 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later basic_dns_sources = files(''' resolved-dns-dnssec.c diff --git a/src/resolve/org.freedesktop.resolve1.policy b/src/resolve/org.freedesktop.resolve1.policy index fd27327f48..08615ec6a4 100644 --- a/src/resolve/org.freedesktop.resolve1.policy +++ b/src/resolve/org.freedesktop.resolve1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/resolve/org.freedesktop.resolve1.service b/src/resolve/org.freedesktop.resolve1.service index 2c25a6129c..32a04f3b81 100644 --- a/src/resolve/org.freedesktop.resolve1.service +++ b/src/resolve/org.freedesktop.resolve1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c index 8cd14711df..5bc936faa7 100644 --- a/src/resolve/resolvconf-compat.c +++ b/src/resolve/resolvconf-compat.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <net/if.h> diff --git a/src/resolve/resolvconf-compat.h b/src/resolve/resolvconf-compat.h index 872add1d56..33a5318139 100644 --- a/src/resolve/resolvconf-compat.h +++ b/src/resolve/resolvconf-compat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int resolvconf_parse_argv(int argc, char *argv[]); diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index a2c5dcb418..48926f6885 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/resolve/resolvectl.h b/src/resolve/resolvectl.h index 6b3a1f8445..830c81d692 100644 --- a/src/resolve/resolvectl.h +++ b/src/resolve/resolvectl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <in-addr-util.h> diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 724c3d4a6a..8912650d40 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.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-common-errors.h" diff --git a/src/resolve/resolved-bus.h b/src/resolve/resolved-bus.h index 28caa64a6b..8628d8ba6f 100644 --- a/src/resolve/resolved-bus.h +++ b/src/resolve/resolved-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "bus-object.h" diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c index 0b7c5c8fc9..476060ad25 100644 --- a/src/resolve/resolved-conf.c +++ b/src/resolve/resolved-conf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "conf-parser.h" diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h index 09ae8d7a5b..07ce2591a9 100644 --- a/src/resolve/resolved-conf.h +++ b/src/resolve/resolved-conf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/resolve/resolved-def.h b/src/resolve/resolved-def.h index 1ce9feae7b..21eb6994e6 100644 --- a/src/resolve/resolved-def.h +++ b/src/resolve/resolved-def.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/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c index 8253a4c9d2..5b762a82e8 100644 --- a/src/resolve/resolved-dns-answer.c +++ b/src/resolve/resolved-dns-answer.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/resolve/resolved-dns-answer.h b/src/resolve/resolved-dns-answer.h index 47fc80e2b0..fd94c516de 100644 --- a/src/resolve/resolved-dns-answer.h +++ b/src/resolve/resolved-dns-answer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct DnsAnswer DnsAnswer; diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c index ccc5914046..2407887f90 100644 --- a/src/resolve/resolved-dns-cache.c +++ b/src/resolve/resolved-dns-cache.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/resolve/resolved-dns-cache.h b/src/resolve/resolved-dns-cache.h index afd7d45db6..4ab213dc9c 100644 --- a/src/resolve/resolved-dns-cache.h +++ b/src/resolve/resolved-dns-cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "hashmap.h" diff --git a/src/resolve/resolved-dns-dnssec.c b/src/resolve/resolved-dns-dnssec.c index 5a01d49dee..97bbbe4282 100644 --- a/src/resolve/resolved-dns-dnssec.c +++ b/src/resolve/resolved-dns-dnssec.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "dns-domain.h" diff --git a/src/resolve/resolved-dns-dnssec.h b/src/resolve/resolved-dns-dnssec.h index 1f70861cd0..9c3c0dcfc9 100644 --- a/src/resolve/resolved-dns-dnssec.h +++ b/src/resolve/resolved-dns-dnssec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef enum DnssecResult DnssecResult; diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index 05fa88ec89..b4eb5efae7 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_GCRYPT #include <gcrypt.h> diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h index 964aff38c4..7d6ee2bc4c 100644 --- a/src/resolve/resolved-dns-packet.h +++ b/src/resolve/resolved-dns-packet.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <netinet/ip.h> diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index ef54c04ab0..f4bca54e19 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "dns-domain.h" diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h index 36a9b7be8f..8056aa3727 100644 --- a/src/resolve/resolved-dns-query.h +++ b/src/resolve/resolved-dns-query.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/resolve/resolved-dns-question.c b/src/resolve/resolved-dns-question.c index 809965a845..047170899d 100644 --- a/src/resolve/resolved-dns-question.c +++ b/src/resolve/resolved-dns-question.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "dns-domain.h" diff --git a/src/resolve/resolved-dns-question.h b/src/resolve/resolved-dns-question.h index 0803f49b8b..a6444b0baf 100644 --- a/src/resolve/resolved-dns-question.h +++ b/src/resolve/resolved-dns-question.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct DnsQuestion DnsQuestion; diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 2db7ec4a0a..219f66451a 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <math.h> diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h index 6c824f7962..59b3a70179 100644 --- a/src/resolve/resolved-dns-rr.h +++ b/src/resolve/resolved-dns-rr.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/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 7579f5e328..3e2fc16f10 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/tcp.h> diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h index 8b1a958551..de05c0838f 100644 --- a/src/resolve/resolved-dns-scope.h +++ b/src/resolve/resolved-dns-scope.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "list.h" diff --git a/src/resolve/resolved-dns-search-domain.c b/src/resolve/resolved-dns-search-domain.c index 420c929814..a01f3dced9 100644 --- a/src/resolve/resolved-dns-search-domain.c +++ b/src/resolve/resolved-dns-search-domain.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "dns-domain.h" diff --git a/src/resolve/resolved-dns-search-domain.h b/src/resolve/resolved-dns-search-domain.h index df0b2f1404..ea91a4e2a4 100644 --- a/src/resolve/resolved-dns-search-domain.h +++ b/src/resolve/resolved-dns-search-domain.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "list.h" diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c index d9ac44f9b5..8112374062 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-messages.h" diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h index 464e8dc251..20afee74ac 100644 --- a/src/resolve/resolved-dns-server.h +++ b/src/resolve/resolved-dns-server.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "in-addr-util.h" diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index e6f72f00b4..1aab089934 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/tcp.h> #include <unistd.h> diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h index de193931c1..dba06447cf 100644 --- a/src/resolve/resolved-dns-stream.h +++ b/src/resolve/resolved-dns-stream.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/resolve/resolved-dns-stub.c b/src/resolve/resolved-dns-stub.c index 6fdd26399e..086d3d9d18 100644 --- a/src/resolve/resolved-dns-stub.c +++ b/src/resolve/resolved-dns-stub.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if_arp.h> diff --git a/src/resolve/resolved-dns-stub.h b/src/resolve/resolved-dns-stub.h index 6686de5e58..072f2130e5 100644 --- a/src/resolve/resolved-dns-stub.h +++ b/src/resolve/resolved-dns-stub.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "hash-funcs.h" diff --git a/src/resolve/resolved-dns-synthesize.c b/src/resolve/resolved-dns-synthesize.c index f65116c3b4..67f0dda246 100644 --- a/src/resolve/resolved-dns-synthesize.c +++ b/src/resolve/resolved-dns-synthesize.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "hostname-util.h" diff --git a/src/resolve/resolved-dns-synthesize.h b/src/resolve/resolved-dns-synthesize.h index 0d9d17bac7..fb624589d7 100644 --- a/src/resolve/resolved-dns-synthesize.h +++ b/src/resolve/resolved-dns-synthesize.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "resolved-dns-answer.h" diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c index 15f349d623..2da957e78c 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-messages.h" diff --git a/src/resolve/resolved-dns-transaction.h b/src/resolve/resolved-dns-transaction.h index 167541806a..88b0d8eab9 100644 --- a/src/resolve/resolved-dns-transaction.h +++ b/src/resolve/resolved-dns-transaction.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/resolve/resolved-dns-trust-anchor.c b/src/resolve/resolved-dns-trust-anchor.c index ad5061c2bd..3e5d25586c 100644 --- a/src/resolve/resolved-dns-trust-anchor.c +++ b/src/resolve/resolved-dns-trust-anchor.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-messages.h" diff --git a/src/resolve/resolved-dns-trust-anchor.h b/src/resolve/resolved-dns-trust-anchor.h index df49777e26..14047ec7eb 100644 --- a/src/resolve/resolved-dns-trust-anchor.h +++ b/src/resolve/resolved-dns-trust-anchor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct DnsTrustAnchor DnsTrustAnchor; diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c index 44554d8cdb..00eb6725f9 100644 --- a/src/resolve/resolved-dns-zone.c +++ b/src/resolve/resolved-dns-zone.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "dns-domain.h" diff --git a/src/resolve/resolved-dns-zone.h b/src/resolve/resolved-dns-zone.h index 2719b2188a..1f5a6e0571 100644 --- a/src/resolve/resolved-dns-zone.h +++ b/src/resolve/resolved-dns-zone.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "hashmap.h" diff --git a/src/resolve/resolved-dnssd-bus.c b/src/resolve/resolved-dnssd-bus.c index 7798746e67..d908cc64e6 100644 --- a/src/resolve/resolved-dnssd-bus.c +++ b/src/resolve/resolved-dnssd-bus.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-polkit.h" diff --git a/src/resolve/resolved-dnssd-bus.h b/src/resolve/resolved-dnssd-bus.h index e51c9ac145..f396e23cd7 100644 --- a/src/resolve/resolved-dnssd-bus.h +++ b/src/resolve/resolved-dnssd-bus.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/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c index d7f3a5adef..78ea1fd814 100644 --- a/src/resolve/resolved-dnssd.c +++ b/src/resolve/resolved-dnssd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-files.h" #include "conf-parser.h" diff --git a/src/resolve/resolved-dnssd.h b/src/resolve/resolved-dnssd.h index faba11ca53..485dd5444b 100644 --- a/src/resolve/resolved-dnssd.h +++ b/src/resolve/resolved-dnssd.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/resolve/resolved-dnstls-gnutls.c b/src/resolve/resolved-dnstls-gnutls.c index 6b7db7ef8c..d3edd350b3 100644 --- a/src/resolve/resolved-dnstls-gnutls.c +++ b/src/resolve/resolved-dnstls-gnutls.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if !ENABLE_DNS_OVER_TLS || !DNS_OVER_TLS_USE_GNUTLS #error This source file requires DNS-over-TLS to be enabled and GnuTLS to be available. diff --git a/src/resolve/resolved-dnstls-gnutls.h b/src/resolve/resolved-dnstls-gnutls.h index d4da2017c3..dc1255fbb9 100644 --- a/src/resolve/resolved-dnstls-gnutls.h +++ b/src/resolve/resolved-dnstls-gnutls.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if !ENABLE_DNS_OVER_TLS || !DNS_OVER_TLS_USE_GNUTLS diff --git a/src/resolve/resolved-dnstls-openssl.c b/src/resolve/resolved-dnstls-openssl.c index f95738649d..defddb5237 100644 --- a/src/resolve/resolved-dnstls-openssl.c +++ b/src/resolve/resolved-dnstls-openssl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if !ENABLE_DNS_OVER_TLS || !DNS_OVER_TLS_USE_OPENSSL #error This source file requires DNS-over-TLS to be enabled and OpenSSL to be available. diff --git a/src/resolve/resolved-dnstls-openssl.h b/src/resolve/resolved-dnstls-openssl.h index 8100d2ba6b..a73b77bb58 100644 --- a/src/resolve/resolved-dnstls-openssl.h +++ b/src/resolve/resolved-dnstls-openssl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if !ENABLE_DNS_OVER_TLS || !DNS_OVER_TLS_USE_OPENSSL diff --git a/src/resolve/resolved-dnstls.h b/src/resolve/resolved-dnstls.h index 6199335b70..b638d61ec7 100644 --- a/src/resolve/resolved-dnstls.h +++ b/src/resolve/resolved-dnstls.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if ENABLE_DNS_OVER_TLS diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c index 4a748d4b64..e784213e91 100644 --- a/src/resolve/resolved-etc-hosts.c +++ b/src/resolve/resolved-etc-hosts.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/resolve/resolved-etc-hosts.h b/src/resolve/resolved-etc-hosts.h index caf32a53dd..459b310185 100644 --- a/src/resolve/resolved-etc-hosts.h +++ b/src/resolve/resolved-etc-hosts.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "resolved-manager.h" diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c index 3665d69f3c..6a693ffe7b 100644 --- a/src/resolve/resolved-link-bus.c +++ b/src/resolve/resolved-link-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <netinet/in.h> diff --git a/src/resolve/resolved-link-bus.h b/src/resolve/resolved-link-bus.h index fc85ff855c..b882df5c40 100644 --- a/src/resolve/resolved-link-bus.h +++ b/src/resolve/resolved-link-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index 6215d2bf46..cb5be90c75 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/if.h> #include <unistd.h> diff --git a/src/resolve/resolved-link.h b/src/resolve/resolved-link.h index 44d489ce47..3f08e98351 100644 --- a/src/resolve/resolved-link.h +++ b/src/resolve/resolved-link.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-netlink.h" diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c index 03f2764d58..2ddf08815a 100644 --- a/src/resolve/resolved-llmnr.c +++ b/src/resolve/resolved-llmnr.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <resolv.h> diff --git a/src/resolve/resolved-llmnr.h b/src/resolve/resolved-llmnr.h index a3b12cf38c..4cdd2606e6 100644 --- a/src/resolve/resolved-llmnr.h +++ b/src/resolve/resolved-llmnr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "resolved-manager.h" diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index e00359f6a5..7690eac8cd 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <netinet/in.h> diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h index a2dd9ae1ff..20afab05fd 100644 --- a/src/resolve/resolved-manager.h +++ b/src/resolve/resolved-manager.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/resolve/resolved-mdns.c b/src/resolve/resolved-mdns.c index 921720febf..a093747198 100644 --- a/src/resolve/resolved-mdns.c +++ b/src/resolve/resolved-mdns.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <resolv.h> #include <netinet/in.h> diff --git a/src/resolve/resolved-mdns.h b/src/resolve/resolved-mdns.h index 2f69478681..38ef1808df 100644 --- a/src/resolve/resolved-mdns.h +++ b/src/resolve/resolved-mdns.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "resolved-manager.h" diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c index a26fe8393a..6fd9959daf 100644 --- a/src/resolve/resolved-resolv-conf.c +++ b/src/resolve/resolved-resolv-conf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <resolv.h> #include <sys/stat.h> diff --git a/src/resolve/resolved-resolv-conf.h b/src/resolve/resolved-resolv-conf.h index 584d25c0f7..3734e28a99 100644 --- a/src/resolve/resolved-resolv-conf.h +++ b/src/resolve/resolved-resolv-conf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "resolved-manager.h" diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c index 2f11a78091..70d6f9056d 100644 --- a/src/resolve/resolved-varlink.c +++ b/src/resolve/resolved-varlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "in-addr-util.h" #include "resolved-dns-synthesize.h" diff --git a/src/resolve/resolved-varlink.h b/src/resolve/resolved-varlink.h index cfb90e5e5e..57fdfe909b 100644 --- a/src/resolve/resolved-varlink.h +++ b/src/resolve/resolved-varlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "resolved-manager.h" diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c index 16477f28d6..fd9be30dcf 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c index bdd96aa9a2..47c7d671cd 100644 --- a/src/resolve/test-dns-packet.c +++ b/src/resolve/test-dns-packet.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/resolve/test-dnssec-complex.c b/src/resolve/test-dnssec-complex.c index ccd62a14d1..e21eb86756 100644 --- a/src/resolve/test-dnssec-complex.c +++ b/src/resolve/test-dnssec-complex.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/ip.h> diff --git a/src/resolve/test-dnssec.c b/src/resolve/test-dnssec.c index 213177d4da..0275d0eb94 100644 --- a/src/resolve/test-dnssec.c +++ b/src/resolve/test-dnssec.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #if HAVE_GCRYPT diff --git a/src/resolve/test-resolve-tables.c b/src/resolve/test-resolve-tables.c index 2230a66ef5..e4f4e14cc3 100644 --- a/src/resolve/test-resolve-tables.c +++ b/src/resolve/test-resolve-tables.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "dns-type.h" #include "resolved-dns-dnssec.h" diff --git a/src/resolve/test-resolved-etc-hosts.c b/src/resolve/test-resolved-etc-hosts.c index 721bf8732e..045952e825 100644 --- a/src/resolve/test-resolved-etc-hosts.c +++ b/src/resolve/test-resolved-etc-hosts.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <netinet/in.h> diff --git a/src/resolve/test-resolved-packet.c b/src/resolve/test-resolved-packet.c index c9a511beba..cd93b1c23d 100644 --- a/src/resolve/test-resolved-packet.c +++ b/src/resolve/test-resolved-packet.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "log.h" #include "resolved-dns-packet.h" diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index 501982819a..c38716842b 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <linux/rfkill.h> diff --git a/src/run-generator/run-generator.c b/src/run-generator/run-generator.c index a149b9c9c2..11e7d9e831 100644 --- a/src/run-generator/run-generator.c +++ b/src/run-generator/run-generator.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/run/run.c b/src/run/run.c index 4179624313..b4cc6fe7f8 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <stdio.h> diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index 7a2767c37b..ef4b88361f 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.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/shared/acl-util.h b/src/shared/acl-util.h index b6a6f480f8..837e8699ee 100644 --- a/src/shared/acl-util.h +++ b/src/shared/acl-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/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c index 38c464c912..1124453799 100644 --- a/src/shared/acpi-fpdt.c +++ b/src/shared/acpi-fpdt.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/shared/acpi-fpdt.h b/src/shared/acpi-fpdt.h index 8d288937ef..9eef92bc35 100644 --- a/src/shared/acpi-fpdt.h +++ b/src/shared/acpi-fpdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <time-util.h> diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c index c4a4b04d22..68e1c557c0 100644 --- a/src/shared/apparmor-util.c +++ b/src/shared/apparmor-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> diff --git a/src/shared/apparmor-util.h b/src/shared/apparmor-util.h index 7fbaf90dcc..8007aeb695 100644 --- a/src/shared/apparmor-util.h +++ b/src/shared/apparmor-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/shared/ask-password-api.c b/src/shared/ask-password-api.c index a727b98e7c..e1c9fe40f8 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.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/shared/ask-password-api.h b/src/shared/ask-password-api.h index 528e3d0197..7aac5e5976 100644 --- a/src/shared/ask-password-api.h +++ b/src/shared/ask-password-api.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/shared/barrier.c b/src/shared/barrier.c index 80b597b5ca..9c93d61a3c 100644 --- a/src/shared/barrier.c +++ b/src/shared/barrier.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/shared/barrier.h b/src/shared/barrier.h index 0eb3d2792e..b11dce4fc0 100644 --- a/src/shared/barrier.h +++ b/src/shared/barrier.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/shared/base-filesystem.c b/src/shared/base-filesystem.c index 657407da2d..1d05409086 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.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/shared/base-filesystem.h b/src/shared/base-filesystem.h index 39d970811d..a33975f3b5 100644 --- a/src/shared/base-filesystem.h +++ b/src/shared/base-filesystem.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/shared/binfmt-util.c b/src/shared/binfmt-util.c index c673c0435d..724d7f27d9 100644 --- a/src/shared/binfmt-util.c +++ b/src/shared/binfmt-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/statvfs.h> diff --git a/src/shared/binfmt-util.h b/src/shared/binfmt-util.h index 70feaad314..2f008d12ff 100644 --- a/src/shared/binfmt-util.h +++ b/src/shared/binfmt-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int disable_binfmt(void); diff --git a/src/shared/bitmap.c b/src/shared/bitmap.c index 2eba72dd59..5d450c8832 100644 --- a/src/shared/bitmap.c +++ b/src/shared/bitmap.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/shared/bitmap.h b/src/shared/bitmap.h index 312cee9ce7..1c305a2c41 100644 --- a/src/shared/bitmap.h +++ b/src/shared/bitmap.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/shared/blkid-util.h b/src/shared/blkid-util.h index eb07a88ba9..3f38e9b308 100644 --- a/src/shared/blkid-util.h +++ b/src/shared/blkid-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if HAVE_BLKID diff --git a/src/shared/bond-util.c b/src/shared/bond-util.c index 2296ecd9de..e04b201155 100644 --- a/src/shared/bond-util.c +++ b/src/shared/bond-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bond-util.h" #include "string-table.h" diff --git a/src/shared/bond-util.h b/src/shared/bond-util.h index 66f86e77fa..a8f9ecb454 100644 --- a/src/shared/bond-util.h +++ b/src/shared/bond-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/shared/boot-timestamps.c b/src/shared/boot-timestamps.c index 4ce146033d..8786e89c0e 100644 --- a/src/shared/boot-timestamps.c +++ b/src/shared/boot-timestamps.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "acpi-fpdt.h" #include "boot-timestamps.h" diff --git a/src/shared/boot-timestamps.h b/src/shared/boot-timestamps.h index 4e648f18e2..55b7ad19aa 100644 --- a/src/shared/boot-timestamps.h +++ b/src/shared/boot-timestamps.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <time-util.h> diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index 189fa25639..e50408ab53 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <linux/magic.h> diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h index 1075a41d54..1557bd0680 100644 --- a/src/shared/bootspec.h +++ b/src/shared/bootspec.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/shared/bpf-program.c b/src/shared/bpf-program.c index e5c9df4004..32881477d5 100644 --- a/src/shared/bpf-program.c +++ b/src/shared/bpf-program.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/shared/bpf-program.h b/src/shared/bpf-program.h index a21589eb1f..eef77f9d8e 100644 --- a/src/shared/bpf-program.h +++ b/src/shared/bpf-program.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <linux/bpf.h> diff --git a/src/shared/bridge-util.c b/src/shared/bridge-util.c index 83a94ef104..e1a8bcb680 100644 --- a/src/shared/bridge-util.c +++ b/src/shared/bridge-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bridge-util.h" #include "string-table.h" diff --git a/src/shared/bridge-util.h b/src/shared/bridge-util.h index 5b1c3e9ea9..c9b02d822f 100644 --- a/src/shared/bridge-util.h +++ b/src/shared/bridge-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/shared/bus-get-properties.c b/src/shared/bus-get-properties.c index 5a123bb8f3..32f68d5e6a 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-get-properties.h" #include "rlimit-util.h" diff --git a/src/shared/bus-get-properties.h b/src/shared/bus-get-properties.h index f3934a86a2..9832c0d067 100644 --- a/src/shared/bus-get-properties.h +++ b/src/shared/bus-get-properties.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-locator.c b/src/shared/bus-locator.c index 2a5aa74677..3754d1dd68 100644 --- a/src/shared/bus-locator.c +++ b/src/shared/bus-locator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-locator.h" #include "macro.h" diff --git a/src/shared/bus-locator.h b/src/shared/bus-locator.h index 2b892360b8..fe3b876527 100644 --- a/src/shared/bus-locator.h +++ b/src/shared/bus-locator.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-log-control-api.c b/src/shared/bus-log-control-api.c index 7c487ada9f..06e6697a33 100644 --- a/src/shared/bus-log-control-api.c +++ b/src/shared/bus-log-control-api.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-get-properties.h" diff --git a/src/shared/bus-log-control-api.h b/src/shared/bus-log-control-api.h index 64eaa540f4..85f60a7a2f 100644 --- a/src/shared/bus-log-control-api.h +++ b/src/shared/bus-log-control-api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-map-properties.c b/src/shared/bus-map-properties.c index 5cc8ce222d..84608567aa 100644 --- a/src/shared/bus-map-properties.c +++ b/src/shared/bus-map-properties.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-map-properties.h" #include "alloc-util.h" diff --git a/src/shared/bus-map-properties.h b/src/shared/bus-map-properties.h index 94242ecc3f..2a766e3cc0 100644 --- a/src/shared/bus-map-properties.h +++ b/src/shared/bus-map-properties.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-message-util.c b/src/shared/bus-message-util.c index 85e1e98e19..19500a552d 100644 --- a/src/shared/bus-message-util.c +++ b/src/shared/bus-message-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-message-util.h" diff --git a/src/shared/bus-message-util.h b/src/shared/bus-message-util.h index 98ad035ee4..b82c0830a0 100644 --- a/src/shared/bus-message-util.h +++ b/src/shared/bus-message-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-object.c b/src/shared/bus-object.c index 217d43d333..f2e53913fb 100644 --- a/src/shared/bus-object.c +++ b/src/shared/bus-object.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-introspect.h" #include "bus-object.h" diff --git a/src/shared/bus-object.h b/src/shared/bus-object.h index 8add854e59..145bbd268f 100644 --- a/src/shared/bus-object.h +++ b/src/shared/bus-object.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/shared/bus-polkit.c b/src/shared/bus-polkit.c index 0722b1a118..14122e0876 100644 --- a/src/shared/bus-polkit.c +++ b/src/shared/bus-polkit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-internal.h" #include "bus-message.h" diff --git a/src/shared/bus-polkit.h b/src/shared/bus-polkit.h index 29b3923047..91a88a2807 100644 --- a/src/shared/bus-polkit.h +++ b/src/shared/bus-polkit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c index bf7d050fa3..4cea25073d 100644 --- a/src/shared/bus-print-properties.c +++ b/src/shared/bus-print-properties.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-print-properties.h" #include "cap-list.h" diff --git a/src/shared/bus-print-properties.h b/src/shared/bus-print-properties.h index 1c21dff2c8..a4574758e5 100644 --- a/src/shared/bus-print-properties.h +++ b/src/shared/bus-print-properties.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/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c index 5ae54efb19..3e97be9671 100644 --- a/src/shared/bus-unit-procs.c +++ b/src/shared/bus-unit-procs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-unit-procs.h" #include "hashmap.h" diff --git a/src/shared/bus-unit-procs.h b/src/shared/bus-unit-procs.h index 1cb5ca6271..78c55697ae 100644 --- a/src/shared/bus-unit-procs.h +++ b/src/shared/bus-unit-procs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 79c2e0cf19..fe3a41f438 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-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 "bus-error.h" diff --git a/src/shared/bus-unit-util.h b/src/shared/bus-unit-util.h index 544767b033..999caf65cd 100644 --- a/src/shared/bus-unit-util.h +++ b/src/shared/bus-unit-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index aa5dadba45..fbda218b3b 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-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/shared/bus-util.h b/src/shared/bus-util.h index 1a1389fd1e..a02d82a52e 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-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/shared/bus-wait-for-jobs.c b/src/shared/bus-wait-for-jobs.c index eb33ba2340..b2a9e031ce 100644 --- a/src/shared/bus-wait-for-jobs.c +++ b/src/shared/bus-wait-for-jobs.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-wait-for-jobs.h" diff --git a/src/shared/bus-wait-for-jobs.h b/src/shared/bus-wait-for-jobs.h index 614a2c9de9..0155887455 100644 --- a/src/shared/bus-wait-for-jobs.h +++ b/src/shared/bus-wait-for-jobs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c index 7592dcf18d..4f1c505bd3 100644 --- a/src/shared/bus-wait-for-units.c +++ b/src/shared/bus-wait-for-units.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-map-properties.h" #include "bus-wait-for-units.h" diff --git a/src/shared/bus-wait-for-units.h b/src/shared/bus-wait-for-units.h index a20f3d8fd7..f7ab666f15 100644 --- a/src/shared/bus-wait-for-units.h +++ b/src/shared/bus-wait-for-units.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/shared/calendarspec.c b/src/shared/calendarspec.c index bcc51f973c..7162592fbf 100644 --- a/src/shared/calendarspec.c +++ b/src/shared/calendarspec.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/shared/calendarspec.h b/src/shared/calendarspec.h index 0a5d95b4b1..3bfe82d7f6 100644 --- a/src/shared/calendarspec.h +++ b/src/shared/calendarspec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once /* A structure for specifying (possibly repetitive) points in calendar diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c index e9995645eb..f197f715c7 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ftw.h> #include <unistd.h> diff --git a/src/shared/cgroup-setup.h b/src/shared/cgroup-setup.h index 43ce32e30d..7eabce2451 100644 --- a/src/shared/cgroup-setup.h +++ b/src/shared/cgroup-setup.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/shared/cgroup-show.c b/src/shared/cgroup-show.c index b8bf3c2726..f7c24f8860 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <dirent.h> #include <errno.h> diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h index dfb26f8291..fbbf7663b3 100644 --- a/src/shared/cgroup-show.h +++ b/src/shared/cgroup-show.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/shared/chown-recursive.c b/src/shared/chown-recursive.c index cb75d9a11b..4563729b7c 100644 --- a/src/shared/chown-recursive.c +++ b/src/shared/chown-recursive.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/shared/chown-recursive.h b/src/shared/chown-recursive.h index 14a79733f5..00038c3b32 100644 --- a/src/shared/chown-recursive.h +++ b/src/shared/chown-recursive.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/shared/clean-ipc.c b/src/shared/clean-ipc.c index 5d8f66c602..77fe227e36 100644 --- a/src/shared/clean-ipc.c +++ b/src/shared/clean-ipc.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/shared/clean-ipc.h b/src/shared/clean-ipc.h index eaff47d4b7..ed348fb601 100644 --- a/src/shared/clean-ipc.h +++ b/src/shared/clean-ipc.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/shared/clock-util.c b/src/shared/clock-util.c index 8669547c13..2caa70fa52 100644 --- a/src/shared/clock-util.c +++ b/src/shared/clock-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/shared/clock-util.h b/src/shared/clock-util.h index b9db54eac9..3f1ae7abfc 100644 --- a/src/shared/clock-util.h +++ b/src/shared/clock-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <time.h> diff --git a/src/shared/condition.c b/src/shared/condition.c index af5d48f55b..b2ec690bc3 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.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/shared/condition.h b/src/shared/condition.h index e5ad43f945..0d9754eb85 100644 --- a/src/shared/condition.h +++ b/src/shared/condition.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/shared/conf-parser.c b/src/shared/conf-parser.c index 524f57ff80..35d301d9db 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.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/shared/conf-parser.h b/src/shared/conf-parser.h index d2391d43bb..8f8714361d 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.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/shared/coredump-util.c b/src/shared/coredump-util.c index 67897414bc..a0b648bf79 100644 --- a/src/shared/coredump-util.c +++ b/src/shared/coredump-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "coredump-util.h" #include "extract-word.h" diff --git a/src/shared/coredump-util.h b/src/shared/coredump-util.h index ff2e511bf1..a7f3c0e86c 100644 --- a/src/shared/coredump-util.h +++ b/src/shared/coredump-util.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/shared/cpu-set-util.c b/src/shared/cpu-set-util.c index 8779d1d4d3..2c3b5bb034 100644 --- a/src/shared/cpu-set-util.c +++ b/src/shared/cpu-set-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/shared/cpu-set-util.h b/src/shared/cpu-set-util.h index 9ec83f6930..3c63a58826 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.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/shared/cryptsetup-util.c b/src/shared/cryptsetup-util.c index 9d86478b06..34a078e7e7 100644 --- a/src/shared/cryptsetup-util.c +++ b/src/shared/cryptsetup-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_LIBCRYPTSETUP #include "alloc-util.h" diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h index 046953b8cc..b96ffc74e3 100644 --- a/src/shared/cryptsetup-util.h +++ b/src/shared/cryptsetup-util.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/shared/daemon-util.h b/src/shared/daemon-util.h index 04b8245310..585e4894a0 100644 --- a/src/shared/daemon-util.h +++ b/src/shared/daemon-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/shared/dev-setup.c b/src/shared/dev-setup.c index d970640993..b788b06913 100644 --- a/src/shared/dev-setup.c +++ b/src/shared/dev-setup.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/shared/dev-setup.h b/src/shared/dev-setup.h index 437c0e96e6..92ba6cf764 100644 --- a/src/shared/dev-setup.h +++ b/src/shared/dev-setup.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/shared/dissect-image.c b/src/shared/dissect-image.c index 394692093c..b32a8bc4e4 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h index f5db7327bd..3b30e08f90 100644 --- a/src/shared/dissect-image.h +++ b/src/shared/dissect-image.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/shared/dm-util.c b/src/shared/dm-util.c index cfb13bad4c..b48b9b5cbc 100644 --- a/src/shared/dm-util.c +++ b/src/shared/dm-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <linux/dm-ioctl.h> diff --git a/src/shared/dm-util.h b/src/shared/dm-util.h index 997963c042..e6e3d7d8c5 100644 --- a/src/shared/dm-util.h +++ b/src/shared/dm-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int dm_deferred_remove_cancel(const char *name); diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c index 35d2eaa9f1..8bd1e3a6ac 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <endian.h> #include <netinet/in.h> diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h index 60de7af227..77f596294d 100644 --- a/src/shared/dns-domain.h +++ b/src/shared/dns-domain.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/shared/dropin.c b/src/shared/dropin.c index 6c614b5c0a..89f4b8ad89 100644 --- a/src/shared/dropin.c +++ b/src/shared/dropin.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/shared/dropin.h b/src/shared/dropin.h index addf1dab14..54cceaff1a 100644 --- a/src/shared/dropin.h +++ b/src/shared/dropin.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "hashmap.h" diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c index 9411fc8cef..20f70da31a 100644 --- a/src/shared/efi-loader.c +++ b/src/shared/efi-loader.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdlib.h> #include <sys/stat.h> diff --git a/src/shared/efi-loader.h b/src/shared/efi-loader.h index 171274a0e3..34476f4ced 100644 --- a/src/shared/efi-loader.h +++ b/src/shared/efi-loader.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "efivars.h" diff --git a/src/shared/enable-mempool.c b/src/shared/enable-mempool.c index a571b43f57..1abfccbd81 100644 --- a/src/shared/enable-mempool.c +++ b/src/shared/enable-mempool.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "mempool.h" diff --git a/src/shared/env-file-label.c b/src/shared/env-file-label.c index add68d224d..468afce2ba 100644 --- a/src/shared/env-file-label.c +++ b/src/shared/env-file-label.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> diff --git a/src/shared/env-file-label.h b/src/shared/env-file-label.h index 158fc4ec0b..d68058ab2e 100644 --- a/src/shared/env-file-label.h +++ b/src/shared/env-file-label.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once /* These functions are split out of fileio.h (and not for example just flags to the functions they wrap) in order to diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c index e36b4090ad..e60d516126 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> #include <sys/ioctl.h> diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h index 9e3f1ed51a..f94b3e15bf 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.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/shared/exec-util.c b/src/shared/exec-util.c index 8fb936dcce..61ee3b18d5 100644 --- a/src/shared/exec-util.c +++ b/src/shared/exec-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <dirent.h> #include <errno.h> diff --git a/src/shared/exec-util.h b/src/shared/exec-util.h index 9fe9012516..a69d57c7ae 100644 --- a/src/shared/exec-util.h +++ b/src/shared/exec-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/shared/exit-status.c b/src/shared/exit-status.c index e2b6c67953..b71dd7afd5 100644 --- a/src/shared/exit-status.c +++ b/src/shared/exit-status.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <signal.h> #include <stdlib.h> diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h index 7ac99a4810..05707bf722 100644 --- a/src/shared/exit-status.h +++ b/src/shared/exit-status.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/shared/fdset.c b/src/shared/fdset.c index dfe8242fc4..679e4aad22 100644 --- a/src/shared/fdset.c +++ b/src/shared/fdset.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/shared/fdset.h b/src/shared/fdset.h index ceabb82311..39d15ee4aa 100644 --- a/src/shared/fdset.h +++ b/src/shared/fdset.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/shared/fileio-label.c b/src/shared/fileio-label.c index 49ab29720b..d03b0548ec 100644 --- a/src/shared/fileio-label.c +++ b/src/shared/fileio-label.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> diff --git a/src/shared/fileio-label.h b/src/shared/fileio-label.h index 8f88955d81..03b4a16417 100644 --- a/src/shared/fileio-label.h +++ b/src/shared/fileio-label.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/shared/firewall-util.c b/src/shared/firewall-util.c index 4d4d615bb7..007d2cb39b 100644 --- a/src/shared/firewall-util.c +++ b/src/shared/firewall-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Temporary work-around for broken glibc vs. linux kernel header definitions * This is already fixed upstream, remove this when distributions have updated. diff --git a/src/shared/firewall-util.h b/src/shared/firewall-util.h index 4fc71dade2..0a51a3c692 100644 --- a/src/shared/firewall-util.h +++ b/src/shared/firewall-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/shared/format-table.c b/src/shared/format-table.c index 1063baba52..a13a198b7a 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <ctype.h> #include <net/if.h> diff --git a/src/shared/format-table.h b/src/shared/format-table.h index 0d7b7c48c5..965549b60a 100644 --- a/src/shared/format-table.h +++ b/src/shared/format-table.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/shared/fsck-util.h b/src/shared/fsck-util.h index 78ec18dd07..855137c99a 100644 --- a/src/shared/fsck-util.h +++ b/src/shared/fsck-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once /* exit codes as defined in fsck(8) */ diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c index ca88813602..292b97cd69 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-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/shared/fstab-util.h b/src/shared/fstab-util.h index a73575e95c..1a602cb56b 100644 --- a/src/shared/fstab-util.h +++ b/src/shared/fstab-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/shared/generator.c b/src/shared/generator.c index d61b367d33..4d49b7d52b 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/shared/generator.h b/src/shared/generator.h index 579e291fe8..ff6072f53d 100644 --- a/src/shared/generator.h +++ b/src/shared/generator.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/shared/geneve-util.c b/src/shared/geneve-util.c index fad01e208b..36ef9c83c7 100644 --- a/src/shared/geneve-util.c +++ b/src/shared/geneve-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "geneve-util.h" #include "string-table.h" diff --git a/src/shared/geneve-util.h b/src/shared/geneve-util.h index 63c03ae02a..3865f805a4 100644 --- a/src/shared/geneve-util.h +++ b/src/shared/geneve-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_link.h> diff --git a/src/shared/gpt.c b/src/shared/gpt.c index 53a3f4bfe6..ebcaa9d70f 100644 --- a/src/shared/gpt.c +++ b/src/shared/gpt.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "gpt.h" #include "string-util.h" diff --git a/src/shared/gpt.h b/src/shared/gpt.h index b162eb9d0d..94752ea128 100644 --- a/src/shared/gpt.h +++ b/src/shared/gpt.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/shared/group-record.c b/src/shared/group-record.c index d999ff95f8..da3ed0a850 100644 --- a/src/shared/group-record.c +++ b/src/shared/group-record.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "group-record.h" #include "strv.h" diff --git a/src/shared/group-record.h b/src/shared/group-record.h index 85c91eb1f5..f81020437c 100644 --- a/src/shared/group-record.h +++ b/src/shared/group-record.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "json.h" diff --git a/src/shared/id128-print.c b/src/shared/id128-print.c index 6237424e82..f232767adf 100644 --- a/src/shared/id128-print.c +++ b/src/shared/id128-print.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/shared/id128-print.h b/src/shared/id128-print.h index 247558231c..d69cb9b551 100644 --- a/src/shared/id128-print.h +++ b/src/shared/id128-print.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/shared/idn-util.c b/src/shared/idn-util.c index 75d815df38..83c4b3c530 100644 --- a/src/shared/idn-util.c +++ b/src/shared/idn-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_LIBIDN2 # include <idn2.h> diff --git a/src/shared/idn-util.h b/src/shared/idn-util.h index d958559ec9..4698eed3b8 100644 --- a/src/shared/idn-util.h +++ b/src/shared/idn-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if HAVE_LIBIDN2 diff --git a/src/shared/ima-util.c b/src/shared/ima-util.c index 0d4ce3cafc..e37c9ad226 100644 --- a/src/shared/ima-util.c +++ b/src/shared/ima-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/shared/ima-util.h b/src/shared/ima-util.h index 8f20741c33..922db786e6 100644 --- a/src/shared/ima-util.h +++ b/src/shared/ima-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/shared/import-util.c b/src/shared/import-util.c index 0a57c08990..298c066dff 100644 --- a/src/shared/import-util.c +++ b/src/shared/import-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/shared/import-util.h b/src/shared/import-util.h index d85aa565cc..8d017f61d1 100644 --- a/src/shared/import-util.h +++ b/src/shared/import-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/shared/install-printf.c b/src/shared/install-printf.c index 9267d52b96..af350a63a5 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.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/shared/install-printf.h b/src/shared/install-printf.h index fa8ea7ef81..34e129413e 100644 --- a/src/shared/install-printf.h +++ b/src/shared/install-printf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "install.h" diff --git a/src/shared/install.c b/src/shared/install.c index cd14b2c4be..302497a965 100644 --- a/src/shared/install.c +++ b/src/shared/install.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/shared/install.h b/src/shared/install.h index 23ac995332..84bf1f59d2 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef enum UnitFilePresetMode UnitFilePresetMode; diff --git a/src/shared/ip-protocol-list.c b/src/shared/ip-protocol-list.c index aa675ea10b..0623d5e9be 100644 --- a/src/shared/ip-protocol-list.c +++ b/src/shared/ip-protocol-list.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/shared/ip-protocol-list.h b/src/shared/ip-protocol-list.h index 5c94969695..abe3f5fc28 100644 --- a/src/shared/ip-protocol-list.h +++ b/src/shared/ip-protocol-list.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once const char *ip_protocol_to_name(int id); diff --git a/src/shared/ipvlan-util.c b/src/shared/ipvlan-util.c index da6be76789..1f2e2ffe7b 100644 --- a/src/shared/ipvlan-util.c +++ b/src/shared/ipvlan-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/if.h> diff --git a/src/shared/ipvlan-util.h b/src/shared/ipvlan-util.h index dda659d42d..90f755b472 100644 --- a/src/shared/ipvlan-util.h +++ b/src/shared/ipvlan-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/shared/journal-importer.c b/src/shared/journal-importer.c index 7c4fc7021d..e95b638f4d 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h index 783edff5d3..e0073fcea8 100644 --- a/src/shared/journal-importer.h +++ b/src/shared/journal-importer.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/shared/journal-util.c b/src/shared/journal-util.c index 4d0edbb7d0..29659aa6b7 100644 --- a/src/shared/journal-util.c +++ b/src/shared/journal-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "acl-util.h" #include "fs-util.h" diff --git a/src/shared/journal-util.h b/src/shared/journal-util.h index 34ad1bfc8e..db7000ffef 100644 --- a/src/shared/journal-util.h +++ b/src/shared/journal-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/shared/json-internal.h b/src/shared/json-internal.h index fabff0c860..63afd22417 100644 --- a/src/shared/json-internal.h +++ b/src/shared/json-internal.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/shared/json.c b/src/shared/json.c index dc06dcb6b8..ddf6dcb663 100644 --- a/src/shared/json.c +++ b/src/shared/json.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <locale.h> diff --git a/src/shared/json.h b/src/shared/json.h index 1d6fec67b6..0809f3187e 100644 --- a/src/shared/json.h +++ b/src/shared/json.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/shared/libcrypt-util.c b/src/shared/libcrypt-util.c index 8a46ace205..5b315413aa 100644 --- a/src/shared/libcrypt-util.c +++ b/src/shared/libcrypt-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_CRYPT_H /* libxcrypt is a replacement for glibc's libcrypt, and libcrypt might be diff --git a/src/shared/libcrypt-util.h b/src/shared/libcrypt-util.h index 924a35d3e1..5b9b945629 100644 --- a/src/shared/libcrypt-util.h +++ b/src/shared/libcrypt-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/shared/libmount-util.h b/src/shared/libmount-util.h index 7c3b855df5..db9728c332 100644 --- a/src/shared/libmount-util.h +++ b/src/shared/libmount-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/shared/local-addresses.c b/src/shared/local-addresses.c index aaad0d9ff0..7be6b945f2 100644 --- a/src/shared/local-addresses.c +++ b/src/shared/local-addresses.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-netlink.h" diff --git a/src/shared/local-addresses.h b/src/shared/local-addresses.h index e88c5e5d21..c633995dc9 100644 --- a/src/shared/local-addresses.h +++ b/src/shared/local-addresses.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-netlink.h" diff --git a/src/shared/lockfile-util.c b/src/shared/lockfile-util.c index 260c2088d5..6f059abfff 100644 --- a/src/shared/lockfile-util.c +++ b/src/shared/lockfile-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/shared/lockfile-util.h b/src/shared/lockfile-util.h index e0eef34cdc..36063270dd 100644 --- a/src/shared/lockfile-util.h +++ b/src/shared/lockfile-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef struct LockFile { diff --git a/src/shared/log-link.h b/src/shared/log-link.h index b844f9ef81..bb692e0518 100644 --- a/src/shared/log-link.h +++ b/src/shared/log-link.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "log.h" diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index f7d3e01b49..0bcc8f41c9 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.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/shared/logs-show.h b/src/shared/logs-show.h index 345efa4b2b..71ebe13573 100644 --- a/src/shared/logs-show.h +++ b/src/shared/logs-show.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/shared/loop-util.c b/src/shared/loop-util.c index 740dccb935..62d5b7ae8e 100644 --- a/src/shared/loop-util.c +++ b/src/shared/loop-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_VALGRIND_MEMCHECK_H #include <valgrind/memcheck.h> diff --git a/src/shared/loop-util.h b/src/shared/loop-util.h index 16f215b059..9538daea31 100644 --- a/src/shared/loop-util.h +++ b/src/shared/loop-util.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/shared/machine-image.c b/src/shared/machine-image.c index 71d6a2c80b..671a56b9e9 100644 --- a/src/shared/machine-image.c +++ b/src/shared/machine-image.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/shared/machine-image.h b/src/shared/machine-image.h index 9fd45899c8..95a8f5cfbd 100644 --- a/src/shared/machine-image.h +++ b/src/shared/machine-image.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/shared/machine-pool.c b/src/shared/machine-pool.c index 7e3312835d..1f0b0b4730 100644 --- a/src/shared/machine-pool.c +++ b/src/shared/machine-pool.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/shared/machine-pool.h b/src/shared/machine-pool.h index 6f59a18fb6..3f528ab060 100644 --- a/src/shared/machine-pool.h +++ b/src/shared/machine-pool.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/shared/macvlan-util.c b/src/shared/macvlan-util.c index 926b4d42a0..11dffe99b2 100644 --- a/src/shared/macvlan-util.c +++ b/src/shared/macvlan-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-parser.h" #include "macvlan-util.h" diff --git a/src/shared/macvlan-util.h b/src/shared/macvlan-util.h index 7670bbf402..0d3a5f4050 100644 --- a/src/shared/macvlan-util.h +++ b/src/shared/macvlan-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_link.h> diff --git a/src/shared/main-func.h b/src/shared/main-func.h index cf23ad450c..05cdffeec0 100644 --- a/src/shared/main-func.h +++ b/src/shared/main-func.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/shared/meson.build b/src/shared/meson.build index 260ee5a8b6..f30fe44995 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later shared_sources = files(''' acl-util.h diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c index 6289a73399..ce10e60bb6 100644 --- a/src/shared/mkfs-util.c +++ b/src/shared/mkfs-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "id128-util.h" #include "mkfs-util.h" diff --git a/src/shared/mkfs-util.h b/src/shared/mkfs-util.h index 54e9b931e6..7647afbfc7 100644 --- a/src/shared/mkfs-util.h +++ b/src/shared/mkfs-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/shared/module-util.c b/src/shared/module-util.c index e1d394c0e1..587e6369fb 100644 --- a/src/shared/module-util.c +++ b/src/shared/module-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/shared/module-util.h b/src/shared/module-util.h index c386c5b459..4db8c5f04e 100644 --- a/src/shared/module-util.h +++ b/src/shared/module-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <libkmod.h> diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c index 83ce749d12..b19b3849aa 100644 --- a/src/shared/mount-util.c +++ b/src/shared/mount-util.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/shared/mount-util.h b/src/shared/mount-util.h index 63de2c7dff..6202008a81 100644 --- a/src/shared/mount-util.h +++ b/src/shared/mount-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <mntent.h> diff --git a/src/shared/netif-naming-scheme.c b/src/shared/netif-naming-scheme.c index 0a701b0e92..df520ab89e 100644 --- a/src/shared/netif-naming-scheme.c +++ b/src/shared/netif-naming-scheme.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "netif-naming-scheme.h" diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h index db47d2909e..503a74ea33 100644 --- a/src/shared/netif-naming-scheme.h +++ b/src/shared/netif-naming-scheme.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/shared/nscd-flush.c b/src/shared/nscd-flush.c index 10fdbaf326..dfc47c4234 100644 --- a/src/shared/nscd-flush.c +++ b/src/shared/nscd-flush.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/poll.h> #include "fd-util.h" diff --git a/src/shared/nscd-flush.h b/src/shared/nscd-flush.h index 22774bf4b7..5aafa9a24e 100644 --- a/src/shared/nscd-flush.h +++ b/src/shared/nscd-flush.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int nscd_flush_cache(char **databases); diff --git a/src/shared/nsflags.c b/src/shared/nsflags.c index 4dbd18b868..2845041cf4 100644 --- a/src/shared/nsflags.c +++ b/src/shared/nsflags.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/shared/nsflags.h b/src/shared/nsflags.h index 0aeb0bc891..3d774c755c 100644 --- a/src/shared/nsflags.h +++ b/src/shared/nsflags.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "missing_sched.h" diff --git a/src/shared/numa-util.c b/src/shared/numa-util.c index 3ec8ffc5b2..7e41d68662 100644 --- a/src/shared/numa-util.c +++ b/src/shared/numa-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <sched.h> diff --git a/src/shared/numa-util.h b/src/shared/numa-util.h index 2a9ced74e8..2f736c9c35 100644 --- a/src/shared/numa-util.h +++ b/src/shared/numa-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "cpu-set-util.h" diff --git a/src/shared/offline-passwd.c b/src/shared/offline-passwd.c index 2d14a38dfe..b607aacf57 100644 --- a/src/shared/offline-passwd.c +++ b/src/shared/offline-passwd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" #include "fs-util.h" diff --git a/src/shared/offline-passwd.h b/src/shared/offline-passwd.h index 90bdfc79be..587af7b01c 100644 --- a/src/shared/offline-passwd.h +++ b/src/shared/offline-passwd.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/shared/openssl-util.h b/src/shared/openssl-util.h index a7dab530e4..1b49834dd8 100644 --- a/src/shared/openssl-util.h +++ b/src/shared/openssl-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #if HAVE_OPENSSL diff --git a/src/shared/os-util.c b/src/shared/os-util.c index 042e77c8c7..3b7e495846 100644 --- a/src/shared/os-util.c +++ b/src/shared/os-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 "env-file.h" diff --git a/src/shared/os-util.h b/src/shared/os-util.h index b54bb0916d..1d9b0b146b 100644 --- a/src/shared/os-util.h +++ b/src/shared/os-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/shared/output-mode.c b/src/shared/output-mode.c index 107b345538..1645b756df 100644 --- a/src/shared/output-mode.c +++ b/src/shared/output-mode.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "output-mode.h" #include "string-table.h" diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h index 1b4765b3ec..a879054b67 100644 --- a/src/shared/output-mode.h +++ b/src/shared/output-mode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "json.h" diff --git a/src/shared/pager.c b/src/shared/pager.c index 9af7009b3f..cd8a840e57 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.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/shared/pager.h b/src/shared/pager.h index 8299e23856..b3b1b4f6b0 100644 --- a/src/shared/pager.h +++ b/src/shared/pager.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/shared/pam-util.c b/src/shared/pam-util.c index ff44df7762..621e7fe802 100644 --- a/src/shared/pam-util.c +++ b/src/shared/pam-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <security/pam_ext.h> #include <syslog.h> diff --git a/src/shared/pam-util.h b/src/shared/pam-util.h index 26d07b7f0c..41f1835b3c 100644 --- a/src/shared/pam-util.h +++ b/src/shared/pam-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <security/pam_modules.h> diff --git a/src/shared/pe-header.h b/src/shared/pe-header.h index 13cb1d8a15..54433c79b8 100644 --- a/src/shared/pe-header.h +++ b/src/shared/pe-header.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/shared/pkcs11-util.c b/src/shared/pkcs11-util.c index 400cebb66f..e74f0be260 100644 --- a/src/shared/pkcs11-util.c +++ b/src/shared/pkcs11-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> diff --git a/src/shared/pkcs11-util.h b/src/shared/pkcs11-util.h index 959e7c3e0d..f14607de84 100644 --- a/src/shared/pkcs11-util.h +++ b/src/shared/pkcs11-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/shared/pretty-print.c b/src/shared/pretty-print.c index f690f334a2..ca5b25a7ab 100644 --- a/src/shared/pretty-print.c +++ b/src/shared/pretty-print.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/utsname.h> #include <errno.h> diff --git a/src/shared/pretty-print.h b/src/shared/pretty-print.h index b3057ae6b8..4619f4e4d7 100644 --- a/src/shared/pretty-print.h +++ b/src/shared/pretty-print.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once void print_separator(void); diff --git a/src/shared/psi-util.c b/src/shared/psi-util.c index 21e965b04b..7a184d53f7 100644 --- a/src/shared/psi-util.c +++ b/src/shared/psi-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <unistd.h> diff --git a/src/shared/psi-util.h b/src/shared/psi-util.h index 9810dbec6e..415fbbdd47 100644 --- a/src/shared/psi-util.h +++ b/src/shared/psi-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/shared/ptyfwd.c b/src/shared/ptyfwd.c index 6bcdfff41a..754b4f5a94 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.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/shared/ptyfwd.h b/src/shared/ptyfwd.h index 887d3cba53..f0ae6e949d 100644 --- a/src/shared/ptyfwd.h +++ b/src/shared/ptyfwd.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/shared/pwquality-util.c b/src/shared/pwquality-util.c index 67332833a5..4000bef89e 100644 --- a/src/shared/pwquality-util.c +++ b/src/shared/pwquality-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/shared/pwquality-util.h b/src/shared/pwquality-util.h index a49de07990..de288bb017 100644 --- a/src/shared/pwquality-util.h +++ b/src/shared/pwquality-util.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/shared/qrcode-util.c b/src/shared/qrcode-util.c index 96d3df493a..7050e186b7 100644 --- a/src/shared/qrcode-util.c +++ b/src/shared/qrcode-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "qrcode-util.h" diff --git a/src/shared/qrcode-util.h b/src/shared/qrcode-util.h index 036c3f7f90..6fc45c93d1 100644 --- a/src/shared/qrcode-util.h +++ b/src/shared/qrcode-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/shared/reboot-util.c b/src/shared/reboot-util.c index 888f685aed..756f9d30e0 100644 --- a/src/shared/reboot-util.c +++ b/src/shared/reboot-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/shared/reboot-util.h b/src/shared/reboot-util.h index 1e98ee1dba..bbca8b858d 100644 --- a/src/shared/reboot-util.h +++ b/src/shared/reboot-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int update_reboot_parameter_and_warn(const char *parameter, bool keep); diff --git a/src/shared/resize-fs.c b/src/shared/resize-fs.c index 24a17a2ffe..33cb78babf 100644 --- a/src/shared/resize-fs.c +++ b/src/shared/resize-fs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/btrfs.h> #include <linux/magic.h> diff --git a/src/shared/resize-fs.h b/src/shared/resize-fs.h index 92b41d318c..8831fd8b40 100644 --- a/src/shared/resize-fs.h +++ b/src/shared/resize-fs.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/shared/resolve-util.c b/src/shared/resolve-util.c index 615cb6d852..1023b62499 100644 --- a/src/shared/resolve-util.c +++ b/src/shared/resolve-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-parser.h" #include "resolve-util.h" diff --git a/src/shared/resolve-util.h b/src/shared/resolve-util.h index a7a9c77bdf..4ea24a60b3 100644 --- a/src/shared/resolve-util.h +++ b/src/shared/resolve-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c index f6a8e4963d..6ca2c5713d 100644 --- a/src/shared/seccomp-util.c +++ b/src/shared/seccomp-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/shared/seccomp-util.h b/src/shared/seccomp-util.h index ff3b96df4b..610597127e 100644 --- a/src/shared/seccomp-util.h +++ b/src/shared/seccomp-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <seccomp.h> diff --git a/src/shared/securebits-util.c b/src/shared/securebits-util.c index b2abaf4f52..c867807bec 100644 --- a/src/shared/securebits-util.c +++ b/src/shared/securebits-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/shared/securebits-util.h b/src/shared/securebits-util.h index b5ec6ee0e6..f2e65cfcb0 100644 --- a/src/shared/securebits-util.h +++ b/src/shared/securebits-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "missing_securebits.h" diff --git a/src/shared/serialize.c b/src/shared/serialize.c index 00b70a777e..45f57d6a53 100644 --- a/src/shared/serialize.c +++ b/src/shared/serialize.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> diff --git a/src/shared/serialize.h b/src/shared/serialize.h index 9e61c825aa..6d4f1ef418 100644 --- a/src/shared/serialize.h +++ b/src/shared/serialize.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/shared/service-util.c b/src/shared/service-util.c index c9b684fc05..092be6ee7f 100644 --- a/src/shared/service-util.c +++ b/src/shared/service-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <stdio.h> diff --git a/src/shared/service-util.h b/src/shared/service-util.h index 928c5961e7..360341fb2f 100644 --- a/src/shared/service-util.h +++ b/src/shared/service-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "bus-object.h" diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c index 134cedaf8b..cea51482de 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2018 Dell Inc. ***/ diff --git a/src/shared/sleep-config.h b/src/shared/sleep-config.h index 86dfbf19be..4b30e6db53 100644 --- a/src/shared/sleep-config.h +++ b/src/shared/sleep-config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <linux/fiemap.h> diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c index 23970dbe55..4a7007d06e 100644 --- a/src/shared/socket-netlink.c +++ b/src/shared/socket-netlink.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/shared/socket-netlink.h b/src/shared/socket-netlink.h index e6cd7d9bf1..eac599159d 100644 --- a/src/shared/socket-netlink.h +++ b/src/shared/socket-netlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-netlink.h" diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c index ddaebf0f61..1f07b198fa 100644 --- a/src/shared/spawn-ask-password-agent.c +++ b/src/shared/spawn-ask-password-agent.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <signal.h> #include <stdlib.h> diff --git a/src/shared/spawn-ask-password-agent.h b/src/shared/spawn-ask-password-agent.h index 97b12fe268..a76cdb11fe 100644 --- a/src/shared/spawn-ask-password-agent.h +++ b/src/shared/spawn-ask-password-agent.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/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c index 4d6c0cae6c..a0024eb2ea 100644 --- a/src/shared/spawn-polkit-agent.c +++ b/src/shared/spawn-polkit-agent.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <poll.h> diff --git a/src/shared/spawn-polkit-agent.h b/src/shared/spawn-polkit-agent.h index 56b0175944..325dfdde46 100644 --- a/src/shared/spawn-polkit-agent.h +++ b/src/shared/spawn-polkit-agent.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/shared/specifier.c b/src/shared/specifier.c index 112cf6f8fb..86731f8cd2 100644 --- a/src/shared/specifier.c +++ b/src/shared/specifier.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/shared/specifier.h b/src/shared/specifier.h index 50c6cbd6ab..f3c038a1f1 100644 --- a/src/shared/specifier.h +++ b/src/shared/specifier.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "string-util.h" diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c index bd89cb4ef1..e0dd17a2f8 100644 --- a/src/shared/switch-root.c +++ b/src/shared/switch-root.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/shared/switch-root.h b/src/shared/switch-root.h index f4d48cb431..4e04283e53 100644 --- a/src/shared/switch-root.h +++ b/src/shared/switch-root.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/shared/sysctl-util.c b/src/shared/sysctl-util.c index 8543dbd2d0..670c33108b 100644 --- a/src/shared/sysctl-util.c +++ b/src/shared/sysctl-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/shared/sysctl-util.h b/src/shared/sysctl-util.h index 316cfcccf9..32364196f9 100644 --- a/src/shared/sysctl-util.h +++ b/src/shared/sysctl-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/shared/test-tables.h b/src/shared/test-tables.h index 4eeda3b1bb..bb8177b649 100644 --- a/src/shared/test-tables.h +++ b/src/shared/test-tables.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <stdlib.h> diff --git a/src/shared/tests.c b/src/shared/tests.c index 808e2e6040..ab7d799029 100644 --- a/src/shared/tests.c +++ b/src/shared/tests.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sched.h> #include <signal.h> diff --git a/src/shared/tests.h b/src/shared/tests.h index 552e0f2c22..c1350763ad 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.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/shared/tmpfile-util-label.c b/src/shared/tmpfile-util-label.c index c12d7c1375..d37c0b0845 100644 --- a/src/shared/tmpfile-util-label.c +++ b/src/shared/tmpfile-util-label.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> diff --git a/src/shared/tmpfile-util-label.h b/src/shared/tmpfile-util-label.h index 97a875161b..01afc0658d 100644 --- a/src/shared/tmpfile-util-label.h +++ b/src/shared/tmpfile-util-label.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/shared/tomoyo-util.c b/src/shared/tomoyo-util.c index 75c24d8007..2347179cbc 100644 --- a/src/shared/tomoyo-util.c +++ b/src/shared/tomoyo-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/shared/tomoyo-util.h b/src/shared/tomoyo-util.h index 06e8227857..a6ee7d4b26 100644 --- a/src/shared/tomoyo-util.h +++ b/src/shared/tomoyo-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/shared/udev-util.c b/src/shared/udev-util.c index 7bb9f40a75..030922eca9 100644 --- a/src/shared/udev-util.c +++ b/src/shared/udev-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h index 0eb7f81904..270861e55e 100644 --- a/src/shared/udev-util.h +++ b/src/shared/udev-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-device.h" diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c index 201d27ab63..5d5bf7f21d 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.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/shared/uid-range.h b/src/shared/uid-range.h index 49ba38287e..ef168cdb33 100644 --- a/src/shared/uid-range.h +++ b/src/shared/uid-range.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/shared/unit-file.c b/src/shared/unit-file.c index 3b51c7c998..4c307199e6 100644 --- a/src/shared/unit-file.c +++ b/src/shared/unit-file.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-id128.h" diff --git a/src/shared/unit-file.h b/src/shared/unit-file.h index d36bb07cc2..5463b0ab13 100644 --- a/src/shared/unit-file.h +++ b/src/shared/unit-file.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/shared/user-record-nss.c b/src/shared/user-record-nss.c index d06c8abdbe..88b8fc2f8f 100644 --- a/src/shared/user-record-nss.c +++ b/src/shared/user-record-nss.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "errno-util.h" #include "format-util.h" diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h index e2a87f664c..22ab04d6ee 100644 --- a/src/shared/user-record-nss.h +++ b/src/shared/user-record-nss.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/shared/user-record-show.c b/src/shared/user-record-show.c index 9046fafcb2..29790282b4 100644 --- a/src/shared/user-record-show.c +++ b/src/shared/user-record-show.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "format-util.h" #include "fs-util.h" diff --git a/src/shared/user-record-show.h b/src/shared/user-record-show.h index 4dcee180a2..dcef065d92 100644 --- a/src/shared/user-record-show.h +++ b/src/shared/user-record-show.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "user-record.h" diff --git a/src/shared/user-record.c b/src/shared/user-record.c index 7e7b28eb55..afa3986642 100644 --- a/src/shared/user-record.c +++ b/src/shared/user-record.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> diff --git a/src/shared/user-record.h b/src/shared/user-record.h index 2e74b910c2..542a0dc84a 100644 --- a/src/shared/user-record.h +++ b/src/shared/user-record.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/shared/userdb.c b/src/shared/userdb.c index 57e58a61a9..2d480283d1 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/auxv.h> diff --git a/src/shared/userdb.h b/src/shared/userdb.h index 2464f54c3e..ee207b518e 100644 --- a/src/shared/userdb.h +++ b/src/shared/userdb.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/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c index 9edcd8302a..b36bc20512 100644 --- a/src/shared/utmp-wtmp.c +++ b/src/shared/utmp-wtmp.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/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h index fe55bad12d..3e71f76b27 100644 --- a/src/shared/utmp-wtmp.h +++ b/src/shared/utmp-wtmp.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/shared/varlink.c b/src/shared/varlink.c index fabfe78280..e7be33ca70 100644 --- a/src/shared/varlink.c +++ b/src/shared/varlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/poll.h> diff --git a/src/shared/varlink.h b/src/shared/varlink.h index 030db39b2f..7ea1f9113f 100644 --- a/src/shared/varlink.h +++ b/src/shared/varlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-event.h" diff --git a/src/shared/verbs.c b/src/shared/verbs.c index d2744b6918..2d19172c6f 100644 --- a/src/shared/verbs.c +++ b/src/shared/verbs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/shared/verbs.h b/src/shared/verbs.h index b6a1afcdee..245bb37ae4 100644 --- a/src/shared/verbs.h +++ b/src/shared/verbs.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/shared/vlan-util.c b/src/shared/vlan-util.c index 180f56ede8..cb43d50220 100644 --- a/src/shared/vlan-util.c +++ b/src/shared/vlan-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-parser.h" #include "parse-util.h" diff --git a/src/shared/vlan-util.h b/src/shared/vlan-util.h index c55adee3c0..0336908bf3 100644 --- a/src/shared/vlan-util.h +++ b/src/shared/vlan-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/shared/volatile-util.c b/src/shared/volatile-util.c index 5ca6ab3376..3323897a4c 100644 --- a/src/shared/volatile-util.c +++ b/src/shared/volatile-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/shared/volatile-util.h b/src/shared/volatile-util.h index 2d31bb1174..9a1bb384e9 100644 --- a/src/shared/volatile-util.h +++ b/src/shared/volatile-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once typedef enum VolatileMode { diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c index 8c8fef6ca0..d33acafe64 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.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/shared/watchdog.h b/src/shared/watchdog.h index ce739fd8a3..b7587db3ab 100644 --- a/src/shared/watchdog.h +++ b/src/shared/watchdog.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/shared/web-util.c b/src/shared/web-util.c index edf650d200..82cd5fbd6b 100644 --- a/src/shared/web-util.c +++ b/src/shared/web-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdbool.h> diff --git a/src/shared/web-util.h b/src/shared/web-util.h index c9e67e5c0a..ec54669f50 100644 --- a/src/shared/web-util.h +++ b/src/shared/web-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/shared/wifi-util.c b/src/shared/wifi-util.c index 22bb3041fb..ae5cecc25d 100644 --- a/src/shared/wifi-util.c +++ b/src/shared/wifi-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <net/ethernet.h> #include <linux/nl80211.h> diff --git a/src/shared/wifi-util.h b/src/shared/wifi-util.h index c7553fafde..01b0c3c635 100644 --- a/src/shared/wifi-util.h +++ b/src/shared/wifi-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/shared/xml.c b/src/shared/xml.c index 78ac42f080..8ff3feafe4 100644 --- a/src/shared/xml.c +++ b/src/shared/xml.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/shared/xml.h b/src/shared/xml.h index 8da2ff5f75..217b3b0e40 100644 --- a/src/shared/xml.h +++ b/src/shared/xml.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once enum { diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 83c4bf4b3d..ee4e215c57 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2010 ProFUSION embedded systems ***/ diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 6eebaf7abc..e6542c2716 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2010 ProFUSION embedded systems ***/ diff --git a/src/shutdown/umount.h b/src/shutdown/umount.h index b01062484f..fac1a12406 100644 --- a/src/shutdown/umount.h +++ b/src/shutdown/umount.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/sleep/sleep.c b/src/sleep/sleep.c index 6bb1a04793..39ab554290 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2010-2017 Canonical Copyright © 2018 Dell Inc. diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index 64dd623c80..4391d9f1f5 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.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/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c index ca145aebf9..81d50717b2 100644 --- a/src/stdio-bridge/stdio-bridge.c +++ b/src/stdio-bridge/stdio-bridge.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c index 4cf9d22c87..b0d71ff580 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2017 Felipe Sateler ***/ diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index e44a0433b1..e263d459a8 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index 666affca19..26874cf877 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/system-update-generator/system-update-generator.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <unistd.h> diff --git a/src/systemctl/systemctl-add-dependency.c b/src/systemctl/systemctl-add-dependency.c index 049719acdf..2a0290de7f 100644 --- a/src/systemctl/systemctl-add-dependency.c +++ b/src/systemctl/systemctl-add-dependency.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-add-dependency.h b/src/systemctl/systemctl-add-dependency.h index 14572d520e..deb0da4f30 100644 --- a/src/systemctl/systemctl-add-dependency.h +++ b/src/systemctl/systemctl-add-dependency.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int add_dependency(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-cancel-job.c b/src/systemctl/systemctl-cancel-job.c index ff211f3a08..4c5203c1f9 100644 --- a/src/systemctl/systemctl-cancel-job.c +++ b/src/systemctl/systemctl-cancel-job.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-cancel-job.h b/src/systemctl/systemctl-cancel-job.h index f337beac46..75151d67fc 100644 --- a/src/systemctl/systemctl-cancel-job.h +++ b/src/systemctl/systemctl-cancel-job.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int cancel_job(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-clean-or-freeze.c b/src/systemctl/systemctl-clean-or-freeze.c index ca15f75146..eca3a6d354 100644 --- a/src/systemctl/systemctl-clean-or-freeze.c +++ b/src/systemctl/systemctl-clean-or-freeze.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-clean-or-freeze.h b/src/systemctl/systemctl-clean-or-freeze.h index 5db9871e51..8e73f4efbe 100644 --- a/src/systemctl/systemctl-clean-or-freeze.h +++ b/src/systemctl/systemctl-clean-or-freeze.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int clean_or_freeze_unit(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-compat-halt.c b/src/systemctl/systemctl-compat-halt.c index dd76d8ee34..8e41bd6cb8 100644 --- a/src/systemctl/systemctl-compat-halt.c +++ b/src/systemctl/systemctl-compat-halt.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <unistd.h> diff --git a/src/systemctl/systemctl-compat-halt.h b/src/systemctl/systemctl-compat-halt.h index da89aa5763..85b9dda0e4 100644 --- a/src/systemctl/systemctl-compat-halt.h +++ b/src/systemctl/systemctl-compat-halt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int halt_parse_argv(int argc, char *argv[]); diff --git a/src/systemctl/systemctl-compat-runlevel.c b/src/systemctl/systemctl-compat-runlevel.c index 39dbba861e..e05b1b4705 100644 --- a/src/systemctl/systemctl-compat-runlevel.c +++ b/src/systemctl/systemctl-compat-runlevel.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/systemctl/systemctl-compat-runlevel.h b/src/systemctl/systemctl-compat-runlevel.h index 5c89f3decc..658524bf1e 100644 --- a/src/systemctl/systemctl-compat-runlevel.h +++ b/src/systemctl/systemctl-compat-runlevel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int runlevel_parse_argv(int argc, char *argv[]); diff --git a/src/systemctl/systemctl-compat-shutdown.c b/src/systemctl/systemctl-compat-shutdown.c index aca90c93c2..0c7d18b6d4 100644 --- a/src/systemctl/systemctl-compat-shutdown.c +++ b/src/systemctl/systemctl-compat-shutdown.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/systemctl/systemctl-compat-shutdown.h b/src/systemctl/systemctl-compat-shutdown.h index 79a317d053..7acf9414c9 100644 --- a/src/systemctl/systemctl-compat-shutdown.h +++ b/src/systemctl/systemctl-compat-shutdown.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int shutdown_parse_argv(int argc, char *argv[]); diff --git a/src/systemctl/systemctl-compat-telinit.c b/src/systemctl/systemctl-compat-telinit.c index 35437ab4c1..148574d52c 100644 --- a/src/systemctl/systemctl-compat-telinit.c +++ b/src/systemctl/systemctl-compat-telinit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/systemctl/systemctl-compat-telinit.h b/src/systemctl/systemctl-compat-telinit.h index ed3e08ef9b..1a2bcd4405 100644 --- a/src/systemctl/systemctl-compat-telinit.h +++ b/src/systemctl/systemctl-compat-telinit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int telinit_parse_argv(int argc, char *argv[]); diff --git a/src/systemctl/systemctl-daemon-reload.c b/src/systemctl/systemctl-daemon-reload.c index 6730877e6d..03ba908383 100644 --- a/src/systemctl/systemctl-daemon-reload.c +++ b/src/systemctl/systemctl-daemon-reload.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-daemon-reload.h b/src/systemctl/systemctl-daemon-reload.h index 01fd500bf6..a9fc00770a 100644 --- a/src/systemctl/systemctl-daemon-reload.h +++ b/src/systemctl/systemctl-daemon-reload.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int daemon_reload(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c index d6f595d477..f6e8671a38 100644 --- a/src/systemctl/systemctl-edit.c +++ b/src/systemctl/systemctl-edit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "copy.h" diff --git a/src/systemctl/systemctl-edit.h b/src/systemctl/systemctl-edit.h index 98cb942688..fe7e4dc757 100644 --- a/src/systemctl/systemctl-edit.h +++ b/src/systemctl/systemctl-edit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int cat(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c index c9daeb15ba..8f053ca649 100644 --- a/src/systemctl/systemctl-enable.c +++ b/src/systemctl/systemctl-enable.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-enable.h b/src/systemctl/systemctl-enable.h index 33802b437b..43f60e78e3 100644 --- a/src/systemctl/systemctl-enable.h +++ b/src/systemctl/systemctl-enable.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int enable_unit(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-is-active.c b/src/systemctl/systemctl-is-active.c index 18eba2d82e..3d99b0deb6 100644 --- a/src/systemctl/systemctl-is-active.c +++ b/src/systemctl/systemctl-is-active.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-is-active.h b/src/systemctl/systemctl-is-active.h index 18b0e1d9aa..9a5238e8c0 100644 --- a/src/systemctl/systemctl-is-active.h +++ b/src/systemctl/systemctl-is-active.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int check_unit_active(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-is-enabled.c b/src/systemctl/systemctl-is-enabled.c index dd64d2e8be..02ef8df86e 100644 --- a/src/systemctl/systemctl-is-enabled.c +++ b/src/systemctl/systemctl-is-enabled.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-is-enabled.h b/src/systemctl/systemctl-is-enabled.h index 860153e420..5cb9e5c537 100644 --- a/src/systemctl/systemctl-is-enabled.h +++ b/src/systemctl/systemctl-is-enabled.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int unit_is_enabled(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-is-system-running.c b/src/systemctl/systemctl-is-system-running.c index 96186ee6e6..ecebf0d114 100644 --- a/src/systemctl/systemctl-is-system-running.c +++ b/src/systemctl/systemctl-is-system-running.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-event.h" #include "sd-daemon.h" diff --git a/src/systemctl/systemctl-is-system-running.h b/src/systemctl/systemctl-is-system-running.h index c955f32e2d..3d7e9fb83d 100644 --- a/src/systemctl/systemctl-is-system-running.h +++ b/src/systemctl/systemctl-is-system-running.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int is_system_running(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-kill.c b/src/systemctl/systemctl-kill.c index 258546f7c1..810aad108a 100644 --- a/src/systemctl/systemctl-kill.c +++ b/src/systemctl/systemctl-kill.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-kill.h b/src/systemctl/systemctl-kill.h index d904612e4e..a42d4f1f90 100644 --- a/src/systemctl/systemctl-kill.h +++ b/src/systemctl/systemctl-kill.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int kill_unit(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-list-dependencies.c b/src/systemctl/systemctl-list-dependencies.c index 9aedcc530f..821998eb4f 100644 --- a/src/systemctl/systemctl-list-dependencies.c +++ b/src/systemctl/systemctl-list-dependencies.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "locale-util.h" #include "sort-util.h" diff --git a/src/systemctl/systemctl-list-dependencies.h b/src/systemctl/systemctl-list-dependencies.h index cdc7fc2f64..7246570144 100644 --- a/src/systemctl/systemctl-list-dependencies.h +++ b/src/systemctl/systemctl-list-dependencies.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int list_dependencies(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-list-jobs.c b/src/systemctl/systemctl-list-jobs.c index 64a8d6779c..8b028c013a 100644 --- a/src/systemctl/systemctl-list-jobs.c +++ b/src/systemctl/systemctl-list-jobs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-list-jobs.h b/src/systemctl/systemctl-list-jobs.h index 40d6e83108..aa49696394 100644 --- a/src/systemctl/systemctl-list-jobs.h +++ b/src/systemctl/systemctl-list-jobs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int list_jobs(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-list-machines.c b/src/systemctl/systemctl-list-machines.c index 424778c803..48d0e8bde4 100644 --- a/src/systemctl/systemctl-list-machines.c +++ b/src/systemctl/systemctl-list-machines.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/systemctl/systemctl-list-machines.h b/src/systemctl/systemctl-list-machines.h index c20b0e9086..4a33e2b27c 100644 --- a/src/systemctl/systemctl-list-machines.h +++ b/src/systemctl/systemctl-list-machines.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/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c index 508909a373..e1bf876620 100644 --- a/src/systemctl/systemctl-list-unit-files.c +++ b/src/systemctl/systemctl-list-unit-files.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-list-unit-files.h b/src/systemctl/systemctl-list-unit-files.h index 12f84923a4..387233e01c 100644 --- a/src/systemctl/systemctl-list-unit-files.h +++ b/src/systemctl/systemctl-list-unit-files.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int list_unit_files(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-list-units.c b/src/systemctl/systemctl-list-units.c index 15d8e4b234..0801912396 100644 --- a/src/systemctl/systemctl-list-units.c +++ b/src/systemctl/systemctl-list-units.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-login.h" diff --git a/src/systemctl/systemctl-list-units.h b/src/systemctl/systemctl-list-units.h index a4c9775837..ef27627712 100644 --- a/src/systemctl/systemctl-list-units.h +++ b/src/systemctl/systemctl-list-units.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int list_units(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-log-setting.c b/src/systemctl/systemctl-log-setting.c index 435ab0e480..64984e4a81 100644 --- a/src/systemctl/systemctl-log-setting.c +++ b/src/systemctl/systemctl-log-setting.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-log-setting.h b/src/systemctl/systemctl-log-setting.h index 7e134a1060..9a2e793f03 100644 --- a/src/systemctl/systemctl-log-setting.h +++ b/src/systemctl/systemctl-log-setting.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int log_setting(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-logind.c b/src/systemctl/systemctl-logind.c index 7cd727986b..405f12a33d 100644 --- a/src/systemctl/systemctl-logind.c +++ b/src/systemctl/systemctl-logind.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/systemctl/systemctl-logind.h b/src/systemctl/systemctl-logind.h index a9399e611e..144056b939 100644 --- a/src/systemctl/systemctl-logind.h +++ b/src/systemctl/systemctl-logind.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "systemctl.h" diff --git a/src/systemctl/systemctl-preset-all.c b/src/systemctl/systemctl-preset-all.c index 2fada83958..b5eb199f4a 100644 --- a/src/systemctl/systemctl-preset-all.c +++ b/src/systemctl/systemctl-preset-all.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-preset-all.h b/src/systemctl/systemctl-preset-all.h index 408e43b599..f4f6790404 100644 --- a/src/systemctl/systemctl-preset-all.h +++ b/src/systemctl/systemctl-preset-all.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int preset_all(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-reset-failed.c b/src/systemctl/systemctl-reset-failed.c index bf7e26dcb7..eee7586465 100644 --- a/src/systemctl/systemctl-reset-failed.c +++ b/src/systemctl/systemctl-reset-failed.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-reset-failed.h b/src/systemctl/systemctl-reset-failed.h index b7902ce716..956bb469df 100644 --- a/src/systemctl/systemctl-reset-failed.h +++ b/src/systemctl/systemctl-reset-failed.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int reset_failed(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-service-watchdogs.c b/src/systemctl/systemctl-service-watchdogs.c index 6a954bfa43..e579851097 100644 --- a/src/systemctl/systemctl-service-watchdogs.c +++ b/src/systemctl/systemctl-service-watchdogs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-service-watchdogs.h b/src/systemctl/systemctl-service-watchdogs.h index 8189376f1d..11a53dbbf1 100644 --- a/src/systemctl/systemctl-service-watchdogs.h +++ b/src/systemctl/systemctl-service-watchdogs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int service_watchdogs(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-set-default.c b/src/systemctl/systemctl-set-default.c index 423d881dac..05c1894b1d 100644 --- a/src/systemctl/systemctl-set-default.c +++ b/src/systemctl/systemctl-set-default.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-set-default.h b/src/systemctl/systemctl-set-default.h index 2067c8c0d0..839b2c9b9f 100644 --- a/src/systemctl/systemctl-set-default.h +++ b/src/systemctl/systemctl-set-default.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int get_default(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-set-environment.c b/src/systemctl/systemctl-set-environment.c index 4d17c91df2..b68e6f6f66 100644 --- a/src/systemctl/systemctl-set-environment.c +++ b/src/systemctl/systemctl-set-environment.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-set-environment.h b/src/systemctl/systemctl-set-environment.h index 57e51d483c..bd05e318ad 100644 --- a/src/systemctl/systemctl-set-environment.h +++ b/src/systemctl/systemctl-set-environment.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int show_environment(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-set-property.c b/src/systemctl/systemctl-set-property.c index 891b67eae7..183a7b6a8a 100644 --- a/src/systemctl/systemctl-set-property.c +++ b/src/systemctl/systemctl-set-property.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-set-property.h b/src/systemctl/systemctl-set-property.h index e431de5533..74990e7cba 100644 --- a/src/systemctl/systemctl-set-property.h +++ b/src/systemctl/systemctl-set-property.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int set_property(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 119825f86e..fabaa545e1 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> diff --git a/src/systemctl/systemctl-show.h b/src/systemctl/systemctl-show.h index b4e5dda5b7..d778bebb43 100644 --- a/src/systemctl/systemctl-show.h +++ b/src/systemctl/systemctl-show.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int show(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-start-special.c b/src/systemctl/systemctl-start-special.c index 46f58ff921..15d2ea7941 100644 --- a/src/systemctl/systemctl-start-special.c +++ b/src/systemctl/systemctl-start-special.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bootspec.h" #include "bus-error.h" diff --git a/src/systemctl/systemctl-start-special.h b/src/systemctl/systemctl-start-special.h index 43a31ba287..06875e9c63 100644 --- a/src/systemctl/systemctl-start-special.h +++ b/src/systemctl/systemctl-start-special.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int start_special(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-start-unit.c b/src/systemctl/systemctl-start-unit.c index bd78568a2d..b398e77eb2 100644 --- a/src/systemctl/systemctl-start-unit.c +++ b/src/systemctl/systemctl-start-unit.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/systemctl/systemctl-start-unit.h b/src/systemctl/systemctl-start-unit.h index 3f827405cc..915c6fa7fb 100644 --- a/src/systemctl/systemctl-start-unit.h +++ b/src/systemctl/systemctl-start-unit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "systemctl.h" diff --git a/src/systemctl/systemctl-switch-root.c b/src/systemctl/systemctl-switch-root.c index ebcc66a30d..9ed40e6ec3 100644 --- a/src/systemctl/systemctl-switch-root.c +++ b/src/systemctl/systemctl-switch-root.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-switch-root.h b/src/systemctl/systemctl-switch-root.h index 47ed852c63..6e13961ab7 100644 --- a/src/systemctl/systemctl-switch-root.h +++ b/src/systemctl/systemctl-switch-root.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int switch_root(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c index 2dca9e480f..a78fa1e04c 100644 --- a/src/systemctl/systemctl-sysv-compat.c +++ b/src/systemctl/systemctl-sysv-compat.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/systemctl/systemctl-sysv-compat.h b/src/systemctl/systemctl-sysv-compat.h index 9a3b84deda..86fd3ec186 100644 --- a/src/systemctl/systemctl-sysv-compat.h +++ b/src/systemctl/systemctl-sysv-compat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "time-util.h" diff --git a/src/systemctl/systemctl-trivial-method.c b/src/systemctl/systemctl-trivial-method.c index 1f1181f213..c0b4d489a2 100644 --- a/src/systemctl/systemctl-trivial-method.c +++ b/src/systemctl/systemctl-trivial-method.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-error.h" #include "bus-locator.h" diff --git a/src/systemctl/systemctl-trivial-method.h b/src/systemctl/systemctl-trivial-method.h index 044540bd90..6dcd152845 100644 --- a/src/systemctl/systemctl-trivial-method.h +++ b/src/systemctl/systemctl-trivial-method.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once int trivial_method(int argc, char *argv[], void *userdata); diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c index 603b1ea4fc..9713fce7af 100644 --- a/src/systemctl/systemctl-util.c +++ b/src/systemctl/systemctl-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/reboot.h> #include <unistd.h> diff --git a/src/systemctl/systemctl-util.h b/src/systemctl/systemctl-util.h index 3693f1d678..6445bb4887 100644 --- a/src/systemctl/systemctl-util.h +++ b/src/systemctl/systemctl-util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 075159ea57..d002d933ae 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/systemctl/systemctl.h b/src/systemctl/systemctl.h index 079c108d7d..f8cefc9b01 100644 --- a/src/systemctl/systemctl.h +++ b/src/systemctl/systemctl.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/systemd/_sd-common.h b/src/systemd/_sd-common.h index 1055b00d07..e3de2ae562 100644 --- a/src/systemd/_sd-common.h +++ b/src/systemd/_sd-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdcommonhfoo #define foosdcommonhfoo diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 62baf7784e..f585b2d75b 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later _systemd_headers = ''' sd-bus.h diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h index 8883ec62b9..ed96cdbab1 100644 --- a/src/systemd/sd-bus-protocol.h +++ b/src/systemd/sd-bus-protocol.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdbusprotocolhfoo #define foosdbusprotocolhfoo diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h index b10a3e04bc..ef57efd595 100644 --- a/src/systemd/sd-bus-vtable.h +++ b/src/systemd/sd-bus-vtable.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdbusvtablehfoo #define foosdbusvtablehfoo diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 9c37e7e6c9..87fbcf366e 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdbushfoo #define foosdbushfoo diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index b47b15a445..f42a5d8966 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddaemonhfoo #define foosddaemonhfoo diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h index 53092d28f9..78fe584160 100644 --- a/src/systemd/sd-device.h +++ b/src/systemd/sd-device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddevicehfoo #define foosddevicehfoo diff --git a/src/systemd/sd-dhcp-client.h b/src/systemd/sd-dhcp-client.h index e0aa93a55b..44bafe6df5 100644 --- a/src/systemd/sd-dhcp-client.h +++ b/src/systemd/sd-dhcp-client.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddhcpclienthfoo #define foosddhcpclienthfoo diff --git a/src/systemd/sd-dhcp-lease.h b/src/systemd/sd-dhcp-lease.h index 17bd491819..c255a1f912 100644 --- a/src/systemd/sd-dhcp-lease.h +++ b/src/systemd/sd-dhcp-lease.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddhcpleasehfoo #define foosddhcpleasehfoo diff --git a/src/systemd/sd-dhcp-option.h b/src/systemd/sd-dhcp-option.h index 45dbd27985..71aa479b5e 100644 --- a/src/systemd/sd-dhcp-option.h +++ b/src/systemd/sd-dhcp-option.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddhcpoptionhfoo #define foosddhcpoptionhfoo diff --git a/src/systemd/sd-dhcp-server.h b/src/systemd/sd-dhcp-server.h index b6a5e9db84..f42c3dbb8b 100644 --- a/src/systemd/sd-dhcp-server.h +++ b/src/systemd/sd-dhcp-server.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddhcpserverhfoo #define foosddhcpserverhfoo diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h index 2b0d63a527..75ee27d68b 100644 --- a/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/sd-dhcp6-client.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddhcp6clienthfoo #define foosddhcp6clienthfoo diff --git a/src/systemd/sd-dhcp6-lease.h b/src/systemd/sd-dhcp6-lease.h index 240df74af8..f77b31acf9 100644 --- a/src/systemd/sd-dhcp6-lease.h +++ b/src/systemd/sd-dhcp6-lease.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddhcp6leasehfoo #define foosddhcp6leasehfoo diff --git a/src/systemd/sd-dhcp6-option.h b/src/systemd/sd-dhcp6-option.h index 88a4986315..ddb2c7cecd 100644 --- a/src/systemd/sd-dhcp6-option.h +++ b/src/systemd/sd-dhcp6-option.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosddhcp6optionhfoo #define foosddhcp6optionhfoo diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index 3a53c3d27d..937c9bd460 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdeventhfoo #define foosdeventhfoo diff --git a/src/systemd/sd-hwdb.h b/src/systemd/sd-hwdb.h index 2b0cd7f5e7..9380759e07 100644 --- a/src/systemd/sd-hwdb.h +++ b/src/systemd/sd-hwdb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdhwdbhfoo #define foosdhwdbhfoo diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h index 9b00b76ea6..02aa318a06 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdid128hfoo #define foosdid128hfoo diff --git a/src/systemd/sd-ipv4acd.h b/src/systemd/sd-ipv4acd.h index ebf723fc22..d900018f42 100644 --- a/src/systemd/sd-ipv4acd.h +++ b/src/systemd/sd-ipv4acd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdipv4acdfoo #define foosdipv4acdfoo diff --git a/src/systemd/sd-ipv4ll.h b/src/systemd/sd-ipv4ll.h index 71bd4cfe48..a0682232e3 100644 --- a/src/systemd/sd-ipv4ll.h +++ b/src/systemd/sd-ipv4ll.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdipv4llfoo #define foosdipv4llfoo diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h index d220f21aa2..03696eb1af 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdjournalhfoo #define foosdjournalhfoo diff --git a/src/systemd/sd-lldp.h b/src/systemd/sd-lldp.h index c2abc20121..f551f6b4fa 100644 --- a/src/systemd/sd-lldp.h +++ b/src/systemd/sd-lldp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdlldphfoo #define foosdlldphfoo diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h index 6a8c206259..6958d99a1e 100644 --- a/src/systemd/sd-login.h +++ b/src/systemd/sd-login.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdloginhfoo #define foosdloginhfoo diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h index eea8c2c900..97ba02ffa8 100644 --- a/src/systemd/sd-messages.h +++ b/src/systemd/sd-messages.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdmessageshfoo #define foosdmessageshfoo diff --git a/src/systemd/sd-ndisc.h b/src/systemd/sd-ndisc.h index 3ddfc8cb6d..c0e37899a7 100644 --- a/src/systemd/sd-ndisc.h +++ b/src/systemd/sd-ndisc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdndiscfoo #define foosdndiscfoo diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h index e01d960e37..bf6d1e47ff 100644 --- a/src/systemd/sd-netlink.h +++ b/src/systemd/sd-netlink.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdnetlinkhfoo #define foosdnetlinkhfoo diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h index 42bcd74b74..7e06251418 100644 --- a/src/systemd/sd-network.h +++ b/src/systemd/sd-network.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdnetworkhfoo #define foosdnetworkhfoo diff --git a/src/systemd/sd-path.h b/src/systemd/sd-path.h index e13e67db8f..5f2f03c27b 100644 --- a/src/systemd/sd-path.h +++ b/src/systemd/sd-path.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdpathhfoo #define foosdpathhfoo diff --git a/src/systemd/sd-radv.h b/src/systemd/sd-radv.h index 0f1437829d..55ddee5731 100644 --- a/src/systemd/sd-radv.h +++ b/src/systemd/sd-radv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdradvfoo #define foosdradvfoo diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h index d78e8db257..ee58d18137 100644 --- a/src/systemd/sd-resolve.h +++ b/src/systemd/sd-resolve.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdresolvehfoo #define foosdresolvehfoo diff --git a/src/systemd/sd-utf8.h b/src/systemd/sd-utf8.h index 151b423d51..57013d011f 100644 --- a/src/systemd/sd-utf8.h +++ b/src/systemd/sd-utf8.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #ifndef foosdutf8hfoo #define foosdutf8hfoo diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index b91f32bbf3..9a8838d5eb 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <utmp.h> diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 7d6be31742..008a8250bb 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.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/test/meson.build b/src/test/meson.build index fd3e53f05b..aed576991f 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later awkscript = 'test-hashmap-ordered.awk' test_hashmap_ordered_c = custom_target( diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c index 08764faa4f..37c8265268 100644 --- a/src/test/test-acl-util.c +++ b/src/test/test-acl-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stdlib.h> diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c index 884372e60e..672dc68be9 100644 --- a/src/test/test-af-list.c +++ b/src/test/test-af-list.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/socket.h> diff --git a/src/test/test-alloc-util.c b/src/test/test-alloc-util.c index 72356aeaa4..b4319f9c7d 100644 --- a/src/test/test-alloc-util.c +++ b/src/test/test-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/test/test-architecture.c b/src/test/test-architecture.c index 8c43bfc750..798c95c0e9 100644 --- a/src/test/test-architecture.c +++ b/src/test/test-architecture.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "architecture.h" #include "log.h" diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c index d7352b54e0..9e21f32189 100644 --- a/src/test/test-arphrd-list.c +++ b/src/test/test-arphrd-list.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/if_arp.h> diff --git a/src/test/test-ask-password-api.c b/src/test/test-ask-password-api.c index 098bb35bce..06158acf12 100644 --- a/src/test/test-ask-password-api.c +++ b/src/test/test-ask-password-api.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "ask-password-api.h" #include "strv.h" diff --git a/src/test/test-async.c b/src/test/test-async.c index 7d8accc2fc..8eefad5044 100644 --- a/src/test/test-async.c +++ b/src/test/test-async.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c index 10417f662f..6ef2998a56 100644 --- a/src/test/test-barrier.c +++ b/src/test/test-barrier.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * IPC barrier tests diff --git a/src/test/test-bitmap.c b/src/test/test-bitmap.c index b281c1ae74..9c5d551d27 100644 --- a/src/test/test-bitmap.c +++ b/src/test/test-bitmap.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bitmap.h" diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c index 29074ecccd..ae5b5821f0 100644 --- a/src/test/test-boot-timestamps.c +++ b/src/test/test-boot-timestamps.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/types.h> #include <unistd.h> diff --git a/src/test/test-bpf-devices.c b/src/test/test-bpf-devices.c index d2740bca73..2c5eb7313b 100644 --- a/src/test/test-bpf-devices.c +++ b/src/test/test-bpf-devices.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/resource.h> #include <sys/time.h> diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c index 71aed12558..cb7d8398a8 100644 --- a/src/test/test-bpf-firewall.c +++ b/src/test/test-bpf-firewall.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/bpf_insn.h> #include <string.h> diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c index 9dbe4dccd1..e840536d4b 100644 --- a/src/test/test-btrfs.c +++ b/src/test/test-btrfs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c index a536608ce0..0381ba1ee4 100644 --- a/src/test/test-bus-util.c +++ b/src/test/test-bus-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "bus-util.h" #include "log.h" diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index d566638d5d..e0b7f22808 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "calendarspec.h" diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c index 81d5c456d7..c5f429d052 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-cap-list.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <sys/prctl.h> diff --git a/src/test/test-capability.c b/src/test/test-capability.c index 2d47c77f46..0ff56070b1 100644 --- a/src/test/test-capability.c +++ b/src/test/test-capability.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> #include <pwd.h> diff --git a/src/test/test-cgroup-cpu.c b/src/test/test-cgroup-cpu.c index a445acc955..be73be83f8 100644 --- a/src/test/test-cgroup-cpu.c +++ b/src/test/test-cgroup-cpu.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "cgroup.h" #include "log.h" diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 27bfcdc17f..b53e327c63 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-cgroup-setup.c b/src/test/test-cgroup-setup.c index 25fa0d75df..72726ca595 100644 --- a/src/test/test-cgroup-setup.c +++ b/src/test/test-cgroup-setup.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/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c index f4843374ea..b03f6ff12e 100644 --- a/src/test/test-cgroup-unit-default.c +++ b/src/test/test-cgroup-unit-default.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index eff586a2e1..41b1df117e 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-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 "build.h" diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c index 4fbb186f52..722e11a0c0 100644 --- a/src/test/test-cgroup.c +++ b/src/test/test-cgroup.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/test/test-chase-symlinks.c b/src/test/test-chase-symlinks.c index f7b3dd5e00..d9b9b62dc5 100644 --- a/src/test/test-chase-symlinks.c +++ b/src/test/test-chase-symlinks.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include "fd-util.h" diff --git a/src/test/test-chown-rec.c b/src/test/test-chown-rec.c index aa11bd270f..66c6fd97d1 100644 --- a/src/test/test-chown-rec.c +++ b/src/test/test-chown-rec.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/xattr.h> #include <unistd.h> diff --git a/src/test/test-clock.c b/src/test/test-clock.c index 271d465546..714935cb81 100644 --- a/src/test/test-clock.c +++ b/src/test/test-clock.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2016 Canonical Ltd. ***/ diff --git a/src/test/test-condition.c b/src/test/test-condition.c index b42de61200..15099d8df8 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <sys/types.h> diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c index f37f32f1b5..ee7bbd1002 100644 --- a/src/test/test-conf-files.c +++ b/src/test/test-conf-files.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2014 Michael Marineau ***/ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index 07edc17f92..04b610c6f1 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "conf-parser.h" #include "fd-util.h" diff --git a/src/test/test-copy.c b/src/test/test-copy.c index 6ed655a358..ffa9297889 100644 --- a/src/test/test-copy.c +++ b/src/test/test-copy.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/xattr.h> #include <unistd.h> diff --git a/src/test/test-coredump-util.c b/src/test/test-coredump-util.c index 14a78007e3..f9a44b2c65 100644 --- a/src/test/test-coredump-util.c +++ b/src/test/test-coredump-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 "coredump-util.h" diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c index 450e19e06f..0cfc883d66 100644 --- a/src/test/test-cpu-set-util.c +++ b/src/test/test-cpu-set-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 "cpu-set-util.h" diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c index 6ca821581f..e6dd29a0a7 100644 --- a/src/test/test-daemon.c +++ b/src/test/test-daemon.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/test/test-date.c b/src/test/test-date.c index f39eca6176..47b7096738 100644 --- a/src/test/test-date.c +++ b/src/test/test-date.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "string-util.h" diff --git a/src/test/test-dev-setup.c b/src/test/test-dev-setup.c index 11196cd4d6..ea9df56aeb 100644 --- a/src/test/test-dev-setup.c +++ b/src/test/test-dev-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "capability-util.h" #include "dev-setup.h" diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c index ad8d9ace16..9efb3fe3b3 100644 --- a/src/test/test-device-nodes.c +++ b/src/test/test-device-nodes.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/types.h> diff --git a/src/test/test-dlopen.c b/src/test/test-dlopen.c index 148ebaa4d0..35981ebc3b 100644 --- a/src/test/test-dlopen.c +++ b/src/test/test-dlopen.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <dlfcn.h> #include <stdlib.h> diff --git a/src/test/test-dns-domain.c b/src/test/test-dns-domain.c index b73dc56465..2df2380de4 100644 --- a/src/test/test-dns-domain.c +++ b/src/test/test-dns-domain.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "dns-domain.h" diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c index 92692bd487..a25c0b57bd 100644 --- a/src/test/test-ellipsize.c +++ b/src/test/test-ellipsize.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-emergency-action.c b/src/test/test-emergency-action.c index 8ce28ed9f5..88214aa7a6 100644 --- a/src/test/test-emergency-action.c +++ b/src/test/test-emergency-action.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "emergency-action.h" #include "tests.h" diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 6465151b27..cd7cfd9f09 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.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/test/test-env-file.c b/src/test/test-env-file.c index 23779b9b87..a3acde17ba 100644 --- a/src/test/test-env-file.c +++ b/src/test/test-env-file.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "env-file.h" #include "fd-util.h" diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c index 7c418209a9..dd150b3068 100644 --- a/src/test/test-env-util.c +++ b/src/test/test-env-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "env-util.h" #include "fd-util.h" diff --git a/src/test/test-escape.c b/src/test/test-escape.c index 699747fcc3..3e410ca299 100644 --- a/src/test/test-escape.c +++ b/src/test/test-escape.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "escape.h" diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c index f5d640a690..5da69f7321 100644 --- a/src/test/test-exec-util.c +++ b/src/test/test-exec-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/test/test-execute.c b/src/test/test-execute.c index 0bc2a45c30..e15b7a55fa 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <sys/prctl.h> diff --git a/src/test/test-exit-status.c b/src/test/test-exit-status.c index e90375f6bd..4dc197301d 100644 --- a/src/test/test-exit-status.c +++ b/src/test/test-exit-status.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "exit-status.h" #include "string-util.h" diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c index cc1f29385f..56b516fe40 100644 --- a/src/test/test-extract-word.c +++ b/src/test/test-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 <stdlib.h> diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index 5351fdb9e9..bece89aef2 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/test/test-fdset.c b/src/test/test-fdset.c index 212fe0dbd4..c77d7ffe83 100644 --- a/src/test/test-fdset.c +++ b/src/test/test-fdset.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <unistd.h> diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c index fcc2bc2a8b..431aea07ef 100644 --- a/src/test/test-fileio.c +++ b/src/test/test-fileio.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <limits.h> diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c index 1788e8d1ca..64616e4391 100644 --- a/src/test/test-firewall-util.c +++ b/src/test/test-firewall-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "firewall-util.h" #include "log.h" diff --git a/src/test/test-format-table.c b/src/test/test-format-table.c index cf2e34dc9d..24ee1df953 100644 --- a/src/test/test-format-table.c +++ b/src/test/test-format-table.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/test/test-format-util.c b/src/test/test-format-util.c index 6558ee2b0a..5562ac8761 100644 --- a/src/test/test-format-util.c +++ b/src/test/test-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 "macro.h" diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c index f63b1f5d5f..d1f9252521 100644 --- a/src/test/test-fs-util.c +++ b/src/test/test-fs-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/test/test-fstab-util.c b/src/test/test-fstab-util.c index f3506045a1..222ffbb2a7 100644 --- a/src/test/test-fstab-util.c +++ b/src/test/test-fstab-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-gcrypt-util.c b/src/test/test-gcrypt-util.c index b28b4eb5a2..2af040b63a 100644 --- a/src/test/test-gcrypt-util.c +++ b/src/test/test-gcrypt-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 "gcrypt-util.h" diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c index 667d15335f..df6444c433 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-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/test/test-hash.c b/src/test/test-hash.c index 44d1044bf3..270fcd0df4 100644 --- a/src/test/test-hash.c +++ b/src/test/test-hash.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/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index 5ff5d096a6..9ed6bee9da 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "hashmap.h" diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c index 852712844f..20bc97ce58 100644 --- a/src/test/test-hashmap.c +++ b/src/test/test-hashmap.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hashmap.h" #include "string-util.h" diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c index 52217429b1..f0f9679769 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.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/test/test-hostname-util.c b/src/test/test-hostname-util.c index 5ab82bba61..73839b3115 100644 --- a/src/test/test-hostname-util.c +++ b/src/test/test-hostname-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/test/test-hostname.c b/src/test/test-hostname.c index 710c0572e6..1a925f253c 100644 --- a/src/test/test-hostname.c +++ b/src/test/test-hostname.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hostname-setup.h" #include "util.h" diff --git a/src/test/test-id128.c b/src/test/test-id128.c index 66eedddce8..a0649b9deb 100644 --- a/src/test/test-id128.c +++ b/src/test/test-id128.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/types.h> diff --git a/src/test/test-in-addr-util.c b/src/test/test-in-addr-util.c index a9ecd0627b..2b6364566b 100644 --- a/src/test/test-in-addr-util.c +++ b/src/test/test-in-addr-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fnmatch.h> #include <netinet/in.h> diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index 6fb2fd4298..aedec54a7f 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.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/test/test-install.c b/src/test/test-install.c index f1423fb635..7cd91efcb7 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <string.h> diff --git a/src/test/test-io-util.c b/src/test/test-io-util.c index 42e632a8a2..104c022cb4 100644 --- a/src/test/test-io-util.c +++ b/src/test/test-io-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stdlib.h> diff --git a/src/test/test-ip-protocol-list.c b/src/test/test-ip-protocol-list.c index 79390e5289..15bbbdeb72 100644 --- a/src/test/test-ip-protocol-list.c +++ b/src/test/test-ip-protocol-list.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <netinet/in.h> diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c index 4565d65676..238f0bf666 100644 --- a/src/test/test-ipcrm.c +++ b/src/test/test-ipcrm.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "clean-ipc.h" #include "errno-util.h" diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c index 33a95c6b52..024d976a75 100644 --- a/src/test/test-job-type.c +++ b/src/test/test-job-type.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c index 4883356956..da266d92ac 100644 --- a/src/test/test-journal-importer.c +++ b/src/test/test-journal-importer.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/types.h> #include <sys/stat.h> diff --git a/src/test/test-json.c b/src/test/test-json.c index 6da93d6aed..1d4b11945e 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <math.h> diff --git a/src/test/test-libcrypt-util.c b/src/test/test-libcrypt-util.c index 58b83b6866..cd296d698e 100644 --- a/src/test/test-libcrypt-util.c +++ b/src/test/test-libcrypt-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #if HAVE_CRYPT_H # include <crypt.h> diff --git a/src/test/test-libmount.c b/src/test/test-libmount.c index c3395493d4..bd2381f38e 100644 --- a/src/test/test-libmount.c +++ b/src/test/test-libmount.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fd-util.h" diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index 2cc679f42e..d162abaea0 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <getopt.h> diff --git a/src/test/test-list.c b/src/test/test-list.c index ca5361adb9..fc6e1c8cd1 100644 --- a/src/test/test-list.c +++ b/src/test/test-list.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2013 Jan Janssen ***/ diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c index 96be244b6b..40c1fd0532 100644 --- a/src/test/test-load-fragment.c +++ b/src/test/test-load-fragment.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stddef.h> diff --git a/src/test/test-local-addresses.c b/src/test/test-local-addresses.c index 37505ea783..7eeddd28f4 100644 --- a/src/test/test-local-addresses.c +++ b/src/test/test-local-addresses.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c index 347982dd52..62f82200a0 100644 --- a/src/test/test-locale-util.c +++ b/src/test/test-locale-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "kbd-util.h" #include "locale-util.h" diff --git a/src/test/test-log.c b/src/test/test-log.c index c1f2f8b09d..a2a53730ef 100644 --- a/src/test/test-log.c +++ b/src/test/test-log.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> #include <unistd.h> diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c index b9533fc16a..298ded94df 100644 --- a/src/test/test-loop-block.c +++ b/src/test/test-loop-block.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <linux/loop.h> diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c index 89b760fae4..58d8c29dbb 100644 --- a/src/test/test-loopback.c +++ b/src/test/test-loopback.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <string.h> diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index 6986405dc6..41df5588d0 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c index ada5b1712c..287488b7c1 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sched.h> #include <sys/mount.h> diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index 7571e609a2..e234f54dee 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/socket.h> diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index a734524eeb..49aca68c49 100644 --- a/src/test/test-netlink-manual.c +++ b/src/test/test-netlink-manual.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <arpa/inet.h> #include <linux/if_tunnel.h> diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 5d7931f619..6ec1cff28a 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.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/test/test-nscd-flush.c b/src/test/test-nscd-flush.c index 97c219596d..1a5a8082f3 100644 --- a/src/test/test-nscd-flush.c +++ b/src/test/test-nscd-flush.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "main-func.h" #include "nscd-flush.h" diff --git a/src/test/test-nss.c b/src/test/test-nss.c index 293d7a8468..2e9414d16d 100644 --- a/src/test/test-nss.c +++ b/src/test/test-nss.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <dlfcn.h> #include <net/if.h> diff --git a/src/test/test-offline-passwd.c b/src/test/test-offline-passwd.c index 5933ec28a3..1a961d125b 100644 --- a/src/test/test-offline-passwd.c +++ b/src/test/test-offline-passwd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/test/test-ordered-set.c b/src/test/test-ordered-set.c index 268c54fccc..0fbdd9706f 100644 --- a/src/test/test-ordered-set.c +++ b/src/test/test-ordered-set.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c index c215a2e99e..ef63026945 100644 --- a/src/test/test-os-util.c +++ b/src/test/test-os-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/test/test-parse-util.c b/src/test/test-parse-util.c index d4f908f5d4..1c969091ef 100644 --- a/src/test/test-parse-util.c +++ b/src/test/test-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 <linux/loadavg.h> diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c index b9111e9259..da146aac2a 100644 --- a/src/test/test-path-lookup.c +++ b/src/test/test-path-lookup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdlib.h> #include <sys/stat.h> diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index e98c19dd6c..36108f548b 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <unistd.h> diff --git a/src/test/test-path.c b/src/test/test-path.c index 2e20674c2f..490fb136a7 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdbool.h> #include <sys/stat.h> diff --git a/src/test/test-pretty-print.c b/src/test/test-pretty-print.c index 9236eb1315..dbae34e73e 100644 --- a/src/test/test-pretty-print.c +++ b/src/test/test-pretty-print.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/test/test-prioq.c b/src/test/test-prioq.c index 50f66cb970..4bfa18195e 100644 --- a/src/test/test-prioq.c +++ b/src/test/test-prioq.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/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c index 4a9b111a20..1f5ee7d768 100644 --- a/src/test/test-proc-cmdline.c +++ b/src/test/test-proc-cmdline.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-util.h" diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index b00dd4a980..a87cdf8747 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-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/mount.h> diff --git a/src/test/test-procfs-util.c b/src/test/test-procfs-util.c index 61434578b0..b2679e30fb 100644 --- a/src/test/test-procfs-util.c +++ b/src/test/test-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/test/test-psi-util.c b/src/test/test-psi-util.c index bde8ef80b1..0b5a30cf57 100644 --- a/src/test/test-psi-util.c +++ b/src/test/test-psi-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/loadavg.h> diff --git a/src/test/test-qrcode-util.c b/src/test/test-qrcode-util.c index c4e2894eb7..221ad854c2 100644 --- a/src/test/test-qrcode-util.c +++ b/src/test/test-qrcode-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "locale-util.h" #include "main-func.h" diff --git a/src/test/test-random-util.c b/src/test/test-random-util.c index ad5bc72a4e..02a73ecdb2 100644 --- a/src/test/test-random-util.c +++ b/src/test/test-random-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "hexdecoct.h" #include "random-util.h" diff --git a/src/test/test-ratelimit.c b/src/test/test-ratelimit.c index 56a6fa2d76..af60572e05 100644 --- a/src/test/test-ratelimit.c +++ b/src/test/test-ratelimit.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/test/test-replace-var.c b/src/test/test-replace-var.c index 8620e72b2b..4d699b92f0 100644 --- a/src/test/test-replace-var.c +++ b/src/test/test-replace-var.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-rlimit-util.c b/src/test/test-rlimit-util.c index 90eda96a73..057ae6b2bc 100644 --- a/src/test/test-rlimit-util.c +++ b/src/test/test-rlimit-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/resource.h> diff --git a/src/test/test-rm-rf.c b/src/test/test-rm-rf.c index d6e426c0fb..38aa100e0b 100644 --- a/src/test/test-rm-rf.c +++ b/src/test/test-rm-rf.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/test/test-sched-prio.c b/src/test/test-sched-prio.c index da6d2a21e6..1f125b1d1e 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2012 Holger Hans Peter Freyther ***/ diff --git a/src/test/test-sd-hwdb.c b/src/test/test-sd-hwdb.c index 8746a841d4..7e1512a97d 100644 --- a/src/test/test-sd-hwdb.c +++ b/src/test/test-sd-hwdb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-hwdb.h" diff --git a/src/test/test-sd-path.c b/src/test/test-sd-path.c index 9260db5ace..75436ab1ce 100644 --- a/src/test/test-sd-path.c +++ b/src/test/test-sd-path.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-path.h" diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c index 8831d87fe7..853b0ef3b9 100644 --- a/src/test/test-seccomp.c +++ b/src/test/test-seccomp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <poll.h> diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c index 59b4f71946..3eb7ad30cf 100644 --- a/src/test/test-selinux.c +++ b/src/test/test-selinux.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c index a57d5db2b1..7bd53a861d 100644 --- a/src/test/test-serialize.c +++ b/src/test/test-serialize.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "escape.h" #include "fd-util.h" diff --git a/src/test/test-set-disable-mempool.c b/src/test/test-set-disable-mempool.c index aea83d2679..ae36fac102 100644 --- a/src/test/test-set-disable-mempool.c +++ b/src/test/test-set-disable-mempool.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <pthread.h> diff --git a/src/test/test-set.c b/src/test/test-set.c index d3e6de7978..16314d051b 100644 --- a/src/test/test-set.c +++ b/src/test/test-set.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "set.h" #include "strv.h" diff --git a/src/test/test-sigbus.c b/src/test/test-sigbus.c index f753e3836e..d141735320 100644 --- a/src/test/test-sigbus.c +++ b/src/test/test-sigbus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <sys/mman.h> diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c index 1a8c60ad42..e5096a8c00 100644 --- a/src/test/test-signal-util.c +++ b/src/test/test-signal-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/test/test-siphash24.c b/src/test/test-siphash24.c index 6ae272fa94..4a1672fb95 100644 --- a/src/test/test-siphash24.c +++ b/src/test/test-siphash24.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "memory-util.h" #include "siphash24.h" diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c index 6dee2022e8..3c9dc180fa 100644 --- a/src/test/test-sizeof.c +++ b/src/test/test-sizeof.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sched.h> #include <stdio.h> diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c index 8b4fa82640..d916254cc9 100644 --- a/src/test/test-sleep.c +++ b/src/test/test-sleep.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <inttypes.h> diff --git a/src/test/test-socket-netlink.c b/src/test/test-socket-netlink.c index afb7038621..704cc01e6f 100644 --- a/src/test/test-socket-netlink.c +++ b/src/test/test-socket-netlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "missing_network.h" diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c index 1bb186655d..4ff7d714f8 100644 --- a/src/test/test-socket-util.c +++ b/src/test/test-socket-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <grp.h> diff --git a/src/test/test-specifier.c b/src/test/test-specifier.c index e81b12b418..b1e8a61021 100644 --- a/src/test/test-specifier.c +++ b/src/test/test-specifier.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "log.h" diff --git a/src/test/test-stat-util.c b/src/test/test-stat-util.c index 13a66dfb17..9aca09c4de 100644 --- a/src/test/test-stat-util.c +++ b/src/test/test-stat-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <linux/magic.h> diff --git a/src/test/test-static-destruct.c b/src/test/test-static-destruct.c index eb0523d87a..904a9bbf5d 100644 --- a/src/test/test-static-destruct.c +++ b/src/test/test-static-destruct.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "static-destruct.h" diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c index 483ba44caa..867be19c86 100644 --- a/src/test/test-strbuf.c +++ b/src/test/test-strbuf.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/test/test-string-util.c b/src/test/test-string-util.c index 196c96aa8c..b74eb180f3 100644 --- a/src/test/test-string-util.c +++ b/src/test/test-string-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 "locale-util.h" diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c index 8e305f3791..be54b0d4d6 100644 --- a/src/test/test-strip-tab-ansi.c +++ b/src/test/test-strip-tab-ansi.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-strv.c b/src/test/test-strv.c index f681795ebe..0c46af05cc 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "escape.h" diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c index 749aa46d75..4b6d8ebce3 100644 --- a/src/test/test-strxcpyx.c +++ b/src/test/test-strxcpyx.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> diff --git a/src/test/test-sysctl-util.c b/src/test/test-sysctl-util.c index 2b957dd4d6..a6f449b764 100644 --- a/src/test/test-sysctl-util.c +++ b/src/test/test-sysctl-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "strv.h" #include "sysctl-util.h" diff --git a/src/test/test-systemd-tmpfiles.py b/src/test/test-systemd-tmpfiles.py index 7f4af38940..255922d05b 100755 --- a/src/test/test-systemd-tmpfiles.py +++ b/src/test/test-systemd-tmpfiles.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # systemd is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 7273611143..e25cf9e5d9 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "architecture.h" #include "automount.h" diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index 003257111a..508f0c03ee 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stdbool.h> diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c index 64242951ac..cfe8753441 100644 --- a/src/test/test-time-util.c +++ b/src/test/test-time-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "random-util.h" #include "serialize.h" diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c index b526871655..4c3389af8c 100644 --- a/src/test/test-tmpfiles.c +++ b/src/test/test-tmpfiles.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <stdio.h> diff --git a/src/test/test-udev-util.c b/src/test/test-udev-util.c index c3efdab41a..b0213f8c39 100644 --- a/src/test/test-udev-util.c +++ b/src/test/test-udev-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdlib.h> #include <string.h> diff --git a/src/test/test-udev.c b/src/test/test-udev.c index 00cab7bb45..8acf86da37 100644 --- a/src/test/test-udev.c +++ b/src/test/test-udev.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2003-2004 Greg Kroah-Hartman <greg@kroah.com> ***/ diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c index 65a556c9c6..16cbab07d6 100644 --- a/src/test/test-uid-range.c +++ b/src/test/test-uid-range.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stddef.h> diff --git a/src/test/test-umask-util.c b/src/test/test-umask-util.c index 27f6b56541..df3ae98f50 100644 --- a/src/test/test-umask-util.c +++ b/src/test/test-umask-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "tests.h" #include "umask-util.h" diff --git a/src/test/test-umount.c b/src/test/test-umount.c index 02852bc089..676c6dd862 100644 --- a/src/test/test-umount.c +++ b/src/test/test-umount.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "errno-util.h" diff --git a/src/test/test-unaligned.c b/src/test/test-unaligned.c index 3d6f9a03b4..b4d380b529 100644 --- a/src/test/test-unaligned.c +++ b/src/test/test-unaligned.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "memory-util.h" #include "sparse-endian.h" diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index d1f85a7f26..8f9679051d 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "path-lookup.h" #include "set.h" diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 0d524f9a56..ece78aa548 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdio.h> #include <stdlib.h> diff --git a/src/test/test-user-record.c b/src/test/test-user-record.c index d623706648..c9182e382b 100644 --- a/src/test/test-user-record.c +++ b/src/test/test-user-record.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <unistd.h> #include <sys/types.h> diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c index 306d08a282..8924b5f95a 100644 --- a/src/test/test-user-util.c +++ b/src/test/test-user-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 "format-util.h" diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c index 66003ac13e..c7b6d8dd53 100644 --- a/src/test/test-utf8.c +++ b/src/test/test-utf8.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "string-util.h" diff --git a/src/test/test-util.c b/src/test/test-util.c index cfbafcc5ca..0fe7a381c7 100644 --- a/src/test/test-util.c +++ b/src/test/test-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/wait.h> diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c index fbfc72cd81..9a5fbc6c8e 100644 --- a/src/test/test-varlink.c +++ b/src/test/test-varlink.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <poll.h> diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c index 24593c75d9..b7a0cbf527 100644 --- a/src/test/test-verbs.c +++ b/src/test/test-verbs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/test/test-watch-pid.c b/src/test/test-watch-pid.c index 28ecffb0c0..4afc46f10f 100644 --- a/src/test/test-watch-pid.c +++ b/src/test/test-watch-pid.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "log.h" #include "manager.h" diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c index ab66d5c49d..cbef75fe07 100644 --- a/src/test/test-watchdog.c +++ b/src/test/test-watchdog.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <string.h> #include <unistd.h> diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c index dd1df8c247..853ea9c291 100644 --- a/src/test/test-web-util.c +++ b/src/test/test-web-util.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "macro.h" #include "web-util.h" diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c index 3e6df96c5d..f93aca68f0 100644 --- a/src/test/test-xattr-util.c +++ b/src/test/test-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/test/test-xdg-autostart.c b/src/test/test-xdg-autostart.c index 70287b3c55..a437e2cfed 100644 --- a/src/test/test-xdg-autostart.c +++ b/src/test/test-xdg-autostart.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "fd-util.h" diff --git a/src/test/test-xml.c b/src/test/test-xml.c index 63e7a10e7b..e69d6d0fe4 100644 --- a/src/test/test-xml.c +++ b/src/test/test-xml.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <stdarg.h> diff --git a/src/time-wait-sync/time-wait-sync.c b/src/time-wait-sync/time-wait-sync.c index 02053e7708..df34541bf7 100644 --- a/src/time-wait-sync/time-wait-sync.c +++ b/src/time-wait-sync/time-wait-sync.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* systemd service to wait until kernel realtime clock is synchronized */ #include <errno.h> diff --git a/src/timedate/meson.build b/src/timedate/meson.build index 46c7360da3..6eb9607e08 100644 --- a/src/timedate/meson.build +++ b/src/timedate/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later if conf.get('ENABLE_TIMEDATED') == 1 install_data('org.freedesktop.timedate1.conf', diff --git a/src/timedate/org.freedesktop.timedate1.conf b/src/timedate/org.freedesktop.timedate1.conf index 53f6c8435d..4567082281 100644 --- a/src/timedate/org.freedesktop.timedate1.conf +++ b/src/timedate/org.freedesktop.timedate1.conf @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/timedate/org.freedesktop.timedate1.policy b/src/timedate/org.freedesktop.timedate1.policy index b6303ba1dd..c4e71b0753 100644 --- a/src/timedate/org.freedesktop.timedate1.policy +++ b/src/timedate/org.freedesktop.timedate1.policy @@ -3,7 +3,7 @@ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <!-- - SPDX-License-Identifier: LGPL-2.1+ + SPDX-License-Identifier: LGPL-2.1-or-later This file is part of systemd. diff --git a/src/timedate/org.freedesktop.timedate1.service b/src/timedate/org.freedesktop.timedate1.service index d5f3a6e30d..6b82d700f9 100644 --- a/src/timedate/org.freedesktop.timedate1.service +++ b/src/timedate/org.freedesktop.timedate1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 0131bbed8c..455c602c30 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <locale.h> diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index c467b85477..cdc0938d5f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.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/timesync/meson.build b/src/timesync/meson.build index e5c118c8db..22b6347bab 100644 --- a/src/timesync/meson.build +++ b/src/timesync/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_timesyncd_sources = files(''' timesyncd.c diff --git a/src/timesync/org.freedesktop.timesync1.service b/src/timesync/org.freedesktop.timesync1.service index 84b4b4f973..98878d6ac9 100644 --- a/src/timesync/org.freedesktop.timesync1.service +++ b/src/timesync/org.freedesktop.timesync1.service @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/timesync/test-timesync.c b/src/timesync/test-timesync.c index bd03a1dd90..31e91e7b7b 100644 --- a/src/timesync/test-timesync.c +++ b/src/timesync/test-timesync.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Some unit tests for the helper functions in timesyncd. */ diff --git a/src/timesync/timesyncd-bus.c b/src/timesync/timesyncd-bus.c index 6effdfc325..c5ad5feb95 100644 --- a/src/timesync/timesyncd-bus.c +++ b/src/timesync/timesyncd-bus.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "sd-bus.h" diff --git a/src/timesync/timesyncd-bus.h b/src/timesync/timesyncd-bus.h index 6670ffbc36..83db2167e2 100644 --- a/src/timesync/timesyncd-bus.h +++ b/src/timesync/timesyncd-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "timesyncd-manager.h" diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c index d7ec94e487..2c3114613b 100644 --- a/src/timesync/timesyncd-conf.c +++ b/src/timesync/timesyncd-conf.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "def.h" diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h index bbe27cf2ac..d6b9060401 100644 --- a/src/timesync/timesyncd-conf.h +++ b/src/timesync/timesyncd-conf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "conf-parser.h" diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index 0fab37d783..93ba4ef87d 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <errno.h> #include <math.h> diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h index d74521c9cf..940a88ed7b 100644 --- a/src/timesync/timesyncd-manager.h +++ b/src/timesync/timesyncd-manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include <sys/timex.h> diff --git a/src/timesync/timesyncd-ntp-message.h b/src/timesync/timesyncd-ntp-message.h index 14fba6d2cc..76ed9ecac6 100644 --- a/src/timesync/timesyncd-ntp-message.h +++ b/src/timesync/timesyncd-ntp-message.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sparse-endian.h" diff --git a/src/timesync/timesyncd-server.c b/src/timesync/timesyncd-server.c index aadecb6a1c..f7ec317f41 100644 --- a/src/timesync/timesyncd-server.c +++ b/src/timesync/timesyncd-server.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "alloc-util.h" #include "timesyncd-server.h" diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h index d30bd2a3ce..8e9e408ecc 100644 --- a/src/timesync/timesyncd-server.h +++ b/src/timesync/timesyncd-server.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "list.h" diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index 4f514d536d..1f59bf14e1 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build index 434dcf800d..2d61568c66 100644 --- a/src/tmpfiles/meson.build +++ b/src/tmpfiles/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_tmpfiles_sources = [ 'src/tmpfiles/tmpfiles.c', diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index b42bc78934..eb63bc3807 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.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/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index 932f6e18b2..1940792b9d 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2015 Werner Fink ***/ diff --git a/src/udev/fido_id/fido_id.c b/src/udev/fido_id/fido_id.c index 83761d72b4..f14b81d30d 100644 --- a/src/udev/fido_id/fido_id.c +++ b/src/udev/fido_id/fido_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Identifies FIDO CTAP1 ("U2F")/CTAP2 security tokens based on the usage declared in their report * descriptor and outputs suitable environment variables. diff --git a/src/udev/fido_id/fido_id_desc.c b/src/udev/fido_id/fido_id_desc.c index bbfcf93709..2dfa759032 100644 --- a/src/udev/fido_id/fido_id_desc.c +++ b/src/udev/fido_id/fido_id_desc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Inspired by Andrew Lutomirski's 'u2f-hidraw-policy.c' */ #include <errno.h> diff --git a/src/udev/fido_id/fido_id_desc.h b/src/udev/fido_id/fido_id_desc.h index c813a3a454..57af57e889 100644 --- a/src/udev/fido_id/fido_id_desc.h +++ b/src/udev/fido_id/fido_id_desc.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/udev/fido_id/fuzz-fido-id-desc.c b/src/udev/fido_id/fuzz-fido-id-desc.c index 45a4879e82..44d66df1a0 100644 --- a/src/udev/fido_id/fuzz-fido-id-desc.c +++ b/src/udev/fido_id/fuzz-fido-id-desc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/hid.h> #include <stdbool.h> diff --git a/src/udev/fido_id/test-fido-id-desc.c b/src/udev/fido_id/test-fido-id-desc.c index 38eec2bc28..6836bca28d 100644 --- a/src/udev/fido_id/test-fido-id-desc.c +++ b/src/udev/fido_id/test-fido-id-desc.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/udev/meson.build b/src/udev/meson.build index aa23b07090..e6dd4c7cac 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later udevadm_sources = files(''' udevadm.c diff --git a/src/udev/net/fuzz-link-parser.c b/src/udev/net/fuzz-link-parser.c index e0dacc732a..6f3469c5b8 100644 --- a/src/udev/net/fuzz-link-parser.c +++ b/src/udev/net/fuzz-link-parser.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "fd-util.h" #include "fs-util.h" diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index c23c2bdd20..afb2cd4d1c 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <linux/netdevice.h> #include <netinet/ether.h> diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h index 8b5801c003..eab1849fcd 100644 --- a/src/udev/net/link-config.h +++ b/src/udev/net/link-config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-device.h" diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c index 1f0073e5cd..9079d1b8e9 100644 --- a/src/udev/udev-builtin-btrfs.c +++ b/src/udev/udev-builtin-btrfs.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <fcntl.h> #include <linux/btrfs.h> diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index 59ae6c7ad4..78835185b0 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.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/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c index 48146105e0..cd766a8b6a 100644 --- a/src/udev/udev-builtin-keyboard.c +++ b/src/udev/udev-builtin-keyboard.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/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index d3db37a8e0..d06a8c7156 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* * Predictable network interface device names based on: diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c index ee3ca9fa38..ef101381f4 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "device-util.h" #include "alloc-util.h" diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index b13c1bffe5..80d17662b2 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <stdio.h> diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index 8401691659..48355aa50c 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1-or-later * * libudev - interface to udev device information * diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c index 7f8960f549..3d219222b9 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c index 92c348d83b..212892527e 100644 --- a/src/update-done/update-done.c +++ b/src/update-done/update-done.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index 4ab90a63ed..0546486f73 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.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/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c index cd92b696c0..d1b8176714 100644 --- a/src/user-sessions/user-sessions.c +++ b/src/user-sessions/user-sessions.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/userdb/meson.build b/src/userdb/meson.build index 2f7e1accbf..3a6225e01e 100644 --- a/src/userdb/meson.build +++ b/src/userdb/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later systemd_userwork_sources = files(''' userwork.c diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c index 0c135fae14..0d0b2870ab 100644 --- a/src/userdb/userdbctl.c +++ b/src/userdb/userdbctl.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <getopt.h> #include <utmp.h> diff --git a/src/userdb/userdbd-manager.c b/src/userdb/userdbd-manager.c index 060285783f..f8d315ce2d 100644 --- a/src/userdb/userdbd-manager.c +++ b/src/userdb/userdbd-manager.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/wait.h> diff --git a/src/userdb/userdbd-manager.h b/src/userdb/userdbd-manager.h index 0bf67fe55b..b81615aca1 100644 --- a/src/userdb/userdbd-manager.h +++ b/src/userdb/userdbd-manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "sd-bus.h" diff --git a/src/userdb/userdbd.c b/src/userdb/userdbd.c index e456104dd7..6f2c807843 100644 --- a/src/userdb/userdbd.c +++ b/src/userdb/userdbd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/stat.h> #include <sys/types.h> diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c index a68011b3fc..d525a6e05a 100644 --- a/src/userdb/userwork.c +++ b/src/userdb/userwork.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <poll.h> #include <sys/wait.h> diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in index 70679b6dd2..a16988c38c 100644 --- a/src/vconsole/90-vconsole.rules.in +++ b/src/vconsole/90-vconsole.rules.in @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # # This file is part of systemd. # diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build index 03065ec26c..695ef0239d 100644 --- a/src/vconsole/meson.build +++ b/src/vconsole/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later if conf.get('ENABLE_VCONSOLE') == 1 vconsole_rules = configure_file( diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index a2fe7e9099..b28e2853e1 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /*** Copyright © 2016 Michal Soltys <soltys@ziu.info> ***/ diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c index ea1d056600..4682a7b04c 100644 --- a/src/veritysetup/veritysetup-generator.c +++ b/src/veritysetup/veritysetup-generator.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/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c index 7ea9eae796..558e9510ff 100644 --- a/src/veritysetup/veritysetup.c +++ b/src/veritysetup/veritysetup.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/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c index 04c371077a..ee3532cc02 100644 --- a/src/volatile-root/volatile-root.c +++ b/src/volatile-root/volatile-root.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <sys/mount.h> diff --git a/src/xdg-autostart-generator/xdg-autostart-condition.c b/src/xdg-autostart-generator/xdg-autostart-condition.c index 84a3561654..c4485cf625 100644 --- a/src/xdg-autostart-generator/xdg-autostart-condition.c +++ b/src/xdg-autostart-generator/xdg-autostart-condition.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "main-func.h" #include "strv.h" diff --git a/src/xdg-autostart-generator/xdg-autostart-generator.c b/src/xdg-autostart-generator/xdg-autostart-generator.c index 6cec28e622..7b441a9a12 100644 --- a/src/xdg-autostart-generator/xdg-autostart-generator.c +++ b/src/xdg-autostart-generator/xdg-autostart-generator.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/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c index da5e79dcff..671d16d2d9 100644 --- a/src/xdg-autostart-generator/xdg-autostart-service.c +++ b/src/xdg-autostart-generator/xdg-autostart-service.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/xdg-autostart-generator/xdg-autostart-service.h b/src/xdg-autostart-generator/xdg-autostart-service.h index 8cf07ef64a..2641718899 100644 --- a/src/xdg-autostart-generator/xdg-autostart-service.h +++ b/src/xdg-autostart-generator/xdg-autostart-service.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1+ */ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include "macro.h" |