From c1d156cf18448438ae6d4b34dea33ac72c420343 Mon Sep 17 00:00:00 2001
From: James Fuller <jim@webcomposite.com>
Date: Wed, 11 Oct 2023 08:10:08 +0200
Subject: [PATCH] prep v8.4.0

---
 CHANGELOG.md    | 6 ++++++
 Makefile        | 4 ++--
 VERSION         | 2 +-
 create_multi.sh | 3 ++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25a5d65..f27c37a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [8.4.0] - 2023-10-11
+### Changed
+- bump to curl 8.4.0
+- bump to alpine 3.18.4
+- build enabled --with-gssapi
+
 ## [8.3.1] - 2023-09-13
 ### Changed
 - bump to curl 8.3.0
diff --git a/Makefile b/Makefile
index e547b3f..3663ca3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ 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.18.3
+base=docker.io/alpine:3.18.4
 arch=""
 compiler="gcc"
-build_opts=" --enable-static --disable-ldap --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr --with-krb5"
+build_opts=" --enable-static --disable-ldap --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr --with-gssapi"
 dev_deps="git zsh libssh2 libssh2-dev libssh2-static autoconf automake build-base groff openssl curl-dev python3 python3-dev libtool curl stunnel perl nghttp2 brotli brotli-dev krb5-dev"
 base_deps="brotli brotli-dev libssh2 nghttp2-dev libidn2 krb5"
 
diff --git a/VERSION b/VERSION
index 9f4a0fb..9da0a09 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.0
\ No newline at end of file
+8.4.0
\ No newline at end of file
diff --git a/create_multi.sh b/create_multi.sh
index 2a2ba72..e69b488 100755
--- a/create_multi.sh
+++ b/create_multi.sh
@@ -24,7 +24,8 @@ buildah manifest create curl-base-multi:${release_tag}
 buildah manifest create curl-multi:${release_tag}
 
 # loop through supported arches
-for IMGTAG in "linux/amd64"  "linux/arm64" "linux/arm/v7" "linux/ppc64le" "linux/s390x" "linux/386" ; do
+# TODO: need to add back "linux/arm/v7"
+for IMGTAG in "linux/amd64" "linux/arm64" "linux/ppc64le" "linux/s390x" "linux/386" ; do
   pathname="${IMGTAG////-}"
   echo "building $IMGTAG : $pathname"
  	./create_dev_image.sh "$IMGTAG" ${base} ${compiler} "$dev_deps" "$build_opts" ${branch_or_ref} curl-dev-${pathname}:${release_tag} 0