From nobody Sun Feb 27 16:47:56 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 525A719EA829; Sun, 27 Feb 2022 16:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K68Zh5YsDz4mF3; Sun, 27 Feb 2022 16:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iz39eoXGBjrqalBjGX0i+8bfCT2F4Cl9AGMFxT9s6V0=; b=EGKiuH8GPIRx0Aa6NCwnKu1jqzAs4zA/Jx5IhG7MN9o7GlkyR3Pd+FSLQ5iybh64WnOlLL qjBD1oaXCTlH8l2iw5bPuRxeqnfdG90nQxEIArze1vE2ShnWGfKkchFu6BrhmVgFIYpZ3y wCYb+TkBntfQKv4xQHVA1rGa4LdkI6khGqqjhbK8kkTeRfBQtxTpBkls04Lvz2THA7hMMw yPJglxOsVIm3iGJJRygdYt0waFMmcySiksAlHsFmNzdupqhF0vgA89Ite5O6uAsy/rCQQ7 3RY4o7Y4YrAUywW4lLfyFq2kx2aNdXqVkU2zQn9gi2klYnTTsXvf74Pqfw4p+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88A2E2665; Sun, 27 Feb 2022 16:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21RGlu8b037105; Sun, 27 Feb 2022 16:47:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlujk037104; Sun, 27 Feb 2022 16:47:56 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:56 GMT Message-Id: <202202271647.21RGlujk037104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 11a9ff5bc150 - main - libefivar: Replace BSD License with BSD+Patent License List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11a9ff5bc150bf555d4af58a658320fcf80abef9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iz39eoXGBjrqalBjGX0i+8bfCT2F4Cl9AGMFxT9s6V0=; b=nwJo/94PkeVo5R4kkA9kyraJQN8whqJeHXGjtAjn+uYpDue7uODJ+G9GYRYAfYAzgRA/0w JCrfdvKkdkr82dxokHZr0ToLEgv5eIMluD7YV6XHUnjDLIIK/FXwaP602IQzI9WUsMCXld pJnHiqfYIt5En0z2KytrOf0kFlo8fVGn4jBxK1In6kkXJTHEcKW8MtcpRU16J8Bs7Pq27j HNWdyqm8+YmndC2/kvhGSHPf5kS6h8WN6qUrYt8tCpMQbDnT6ofF2KEuhVESt4Z2Hxn5IP hWLRDLEAzPSxJ61Ui6iGbZx2t2kwPE0QdY027La897g2FxoqpUHscnuwJz3h5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980477; a=rsa-sha256; cv=none; b=SmEfpgWDDMhbQEOUWcmxFaRsAzuPPVBVl8a3a8Ttu7DT8b6dnyMEU4W4CvV7/EAJJS2XQR JbEdNMmwd8to/Al97O2b5mzsrne+pUJWRp19IzXVVUwI6s8PBZoRKqqOsaFFwy3kuJOw2A fHURxnMchgwWj5Gw2lu4F5u5lqe6bCPSwR5a2V94ZrSiElYfkf4LnSXCt4JKnie+3I4fDn VbevA5fn4SyGLHOn4pgqZeMc9BRZSxZZJcXmsmYwvhArPPPZRC/lE0rFAw243jDswxwKqW QubiS1m+b9GtSDZ7XQPSqb/LHRJuHvG3SeGcFssTq7jPfASiOZkBalQpRYbTDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=11a9ff5bc150bf555d4af58a658320fcf80abef9 commit 11a9ff5bc150bf555d4af58a658320fcf80abef9 Author: Jose Luis Duran AuthorDate: 2022-02-24 00:54:02 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:13:43 +0000 libefivar: Replace BSD License with BSD+Patent License Replace BSD 2-Clause License with BSD+Patent License. This change is based on the following emails: https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html RFCs with detailed process for the license change: V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1373 Obtained from: https://github.com/tianocore/edk2/commit/9344f0921518309295da89c221d10cbead8531aa Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-format.c | 8 +------- lib/libefivar/efivar-dp-parse.c | 8 +------- lib/libefivar/uefi-dplib.h | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index c3fa492d4c24..f70a59a62c83 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -66,13 +66,7 @@ __FBSDID("$FreeBSD$"); (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index c6ea7bc00a57..2441360380e2 100644 --- a/lib/libefivar/efivar-dp-parse.c +++ b/lib/libefivar/efivar-dp-parse.c @@ -64,13 +64,7 @@ __FBSDID("$FreeBSD$"); DevicePathFromText protocol as defined in the UEFI 2.0 specification. Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/lib/libefivar/uefi-dplib.h b/lib/libefivar/uefi-dplib.h index 097b78ff0d64..5a40ad481afd 100644 --- a/lib/libefivar/uefi-dplib.h +++ b/lib/libefivar/uefi-dplib.h @@ -33,13 +33,7 @@ Definition for Device Path library. Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +SPDX-License-Identifier: BSD-2-Clause-Patent **/