nsjail: update to 2.6 and fix template
+ don't git clone + fix musl + install manpage Closes: #13093 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
parent
06a7cb9ec0
commit
ac83401d35
2 changed files with 36 additions and 14 deletions
14
srcpkgs/nsjail/patches/musl.patch
Normal file
14
srcpkgs/nsjail/patches/musl.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
--- mnt.cc 2018-04-18 14:11:19.000000000 +0200
|
||||
+++ mnt.cc 2018-04-21 13:07:43.814692651 +0200
|
||||
@@ -47,6 +47,11 @@
|
||||
#include "subproc.h"
|
||||
#include "util.h"
|
||||
|
||||
+#if !defined(ST_RELATIME)
|
||||
+/* In musl libc this is not (yet?) defined */
|
||||
+#define ST_RELATIME 4096
|
||||
+#endif
|
||||
+
|
||||
namespace mnt {
|
||||
|
||||
#if !defined(MS_LAZYTIME)
|
|
@ -1,28 +1,36 @@
|
|||
# Template file for 'nsjail'
|
||||
pkgname=nsjail
|
||||
version=2.4
|
||||
revision=2
|
||||
version=2.6
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
hostmakedepends="libnl3-devel git pkg-config protobuf-c bison flex"
|
||||
makedepends="libnl3-devel libcap-devel protobuf-devel"
|
||||
hostmakedepends="bison flex pkg-config protobuf-devel"
|
||||
makedepends="libnl3-devel protobuf-devel"
|
||||
short_desc="A light-weight process isolation tool"
|
||||
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
||||
license="Apache-2.0"
|
||||
homepage="https://github.com/google/nsjail"
|
||||
homepage="http://nsjail.com"
|
||||
distfiles="
|
||||
https://github.com/google/nsjail/archive/${version}.tar.gz
|
||||
https://github.com/google/kafel/archive/9a8568c8f91a91d93893a61a48665dc329e075f1.tar.gz
|
||||
"
|
||||
checksum="
|
||||
866c181266e33f94e22e1bba72c04883d8bd5694929b19d8aa183a72acc8519b
|
||||
6fc048e72499fd0bc0414e4ab9c32fabefc04a2a36a8af46799557aa3150d1dd
|
||||
"
|
||||
|
||||
only_for_archs="armv6l armv7l x86_64"
|
||||
only_for_archs="aarch64 aarch64-musl armv5tel armv5tel-musl armv6l armv6l-musl armv7l armv7l-musl x86_64 x86_64-musl"
|
||||
|
||||
CFLAGS="-Wno-error=format"
|
||||
|
||||
do_fetch() {
|
||||
git clone $homepage $wrksrc
|
||||
cd $wrksrc
|
||||
git checkout $version
|
||||
post_extract() {
|
||||
rmdir kafel
|
||||
ln -s ../kafel-* kafel
|
||||
}
|
||||
do_build() {
|
||||
make CC=$CC
|
||||
|
||||
pre_build() {
|
||||
sed -i -e 's/\b\(\(C\(XX\)\?\|LD\)FLAGS\s*+=\)/override \1/g' Makefile kafel/build/Makefile.mk kafel/src/Makefile
|
||||
}
|
||||
|
||||
do_install() {
|
||||
vbin ${pkgname}
|
||||
vman nsjail.1
|
||||
vlicense LICENSE
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue