From 3dff16caaf8bfe6e3f3852e21fa0bf4e57068837 Mon Sep 17 00:00:00 2001
From: James Fuller <jim@webcomposite.com>
Date: Wed, 5 Feb 2025 10:00:35 +0100
Subject: [PATCH] prep v8.12.0

---
 .github/workflows/build_ci_multi.yml             | 2 +-
 .github/workflows/build_latest_release_multi.yml | 2 +-
 .github/workflows/build_master.yml               | 2 +-
 .github/workflows/build_master_dev.yml           | 2 +-
 .github/workflows/build_master_multi.yml         | 2 +-
 CHANGELOG.md                                     | 5 +++++
 Makefile                                         | 4 ++--
 VERSION                                          | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_ci_multi.yml b/.github/workflows/build_ci_multi.yml
index 734081c..c681d24 100644
--- a/.github/workflows/build_ci_multi.yml
+++ b/.github/workflows/build_ci_multi.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v3
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
+          sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
         name: 'install dev deps'
       - run: buildah unshare make branch_or_ref=master release_tag=master multibuild
         name: 'build multi image'
diff --git a/.github/workflows/build_latest_release_multi.yml b/.github/workflows/build_latest_release_multi.yml
index aa45610..967a452 100644
--- a/.github/workflows/build_latest_release_multi.yml
+++ b/.github/workflows/build_latest_release_multi.yml
@@ -40,7 +40,7 @@ jobs:
           docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
+          sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
         name: 'install dev deps'
       - name: Sets env vars
         run: |
diff --git a/.github/workflows/build_master.yml b/.github/workflows/build_master.yml
index 2e4adac..85ba74c 100644
--- a/.github/workflows/build_master.yml
+++ b/.github/workflows/build_master.yml
@@ -43,7 +43,7 @@ jobs:
           docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
+          sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
         name: 'install dev deps'
       - run: buildah unshare make branch_or_ref=master release_tag=master build_ref_images
         name: 'build master images'
diff --git a/.github/workflows/build_master_dev.yml b/.github/workflows/build_master_dev.yml
index 4c4e70a..8f16aa0 100644
--- a/.github/workflows/build_master_dev.yml
+++ b/.github/workflows/build_master_dev.yml
@@ -43,7 +43,7 @@ jobs:
           docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
+          sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
         name: 'install dev deps'
       - run: buildah unshare make branch_or_ref=master release_tag=master build_debian
         name: 'build debian dev image'
diff --git a/.github/workflows/build_master_multi.yml b/.github/workflows/build_master_multi.yml
index 62c3dd0..a8415b0 100644
--- a/.github/workflows/build_master_multi.yml
+++ b/.github/workflows/build_master_multi.yml
@@ -43,7 +43,7 @@ jobs:
           docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
+          sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam
         name: 'install dev deps'
       - run: buildah unshare make branch_or_ref=master release_tag=master multibuild
         name: 'build multi image'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4eac8a..c43d6ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [8.12.0] - 2025-05-02
+### Changed
+- bump to curl 8.12.0
+- bump to alpine:3.21.2
+
 ## [8.11.1] - 2024-12-11
 ### Changed
 - bump to curl 8.11.1
diff --git a/Makefile b/Makefile
index 63e0728..56258f4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ container_ids=`buildah ls --format "{{.ContainerID}}"`
 # default setttings for official curl images
 debian_base=docker.io/debian
 fedora_base=docker.io/fedora
-base=docker.io/alpine:3.21.0
+base=docker.io/alpine:3.21.2
 arch=""
 compiler="gcc"
 build_opts=" --enable-static --disable-ldap --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr --with-gssapi"
@@ -37,7 +37,7 @@ build_fedora:
 #  > make branch_or_ref=master release_tag=master run_tests=1 build_arm64
 #
 build_arm64:
-	./create_dev_image.sh "linux/arm" ${base} ${compiler} ${dev_deps} ${build_opts} ${branch_or_ref} curl-dev-linux-arm64:${release_tag} ${run_tests}
+	./create_dev_image.sh "arm64" ${base} ${compiler} ${dev_deps} ${build_opts} ${branch_or_ref} curl-dev-linux-arm64:${release_tag} ${run_tests}
 # 	./create_base_image.sh "linux/arm64" ${base} localhost/curl-dev-linux-arm64:${release_tag} ${base_deps} curl-base-linux-arm64:${release_tag} ${release_tag}
 # 	./create_appliance_image.sh "linux/arm64" localhost/curl-base-linux-arm64:${release_tag} curl-linux-arm64:${release_tag} ${release_tag}
 
diff --git a/VERSION b/VERSION
index 876e313..a6b1604 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.11.1
\ No newline at end of file
+8.12.0
\ No newline at end of file