From ac04c8c7a1eac4d4a8a4e4bec3810e87e7041f01 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 13 Sep 2022 21:13:56 +0200 Subject: [PATCH 1/4] Revert "Improve reuse test." This reverts commit 7eddfda7f850d17a6f90862ce061a74d1fb364f7. --- .github/workflows/reuse.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 7646c5cfb..51d9ac2fb 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -23,10 +23,5 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Remove some files before checking REUSE compliance - run: | - rm -f tests/integration/targets/*/files/*.pem - rm -f tests/integration/targets/*/files/roots/*.pem - - name: REUSE Compliance Check uses: fsfe/reuse-action@v3 From 24fab7ae11ed9998a6920f616e0b4850b794967d Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 13 Sep 2022 21:14:01 +0200 Subject: [PATCH 2/4] Revert "Update README." This reverts commit b0ec28c6a120ea9c2487c42117052d678ae60117. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e8136227..629857e31 100644 --- a/README.md +++ b/README.md @@ -144,4 +144,4 @@ See [LICENSES/GPL-3.0-or-later.txt](https://github.com/ansible-collections/commu Parts of the collection are licensed under the [Apache 2.0 license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/Apache-2.0.txt) (`plugins/module_utils/crypto/_obj2txt.py` and `plugins/module_utils/crypto/_objects_data.py`), the [BSD 2-Clause license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/BSD-2-Clause.txt) (`plugins/module_utils/ecs/api.py`), the [BSD 3-Clause license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/BSD-3-Clause.txt) (`plugins/module_utils/crypto/_obj2txt.py`, `tests/integration/targets/prepare_jinja2_compat/filter_plugins/jinja_compatibility.py`), and the [PSF 2.0 license](https://github.com/ansible-collections/community.crypto/blob/main/LICENSES/PSF-2.0.txt) (`plugins/module_utils/_version.py`). This only applies to vendored files in ``plugins/module_utils/`` and to the ECS module utils. -Almost all files have a machine readable `SDPX-License-Identifier:` comment denoting its respective license(s) or an equivalent entry in an accompanying `.license` file. Only changelog fragments (which will not be part of a release) are covered by a blanket statement in `.reuse/dep5`. Right now a few vendored PEM files do not have licensing information as well. This conforms to the [REUSE specification](https://reuse.software/spec/) up to the aforementioned PEM files. +All files have a machine readable `SDPX-License-Identifier:` comment denoting its respective license(s) or an equivalent entry in an accompanying `.license` file. Only changelog fragments (which will not be part of a release) are covered by a blanket statement in `.reuse/dep5`. This conforms to the [REUSE specification](https://reuse.software/spec/). From ada147f4ecd995cb682a5aadecdc43f563d0543c Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 13 Sep 2022 21:14:06 +0200 Subject: [PATCH 3/4] Revert "Add exceptions." This reverts commit c7494212929768680c79d213bc545476b2cc1168. --- tests/sanity/extra/licenses.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/sanity/extra/licenses.py b/tests/sanity/extra/licenses.py index 9eb3cc9ec..80eb795ef 100755 --- a/tests/sanity/extra/licenses.py +++ b/tests/sanity/extra/licenses.py @@ -76,8 +76,6 @@ def main(): '.reuse/dep5', 'LICENSES/*.txt', 'COPYING', - 'tests/integration/targets/*/files/*.pem', - 'tests/integration/targets/*/files/roots/*.pem', ] no_comments_allowed = [fn for pattern in no_comments_allowed for fn in glob.glob(pattern)] From 254755eb47673f4d3bf53bb48e58def592aa2379 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 13 Sep 2022 21:14:18 +0200 Subject: [PATCH 4/4] Revert "Revert "Add .license file for vendored third-party certificates."" This reverts commit 034b900a30abe1bf9cd2ff655af848921b27f8d4. --- .../certificate_complete_chain/files/cert1-chain.pem.license | 3 +++ .../files/cert1-fullchain.pem.license | 3 +++ .../certificate_complete_chain/files/cert1-root.pem.license | 3 +++ .../targets/certificate_complete_chain/files/cert1.pem.license | 3 +++ .../files/cert2-altchain.pem.license | 3 +++ .../certificate_complete_chain/files/cert2-altroot.pem.license | 3 +++ .../certificate_complete_chain/files/cert2-chain.pem.license | 3 +++ .../files/cert2-fullchain.pem.license | 3 +++ .../certificate_complete_chain/files/cert2-root.pem.license | 3 +++ .../targets/certificate_complete_chain/files/cert2.pem.license | 3 +++ .../targets/certificate_complete_chain/files/roots.pem.license | 3 +++ .../files/roots/COMODO_Certification_Authority.pem.license | 3 +++ .../files/roots/COMODO_ECC_Certification_Authority.pem.license | 3 +++ .../files/roots/COMODO_RSA_Certification_Authority.pem.license | 3 +++ .../files/roots/DST_Root_CA_X3.pem.license | 3 +++ .../files/roots/ISRG_Root_X1.pem.license | 3 +++ .../targets/x509_certificate_info/files/cert1.pem.license | 3 +++ 17 files changed, 51 insertions(+) create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert1-chain.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert1-fullchain.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert1-root.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert1.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert2-altchain.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert2-altroot.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert2-chain.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert2-fullchain.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert2-root.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/cert2.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/roots.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/roots/COMODO_Certification_Authority.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/roots/COMODO_ECC_Certification_Authority.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/roots/COMODO_RSA_Certification_Authority.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/roots/DST_Root_CA_X3.pem.license create mode 100644 tests/integration/targets/certificate_complete_chain/files/roots/ISRG_Root_X1.pem.license create mode 100644 tests/integration/targets/x509_certificate_info/files/cert1.pem.license diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1-chain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1-chain.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1-chain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1-fullchain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1-fullchain.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1-fullchain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1-root.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1-root.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1-root.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert1.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert1.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert1.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-altchain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-altchain.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-altchain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-altroot.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-altroot.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-altroot.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-chain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-chain.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-chain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-fullchain.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-fullchain.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-fullchain.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2-root.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2-root.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2-root.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/cert2.pem.license b/tests/integration/targets/certificate_complete_chain/files/cert2.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/cert2.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_Certification_Authority.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_Certification_Authority.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_Certification_Authority.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_ECC_Certification_Authority.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_ECC_Certification_Authority.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_ECC_Certification_Authority.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_RSA_Certification_Authority.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_RSA_Certification_Authority.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/COMODO_RSA_Certification_Authority.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/DST_Root_CA_X3.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/DST_Root_CA_X3.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/DST_Root_CA_X3.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/certificate_complete_chain/files/roots/ISRG_Root_X1.pem.license b/tests/integration/targets/certificate_complete_chain/files/roots/ISRG_Root_X1.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/certificate_complete_chain/files/roots/ISRG_Root_X1.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project diff --git a/tests/integration/targets/x509_certificate_info/files/cert1.pem.license b/tests/integration/targets/x509_certificate_info/files/cert1.pem.license new file mode 100644 index 000000000..edff8c768 --- /dev/null +++ b/tests/integration/targets/x509_certificate_info/files/cert1.pem.license @@ -0,0 +1,3 @@ +GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: Ansible Project