aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-04-17 12:13:17 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-04-17 12:13:17 -0400
commit20b1a0d188129568efccfb21478cc035a1b0f048 (patch)
tree27205bb9e221589dd3b33733545872f4681a3964
parentMerge pull request #449 from Fred-Barclay/proposed (diff)
downloadfirejail-20b1a0d188129568efccfb21478cc035a1b0f048.tar.gz
firejail-20b1a0d188129568efccfb21478cc035a1b0f048.tar.zst
firejail-20b1a0d188129568efccfb21478cc035a1b0f048.zip
warzone2100 and firecfg fixes
-rw-r--r--README1
-rw-r--r--README.md3
-rw-r--r--RELNOTES2
-rw-r--r--etc/warzone2100.profile2
-rw-r--r--src/firecfg/main.c5
5 files changed, 8 insertions, 5 deletions
diff --git a/README b/README
index ade4b4258..e42c187e2 100644
--- a/README
+++ b/README
@@ -28,6 +28,7 @@ Fred-Barclay (https://github.com/Fred-Barclay)
28 - split Icedove and Thunderbird profiles 28 - split Icedove and Thunderbird profiles
29 - added 0ad profile 29 - added 0ad profile
30 - fixed version for deb packages 30 - fixed version for deb packages
31 - added Warzone2100 profile
31avoidr (https://github.com/avoidr) 32avoidr (https://github.com/avoidr)
32 - whitelist fix 33 - whitelist fix
33 - recently-used.xbel fix 34 - recently-used.xbel fix
diff --git a/README.md b/README.md
index d6a9a6c7a..ed564e58a 100644
--- a/README.md
+++ b/README.md
@@ -281,5 +281,6 @@ $ man firejail-profile
281 281
282## New security profiles 282## New security profiles
283lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril, qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars, qTox, 283lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril, qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars, qTox,
284OpenSSH client, OpenBox window manager, Dillo, cmus, dnsmasq, PaleMoon, Icedove, abrowser, 0ad, netsurf 284OpenSSH client, OpenBox window manager, Dillo, cmus, dnsmasq, PaleMoon, Icedove, abrowser, 0ad, netsurf,
285Warzone2100
285 286
diff --git a/RELNOTES b/RELNOTES
index fc7df6f19..4bff6d092 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -18,7 +18,7 @@ firejail (0.9.40-rc1) baseline; urgency=low
18 * new profiles: lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril 18 * new profiles: lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril
19 * new profiles: qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars 19 * new profiles: qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars
20 * new profiles: qTox, OpenSSH client, OpenBox, Dillo, cmus, dnsmasq 20 * new profiles: qTox, OpenSSH client, OpenBox, Dillo, cmus, dnsmasq
21 * new profiles: PaleMoon, Icedove, abrowser, 0ad, netsurf 21 * new profiles: PaleMoon, Icedove, abrowser, 0ad, netsurf, Warzone2100
22 * build rpm packages using "make rpms" 22 * build rpm packages using "make rpms"
23 * bugfixes 23 * bugfixes
24 -- netblue30 <netblue30@yahoo.com> Sun, 3 Apr 2016 08:00:00 -0500 24 -- netblue30 <netblue30@yahoo.com> Sun, 3 Apr 2016 08:00:00 -0500
diff --git a/etc/warzone2100.profile b/etc/warzone2100.profile
index 73408ffb1..7588da657 100644
--- a/etc/warzone2100.profile
+++ b/etc/warzone2100.profile
@@ -1,5 +1,6 @@
1# Firejail profile for warzone2100 1# Firejail profile for warzone2100
2# Currently supports warzone2100-3.1 2# Currently supports warzone2100-3.1
3noblacklist ~/.warzone2100-3.1
3include /etc/firejail/disable-common.inc 4include /etc/firejail/disable-common.inc
4include /etc/firejail/disable-devel.inc 5include /etc/firejail/disable-devel.inc
5include /etc/firejail/disable-passwdmgr.inc 6include /etc/firejail/disable-passwdmgr.inc
@@ -14,6 +15,5 @@ seccomp
14tracelog 15tracelog
15 16
16# Whitelist 17# Whitelist
17noblacklist ~/.warzone2100-3.1
18mkdir ~/.warzone2100-3.1 18mkdir ~/.warzone2100-3.1
19whitelist ~/.warzone2100-3.1 19whitelist ~/.warzone2100-3.1
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 70d29a3ed..5fcace6cb 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -79,7 +79,8 @@ static int find(const char *program, const char *directory) {
79static int which(const char *program) { 79static int which(const char *program) {
80 // check some well-known paths 80 // check some well-known paths
81 if (find(program, "/bin") || find(program, "/usr/bin") || 81 if (find(program, "/bin") || find(program, "/usr/bin") ||
82 find(program, "/sbin") || find(program, "/usr/sbin")) 82 find(program, "/sbin") || find(program, "/usr/sbin") ||
83 find(program, "/usr/games"))
83 return 1; 84 return 1;
84 85
85 // check environment 86 // check environment
@@ -268,7 +269,7 @@ static void set(void) {
268 // empty line 269 // empty line
269 if (*start == '\0') 270 if (*start == '\0')
270 continue; 271 continue;
271 272
272 // set link 273 // set link
273 set_file(start, firejail_exec); 274 set_file(start, firejail_exec);
274 } 275 }