diff options
author | Armin Kuster <akuster808@gmail.com> | 2023-03-17 16:12:18 -0400 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-03-20 16:30:29 -0400 |
commit | 90feb1888d69de4d797e3b401457a9002d7afbfe (patch) | |
tree | e95368d21c7e9760eb64d888c1f98cd01fd46010 | |
parent | d440752461546a447161e64580e445eee3b7856e (diff) | |
download | meta-security-90feb1888d69de4d797e3b401457a9002d7afbfe.tar.gz |
firejail: update 0.9.72
refresh patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/Firejail/firejail/exclude_seccomp_util_compiles.patch | 20 | ||||
-rw-r--r-- | recipes-security/Firejail/firejail_0.9.72.bb (renamed from recipes-security/Firejail/firejail_0.9.70.bb) | 3 |
2 files changed, 12 insertions, 11 deletions
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 | |||
5 | we are currently doing this on the target. | 5 | we are currently doing this on the target. |
6 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | 6 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
7 | 7 | ||
8 | Index: git/Makefile.in | 8 | Index: git/Makefile |
9 | =================================================================== | 9 | =================================================================== |
10 | --- git.orig/Makefile.in | 10 | --- git.orig/Makefile |
11 | +++ git/Makefile.in | 11 | +++ git/Makefile |
12 | @@ -34,7 +34,6 @@ MYDIRS = src/lib $(MAN_SRC) $(COMPLETION | 12 | @@ -18,7 +18,6 @@ MYDIRS = src/lib $(MAN_SRC) $(COMPLETION |
13 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so | 13 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so |
14 | COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion | 14 | COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion |
15 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 jailcheck.1 | 15 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 jailcheck.1 |
16 | -SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 | 16 | -SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 |
17 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS) | 17 | ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS) |
18 | 18 | ||
19 | .PHONY: all_items $(ALL_ITEMS) | 19 | .PHONY: all |
20 | @@ -52,7 +51,7 @@ $(MANPAGES): src/man | 20 | @@ -43,7 +42,7 @@ $(MANPAGES): src/man config.mk |
21 | 21 | ||
22 | man: $(MANPAGES) | 22 | man: $(MANPAGES) |
23 | 23 | ||
24 | -filters: $(SECCOMP_FILTERS) $(SBOX_APPS_NON_DUMPABLE) | 24 | -filters: $(SECCOMP_FILTERS) $(SBOX_APPS_NON_DUMPABLE) |
25 | +filters: $(SBOX_APPS_NON_DUMPABLE) | 25 | +filters: $(SBOX_APPS_NON_DUMPABLE) |
26 | seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize | 26 | seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize |
27 | src/fseccomp/fseccomp default seccomp | 27 | src/fseccomp/fseccomp default seccomp |
28 | src/fsec-optimize/fsec-optimize seccomp | 28 | src/fsec-optimize/fsec-optimize seccomp |
29 | @@ -81,7 +80,6 @@ clean: | 29 | @@ -72,7 +71,6 @@ clean: |
30 | done | 30 | done |
31 | $(MAKE) -C test clean | 31 | $(MAKE) -C test clean |
32 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm | 32 | rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm |
@@ -34,12 +34,12 @@ Index: git/Makefile.in | |||
34 | rm -f test/utils/index.html* | 34 | rm -f test/utils/index.html* |
35 | rm -f test/utils/wget-log | 35 | rm -f test/utils/wget-log |
36 | rm -f test/utils/firejail-test-file* | 36 | rm -f test/utils/firejail-test-file* |
37 | @@ -119,7 +117,7 @@ endif | 37 | @@ -110,7 +108,7 @@ endif |
38 | # libraries and plugins | 38 | # libraries and plugins |
39 | install -m 0755 -d $(DESTDIR)$(libdir)/firejail | 39 | install -m 0755 -d $(DESTDIR)$(libdir)/firejail |
40 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/firecfg/firejail-welcome.sh | 40 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/firecfg/firejail-welcome.sh |
41 | - install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS) | 41 | - install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS) |
42 | + install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) | 42 | + install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) |
43 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS) | 43 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS) |
44 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats | 44 | install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats |
45 | # plugins w/o read permission (non-dumpable) | 45 | # 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 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." | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
10 | LICENSE = "GPL-2.0-only" | 10 | LICENSE = "GPL-2.0-only" |
11 | 11 | ||
12 | SRCREV = "b4b08d21cd95725c9d55dfdb6987fcc6d7893247" | 12 | SRCREV = "2551bc71f14052344666f3ca2ad67f5b798020b9" |
13 | SRC_URI = "git://github.com/netblue30/firejail.git;protocol=https;branch=master \ | 13 | SRC_URI = "git://github.com/netblue30/firejail.git;protocol=https;branch=master \ |
14 | file://exclude_seccomp_util_compiles.patch \ | 14 | file://exclude_seccomp_util_compiles.patch \ |
15 | " | 15 | " |
@@ -46,6 +46,7 @@ PACKAGES:append = " ${PN}-vim ${PN}-zsh" | |||
46 | 46 | ||
47 | FILES:${PN}-vim = "${datadir}/vim/" | 47 | FILES:${PN}-vim = "${datadir}/vim/" |
48 | FILES:${PN}-zsh = "${datadir}/zsh/" | 48 | FILES:${PN}-zsh = "${datadir}/zsh/" |
49 | FILES:${PN}-dev = "${datadir}/gtksourceview-5/" | ||
49 | 50 | ||
50 | pkg_postinst_ontarget:${PN} () { | 51 | pkg_postinst_ontarget:${PN} () { |
51 | ${libdir}/${BPN}/fseccomp default ${libdir}/${BPN}/seccomp | 52 | ${libdir}/${BPN}/fseccomp default ${libdir}/${BPN}/seccomp |