'./check-copyright' reports these license inconsistencies: Module License File License File name ================= ================= ===================================== LGPLv3+ or GPLv2+ LGPL lib/wcsstr-impl.h LGPLv3+ or GPLv2+ LGPLv2+ lib/wcs-two-way.h
The cause is that some of the code is shared or is maintained together with the strstr implementation, which is under LGPLv2+. Since it's essentially the same code, regardless whether on 'char *' or 'wchar_t *' strings, it simplifies things to just put the 'wchar_t *' code under LGPLv2+ as well. The following patches do this, together with the dependencies. Most of the code, including all of lib/wcsstr.c, was written by me. lib/wcsstr-impl.h has code written by Eric Blake, that was under LGPLv2+ when it was copied from lib/strstr.c. So, I need no one's explicit permission. 2023-08-21 Bruno Haible <[email protected]> wcsstr: Relicense under LGPLv2+. * modules/wcsstr (License): Change to LGPLv2+. wcsstr-simple: Relicense under LGPLv2+. * modules/wcsstr-simple (License): Change to LGPLv2+. * lib/wcsstr.c: Update license notice. * lib/wcsstr-impl.h: Update license notice. The code added here on 2023-03-27 was under LGPLv2+. wmemcmp: Relicense under LGPLv2+. * modules/wmemcmp (License): Change to LGPLv2+. * lib/wmemcmp.c: Update license notice. * lib/wmemcmp-impl.h: Likewise. wcschr: Relicense under LGPLv2+. * modules/wcschr (License): Change to LGPLv2+. * lib/wcschr.c: Update license notice. * lib/wcschr-impl.h: Likewise.
>From 567b7fe949cbe54bc346bd0642292930fc306b33 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Mon, 21 Aug 2023 15:46:02 +0200 Subject: [PATCH 1/4] wcschr: Relicense under LGPLv2+. * modules/wcschr (License): Change to LGPLv2+. * lib/wcschr.c: Update license notice. * lib/wcschr-impl.h: Likewise. --- ChangeLog | 7 +++++++ lib/wcschr-impl.h | 2 +- lib/wcschr.c | 2 +- modules/wcschr | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 129f7aa495..145866bc1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-08-21 Bruno Haible <[email protected]> + + wcschr: Relicense under LGPLv2+. + * modules/wcschr (License): Change to LGPLv2+. + * lib/wcschr.c: Update license notice. + * lib/wcschr-impl.h: Likewise. + 2023-08-21 Bruno Haible <[email protected]> unistr/u32-strlen: Complete license change from 2023-07-23. diff --git a/lib/wcschr-impl.h b/lib/wcschr-impl.h index d4ca0a6609..9cfb29fc69 100644 --- a/lib/wcschr-impl.h +++ b/lib/wcschr-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/wcschr.c b/lib/wcschr.c index 20d849707b..a6698e7397 100644 --- a/lib/wcschr.c +++ b/lib/wcschr.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/wcschr b/modules/wcschr index a5c40efffb..9595b16fec 100644 --- a/modules/wcschr +++ b/modules/wcschr @@ -29,7 +29,7 @@ Include: <wchar.h> License: -LGPL +LGPLv2+ Maintainer: all -- 2.34.1
>From acfc83b9e0fc10c9bfa3452c7f0b21e540115fcd Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Mon, 21 Aug 2023 15:50:35 +0200 Subject: [PATCH 2/4] wmemcmp: Relicense under LGPLv2+. * modules/wmemcmp (License): Change to LGPLv2+. * lib/wmemcmp.c: Update license notice. * lib/wmemcmp-impl.h: Likewise. --- ChangeLog | 5 +++++ lib/wmemcmp-impl.h | 2 +- lib/wmemcmp.c | 2 +- modules/wmemcmp | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 145866bc1b..1b21fcb9b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2023-08-21 Bruno Haible <[email protected]> + wmemcmp: Relicense under LGPLv2+. + * modules/wmemcmp (License): Change to LGPLv2+. + * lib/wmemcmp.c: Update license notice. + * lib/wmemcmp-impl.h: Likewise. + wcschr: Relicense under LGPLv2+. * modules/wcschr (License): Change to LGPLv2+. * lib/wcschr.c: Update license notice. diff --git a/lib/wmemcmp-impl.h b/lib/wmemcmp-impl.h index 6148220de7..53199015f4 100644 --- a/lib/wmemcmp-impl.h +++ b/lib/wmemcmp-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/wmemcmp.c b/lib/wmemcmp.c index 95893347fd..fd1b407134 100644 --- a/lib/wmemcmp.c +++ b/lib/wmemcmp.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/wmemcmp b/modules/wmemcmp index c0e19a5184..e2b99035ee 100644 --- a/modules/wmemcmp +++ b/modules/wmemcmp @@ -24,7 +24,7 @@ Include: <wchar.h> License: -LGPL +LGPLv2+ Maintainer: all -- 2.34.1
>From 3f13a7efde02fe00de28c26941108fb00aef3933 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Mon, 21 Aug 2023 15:58:16 +0200 Subject: [PATCH 3/4] wcsstr-simple: Relicense under LGPLv2+. * modules/wcsstr-simple (License): Change to LGPLv2+. * lib/wcsstr.c: Update license notice. * lib/wcsstr-impl.h: Update license notice. The code added here on 2023-03-27 was under LGPLv2+. --- ChangeLog | 6 ++++++ lib/wcsstr-impl.h | 2 +- lib/wcsstr.c | 2 +- modules/wcsstr-simple | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b21fcb9b3..960fad1f96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2023-08-21 Bruno Haible <[email protected]> + wcsstr-simple: Relicense under LGPLv2+. + * modules/wcsstr-simple (License): Change to LGPLv2+. + * lib/wcsstr.c: Update license notice. + * lib/wcsstr-impl.h: Update license notice. The code added here on + 2023-03-27 was under LGPLv2+. + wmemcmp: Relicense under LGPLv2+. * modules/wmemcmp (License): Change to LGPLv2+. * lib/wmemcmp.c: Update license notice. diff --git a/lib/wcsstr-impl.h b/lib/wcsstr-impl.h index f889c26b11..dc9bd1658c 100644 --- a/lib/wcsstr-impl.h +++ b/lib/wcsstr-impl.h @@ -3,7 +3,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/wcsstr.c b/lib/wcsstr.c index 6c73f2df5f..712d97fc9b 100644 --- a/lib/wcsstr.c +++ b/lib/wcsstr.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/wcsstr-simple b/modules/wcsstr-simple index 827d50c4f8..c33e1e42d1 100644 --- a/modules/wcsstr-simple +++ b/modules/wcsstr-simple @@ -23,7 +23,7 @@ Include: <wchar.h> License: -LGPL +LGPLv2+ Maintainer: all -- 2.34.1
>From cdc6a65ae56043e3bfd598257b199ff1a1291272 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Mon, 21 Aug 2023 15:59:34 +0200 Subject: [PATCH 4/4] wcsstr: Relicense under LGPLv2+. * modules/wcsstr (License): Change to LGPLv2+. --- ChangeLog | 3 +++ modules/wcsstr | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 960fad1f96..054f07345a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2023-08-21 Bruno Haible <[email protected]> + wcsstr: Relicense under LGPLv2+. + * modules/wcsstr (License): Change to LGPLv2+. + wcsstr-simple: Relicense under LGPLv2+. * modules/wcsstr-simple (License): Change to LGPLv2+. * lib/wcsstr.c: Update license notice. diff --git a/modules/wcsstr b/modules/wcsstr index 87ac47fa65..891de1ea98 100644 --- a/modules/wcsstr +++ b/modules/wcsstr @@ -26,7 +26,7 @@ Include: <wchar.h> License: -LGPL +LGPLv2+ Maintainer: all -- 2.34.1
