From: Zbigniew Jędrzejewski-Szmek Date: Wed, 26 Oct 2022 06:02:14 +0000 (+0200) Subject: man: change license of examples to MIT-0 X-Git-Tag: v252~26^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fe6d37ea53483c13d945c8db6350795c79f9326;p=thirdparty%2Fsystemd.git man: change license of examples to MIT-0 Quoting Richard Fontana in [1]: CC0 has been listed by Fedora as a 'good' license for code and content (corresponding to allowed and allowed-content under the new system). We plan to classify CC0 as allowed-content only, so that CC0 would no longer be allowed for code. Over a long period of time a consensus has been building in FOSS that licenses that preclude any form of patent licensing or patent forbearance cannot be considered FOSS. CC0 has a clause that says: "No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document." (The trademark side of that clause is nonproblematic from a FOSS licensing norms standpoint.) The regular Creative Commons licenses have similar clauses. For the case of our documentation snippets, patent issues do not matter much. But it is always nicer to have a license that is considerred acceptable without any further considerations. So let's change the license to the (now recommended replacement) MIT-0. [1] https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/NO7KGDNL5GX3KCB7T3XTGFA3QPSUJA6R/ Using 'git blame -b' and 'git log -p --follow', I identified the following folks as having made non-trivial changes to those snippets: Lennart Poettering Tom Gundersen Luca Bocassi Zbigniew Jędrzejewski-Szmek Thomas Mühlbacher Daan De Meyer I'll ask for confirmation in the pull request. --- diff --git a/LICENSES/README.md b/LICENSES/README.md index 69ef2d63157..720b5eff6ff 100644 --- a/LICENSES/README.md +++ b/LICENSES/README.md @@ -47,8 +47,9 @@ The following exceptions apply: - src/basic/siphash24.h - src/systemctl/systemd-sysv-install.SKELETON - tools/check-includes.pl - - all examples under man/ - config files and examples under /network + * the following sources are licensed under the **MIT-0** license: + - all examples under man/ * the following sources are under **Public Domain** (LicenseRef-murmurhash2-public-domain): - src/basic/MurmurHash2.c - src/basic/MurmurHash2.h diff --git a/man/50-xdg-data-dirs.sh b/man/50-xdg-data-dirs.sh index 5f042c5511a..0a180ffa3ea 100755 --- a/man/50-xdg-data-dirs.sh +++ b/man/50-xdg-data-dirs.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 # set the default value XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share}" diff --git a/man/90-rearrange-path.py b/man/90-rearrange-path.py index 50696a60e24..5c727e411ec 100755 --- a/man/90-rearrange-path.py +++ b/man/90-rearrange-path.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 """ diff --git a/man/check-os-release-simple.py b/man/check-os-release-simple.py index 738b1fd8605..ce73c77b14a 100644 --- a/man/check-os-release-simple.py +++ b/man/check-os-release-simple.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 import platform os_release = platform.freedesktop_os_release() diff --git a/man/check-os-release.py b/man/check-os-release.py index 1a57c7a20d0..19b193ec76a 100644 --- a/man/check-os-release.py +++ b/man/check-os-release.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 import ast import re diff --git a/man/check-os-release.sh b/man/check-os-release.sh index 35c8cac4bdd..12f7ee12cc5 100644 --- a/man/check-os-release.sh +++ b/man/check-os-release.sh @@ -1,5 +1,5 @@ #!/bin/sh -eu -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 test -e /etc/os-release && os_release='/etc/os-release' || os_release='/usr/lib/os-release' . "${os_release}" diff --git a/man/event-quick-child.c b/man/event-quick-child.c index 16cc6cf3a4c..8195efbaa5e 100644 --- a/man/event-quick-child.c +++ b/man/event-quick-child.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/fido2-crypttab.sh b/man/fido2-crypttab.sh index f7d25bf88bb..acb2e177ef4 100644 --- a/man/fido2-crypttab.sh +++ b/man/fido2-crypttab.sh @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 # Enroll the security token in the LUKS2 volume. Replace /dev/sdXn by the # partition to use (e.g. /dev/sda1). diff --git a/man/glib-event-glue.c b/man/glib-event-glue.c index 3741b5257bb..61e8bf6463d 100644 --- a/man/glib-event-glue.c +++ b/man/glib-event-glue.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/hwdb-usb-device.c b/man/hwdb-usb-device.c index 743c190f955..19a5db80229 100644 --- a/man/hwdb-usb-device.c +++ b/man/hwdb-usb-device.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/id128-app-specific.c b/man/id128-app-specific.c index 39660f4f865..b8982c75f85 100644 --- a/man/id128-app-specific.c +++ b/man/id128-app-specific.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/inotify-watch-tmp.c b/man/inotify-watch-tmp.c index a1144790c69..07ee8f6754b 100644 --- a/man/inotify-watch-tmp.c +++ b/man/inotify-watch-tmp.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/journal-enumerate-fields.c b/man/journal-enumerate-fields.c index f4b6b7b0785..bb0931970a6 100644 --- a/man/journal-enumerate-fields.c +++ b/man/journal-enumerate-fields.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/journal-iterate-foreach.c b/man/journal-iterate-foreach.c index 363101d5ba1..381b50f9ceb 100644 --- a/man/journal-iterate-foreach.c +++ b/man/journal-iterate-foreach.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/journal-iterate-poll.c b/man/journal-iterate-poll.c index 8205bfd858b..d377324b780 100644 --- a/man/journal-iterate-poll.c +++ b/man/journal-iterate-poll.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/journal-iterate-unique.c b/man/journal-iterate-unique.c index ac0c638032f..5fe98b36b75 100644 --- a/man/journal-iterate-unique.c +++ b/man/journal-iterate-unique.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/journal-iterate-wait.c b/man/journal-iterate-wait.c index 60b3459a18c..ac4b60b8e9b 100644 --- a/man/journal-iterate-wait.c +++ b/man/journal-iterate-wait.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/journal-stream-fd.c b/man/journal-stream-fd.c index d59aa14c13b..8aad5ff8c66 100644 --- a/man/journal-stream-fd.c +++ b/man/journal-stream-fd.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/path-documents.c b/man/path-documents.c index 13ea85a82ca..a357dd659a8 100644 --- a/man/path-documents.c +++ b/man/path-documents.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/print-unit-path.c b/man/print-unit-path.c index ff52fd28cd2..44c8271820f 100644 --- a/man/print-unit-path.c +++ b/man/print-unit-path.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/sd-bus-container-append.c b/man/sd-bus-container-append.c index 11238779ddc..8bb4f33e867 100644 --- a/man/sd-bus-container-append.c +++ b/man/sd-bus-container-append.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include diff --git a/man/sd-bus-container-read.c b/man/sd-bus-container-read.c index 75be5fa9bba..5ede316c03b 100644 --- a/man/sd-bus-container-read.c +++ b/man/sd-bus-container-read.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include diff --git a/man/sd_bus_error-example.c b/man/sd_bus_error-example.c index abea13ca451..9b162eb6cc3 100644 --- a/man/sd_bus_error-example.c +++ b/man/sd_bus_error-example.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/send-unit-files-changed.c b/man/send-unit-files-changed.c index 4d03dd1fe00..dfd38a14a7a 100644 --- a/man/send-unit-files-changed.c +++ b/man/send-unit-files-changed.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #define _cleanup_(f) __attribute__((cleanup(f))) diff --git a/man/tpm2-crypttab.sh b/man/tpm2-crypttab.sh index a988fb6e0b3..d109eb40cdf 100644 --- a/man/tpm2-crypttab.sh +++ b/man/tpm2-crypttab.sh @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 # Enroll the TPM2 security chip in the LUKS2 volume, and bind it to PCR 7 # only. Replace /dev/sdXn by the partition to use (e.g. /dev/sda1). diff --git a/man/vtable-example.c b/man/vtable-example.c index d82bb18a390..e3346a80211 100644 --- a/man/vtable-example.c +++ b/man/vtable-example.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: CC0-1.0 */ +/* SPDX-License-Identifier: MIT-0 */ #include #include diff --git a/man/yubikey-crypttab.sh b/man/yubikey-crypttab.sh index 13084dbf122..ce9c2917c5c 100644 --- a/man/yubikey-crypttab.sh +++ b/man/yubikey-crypttab.sh @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: CC0-1.0 +# SPDX-License-Identifier: MIT-0 # Destroy any old key on the Yubikey (careful!) ykman piv reset