Re: vasnwprintf: Fix module dependencies

2023-03-20 Thread Bruno Haible
Yesterday I did:
> 2023-03-19  Bruno Haible  
> 
>   vasnwprintf: Fix module dependencies.
>   * modules/vasnwprintf (Depends-on): Add wmemcpy, wmemset.

Oops, this produces gnulib-tool warnings:

gnulib-tool: warning: module vasnwprintf-posix depends on a module with an 
incompatible license: wmemcpy
gnulib-tool: warning: module vasnwprintf-posix depends on a module with an 
incompatible license: wmemset

Fixed by relicensing these two modules under LGPLv2. (I am the only copyright-
relevant contributor to the files of these two modules.)


2023-03-20  Bruno Haible  

wmemset: Relicense under LGPLv2+.
* modules/wmemset (License): Change to LGPLv2+.
* lib/wmemset.c: Update license notice.
* lib/wmemset-impl.h: Likewise.

2023-03-20  Bruno Haible  

wmemcpy: Relicense under LGPLv2+.
* modules/wmemcpy (License): Change to LGPLv2+.
* lib/wmemcpy.c: Update license notice.
* lib/wmemcpy-impl.h: Likewise.

>From d8f3b7a5aecc81f83c2fb62a7e3e63c0b3998300 Mon Sep 17 00:00:00 2001
From: Bruno Haible 
Date: Mon, 20 Mar 2023 10:09:16 +0100
Subject: [PATCH 1/2] wmemcpy: Relicense under LGPLv2+.

* modules/wmemcpy (License): Change to LGPLv2+.
* lib/wmemcpy.c: Update license notice.
* lib/wmemcpy-impl.h: Likewise.
---
 ChangeLog  | 7 +++
 lib/wmemcpy-impl.h | 2 +-
 lib/wmemcpy.c  | 2 +-
 modules/wmemcpy| 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e83875f2ee..83e9383f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-03-20  Bruno Haible  
+
+	wmemcpy: Relicense under LGPLv2+.
+	* modules/wmemcpy (License): Change to LGPLv2+.
+	* lib/wmemcpy.c: Update license notice.
+	* lib/wmemcpy-impl.h: Likewise.
+
 2023-03-19  Bruno Haible  
 
 	vasnwprintf: Fix test failures on musl libc.
diff --git a/lib/wmemcpy-impl.h b/lib/wmemcpy-impl.h
index f0a7007506..c243acfa15 100644
--- a/lib/wmemcpy-impl.h
+++ b/lib/wmemcpy-impl.h
@@ -4,7 +4,7 @@
 
This file 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 3 of the
+   published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
 
This file is distributed in the hope that it will be useful,
diff --git a/lib/wmemcpy.c b/lib/wmemcpy.c
index 0cfe407a1a..082bfed9ef 100644
--- a/lib/wmemcpy.c
+++ b/lib/wmemcpy.c
@@ -4,7 +4,7 @@
 
This file 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 3 of the
+   published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
 
This file is distributed in the hope that it will be useful,
diff --git a/modules/wmemcpy b/modules/wmemcpy
index e45e94fe70..161762304e 100644
--- a/modules/wmemcpy
+++ b/modules/wmemcpy
@@ -23,7 +23,7 @@ Include:
 
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 all
-- 
2.34.1

>From d25f915afb66e63d32f1feec94a0a9bbc87ff8a8 Mon Sep 17 00:00:00 2001
From: Bruno Haible 
Date: Mon, 20 Mar 2023 10:09:57 +0100
Subject: [PATCH 2/2] wmemset: Relicense under LGPLv2+.

* modules/wmemset (License): Change to LGPLv2+.
* lib/wmemset.c: Update license notice.
* lib/wmemset-impl.h: Likewise.
---
 ChangeLog  | 7 +++
 lib/wmemset-impl.h | 2 +-
 lib/wmemset.c  | 2 +-
 modules/wmemset| 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83e9383f40..7320f54be3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-03-20  Bruno Haible  
+
+	wmemset: Relicense under LGPLv2+.
+	* modules/wmemset (License): Change to LGPLv2+.
+	* lib/wmemset.c: Update license notice.
+	* lib/wmemset-impl.h: Likewise.
+
 2023-03-20  Bruno Haible  
 
 	wmemcpy: Relicense under LGPLv2+.
diff --git a/lib/wmemset-impl.h b/lib/wmemset-impl.h
index d2cc14ad42..2743469c04 100644
--- a/lib/wmemset-impl.h
+++ b/lib/wmemset-impl.h
@@ -4,7 +4,7 @@
 
This file 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 3 of the
+   published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
 
This file is distributed in the hope that it will be useful,
diff --git a/lib/wmemset.c b/lib/wmemset.c
index 72b9eb5f56..d83e07ba64 100644
--- a/lib/wmemset.c
+++ b/lib/wmemset.c
@@ -4,7 +4,7 @@
 
This file 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 3 of the
+   published by the Free Software Foundation; 

vasnwprintf: Fix module dependencies

2023-03-19 Thread Bruno Haible
The vasnwprintf implementation and tests depend on a few wide-character string
functions from . This patch adds the dependencies.

It also depends on 'swprintf'; to be added later.


2023-03-19  Bruno Haible  

vasnwprintf: Fix module dependencies.
* modules/vasnwprintf (Depends-on): Add wmemcpy, wmemset.
* modules/vasnwprintf-tests (Depends-on): Add wmemcmp.
* modules/vasnwprintf-posix-tests (Depends-on): Likewise.

diff --git a/modules/vasnwprintf b/modules/vasnwprintf
index 544d7144a4..6c7d63a5f6 100644
--- a/modules/vasnwprintf
+++ b/modules/vasnwprintf
@@ -34,6 +34,8 @@ errno
 memchr
 assert-h
 wchar
+wmemcpy
+wmemset
 
 configure.ac:
 AC_REQUIRE([AC_C_RESTRICT])
diff --git a/modules/vasnwprintf-posix-tests b/modules/vasnwprintf-posix-tests
index 4f2891a4ff..d9729e9dcb 100644
--- a/modules/vasnwprintf-posix-tests
+++ b/modules/vasnwprintf-posix-tests
@@ -16,6 +16,7 @@ float
 setlocale
 wcscmp
 wcsspn
+wmemcmp
 wmemcpy
 
 configure.ac:
diff --git a/modules/vasnwprintf-tests b/modules/vasnwprintf-tests
index e90236e8d2..37ed08de56 100644
--- a/modules/vasnwprintf-tests
+++ b/modules/vasnwprintf-tests
@@ -4,6 +4,7 @@ tests/macros.h
 
 Depends-on:
 wcscmp
+wmemcmp
 wmemcpy
 
 configure.ac: