Skip to content

Commit

Permalink
Merge pull request #39 from curl/v8.4.0
Browse files Browse the repository at this point in the history
prep v8.4.0
  • Loading branch information
xquery authored Oct 11, 2023
2 parents ac1455e + c1d156c commit 7d7540f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.3.0
8.4.0
3 changes: 2 additions & 1 deletion create_multi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7d7540f

Please sign in to comment.