[PATCH 1/9 v2] Replace individual license references with SPDX Identifiers

Fri Sep 25 10:06:57 GMT 2020

On 25/09/20 10:38 +0200, Dodji Seketeli wrote:
>Hello Jonathan,
>
>Jonathan Wakely <jwakely@redhat.com> writes:
>
>> One remaining issue in v2 of this patch, and two requests for a better
>> commit message. See below.
>
>Oh, right ...
>
>[...]
>
>
>>>	* ltmain.sh: Replace the license header with the SPDX identifier
>>>	GPL-2.0-or-later.
>>
>> It would be helpful if the commit log mentioned that this change to
>> ltmain.sh drops the (redundant?) libtool exception. I know you already
>> explained why that's OK, but I just noticed it again myself and asked
>> you about it on IRC. If the commit log mentioned it, I wouldn't need
>> to wonder if it's an error.
>
>Right.  I have added a hopefully better comment for this.  I am
>attaching the resulting patch below.
>
>[...]
>
>>>	* tests/lib/catch.hpp: Replace the license header with the SPDX
>>>	identifier BSL-1.0.
>>
>> The changelog says "Replace" but actually it's just adding it. Nothing
>> gets replaced.
>
>Right.  I've updated the changelog.  The reason why we don't replace it
>here is that file was generated and merged into this project.  So I
>guess we try to not mess with it too much.  Also the license of this
>file stays BSL-1.0 after the relicensing.
>
>>
>>>	* tests/mockfedabipkgdiff.in: Replace the license header with the
>>>	SPDX identifier LGPL-3.0-or-later.
>>
>> This change looks wrong:
>>
>>>diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
>>>index 47c8cc8..ea8efc1 100644
>>>--- a/tests/mockfedabipkgdiff.in
>>>+++ b/tests/mockfedabipkgdiff.in
>>>@@ -1,23 +1,8 @@
>>> #!/usr/bin/env python
>>>+# SPDX-License-Identifier: LGPL-3.0-or-later
>>> # -*- coding: utf-8 -*-
>>> # -*- Mode: Python
>>> #
>>>-# This file is part of the GNU Application Binary Interface Generic
>>>-# Analysis and Instrumentation Library (libabigail).  This library is
>>>-# free software; you can redistribute it and/or modify it under the
>>>-# terms of the GNU General Public License as published by the
>>>-# Free Software Foundation; either version 3, or (at your option) any
>>>-# later version.
>>>-#
>>>-# This library is distributed in the hope that it will be useful, but
>>>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>>>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>>-# General Public License for more details.
>>>-#
>>>-# You should have received a copy of the GNU General Public
>>>-# License along with this program; see the file COPYING-GPLV3.  If
>>>-# not, see <http:#www.gnu.org/licenses/>.
>>>-#
>>> # Author: Dodji Seketeli
>>> #
>>> # Based on some preliminary work from Chenxiong Qi, posted to
>>
>
>Right, I have fixed this so that the SPDX is now GPL-3.0-or-later.
>
>Thanks for catching this issues!
>
>Please find the updated patch below.
>
>
>From 18567ab775b78c5c0c7f9b9f2315c65b6741a864 Mon Sep 17 00:00:00 2001
>From: Matthias Maennich <maennich@google.com>
>Date: Sat, 7 Mar 2020 23:46:31 +0000
>Subject: [PATCH 1/9] Replace individual license references with SPDX
> Identifiers
>
>This patch replaces license headers with SPDX identifiers in all files
>containing license headers.  For each file, the SPDX identifier
>formally represents its current license.  Note that the list of SPDX
>identifiers is available on the SPDX web site at
>https://spdx.org/licenses.
>
>For autoconf-archive/ax_prog_python_version.m4 however, there is a
>little catch.  Dodji Seketeli wrote this ax_check_python_modules.m4.
>Just like the other autoconf-archive macros, it makes sense to have it
>under the FSF All Permissive license.  Actually, the terms of that
>license was already in the file but then the license header was
>wrongly set to GPLv2 with autoconf exception.  So I fixed that in this
>commit by setting the SPDX identifier to FSFAP.
>
>	* abigail.m4: Replace the license header with the SPDX identifier
>	GPL-3.0-or-later WITH GCC-exception-3.1
>	* autoconf-archive/ax_check_python_modules.m4: Correctly set the
>	SPDX identifier to FSFAP.
>	* autoconf-archive/ax_compare_version.m4: Replace the license
>	header with the SPDX identifier FSFAP.
>	* autoconf-archive/ax_prog_python_version.m4: Likewise.
>	header with the SPDX identifier FSFAP.
>	* autoconf-archive/ax_valgrind_check.m4: Likewise.
>	* gen-changelog.py: Replace the license header with the SPDX
>	identifier LGPL-2.0-or-later.
>	* include/abg-comp-filter.h: Replace the license header with the
>	SPDX identifier LGPL-3.0-or-later.
>	* include/abg-comparison.h: Likewise.
>	* include/abg-config.h: Likewise.
>	* include/abg-corpus.h: Likewise.
>	* include/abg-cxx-compat.h: Replace the license header with the
>	SPDX identifier LGPL-2.0-or-later.
>	* include/abg-diff-utils.h: Replace the license header with the
>	SPDX identifier LGPL-3.0-or-later
>	* include/abg-dwarf-reader.h: Likewise.
>	* include/abg-fwd.h: Likewise.
>	* include/abg-hash.h: Likewise.
>	* include/abg-ini.h: Likewise.
>	* include/abg-interned-str.h: Likewise.
>	* include/abg-ir.h: Likewise.
>	* include/abg-libxml-utils.h: Likewise.
>	* include/abg-libzip-utils.h: Likewise.
>	* include/abg-reader.h: Likewise.
>	* include/abg-regex.h: Likewise.
>	* include/abg-reporter.h: Likewise.
>	* include/abg-sptr-utils.h: Likewise.
>	* include/abg-suppression.h: Likewise.
>	* include/abg-tools-utils.h: Likewise.
>	* include/abg-traverse.h: Likewise.
>	* include/abg-viz-common.h: Likewise.
>	* include/abg-viz-dot.h: Likewise.
>	* include/abg-viz-svg.h: Likewise.
>	* include/abg-workers.h: Likewise.
>	* include/abg-writer.h: Likewise.
>	* install-sh: Replace the license header with the SPDX identifier MIT.
>	* ltmain.sh: Replace the license header with the SPDX identifier
>	GPL-2.0-or-later.  Note that this file has the libtool special
>	exception which allows us to redistribute it under the general
>	license of the project.
>	* src/abg-comp-filter.cc: Replace the license header with the SPDX
>	* src/abg-comparison-priv.h: Likewise.
>	* src/abg-comparison.cc: Likewise.
>	* src/abg-config.cc: Likewise.
>	* src/abg-corpus-priv.h: Likewise.
>	* src/abg-corpus.cc: Likewise.
>	* src/abg-default-reporter.cc: Likewise.
>	* src/abg-diff-utils.cc: Likewise.
>	* src/abg-dwarf-reader.cc: Likewise.
>	* src/abg-elf-helpers.cc: Likewise.
>	* src/abg-elf-helpers.h: Likewise.
>	* src/abg-regex.cc: Likewise.
>	* src/abg-hash.cc: Likewise.
>	* src/abg-ini.cc: Likewise.
>	* src/abg-internal.h: Likewise.
>	* src/abg-ir-priv.h: Likewise.
>	* src/abg-ir.cc: Likewise.
>	* src/abg-leaf-reporter.cc: Likewise.
>	* src/abg-libxml-utils.cc: Likewise.
>	* src/abg-libzip-utils.cc: Likewise.
>	* src/abg-reader.cc: Likewise.
>	* src/abg-reporter-priv.cc: Likewise.
>	* src/abg-reporter-priv.h: Likewise.
>	* src/abg-sptr-utils.cc: Likewise.
>	* src/abg-suppression-priv.h: Likewise.
>	* src/abg-suppression.cc: Likewise.
>	* src/abg-tools-utils.cc: Likewise.
>	* src/abg-traverse.cc: Likewise.
>	* src/abg-viz-common.cc: Likewise.
>	* src/abg-viz-dot.cc: Likewise.
>	* src/abg-viz-svg.cc: Likewise.
>	* src/abg-workers.cc: Likewise.
>	* src/abg-writer.cc: Likewise.
>	* tests/lib/catch.hpp: Add an SPDX identifier BSL-1.0.
>	* tests/lib/catch.cc: Likewise.

The patch itself looks fine now, but these two lines in the changelog
have been reordered. That makes it look like the "catch.cc: Likewise."
means that file gets the BSL-1.0 identifier. But actually it gets the
LGPL one. I think it should be this way round, as before:

	* tests/lib/catch.cc: Likewise.
	* tests/lib/catch.hpp: Add an SPDX identifier BSL-1.0.

Looks good apart from that.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

I think I've signed-off on the whole series now.