[elbe-devel] [PATCH v2 08/11] tests: example-mapping: add mapping for GPL-3.0-or-later WITH Bison-exception-2.2
Thomas Weißschuh
thomas.weissschuh at linutronix.de
Wed Jul 24 12:22:04 CEST 2024
This is a direct match.
As the example-mapping can also be used as reference by users, make sure
its useful.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
elbepack/tests/cyclonedx/example-mapping.xml | 1 +
elbepack/tests/test_parselicence_reference.spdx | 16 ++++++++--------
elbepack/tests/test_parselicence_reference.xml | 16 ++++++++--------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/elbepack/tests/cyclonedx/example-mapping.xml b/elbepack/tests/cyclonedx/example-mapping.xml
index 0350ce765afa..dd14565e8cb2 100644
--- a/elbepack/tests/cyclonedx/example-mapping.xml
+++ b/elbepack/tests/cyclonedx/example-mapping.xml
@@ -49,6 +49,7 @@
<mapping name='FTL'>FTL</mapping>
<mapping name='ISC'>ISC</mapping>
<mapping name='Gzip'>Zlib</mapping>
+ <mapping name='GPL-3+ with Bison exception'>GPL-3.0-or-later WITH Bison-exception-2.2</mapping>
<mapping name='X-Consortium'>X11</mapping>
diff --git a/elbepack/tests/test_parselicence_reference.spdx b/elbepack/tests/test_parselicence_reference.spdx
index 07adcbc0b693..c48497cb8506 100644
--- a/elbepack/tests/test_parselicence_reference.spdx
+++ b/elbepack/tests/test_parselicence_reference.spdx
@@ -47,7 +47,7 @@ PackageLicenseInfoFromFiles: NOASSERTION
PackageName: bash
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: GPL-3.0-or-later AND GPL-3.0-or-later WITH Bison exception AND GPL-2.0-or-later AND UNKNOWN_MAPPING(GFDL-NIV-1.3) AND UNKNOWN_MAPPING(Latex2e) AND UNKNOWN_MAPPING(BSD-4-clause-UC) AND UNKNOWN_MAPPING(MIT-like) AND UNKNOWN_MAPPING(permissive)
+PackageLicenseDeclared: GPL-3.0-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-2.0-or-later AND UNKNOWN_MAPPING(GFDL-NIV-1.3) AND UNKNOWN_MAPPING(Latex2e) AND UNKNOWN_MAPPING(BSD-4-clause-UC) AND UNKNOWN_MAPPING(MIT-like) AND UNKNOWN_MAPPING(permissive)
PackageLicenseInfoFromFiles: NOASSERTION
## Package bsdutils
@@ -432,7 +432,7 @@ PackageLicenseInfoFromFiles: NOASSERTION
PackageName: libelf1
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: GPL-3.0-or-later AND UNKNOWN_MAPPING(GFDL-NIV-1.3) AND LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later) AND GPL-3.0-or-later WITH Bison exception AND BSD-2-Clause
+PackageLicenseDeclared: GPL-3.0-or-later AND UNKNOWN_MAPPING(GFDL-NIV-1.3) AND LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later) AND GPL-3.0-or-later WITH Bison-exception-2.2 AND BSD-2-Clause
PackageLicenseInfoFromFiles: NOASSERTION
## Package libext2fs2
@@ -474,7 +474,7 @@ PackageLicenseInfoFromFiles: NOASSERTION
PackageName: libgmp10
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later AND GPL-3.0-or-later WITH Bison exception
+PackageLicenseDeclared: (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2
PackageLicenseInfoFromFiles: NOASSERTION
## Package libgnutls30
@@ -656,28 +656,28 @@ PackageLicenseInfoFromFiles: NOASSERTION
PackageName: libpam-modules
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison exception AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
+PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
PackageLicenseInfoFromFiles: NOASSERTION
## Package libpam-modules-bin
PackageName: libpam-modules-bin
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison exception AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
+PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
PackageLicenseInfoFromFiles: NOASSERTION
## Package libpam-runtime
PackageName: libpam-runtime
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison exception AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
+PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
PackageLicenseInfoFromFiles: NOASSERTION
## Package libpam0g
PackageName: libpam0g
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison exception AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
+PackageLicenseDeclared: (BSD-3-Clause OR UNKNOWN_MAPPING(GPL)) AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later WITH Bison-exception-2.2 AND UNKNOWN_MAPPING(BSD-tcp_wrappers) AND LGPL-2.0-or-later AND CC0-1.0 AND UNKNOWN_MAPPING(Beerware)
PackageLicenseInfoFromFiles: NOASSERTION
## Package libpcre2-8-0
@@ -1020,7 +1020,7 @@ PackageLicenseInfoFromFiles: NOASSERTION
PackageName: tar
PackageDownloadLocation: NOASSERTION
PackageLicenseConcluded: NOASSERTION
-PackageLicenseDeclared: GPL-3.0-or-later AND GPL-3.0-or-later WITH Bison exception AND LGPL-3.0-or-later AND GPL-2.0-or-later
+PackageLicenseDeclared: GPL-3.0-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LGPL-3.0-or-later AND GPL-2.0-or-later
PackageLicenseInfoFromFiles: NOASSERTION
## Package tasksel
diff --git a/elbepack/tests/test_parselicence_reference.xml b/elbepack/tests/test_parselicence_reference.xml
index ca2bbd872637..56263c503964 100644
--- a/elbepack/tests/test_parselicence_reference.xml
+++ b/elbepack/tests/test_parselicence_reference.xml
@@ -1477,7 +1477,7 @@ License: permissive
</detailed>
<spdx_licenses>
<license>GPL-3.0-or-later</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
<license>GPL-2.0-or-later</license>
<license>UNKNOWN_MAPPING(GFDL-NIV-1.3)</license>
<license>UNKNOWN_MAPPING(Latex2e)</license>
@@ -17615,7 +17615,7 @@ Comment: GPL-3+
<license>UNKNOWN_MAPPING(GFDL-NIV-1.3)</license>
<license>LGPL-2.1-or-later</license>
<license>LGPL-3.0-or-later OR GPL-2.0-or-later</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
<license>BSD-2-Clause</license>
</spdx_licenses><error>no override for heuristics based package "libelf1"</error>
<error>no mapping for "GFDL-NIV-1.3" for pkg "libelf1"</error>
@@ -21814,7 +21814,7 @@ License: LGPL-3+
<spdx_licenses>
<license>GPL-2.0-or-later OR LGPL-3.0-or-later</license>
<license>GPL-3.0-or-later</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
</spdx_licenses></pkglicense>
<pkglicense name="libgnutls30"><text>This package was debianized by Ivo Timmermans <ivo at debian.org> on
Fri, 3 Aug 2001 10:00:42 +0200.
@@ -36366,7 +36366,7 @@ License: Beerware
<license>GPL-2.0-only</license>
<license>GPL-2.0-or-later</license>
<license>GPL-3.0-only</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
<license>UNKNOWN_MAPPING(BSD-tcp_wrappers)</license>
<license>LGPL-2.0-or-later</license>
<license>CC0-1.0</license>
@@ -36671,7 +36671,7 @@ License: Beerware
<license>GPL-2.0-only</license>
<license>GPL-2.0-or-later</license>
<license>GPL-3.0-only</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
<license>UNKNOWN_MAPPING(BSD-tcp_wrappers)</license>
<license>LGPL-2.0-or-later</license>
<license>CC0-1.0</license>
@@ -36976,7 +36976,7 @@ License: Beerware
<license>GPL-2.0-only</license>
<license>GPL-2.0-or-later</license>
<license>GPL-3.0-only</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
<license>UNKNOWN_MAPPING(BSD-tcp_wrappers)</license>
<license>LGPL-2.0-or-later</license>
<license>CC0-1.0</license>
@@ -37281,7 +37281,7 @@ License: Beerware
<license>GPL-2.0-only</license>
<license>GPL-2.0-or-later</license>
<license>GPL-3.0-only</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
<license>UNKNOWN_MAPPING(BSD-tcp_wrappers)</license>
<license>LGPL-2.0-or-later</license>
<license>CC0-1.0</license>
@@ -56911,7 +56911,7 @@ Comment:
</detailed>
<spdx_licenses>
<license>GPL-3.0-or-later</license>
-<license>GPL-3.0-or-later WITH Bison exception</license>
+<license>GPL-3.0-or-later WITH Bison-exception-2.2</license>
<license>LGPL-3.0-or-later</license>
<license>GPL-2.0-or-later</license>
</spdx_licenses></pkglicense>
--
2.45.2
More information about the elbe-devel
mailing list