Re: [PATCH 2/5] Import idx.h from gnulib

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

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

On 12/25/20 12:34 PM, Florian Weimer wrote:
> This file is linked into the library itself, so we can only accept
> something that is under a compatible license (probably LGPLv2 or later).

I installed the attached patch to the Gnulib copy of idx.h to do that. 
This uses the same wording as what's in glibc's scratch_buffer.h.

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

From e0ea25e27e1f1ed70b5dcc2338b9ede365f9a79a Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Dec 2020 17:26:51 -0800
Subject: [PATCH] idx: change idx.h comment to LGPLv2.1+

* lib/idx.h: Change license notice to match what should be in glibc.
gnulib-tool will change it as appropriate anyway, so this is just
to simplify syncing with glibc.
---
 ChangeLog |  7 +++++++
 lib/idx.h | 21 +++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16112f73e..82362718d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-12-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	idx: change idx.h comment to LGPLv2.1+
+	* lib/idx.h: Change license notice to match what should be in glibc.
+	gnulib-tool will change it as appropriate anyway, so this is just
+	to simplify syncing with glibc.
+
 2020-12-25  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	MODULES.html.sh: Update after 2020-12-19 change.
diff --git a/lib/idx.h b/lib/idx.h
index ad7d31a2b..024b44ae9 100644
--- a/lib/idx.h
+++ b/lib/idx.h
@@ -1,19 +1,20 @@
 /* A type for indices and sizes.
-
    Copyright (C) 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 2, 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/>.  */
 
 #ifndef _IDX_H
 #define _IDX_H
-- 
2.27.0