From 019cd5a466f5b85c73e76c06a8cd9637b9eba4b0 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 2 Jun 2025 16:22:11 +0900 Subject: [PATCH 1/4] bump libslirp to v4.9.1 https://gitlab.freedesktop.org/slirp/libslirp/-/blob/v4.9.1/CHANGELOG.md Signed-off-by: Akihiro Suda --- .github/workflows/main.yaml | 2 +- Dockerfile.artifact | 2 +- Dockerfile.buildtests | 2 +- Dockerfile.tests | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e186d60..4bf1e04 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - libslirp_commit: [master, v4.9.0, v4.8.0, v4.1.0] + libslirp_commit: [master, v4.9.1, v4.8.0, v4.1.0] steps: - uses: actions/checkout@v4 - run: docker build -t slirp4netns-tests --build-arg LIBSLIRP_COMMIT -f Dockerfile.tests . diff --git a/Dockerfile.artifact b/Dockerfile.artifact index ce1bf5a..d445e62 100644 --- a/Dockerfile.artifact +++ b/Dockerfile.artifact @@ -5,7 +5,7 @@ # --platform=amd64,arm64,arm,s390x,ppc64le,riscv64 \ # -f Dockerfile.artifact . -ARG LIBSLIRP_COMMIT=v4.9.0 +ARG LIBSLIRP_COMMIT=v4.9.1 # TODO: update from jammy (22.04) to noble (24.04) ARG UBUNTU_VERSION=jammy-20250126 ARG XX_VERSION=1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 diff --git a/Dockerfile.buildtests b/Dockerfile.buildtests index a30af15..ef4c7fe 100644 --- a/Dockerfile.buildtests +++ b/Dockerfile.buildtests @@ -1,4 +1,4 @@ -ARG LIBSLIRP_COMMIT=v4.9.0 +ARG LIBSLIRP_COMMIT=v4.9.1 # Alpine FROM alpine:3 AS buildtest-alpine3-static diff --git a/Dockerfile.tests b/Dockerfile.tests index 2f6c1a0..e98ff1d 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -1,4 +1,4 @@ -ARG LIBSLIRP_COMMIT=v4.9.0 +ARG LIBSLIRP_COMMIT=v4.9.1 FROM ubuntu:24.04 AS build ENV DEBIAN_FRONTEND=noninteractive From 0422b01edbc3ad96537abb0aedf1bfd29adfe4ce Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 2 Jun 2025 16:23:42 +0900 Subject: [PATCH 2/4] CI: bump up deps Signed-off-by: Akihiro Suda --- Dockerfile.artifact | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.artifact b/Dockerfile.artifact index d445e62..a6fdc8c 100644 --- a/Dockerfile.artifact +++ b/Dockerfile.artifact @@ -7,7 +7,7 @@ ARG LIBSLIRP_COMMIT=v4.9.1 # TODO: update from jammy (22.04) to noble (24.04) -ARG UBUNTU_VERSION=jammy-20250126 +ARG UBUNTU_VERSION=jammy-20250415.1 ARG XX_VERSION=1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 ARG REPRO_SOURCES_LIST_VERSION=v0.1.4 From 944fa94090e1fd1312232cbc0e6b43585553d824 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 2 Jun 2025 16:24:14 +0900 Subject: [PATCH 3/4] v1.3.3 Signed-off-by: Akihiro Suda --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 97018fe..ded742e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([slirp4netns], [1.3.2+dev], [https://github.com/rootless-containers/slirp4netns/issues]) +AC_INIT([slirp4netns], [1.3.3], [https://github.com/rootless-containers/slirp4netns/issues]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS([config.h]) From 3d01dcebbf508ec23c712cf00895e4af5305ae13 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 2 Jun 2025 16:24:22 +0900 Subject: [PATCH 4/4] v1.3.3+dev Signed-off-by: Akihiro Suda --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ded742e..0d301be 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([slirp4netns], [1.3.3], [https://github.com/rootless-containers/slirp4netns/issues]) +AC_INIT([slirp4netns], [1.3.3+dev], [https://github.com/rootless-containers/slirp4netns/issues]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS([config.h])