From owner-dev-commits-src-all@freebsd.org Tue Jul 27 17:57:31 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 036376660AC;
Tue, 27 Jul 2021 17:57:31 +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 4GZ4JB6jCfz4rVC;
Tue, 27 Jul 2021 17:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 C3F41713B;
Tue, 27 Jul 2021 17:57:30 +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 16RHvUU6064122;
Tue, 27 Jul 2021 17:57:30 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16RHvU9Y064121;
Tue, 27 Jul 2021 17:57:30 GMT (envelope-from git)
Date: Tue, 27 Jul 2021 17:57:30 GMT
Message-Id: <202107271757.16RHvU9Y064121@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alan Somers <asomers@FreeBSD.org>
Subject: git: 1b58943ef867 - stable/13 - [skip ci] correct a few SPDX license
tags
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: asomers
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 1b58943ef8679ce862a10ebc9f6fcb1d5d394db9
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the src repository
<dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>,
<mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jul 2021 17:57:31 -0000
The branch stable/13 has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=1b58943ef8679ce862a10ebc9f6fcb1d5d394db9
commit 1b58943ef8679ce862a10ebc9f6fcb1d5d394db9
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2021-07-07 19:52:20 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
CommitDate: 2021-07-27 17:57:17 +0000
[skip ci] correct a few SPDX license tags
These were all incorrectly labeled as 2-clause BSD licenses by a
semi-automated process, when in fact they are 3-clause.
Discussed with: pfg, imp
Sponsored by: Axcient
(cherry picked from commit 3874c0abb0afaea6adc24ac96dc9dc5043f2b69e)
---
lib/libgeom/geom_getxml.c | 2 +-
lib/libgeom/geom_stats.c | 2 +-
lib/libgeom/geom_xml2tree.c | 2 +-
lib/libgeom/libgeom.h | 2 +-
sbin/fsck_ffs/ea.c | 2 +-
usr.sbin/gstat/gstat.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/libgeom/geom_getxml.c b/lib/libgeom/geom_getxml.c
index f3d7ba9deb03..48565f707b03 100644
--- a/lib/libgeom/geom_getxml.c
+++ b/lib/libgeom/geom_getxml.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c
index 7c9191e29686..e8e2969e835f 100644
--- a/lib/libgeom/geom_stats.c
+++ b/lib/libgeom/geom_stats.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
index 5f4636f9368b..824800070933 100644
--- a/lib/libgeom/geom_xml2tree.c
+++ b/lib/libgeom/geom_xml2tree.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h
index 075d2d21f26c..fc593b234302 100644
--- a/lib/libgeom/libgeom.h
+++ b/lib/libgeom/libgeom.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index 7cf20196dfae..54353005bdc0 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
*
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c
index c2d28720205f..65388c3002ff 100644
--- a/usr.sbin/gstat/gstat.c
+++ b/usr.sbin/gstat/gstat.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
*
* Copyright (c) 2003 Poul-Henning Kamp
* All rights reserved.