diff mbox series

[meta-security,9/9] firejail: update 0.9.72

Message ID 20230318195952.538375-9-akuster808@gmail.com
State New
Headers show
Series [meta-security,1/9] python3-fail2ban: update to 1.0.2 | expand

Commit Message

akuster808 March 18, 2023, 7:59 p.m. UTC 
refresh patch

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../exclude_seccomp_util_compiles.patch       | 20 +++++++++----------
 ...{firejail_0.9.70.bb => firejail_0.9.72.bb} |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)
 rename recipes-security/Firejail/{firejail_0.9.70.bb => firejail_0.9.72.bb} (96%)
diff mbox series

Patch

diff --git a/recipes-security/Firejail/firejail/exclude_seccomp_util_compiles.patch b/recipes-security/Firejail/firejail/exclude_seccomp_util_compiles.patch
index a32720a..7e70692 100644
--- a/recipes-security/Firejail/firejail/exclude_seccomp_util_compiles.patch
+++ b/recipes-security/Firejail/firejail/exclude_seccomp_util_compiles.patch
@@ -5,28 +5,28 @@  There are some files that need to run to generate the appropriate files
 we are currently doing this on the target. 
 Signed-off-by: Armin Kuster <akuster808@gmail.com>
 
-Index: git/Makefile.in
+Index: git/Makefile
 ===================================================================
---- git.orig/Makefile.in
-+++ git/Makefile.in
-@@ -34,7 +34,6 @@ MYDIRS = src/lib $(MAN_SRC) $(COMPLETION
+--- git.orig/Makefile
++++ git/Makefile
+@@ -18,7 +18,6 @@ MYDIRS = src/lib $(MAN_SRC) $(COMPLETION
  MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so
  COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion
  MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 jailcheck.1
 -SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32
  ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS)
  
- .PHONY: all_items $(ALL_ITEMS)
-@@ -52,7 +51,7 @@ $(MANPAGES): src/man
+ .PHONY: all
+@@ -43,7 +42,7 @@ $(MANPAGES): src/man config.mk
  
  man: $(MANPAGES)
  
 -filters: $(SECCOMP_FILTERS) $(SBOX_APPS_NON_DUMPABLE)
-+filters: $(SBOX_APPS_NON_DUMPABLE)
++filters:  $(SBOX_APPS_NON_DUMPABLE)
  seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
  	src/fseccomp/fseccomp default seccomp
  	src/fsec-optimize/fsec-optimize seccomp
-@@ -81,7 +80,6 @@ clean:
+@@ -72,7 +71,6 @@ clean:
  	done
  	$(MAKE) -C test clean
  	rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm
@@ -34,12 +34,12 @@  Index: git/Makefile.in
  	rm -f test/utils/index.html*
  	rm -f test/utils/wget-log
  	rm -f test/utils/firejail-test-file*
-@@ -119,7 +117,7 @@ endif
+@@ -110,7 +108,7 @@ endif
  	# libraries and plugins
  	install -m 0755 -d $(DESTDIR)$(libdir)/firejail
  	install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/firecfg/firejail-welcome.sh
 -	install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS)
-+	install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) 
++	install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS)
  	install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS)
  	install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats
  	# plugins w/o read permission (non-dumpable)
diff --git a/recipes-security/Firejail/firejail_0.9.70.bb b/recipes-security/Firejail/firejail_0.9.72.bb
similarity index 96%
rename from recipes-security/Firejail/firejail_0.9.70.bb
rename to recipes-security/Firejail/firejail_0.9.72.bb
index 35f7b07..12a3105 100644
--- a/recipes-security/Firejail/firejail_0.9.70.bb
+++ b/recipes-security/Firejail/firejail_0.9.72.bb
@@ -9,7 +9,7 @@  seccomp-bpf and Linux capabilities."
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 LICENSE = "GPL-2.0-only"
 
-SRCREV = "b4b08d21cd95725c9d55dfdb6987fcc6d7893247"
+SRCREV = "2551bc71f14052344666f3ca2ad67f5b798020b9"
 SRC_URI = "git://github.com/netblue30/firejail.git;protocol=https;branch=master \
            file://exclude_seccomp_util_compiles.patch \
            "
@@ -46,6 +46,7 @@  PACKAGES:append = " ${PN}-vim ${PN}-zsh"
 
 FILES:${PN}-vim = "${datadir}/vim/"
 FILES:${PN}-zsh = "${datadir}/zsh/"
+FILES:${PN}-dev = "${datadir}/gtksourceview-5/"
 
 pkg_postinst_ontarget:${PN} () {
     ${libdir}/${BPN}/fseccomp default ${libdir}/${BPN}/seccomp