luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add SBOM license enrichment for AppImage variants 

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
This commit is contained in:
Darryl L. Miles 2026-07-20 17:10:32 +01:00 committed by R. Timothy Edwards
parent 298f19ce31
commit b0ba9db6a4
8 changed files with 200 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
.github/workflows/appimage10.yml vendored
View File

@ -408,9 +408,50 @@ jobs:
with: with:
path: ${{ github.workspace }}/appimage/10/squashfs-root path: ${{ github.workspace }}/appimage/10/squashfs-root
format: spdx-json format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true upload-artifact: false
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }} upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/10
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/10/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact - name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload #if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload

47
.github/workflows/appimage7.yml vendored
View File

@ -408,9 +408,50 @@ jobs:
with: with:
path: ${{ github.workspace }}/appimage/7/squashfs-root path: ${{ github.workspace }}/appimage/7/squashfs-root
format: spdx-json format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true upload-artifact: false
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }} upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/7
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/7/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact - name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload #if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload

47
.github/workflows/appimage8.yml vendored
View File

@ -408,9 +408,50 @@ jobs:
with: with:
path: ${{ github.workspace }}/appimage/8/squashfs-root path: ${{ github.workspace }}/appimage/8/squashfs-root
format: spdx-json format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true upload-artifact: false
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }} upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/8
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/8/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact - name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload #if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload

47
.github/workflows/appimage9.yml vendored
View File

@ -408,9 +408,50 @@ jobs:
with: with:
path: ${{ github.workspace }}/appimage/9/squashfs-root path: ${{ github.workspace }}/appimage/9/squashfs-root
format: spdx-json format: spdx-json
artifact-name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json output-file: ${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
upload-artifact: true upload-artifact: false
upload-release-assets: ${{ env.MY_GITHUB_TAG != '' }} upload-release-assets: false
- name: Apply SBOM license metadata
run: |
cd appimage/9
sbom_file="sbom-${MAGIC_APPIMAGE_OUTPUT_FILENAME}.spdx.json"
jq '
def is_tcltk:
(.name | test("(^|/)(tclsh|wish)[0-9.]*$|(^|/)libtcl[^/]*\\.so(\\.[0-9.]+)*$|(^|/)libtk[^/]*\\.so(\\.[0-9.]+)*$"));
def is_magic_linked:
(.name | test("(^|/)(magicexec|magicdnull|tclmagic\\.so)$"));
.packages |= map(
if is_magic_linked then
. + {
licenseConcluded: "HPND-UC-export-US AND TCL",
licenseDeclared: "HPND-UC-export-US AND TCL"
}
elif is_tcltk then
. + {
licenseConcluded: "TCL",
licenseDeclared: "TCL"
}
else
.
end
)
' "$sbom_file" > "$sbom_file.tmp"
mv "$sbom_file.tmp" "$sbom_file"
- name: Upload SBOM Release Asset
if: ${{ env.MY_GITHUB_TAG != '' }}
uses: softprops/action-gh-release@v3
with:
files: |
${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload SBOM Artifact
uses: actions/upload-artifact@v7
with:
name: sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
path: |
${{ github.workspace }}/appimage/9/sbom-${{env.MAGIC_APPIMAGE_OUTPUT_FILENAME}}.spdx.json
- name: Upload Artifact - name: Upload Artifact
#if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload #if: ${{ env.MY_GITHUB_TAG == '' }} # commented out to always upload

7
appimage/10/Dockerfile
View File

@ -60,6 +60,9 @@ RUN set -eux; \
./configure --prefix=/prefix --with-tcl=/prefix/lib; \ ./configure --prefix=/prefix --with-tcl=/prefix/lib; \
make; \ make; \
make install install-libraries make install install-libraries
RUN install -d /prefix/share/licenses/tcl /prefix/share/licenses/tk \
&& install -m 0644 /tcl/license.terms /prefix/share/licenses/tcl/license.terms \
&& install -m 0644 /tk/license.terms /prefix/share/licenses/tk/license.terms
WORKDIR /prefix/bin WORKDIR /prefix/bin
RUN cp ./wish9.0 ./wish RUN cp ./wish9.0 ./wish
@ -76,7 +79,9 @@ RUN ./configure \
&& make clean \ && make clean \
&& make database/database.h \ && make database/database.h \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install && make install \
&& install -d /prefix/share/licenses/magic \
&& install -m 0644 /magic/LICENSE /prefix/share/licenses/magic/LICENSE
# Produce summary of what was created and confirm their DSOs # Produce summary of what was created and confirm their DSOs
RUN echo "### filesystem:" \ RUN echo "### filesystem:" \

7
appimage/7/Dockerfile
View File

@ -70,6 +70,9 @@ RUN set -eux; \
./configure --prefix=/prefix --with-tcl=/prefix/lib; \ ./configure --prefix=/prefix --with-tcl=/prefix/lib; \
make; \ make; \
make install make install
RUN install -d /prefix/share/licenses/tcl /prefix/share/licenses/tk \
&& install -m 0644 /tcl/license.terms /prefix/share/licenses/tcl/license.terms \
&& install -m 0644 /tk/license.terms /prefix/share/licenses/tk/license.terms
WORKDIR /prefix/bin WORKDIR /prefix/bin
RUN cp ./wish8.6 ./wish RUN cp ./wish8.6 ./wish
@ -87,7 +90,9 @@ RUN ./configure \
&& make clean \ && make clean \
&& make database/database.h \ && make database/database.h \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install && make install \
&& install -d /prefix/share/licenses/magic \
&& install -m 0644 /magic/LICENSE /prefix/share/licenses/magic/LICENSE
# Produce summary of what was created and confirm their DSOs # Produce summary of what was created and confirm their DSOs
RUN echo "### filesystem:" \ RUN echo "### filesystem:" \

7
appimage/8/Dockerfile
View File

@ -59,6 +59,9 @@ RUN set -eux; \
./configure --prefix=/prefix --with-tcl=/prefix/lib; \ ./configure --prefix=/prefix --with-tcl=/prefix/lib; \
make; \ make; \
make install make install
RUN install -d /prefix/share/licenses/tcl /prefix/share/licenses/tk \
&& install -m 0644 /tcl/license.terms /prefix/share/licenses/tcl/license.terms \
&& install -m 0644 /tk/license.terms /prefix/share/licenses/tk/license.terms
WORKDIR /prefix/bin WORKDIR /prefix/bin
RUN cp ./wish8.6 ./wish RUN cp ./wish8.6 ./wish
@ -75,7 +78,9 @@ RUN ./configure \
&& make clean \ && make clean \
&& make database/database.h \ && make database/database.h \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install && make install \
&& install -d /prefix/share/licenses/magic \
&& install -m 0644 /magic/LICENSE /prefix/share/licenses/magic/LICENSE
# Produce summary of what was created and confirm their DSOs # Produce summary of what was created and confirm their DSOs
RUN echo "### filesystem:" \ RUN echo "### filesystem:" \

7
appimage/9/Dockerfile
View File

@ -60,6 +60,9 @@ RUN set -eux; \
./configure --prefix=/prefix --with-tcl=/prefix/lib; \ ./configure --prefix=/prefix --with-tcl=/prefix/lib; \
make; \ make; \
make install install-libraries make install install-libraries
RUN install -d /prefix/share/licenses/tcl /prefix/share/licenses/tk \
&& install -m 0644 /tcl/license.terms /prefix/share/licenses/tcl/license.terms \
&& install -m 0644 /tk/license.terms /prefix/share/licenses/tk/license.terms
WORKDIR /prefix/bin WORKDIR /prefix/bin
RUN cp ./wish9.0 ./wish RUN cp ./wish9.0 ./wish
@ -76,7 +79,9 @@ RUN ./configure \
&& make clean \ && make clean \
&& make database/database.h \ && make database/database.h \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make install && make install \
&& install -d /prefix/share/licenses/magic \
&& install -m 0644 /magic/LICENSE /prefix/share/licenses/magic/LICENSE
# Produce summary of what was created and confirm their DSOs # Produce summary of what was created and confirm their DSOs
RUN echo "### filesystem:" \ RUN echo "### filesystem:" \