Skip to content

Commit

Permalink
Merge pull request #39 from RedHatProductSecurity/fix-data-license
Browse files Browse the repository at this point in the history
Fix data license to use the only allowed value: CC0-1.0
  • Loading branch information
mprpic authored Nov 19, 2024
2 parents f7c5ffd + 64dff9f commit fe7d713
Show file tree
Hide file tree
Showing 29 changed files with 30 additions and 31 deletions.
5 changes: 2 additions & 3 deletions docs/sbom.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ The following snippet shows a minimal SBOM document:
```json
{
"spdxVersion": "SPDX-2.3",// (1)!
"dataLicense": "CC-BY-4.0",// (2)!
"dataLicense": "CC0-1.0",// (2)!
"SPDXID": "SPDXRef-DOCUMENT",// (3)!
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand All @@ -170,8 +170,7 @@ The following snippet shows a minimal SBOM document:

1. SPDX version 2.3 as described at [https://spdx.github.io/spdx-spec/v2.3/](https://spdx.github.io/spdx-spec/v2.3/).

2. All Red Hat security data is published under the
[Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
2. The CC0-1.0 license is required by the SPDX specification.

3. [`SPDXID`](https://spdx.github.io/spdx-spec/v2.3/document-creation-information/#63-spdx-identifier-field)
must be set to `SPDXRef-DOCUMENT`.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/container_image/release/from_catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def create_sbom(image_id, root_package, packages, rel_type, other_pkgs=None, oth

spdx = {
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/product/create_product_sbom.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def create_spdx():
fname = name_short + ".spdx.json"
sbom = {
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56Z",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/product/rhel-9.2-eus.spdx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/rpm/build/from-koji.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ def handle_srpm(filename, name):

spdx = {
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/rpm/build/openssl-3.0.7-18.el9_2.spdx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/rpm/build/poppler-21.01.0-19.el9.spdx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/rpm/release/openssl-3.0.7-18.el9_2.spdx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down
2 changes: 1 addition & 1 deletion sbom/examples/rpm/release/poppler-21.01.0-19.el9.spdx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"spdxVersion": "SPDX-2.3",
"dataLicense": "CC-BY-4.0",
"dataLicense": "CC0-1.0",
"SPDXID": "SPDXRef-DOCUMENT",
"creationInfo": {
"created": "2006-08-14T02:34:56+00:00",
Expand Down

0 comments on commit fe7d713

Please sign in to comment.