You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
74 lines
3.4 KiB
74 lines
3.4 KiB
1 month ago
|
commit 273a835fe7c685cc54266bb8b502787bad5e9bae
|
||
|
|
Author: Carlos O'Donell <carlos@redhat.com>
|
||
|
|
Date: Tue Apr 23 13:30:37 2024 -0400
|
||
|
|
|
||
|
|
time: Allow later version licensing.
|
||
|
|
|
||
|
|
The FSF's Licensing and Compliance Lab noted a discrepancy in the
|
||
|
|
licensing of several files in the glibc package.
|
||
|
|
|
||
|
|
When timespect_get.c was impelemented the license did not include
|
||
|
|
the standard ", or (at your option) any later version." text.
|
||
|
|
|
||
|
|
Change the license in timespec_get.c and all copied files to match
|
||
|
|
the expected license.
|
||
|
|
|
||
|
|
This change was previously approved in principle by the FSF in
|
||
|
|
RT ticket #1316403. And a similar instance was fixed in
|
||
|
|
commit 46703efa02f6ddebce5ee54c92f7c32598de0de6.
|
||
|
|
|
||
|
|
(cherry picked from commit 91695ee4598b39d181ab8df579b888a8863c4cab)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/unix/sysv/linux/timespec_get.c b/sysdeps/unix/sysv/linux/timespec_get.c
|
||
|
|
index c6e5e6628928523b..778d1e33548d2369 100644
|
||
|
|
--- a/sysdeps/unix/sysv/linux/timespec_get.c
|
||
|
|
+++ b/sysdeps/unix/sysv/linux/timespec_get.c
|
||
|
|
@@ -5,7 +5,7 @@
|
||
|
|
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.
|
||
|
|
+ version 2.1 of the License, or (at your option) any later version.
|
||
|
|
|
||
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
||
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
|
|
diff --git a/sysdeps/unix/sysv/linux/timespec_getres.c b/sysdeps/unix/sysv/linux/timespec_getres.c
|
||
|
|
index 5acebe2a2cb99ccf..2eef9e512c6f650e 100644
|
||
|
|
--- a/sysdeps/unix/sysv/linux/timespec_getres.c
|
||
|
|
+++ b/sysdeps/unix/sysv/linux/timespec_getres.c
|
||
|
|
@@ -5,7 +5,7 @@
|
||
|
|
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.
|
||
|
|
+ version 2.1 of the License, or (at your option) any later version.
|
||
|
|
|
||
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
||
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
|
|
diff --git a/time/timespec_get.c b/time/timespec_get.c
|
||
|
|
index b031e42ca20c1eea..26a044bca6e7f9fe 100644
|
||
|
|
--- a/time/timespec_get.c
|
||
|
|
+++ b/time/timespec_get.c
|
||
|
|
@@ -4,7 +4,7 @@
|
||
|
|
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.
|
||
|
|
+ version 2.1 of the License, or (at your option) any later version.
|
||
|
|
|
||
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
||
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
|
|
diff --git a/time/timespec_getres.c b/time/timespec_getres.c
|
||
|
|
index edb397507cdfc2fa..2e18b8bcacfec498 100644
|
||
|
|
--- a/time/timespec_getres.c
|
||
|
|
+++ b/time/timespec_getres.c
|
||
|
|
@@ -5,7 +5,7 @@
|
||
|
|
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.
|
||
|
|
+ version 2.1 of the License, or (at your option) any later version.
|
||
|
|
|
||
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
||
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|