Merge pull request #3314 from kolyshkin/seccomp-2.5.3

release: update libseccomp to 2.5.3, minor script fixes

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

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]}")/..")"
 
@@ -100,7 +100,7 @@ function build_project() {
 
 # Print usage information.
 function usage() {
-	echo "usage: release_build.sh [-a <cross-arch>]... [-c <commit-ish>] [-h <hashcmd>]" >&2
+	echo "usage: release_build.sh [-a <cross-arch>]... [-c <commit-ish>] [-H <hashcmd>]" >&2
 	echo "                        [-r <release-dir>] [-v <version>]" >&2
 	exit 1
 }

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 <gpg-key-id>] [-r <release-dir>]" >&2
+	echo "usage: release_sign.sh [-S <gpg-key-id>] [-H <hashcmd>]" >&2
+	echo "                       [-r <release-dir>] [-v <version>]" >&2
 	exit 1
 }
 

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 <version> <dest-dir> [<extra-arch> ...]" >&2
 	exit 1
 fi