diff mbox series

Relicense IBM portions of resolv/base64.c resolv/res_debug.c.

Message ID 20240126201350.2215924-1-carlos@redhat.com
State Committed
Commit ae49a7b29acc184b03c2a6bd6ac01b5e08efd54f
Headers
Series Relicense IBM portions of resolv/base64.c resolv/res_debug.c. |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch warning Patch already apply to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686

Commit Message

Carlos O'Donell Jan. 26, 2024, 8:13 p.m. UTC 
  This change relicenses the IBM portions of resolv/base64.c and
resolv/res_debug.c to a new license that does not have use-limited
patent language.  The top-level LICENSE file is updated with the
license.

The relicensing was approved by IBM.

Signed-off-by: Brad Topol, IBM Director of Open Technologies <btopol@us.ibm.com>
Signed-off-by: Richard Fontana <rfontana@redhat.com>
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
---
 LICENSES           | 21 +++++++++++++++++++++
 resolv/base64.c    | 36 +++++++++++++++++-------------------
 resolv/res_debug.c | 36 +++++++++++++++++-------------------
 3 files changed, 55 insertions(+), 38 deletions(-)

Comments

Carlos O'Donell Jan. 26, 2024, 8:15 p.m. UTC | #1 
On 1/26/24 15:13, Carlos O'Donell wrote:
> This change relicenses the IBM portions of resolv/base64.c and
> resolv/res_debug.c to a new license that does not have use-limited
> patent language.  The top-level LICENSE file is updated with the
> license.
> 
> The relicensing was approved by IBM.
> 
> Signed-off-by: Brad Topol, IBM Director of Open Technologies <btopol@us.ibm.com>
> Signed-off-by: Richard Fontana <rfontana@redhat.com>
> Signed-off-by: Carlos O'Donell <carlos@redhat.com>

Andreas,

As RM is this OK to push? No code changes, but it fixes the license issues with
this code and so should make glibc 2.39.
Andreas K. Huettel Jan. 26, 2024, 8:18 p.m. UTC | #2 
Am Freitag, 26. Januar 2024, 21:15:45 CET schrieb Carlos O'Donell:
> On 1/26/24 15:13, Carlos O'Donell wrote:
> > This change relicenses the IBM portions of resolv/base64.c and
> > resolv/res_debug.c to a new license that does not have use-limited
> > patent language.  The top-level LICENSE file is updated with the
> > license.
> > 
> > The relicensing was approved by IBM.
> > 
> > Signed-off-by: Brad Topol, IBM Director of Open Technologies <btopol@us.ibm.com>
> > Signed-off-by: Richard Fontana <rfontana@redhat.com>
> > Signed-off-by: Carlos O'Donell <carlos@redhat.com>
> 
> Andreas,
> 
> As RM is this OK to push? No code changes, but it fixes the license issues with
> this code and so should make glibc 2.39.

Yes, of course. Thanks a lot, very good.
diff mbox series

Patch

diff --git a/LICENSES b/LICENSES
index 530893b1dc..f4b24c1a41 100644
--- a/LICENSES
+++ b/LICENSES
@@ -389,3 +389,24 @@  Copyright 2001 by Stephen L. Moshier <moshier@na-net.ornl.gov>
  You should have received a copy of the GNU Lesser General Public
  License along with this library; if not, see
  <https://www.gnu.org/licenses/>.  */
+
+Copyright (c) 1995 IBM Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/resolv/base64.c b/resolv/base64.c
index fedc086b0c..6237257bb0 100644
--- a/resolv/base64.c
+++ b/resolv/base64.c
@@ -16,28 +16,26 @@ 
  */
 
 /*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
+ * Copyright (c) 1995 IBM Corporation
  *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include <sys/types.h>
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index b0fe69b1aa..dab5283bbf 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -48,28 +48,26 @@ 
  */
 
 /*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
+ * Copyright (c) 1995 IBM Corporation
  *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /*