On 2024-08-30 04:13, Bruno Haible wrote:
Do you agree with that?
Yes, that sounds right. I implemented that suggestion by installing the
attached.From e87d09bee37eeb742b8a34c9054cd2ebde22b835 Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Thu, 5 Sep 2024 18:31:29 -0700
Subject: [PATCH] Fix COPYING.EXCEPTION license notices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Problem reported by Bruno Haible in:
https://lists.gnu.org/r/bug-gnulib/2024-08/msg00227.html
* m4/std-gnu11.m4: Fix license notice to use COPYING.EXCEPTION
correctly.
* m4/std-gnu23.m4: Likewise. Also document the commit ID,
since Autoconf was updated likewise and we’re copying from there.
---
ChangeLog | 10 ++++++++++
m4/std-gnu11.m4 | 19 ++++++++++++++-----
m4/std-gnu23.m4 | 22 +++++++++++++++-------
3 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 366aa8464c..f87bc0f741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-09-05 Paul Eggert <egg...@cs.ucla.edu>
+
+ Fix COPYING.EXCEPTION license notices
+ Problem reported by Bruno Haible in:
+ https://lists.gnu.org/r/bug-gnulib/2024-08/msg00227.html
+ * m4/std-gnu11.m4: Fix license notice to use COPYING.EXCEPTION
+ correctly.
+ * m4/std-gnu23.m4: Likewise. Also document the commit ID,
+ since Autoconf was updated likewise and we’re copying from there.
+
2024-09-04 Bruno Haible <br...@clisp.org>
Resolve conflicts for functions introduced in Android API level 35.
diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4
index e8d5de7a1e..d61d694297 100644
--- a/m4/std-gnu11.m4
+++ b/m4/std-gnu11.m4
@@ -1,5 +1,5 @@
# std-gnu11.m4
-# serial 2
+# serial 3
# Prefer GNU C11 and C++11 to earlier versions. -*- coding: utf-8 -*-
@@ -9,6 +9,7 @@ m4_ifndef([_AC_C_C23_OPTIONS], [
# This implementation is taken from GNU Autoconf lib/autoconf/c.m4
# commit 017d5ddd82854911f0119691d91ea8a1438824d6
# dated Sun Apr 3 13:57:17 2016 -0700
+# with minor changes to commentary.
# This implementation will be obsolete once we can assume Autoconf 2.70
# or later is installed everywhere a Gnulib program might be developed.
@@ -17,9 +18,10 @@ m4_version_prereq([2.70], [], [
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
-# This program 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 of the License, or
+# This file is part of Autoconf. This program 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 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -27,8 +29,15 @@ m4_version_prereq([2.70], [], [
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
+# Under Section 7 of GPL version 3, you are granted additional
+# permissions described in the Autoconf Configure Script Exception,
+# version 3.0, as published by the Free Software Foundation.
+#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# and a copy of the Autoconf Configure Script Exception along with
+# this program; see the files COPYINGv3 and COPYING.EXCEPTION
+# respectively. If not, see <https://www.gnu.org/licenses/> and
+# <https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;f=COPYING.EXCEPTION>.
# Written by David MacKenzie, with help from
# Akim Demaille, Paul Eggert,
diff --git a/m4/std-gnu23.m4 b/m4/std-gnu23.m4
index db65c2bc36..cebf62d283 100644
--- a/m4/std-gnu23.m4
+++ b/m4/std-gnu23.m4
@@ -1,11 +1,11 @@
# std-gnu23.m4
-# serial 1
+# serial 2
# Prefer GNU C23 to earlier versions.
# This implementation is taken from GNU Autoconf lib/autoconf/c.m4
-# commit 653956f44683e1daed9827de429590bdd2e317e7
-# dated Tue Apr 30 10:26:50 2024 -0700
+# commit 93b3d33c1d09b05601b240bf17b83f50ac4a148b
+# dated Thu Sep 5 18:19:36 2024 -0700
# This implementation will be obsolete once we can assume Autoconf 2.73
# or later is installed everywhere a Gnulib program might be developed.
@@ -14,9 +14,10 @@ m4_version_prereq([2.73], [], [
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
-# This program 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 of the License, or
+# This file is part of Autoconf. This program 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 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -24,8 +25,15 @@ m4_version_prereq([2.73], [], [
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
+# Under Section 7 of GPL version 3, you are granted additional
+# permissions described in the Autoconf Configure Script Exception,
+# version 3.0, as published by the Free Software Foundation.
+#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# and a copy of the Autoconf Configure Script Exception along with
+# this program; see the files COPYINGv3 and COPYING.EXCEPTION
+# respectively. If not, see <https://www.gnu.org/licenses/> and
+# <https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;f=COPYING.EXCEPTION>.
# Written by David MacKenzie, with help from
# Akim Demaille, Paul Eggert,
--
2.43.0
