diff --git a/srcpkgs/firejail/patches/seccomp.patch b/srcpkgs/firejail/patches/seccomp.patch new file mode 100644 index 00000000000..2172d8ce74c --- /dev/null +++ b/srcpkgs/firejail/patches/seccomp.patch @@ -0,0 +1,53 @@ +--- 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 diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index 2e5284b82e8..cd95f0f6623 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -1,16 +1,21 @@ # Template file for 'firejail' pkgname=firejail -version=0.9.44.10 +version=0.9.46 revision=1 build_style=gnu-configure +hostmakedepends="automake" conf_files="/etc/firejail/*" short_desc="SUID security sandbox program" maintainer="Duncaen " license="GPL-2" homepage="https://firejail.wordpress.com" distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" -checksum=eccb6f8ace71142253a1ed0e6902bbb3dd560d34bb4785ff1e7d01f0263ade34 +checksum=691225b5717b6e9540cdfe2a036f6e81bc27fc42abf438400732fc0459bdd005 case "$XBPS_TARGET_MACHINE" in arm*) configure_args+=" --disable-seccomp" ;; esac + +pre_configure() { + autoreconf -fi +}