Re: [PATCH 3/5] Import filename.h from gnulib

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

On 12/31/20 3:13 PM, Joseph Myers wrote:

> Anything used in glibc libraries should be LGPLv2.1+.

Thanks for catching that. I installed the attached patch into Gnulib so 
that glibc and Gnulib copies of filename.h can be identical.

[-- Attachment #2: 0001-filename-change-filename.h-comment-to-LGPLv2.1.patch --]
[-- Type: text/x-patch, Size: 2662 bytes --]

From ec51ca6c9d59037df66afe0804394f66a2a8ff54 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 31 Dec 2020 19:29:08 -0800
Subject: [PATCH] filename: change filename.h comment to LGPLv2.1+

* lib/filename.h: Change license notice to match what should be in
glibc, and what modules/filename specifies.  This is to simplify
syncing with glibc.
---
 ChangeLog      |  5 +++++
 lib/filename.h | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8b956828..f535c7805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2020-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 
+	filename: change filename.h comment to LGPLv2.1+
+	* lib/filename.h: Change license notice to match what should be in
+	glibc, and what modules/filename specifies.  This is to simplify
+	syncing with glibc.
+
 	doc: mention year-0 bugs in Solaris etc.
 	* doc/posix-functions/gmtime.texi, doc/posix-functions/gmtime_r.texi:
 	* doc/posix-functions/localtime.texi:
diff --git a/lib/filename.h b/lib/filename.h
index 4598fb1d6..984154c49 100644
--- a/lib/filename.h
+++ b/lib/filename.h
@@ -1,18 +1,20 @@
 /* Basic filename support macros.
    Copyright (C) 2001-2004, 2007-2020 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-   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.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   The GNU C 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* From Paul Eggert and Jim Meyering.  */
 
-- 
2.27.0