From 3b4cb0b4389cd729cbecf49880bea1df62f934fd Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 9 Jul 2020 12:57:59 +0900 Subject: [PATCH 1/3] run tests with libslirp v4.3.1 https://gitlab.freedesktop.org/slirp/libslirp/-/blob/v4.3.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 05bcbfe..5186d44 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - libslirp_commit: [master, v4.3.0, v4.2.0, v4.1.0] + libslirp_commit: [master, v4.3.1, v4.2.0, v4.1.0] steps: - uses: actions/checkout@v2 - run: docker build -t slirp4netns-tests --build-arg LIBSLIRP_COMMIT -f Dockerfile.tests . diff --git a/Dockerfile.artifact b/Dockerfile.artifact index b2d6eb4..a1a3bb6 100644 --- a/Dockerfile.artifact +++ b/Dockerfile.artifact @@ -1,4 +1,4 @@ -ARG LIBSLIRP_COMMIT=v4.3.0 +ARG LIBSLIRP_COMMIT=v4.3.1 FROM --platform=$TARGETPLATFORM debian:10 AS build RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev libseccomp-dev git ninja-build python3-pip diff --git a/Dockerfile.buildtests b/Dockerfile.buildtests index 179a6a7..8ad68c1 100644 --- a/Dockerfile.buildtests +++ b/Dockerfile.buildtests @@ -1,4 +1,4 @@ -ARG LIBSLIRP_COMMIT=v4.3.0 +ARG LIBSLIRP_COMMIT=v4.3.1 # Alpine FROM alpine:3 AS buildtest-alpine3-static diff --git a/Dockerfile.tests b/Dockerfile.tests index f4d2ad0..a0dcfe1 100644 --- a/Dockerfile.tests +++ b/Dockerfile.tests @@ -1,4 +1,4 @@ -ARG LIBSLIRP_COMMIT=v4.3.0 +ARG LIBSLIRP_COMMIT=v4.3.1 FROM ubuntu:18.04 AS build RUN apt update && apt install -y automake autotools-dev make gcc libglib2.0-dev libcap-dev libseccomp-dev git ninja-build python3-pip From b6a004dfc2170c1ea16ed7934c3326100f0e32f9 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 9 Jul 2020 12:58:53 +0900 Subject: [PATCH 2/3] v1.1.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 8f62a63..fb6f3c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([slirp4netns], [1.1.2+dev], [https://github.com/rootless-containers/slirp4netns/issues]) +AC_INIT([slirp4netns], [1.1.3], [https://github.com/rootless-containers/slirp4netns/issues]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS([config.h]) From 507b888338da9256fcf03e4a8f0c8300028553ef Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 9 Jul 2020 12:59:03 +0900 Subject: [PATCH 3/3] v1.1.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 fb6f3c0..d7f053a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([slirp4netns], [1.1.3], [https://github.com/rootless-containers/slirp4netns/issues]) +AC_INIT([slirp4netns], [1.1.3+dev], [https://github.com/rootless-containers/slirp4netns/issues]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS([config.h])