From c729594cddd0116ccd4c25c28d8729d77d2ab325 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 8 Dec 2021 21:16:46 -0800 Subject: [PATCH 1/3] deps: update libseccomp to 2.5.3 It was released about a month ago. I don't see anything major in the changelog but it makes sense to keep tracking upstream deps. Signed-off-by: Kir Kolyshkin --- Dockerfile | 2 +- script/release_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ba1ba128..d6680cc2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG GO_VERSION=1.17 ARG BATS_VERSION=v1.3.0 -ARG LIBSECCOMP_VERSION=2.5.2 +ARG LIBSECCOMP_VERSION=2.5.3 FROM golang:${GO_VERSION}-bullseye ARG DEBIAN_FRONTEND=noninteractive diff --git a/script/release_build.sh b/script/release_build.sh index 2d3fe93b6..03701c140 100755 --- a/script/release_build.sh +++ b/script/release_build.sh @@ -19,7 +19,7 @@ set -e ## ---> # Project-specific options and functions. In *theory* you shouldn't need to # touch anything else in this script in order to use this elsewhere. -: "${LIBSECCOMP_VERSION:=2.5.2}" +: "${LIBSECCOMP_VERSION:=2.5.3}" project="runc" root="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..")" From 457ca62f1f51c15aa909d56e28466373f40c13b6 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 9 Dec 2021 00:51:07 -0800 Subject: [PATCH 2/3] script/release_*.sh: fix usage - release_build: fix -H option (was -h) - release_sign: add -H and -S options Signed-off-by: Kir Kolyshkin --- script/release_build.sh | 2 +- script/release_sign.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/script/release_build.sh b/script/release_build.sh index 03701c140..252516158 100755 --- a/script/release_build.sh +++ b/script/release_build.sh @@ -100,7 +100,7 @@ function build_project() { # Print usage information. function usage() { - echo "usage: release_build.sh [-a ]... [-c ] [-h ]" >&2 + echo "usage: release_build.sh [-a ]... [-c ] [-H ]" >&2 echo " [-r ] [-v ]" >&2 exit 1 } diff --git a/script/release_sign.sh b/script/release_sign.sh index 5b2e6f365..8cc224ac6 100755 --- a/script/release_sign.sh +++ b/script/release_sign.sh @@ -21,7 +21,8 @@ root="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/..")" # Print usage information. function usage() { - echo "usage: release_sign.sh [-S ] [-r ]" >&2 + echo "usage: release_sign.sh [-S ] [-H ]" >&2 + echo " [-r ] [-v ]" >&2 exit 1 } From 6d2067a4bf1ae0a9ae1c570a0d1f2004e80eb229 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 9 Dec 2021 00:54:48 -0800 Subject: [PATCH 3/3] script/seccomp.sh: fix argc check This check was always broken, and it slipped through the cracks because we never run it without additional architectures now. Signed-off-by: Kir Kolyshkin --- script/seccomp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/seccomp.sh b/script/seccomp.sh index 488ef5b99..2c2ea84e0 100755 --- a/script/seccomp.sh +++ b/script/seccomp.sh @@ -50,7 +50,7 @@ function build_libseccomp() { mv "$tar"{,.asc} "$dest"/src } -if [ $# -lt 4 ]; then +if [ $# -lt 2 ]; then echo "Usage: seccomp.sh [ ...]" >&2 exit 1 fi