From 61bd6d2c8c703f9c8df297f6415b0403ba8b7735 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 24 Jan 2019 21:19:37 -0600 Subject: [PATCH] nsjail: update to 2.8 --- srcpkgs/nsjail/patches/fix-format-error.patch | 11 ----------- srcpkgs/nsjail/template | 12 ++++++------ 2 files changed, 6 insertions(+), 17 deletions(-) delete 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 deleted file mode 100644 index 54365b45f9c..00000000000 --- a/srcpkgs/nsjail/patches/fix-format-error.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 7b724cdf833..fee353f3689 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,18 +1,18 @@ # Template file for 'nsjail' pkgname=nsjail -version=2.7 -revision=5 +version=2.8 +revision=1 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf-devel" makedepends="libnl3-devel protobuf-devel" -short_desc="A light-weight process isolation tool" +short_desc="Light-weight process isolation tool" maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://nsjail.com" distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz -https://github.com/google/kafel/archive/409ccb2113e1f82f497d1dcfb5ae18376ff7056c.tar.gz" -checksum="28afa89c7dbed94528408e4f11d724622d24ea582739b254fa2a739320e87481 -bfebebaf501f9dbd0d0c374797d3c07ee0dd3537b5a6bc70e80408f081d051fe" +https://github.com/google/kafel/archive/722b93a630e53ca472a4c69f61cb3dfc44ea5041.tar.gz" +checksum="1eb5cad7e698d467a0224614aaca04e169bde6c2cf57f2e6a01a8ad5f787bb56 + 49d2327c794c90aca50a9933c00d453705534b16e5f42d8c8e19c3d274f5e5f8" only_for_archs="aarch64 aarch64-musl armv5tel armv5tel-musl armv6l armv6l-musl armv7l armv7l-musl x86_64 x86_64-musl" CXXFLAGS="-Wno-format-truncation"