From e6db8aebce4e844df6123b97748450cdf53441a7 Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Fri, 11 Oct 2024 22:06:15 -0400
Subject: [PATCH 1/2] Bug Fix: Rocky Linux 8.8-8.10 requires Python 3.11

When updating the images the Python 8.8-8.10 images were changed
from Python 3.11 Devel to just Python3 Devel which meant depending
on Python 3.6.

Interestingly if Python 3.6 and 3.11 are installed then CMake will
lock only Python 3.6. So we have to cleanup the image so it will
build correctly too.
---
 script/bootstrap | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/bootstrap b/script/bootstrap
index 77fda0e..bf79efa 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1734,7 +1734,7 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
+                          python3.11-devel \
                           rpm-build \
                           make \
                           clang
@@ -1761,7 +1761,7 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
+                          python3.11-devel \
                           rpm-build \
                           make \
                           clang
@@ -1788,7 +1788,7 @@ function bootstrapOnRockyLinux ()
                           libpng-devel \
                           expat-devel \
                           gtk3-devel \
-                          python3-devel \
+                          python3.11-devel \
                           rpm-build \
                           make \
                           clang

From 0ef2d7005545cb11a0b205cd428d46a20c1138bd Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Sat, 12 Oct 2024 00:24:14 -0400
Subject: [PATCH 2/2] Bug Fix: Cleanup the Anchore scans

---
 .github/workflows/Anchore-Container-Scan.yml | 24 ++++++--------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml
index 668a955..85bae31 100644
--- a/.github/workflows/Anchore-Container-Scan.yml
+++ b/.github/workflows/Anchore-Container-Scan.yml
@@ -21,36 +21,26 @@ jobs:
       fail-fast: false
       matrix:
         FROM:
-          - 'ubuntu:mantic'
+          - 'ubuntu:noble'
           - 'ubuntu:jammy'
           - 'ubuntu:focal'
-          - 'ubuntu:bionic'
+          - 'linuxmintd/mint22-amd64'
+          - 'linuxmintd/mint21.3-amd64'
+          - 'linuxmintd/mint21.2-amd64'
           - 'linuxmintd/mint21.1-amd64'
           - 'linuxmintd/mint21-amd64'
           - 'linuxmintd/mint20-amd64'
           - 'debian:bookworm'
           - 'debian:bullseye'
-          #- 'debian:buster'        # buster-backports is no longer available from deb.debian.org. Sunsetting?
+          - 'opensuse/leap:15.6'
           - 'opensuse/leap:15.5'
           - 'opensuse/leap:15.4'
           - 'opensuse/leap:15.3'
           - 'opensuse/leap:15.2'
+          #- 'fedora:41'
           - 'fedora:40'
           - 'fedora:39'
-          - 'fedora:38'
-          - 'fedora:37'
-          - 'fedora:36'
-          - 'fedora:35'
-          - 'fedora:34'
-          - 'rockylinux:9.3'
-          - 'rockylinux:9.2'
-          - 'rockylinux:9.1'
-          - 'rockylinux:9.0'
-          - 'rockylinux:8.9'
-          - 'rockylinux:8.8'
-          - 'rockylinux:8.7'
-          - 'rockylinux:8.6'
-          - 'rockylinux:8.5'
+          - 'rockylinux/rockylinux:9.4'
           - 'manjarolinux/base'
           #- 'funtoo/stage3-generic_64'