firejail: update to 0.9.48.

This commit is contained in:
Duncaen 2017-06-13 16:56:53 +02:00
parent 1e25b85c4d
commit f189a462b7
2 changed files with 2 additions and 55 deletions

View File

@ -1,53 +0,0 @@
--- Makefile.in.orig
+++ Makefile.in
@@ -16,6 +16,7 @@
NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@
DOCDIR=@docdir@
+HAVE_SECCOMP=@HAVE_SECCOMP@
HAVE_APPARMOR=@HAVE_APPARMOR@
HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
HAVE_GIT_INSTALL=@HAVE_GIT_INSTALL@
@@ -39,10 +40,12 @@
man: $(MANPAGES)
filters: src/fseccomp
+ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP)
src/fseccomp/fseccomp default seccomp
src/fseccomp/fseccomp default seccomp.debug allow-debuggers
src/fseccomp/fseccomp secondary 32 seccomp.i386
src/fseccomp/fseccomp secondary 64 seccomp.amd64
+endif
clean:
for dir in $(APPS) $(MYLIBS); do \
@@ -87,15 +90,18 @@
install -c -m 0755 src/fgit/fgit-install.sh $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0755 src/fgit/fgit-uninstall.sh $(DESTDIR)/$(libdir)/firejail/.
endif
+
install -c -m 0644 src/firecfg/firecfg.config $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0755 src/faudit/faudit $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0755 src/fnet/fnet $(DESTDIR)/$(libdir)/firejail/.
- install -c -m 0755 src/fseccomp/fseccomp $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0755 src/fcopy/fcopy $(DESTDIR)/$(libdir)/firejail/.
+ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP)
+ install -c -m 0755 src/fseccomp/fseccomp $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0644 seccomp $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0644 seccomp.debug $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0644 seccomp.i386 $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0644 seccomp.amd64 $(DESTDIR)/$(libdir)/firejail/.
+endif
ifeq ($(HAVE_CONTRIB_INSTALL),yes)
install -c -m 0755 contrib/fix_private-bin.py $(DESTDIR)/$(libdir)/firejail/.
install -c -m 0755 contrib/fjclip.py $(DESTDIR)/$(libdir)/firejail/.
@@ -240,7 +246,9 @@
cd test/environment; ./environment.sh | grep TESTING
test-filters:
+ifeq ($(HAVE_SECCOMP),-DHAVE_SECCOMP)
cd test/filters; ./filters.sh | grep TESTING
+endif
test-arguments:
cd test/arguments; ./arguments.sh | grep TESTING

View File

@ -1,6 +1,6 @@
# Template file for 'firejail'
pkgname=firejail
version=0.9.46
version=0.9.48
revision=1
build_style=gnu-configure
hostmakedepends="automake"
@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.eu>"
license="GPL-2"
homepage="https://firejail.wordpress.com"
distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz"
checksum=691225b5717b6e9540cdfe2a036f6e81bc27fc42abf438400732fc0459bdd005
checksum=89db558f7625e2341656751e7681ac7079f5d3d2ef9a9df03f3672dd2f71158e
case "$XBPS_TARGET_MACHINE" in
arm*|aarch64*) configure_args+=" --disable-seccomp" ;;