From d2845307b50dd38ec7b2e7903c6acf1f0ea02b49 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 1 Jul 2018 15:35:47 +0200 Subject: [PATCH] nsjail: fix 32bit builds --- srcpkgs/nsjail/patches/fix-format-error.patch | 11 +++++++++++ srcpkgs/nsjail/template | 6 +----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/nsjail/patches/fix-format-error.patch diff --git a/srcpkgs/nsjail/patches/fix-format-error.patch b/srcpkgs/nsjail/patches/fix-format-error.patch new file mode 100644 index 00000000000..54365b45f9c --- /dev/null +++ b/srcpkgs/nsjail/patches/fix-format-error.patch @@ -0,0 +1,11 @@ +--- subproc.cc.orig 2018-07-01 15:34:05.381551578 +0200 ++++ subproc.cc 2018-07-01 15:34:10.523598404 +0200 +@@ -343,7 +343,7 @@ int reapProc(nsjconf_t* nsjconf) { + if ((uint64_t)diff >= nsjconf->tlimit) { + LOG_I("PID: %d run time >= time limit (%ld >= %" PRId64 + ") (%s). Killing it", +- pid, (long)diff, (long)nsjconf->tlimit, p.remote_txt.c_str()); ++ pid, (long)diff, nsjconf->tlimit, p.remote_txt.c_str()); + /* + * Probably a kernel bug - some processes cannot be killed with KILL if + * they're namespaced, and in a stopped state diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index cd0bdab0bcb..123f7e5cb20 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail version=2.7 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf-devel" makedepends="libnl3-devel protobuf-devel" @@ -16,10 +16,6 @@ bfebebaf501f9dbd0d0c374797d3c07ee0dd3537b5a6bc70e80408f081d051fe" only_for_archs="aarch64 aarch64-musl armv5tel armv5tel-musl armv6l armv6l-musl armv7l armv7l-musl x86_64 x86_64-musl" -case "$XBPS_TARGET_MACHINE" in - armv[67]*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/9674/steps/shell_3/logs/stdio";; -esac - post_extract() { rmdir kafel ln -s ../kafel-* kafel