From fe6239a11fce33192c32c9282accb3057088f178 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 21 Jun 2023 17:22:40 +0000 Subject: [PATCH] reuse: comply with 3.1 spec and 2.0.0 checker The checker tool was upgraded upstream to 2.0.0 and the REUSE Specification to version 3.1 (from 3.0), causing these new errors: ``` reuse.project - WARNING - Copyright and licensing information for 'docs/INSTALL_AUTOTOOLS' have been found in 'docs/INSTALL_AUTOTOOLS' and the DEP5 file located at '.reuse/dep5'. The information in the DEP5 file has been overridden. Please ensure that this is correct. reuse.project - WARNING - Copyright and licensing information for 'tests/openssh_server/Dockerfile' have been found in 'tests/openssh_server/Dockerfile' and the DEP5 file located at '.reuse/dep5'. The information in the DEP5 file has been overridden. Please ensure that this is correct. The following files have no licensing information: * docs/INSTALL_AUTOTOOLS * tests/openssh_server/Dockerfile ``` Via: https://github.com/libssh2/libssh2/actions/runs/5333572682/jobs/9664211341?pr=1098#step:4:4 Ref: https://github.com/fsfe/reuse-tool/releases/tag/v2.0.0 Ref: https://git.fsfe.org/reuse/docs/src/branch/stable/CHANGELOG.md#3-1-2023-06-21 Original discovery: https://github.com/libssh2/libssh2/pull/1098#issuecomment-1600719575 Fixes #1101 Closes #1102 --- .reuse/dep5 | 5 ----- docs/INSTALL_AUTOTOOLS | 2 ++ tests/openssh_server/Dockerfile | 33 --------------------------------- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/.reuse/dep5 b/.reuse/dep5 index 5ebe2e63..a2cc768e 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -27,8 +27,3 @@ License: BSD-3-Clause Files: .checksrc .editorconfig .github/ISSUE_TEMPLATE/bug_report.md .github/SECURITY.md .github/stale.yml .gitignore example/.gitignore m4/.gitignore src/.gitignore tests/.gitignore Copyright: The libssh2 project and its contributors. License: BSD-3-Clause - -# autotools INSTALL -Files: docs/INSTALL_AUTOTOOLS -Copyright: Free Software Foundation, Inc. -License: FSFULLR diff --git a/docs/INSTALL_AUTOTOOLS b/docs/INSTALL_AUTOTOOLS index ce1461a4..3e42c697 100644 --- a/docs/INSTALL_AUTOTOOLS +++ b/docs/INSTALL_AUTOTOOLS @@ -7,6 +7,8 @@ Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. +SPDX-License-Identifier: FSFULLR + When Building directly from Master ================================== diff --git a/tests/openssh_server/Dockerfile b/tests/openssh_server/Dockerfile index 55c54fd9..894175aa 100644 --- a/tests/openssh_server/Dockerfile +++ b/tests/openssh_server/Dockerfile @@ -1,37 +1,4 @@ # Copyright (C) Alexander Lamaison -# -# Redistribution and use in source and binary forms, -# with or without modification, are permitted provided -# that the following conditions are met: -# -# Redistributions of source code must retain the above -# copyright notice, this list of conditions and the -# following disclaimer. -# -# Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# Neither the name of the copyright holder nor the names -# of any other contributors may be used to endorse or -# promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -# OF SUCH DAMAGE. FROM debian:testing-slim