Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Jul 2023 20:48:46 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 6d30916e9bc4 - stable/13 - spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD
Message-ID:  <202307252048.36PKmk8Y063697@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=6d30916e9bc49501e1ae22575fdd0736a1191d9a

commit 6d30916e9bc49501e1ae22575fdd0736a1191d9a
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-05-10 15:40:58 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-07-25 15:18:00 +0000

    spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD
    
    There never was a BSD-3-Clause-FreeBSD SPDX identifier. Replace it
    with BSD-3-Clause.
    
    Discussed with:         pfg
    MFC After:              3 days
    Sponsored by:           Netflix
    
    (cherry picked from commit eb8f887758f31f605829c995ce71a627dec0838a)
---
 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 a6bb130fd5a7..a46a58328373 100644
--- a/lib/libgeom/geom_getxml.c
+++ b/lib/libgeom/geom_getxml.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2003 Poul-Henning Kamp
  * All rights reserved.
diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c
index e8e2969e835f..80a29cb9148e 100644
--- a/lib/libgeom/geom_stats.c
+++ b/lib/libgeom/geom_stats.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2003 Poul-Henning Kamp
  * All rights reserved.
diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
index 52d21790101e..d75b8e53bcd0 100644
--- a/lib/libgeom/geom_xml2tree.c
+++ b/lib/libgeom/geom_xml2tree.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2003 Poul-Henning Kamp
  * All rights reserved.
diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h
index 339a8d34729f..86d22b125287 100644
--- a/lib/libgeom/libgeom.h
+++ b/lib/libgeom/libgeom.h
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2003 Poul-Henning Kamp
  * All rights reserved.
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index f46d883e12ad..c64fb20ee9e8 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * 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 65388c3002ff..cd44c740a3b4 100644
--- a/usr.sbin/gstat/gstat.c
+++ b/usr.sbin/gstat/gstat.c
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2003 Poul-Henning Kamp
  * All rights reserved.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307252048.36PKmk8Y063697>