From patchwork Fri Jan 26 20:13:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 84808 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 582E0385842F for ; Fri, 26 Jan 2024 20:14:32 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6C8BE3858D35 for ; Fri, 26 Jan 2024 20:14:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6C8BE3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6C8BE3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706300049; cv=none; b=H0TL1WJHRVTDD+gLLSOdtCgkSK6rVOYCfAubY7Vrx2JF/f7L/fOqxAxYz6jd7JZIqhH/nywjnQU6Dd0vHSMZ0yB/c8FOVD/VGByIIi3qlCAAjydfjsgJGrBxZKVZL9jTUxQFhvxNQt1miFRG7WGhZtfG7vDhIIHbci6zobSEXPY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706300049; c=relaxed/simple; bh=nh3BMjggX4bcCxYble0K9jCgqbTB+QiGlMGB/eg8l3k=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=h7jdqv8p0Prgen69k99DN5dz0EYMW/MPGLK4/K1z3Im2aNzxlyZyQcWmP+8bL5A7qOJQc5zh87X9YjkM4OBsentvDuTvG65tBst+3UjStmQXp+S8Rj/PZbEqKuF1r4IAfIEsQoL5FUD2ODVW644bUazNlVtjQk7tXSquIQvKuKo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706300047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v9D0QpyPSA2a00dibyzw0BIAZt7LXot0bojqurvkTxk=; b=GvcGKF9pvBI02vguxmQIk7fr/JUPh1jPN95sR44fJ/ChyCNQH/3/jcv5HQbjq3RVl01uoK 7giQhnrVQlxh1j5Y5btUz1TTkEbB3U8DPLI276gXTtgj86p4OOPT5a2tYwWxIUqjGYCNaX 4XOoFG8zRWrqmCSM7lFIoEUcsakMdko= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-264-R6z2_BmPMpumY9EYpzOzAg-1; Fri, 26 Jan 2024 15:14:00 -0500 X-MC-Unique: R6z2_BmPMpumY9EYpzOzAg-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-42a4660fae8so13553241cf.1 for ; Fri, 26 Jan 2024 12:14:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706300039; x=1706904839; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hiMaLSFw+Pt/aXDdA4owwlhZVonrKi0A4rz29QzfrgE=; b=j2nq/0HP7/BZfpkwRBlbkt2PGi0WElLQo55a+MJobuP8a6hHRPhT2ACQaqHOr9XuEt JRgkLqlAVI+VVmIlFaA5C1F2W7Y+5vpNedSHBRMcpYSbF8V6GQXVNgJJrCjyFRleOwee OhXGDsUa/TMc8y7vj6SpNTqthUkjQ9IHOqUDryJeSRqp9sFAKLo09bJQJKJ4fQvZ1tQj JNxbIipd0o4pMfdsBLQXKFzBzgyNbBGfnPIMkZBvL0ygtL2fn7WpC9emBX3eWlcut7R9 gTL9xhkVBF8QawtD7qbieyjYgG6eO4dkMIY5kMr/8RlEIsXkAvBWIl3REgeYVMxUSzv5 ds3g== X-Gm-Message-State: AOJu0Ywtn/0cru1mx0qxpE47gP9z1bsrIkERL7gh4XFl42rEP5MZIgTn 7xFAsLaJMTDHrewjKshPjnxO3jpjN4SSUmU2KfWCsig1WvDo33cqODJd8FalF6ly9eLqgdIPpzf ZFxMEWPljJ7p/vZsSHzbaI00YIXeRQ77w4GQc9FPzAphsBsEik3S9riGD1x5hkNgfjkL0SdraXh KKa57ANTmv9otCSj9Fnko9/rDDAcUv/Ovsoeh91BU= X-Received: by 2002:ac8:7d56:0:b0:42a:896f:e619 with SMTP id h22-20020ac87d56000000b0042a896fe619mr288255qtb.34.1706300039533; Fri, 26 Jan 2024 12:13:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGC9NC2kTTNRCRTBFkC9Zl7mEiwfiC0dgvTSFVDhdUPA7O6K3iD3OSNGMsiV3m4J+05pWr7rg== X-Received: by 2002:ac8:7d56:0:b0:42a:896f:e619 with SMTP id h22-20020ac87d56000000b0042a896fe619mr288233qtb.34.1706300039042; Fri, 26 Jan 2024 12:13:59 -0800 (PST) Received: from athas.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id fv27-20020a05622a4a1b00b00429be14d3bbsm819432qtb.13.2024.01.26.12.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 12:13:58 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org, fweimer@redhat.com, dilfridge@gentoo.org Cc: Carlos O'Donell Subject: [PATCH] Relicense IBM portions of resolv/base64.c resolv/res_debug.c. Date: Fri, 26 Jan 2024 15:13:43 -0500 Message-ID: <20240126201350.2215924-1-carlos@redhat.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain; charset=UTF-8 X-Spam-Status: No, score=-22.2 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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 Signed-off-by: Richard Fontana Signed-off-by: Carlos O'Donell --- LICENSES | 21 +++++++++++++++++++++ resolv/base64.c | 36 +++++++++++++++++------------------- resolv/res_debug.c | 36 +++++++++++++++++------------------- 3 files changed, 55 insertions(+), 38 deletions(-) diff --git a/LICENSES b/LICENSES index 530893b1dc..f4b24c1a41 100644 --- a/LICENSES +++ b/LICENSES @@ -389,3 +389,24 @@ Copyright 2001 by Stephen L. Moshier You should have received a copy of the GNU Lesser General Public License along with this library; if not, see . */ + +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 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. */ /*