From 20b1a0d188129568efccfb21478cc035a1b0f048 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Sun, 17 Apr 2016 12:13:17 -0400
Subject: warzone2100 and firecfg fixes

---
 README                  | 1 +
 README.md               | 3 ++-
 RELNOTES                | 2 +-
 etc/warzone2100.profile | 2 +-
 src/firecfg/main.c      | 5 +++--
 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)
 	- split Icedove and Thunderbird profiles
 	- added 0ad profile
 	- fixed version for deb packages
+	- added Warzone2100 profile
 avoidr (https://github.com/avoidr)
 	- whitelist fix
 	- 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
 
 ## New security profiles
 lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril, qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars, qTox,
-OpenSSH client, OpenBox window manager, Dillo, cmus, dnsmasq, PaleMoon, Icedove, abrowser, 0ad, netsurf
+OpenSSH client, OpenBox window manager, Dillo, cmus, dnsmasq, PaleMoon, Icedove, abrowser, 0ad, netsurf,
+Warzone2100
 
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
   * new profiles: lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril
   * new profiles: qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars
   * new profiles: qTox, OpenSSH client, OpenBox, Dillo, cmus, dnsmasq
-  * new profiles: PaleMoon, Icedove, abrowser, 0ad, netsurf
+  * new profiles: PaleMoon, Icedove, abrowser, 0ad, netsurf, Warzone2100
   * build rpm packages using "make rpms"
   * bugfixes
  -- 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 @@
 # Firejail profile for warzone2100
 # Currently supports warzone2100-3.1
+noblacklist ~/.warzone2100-3.1
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-passwdmgr.inc
@@ -14,6 +15,5 @@ seccomp
 tracelog
 
 # Whitelist
-noblacklist ~/.warzone2100-3.1
 mkdir ~/.warzone2100-3.1
 whitelist ~/.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) {
 static int which(const char *program) {
 	// check some well-known paths
 	if (find(program, "/bin") || find(program, "/usr/bin") ||
-	     find(program, "/sbin") || find(program, "/usr/sbin"))
+	     find(program, "/sbin") || find(program, "/usr/sbin") ||
+	     find(program, "/usr/games"))
 		return 1;
 		
 	// check environment
@@ -268,7 +269,7 @@ static void set(void) {
 		// empty line
 		if (*start == '\0')
 			continue;
-		
+
 		// set link
 		set_file(start, firejail_exec);
 	}
-- 
cgit v1.2.3-70-g09d2