aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2016-09-02 12:08:03 +1000
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2016-09-02 12:08:03 +1000
commit425c3c34c54366cadc6f97df99dc6fa5c964dc25 (patch)
tree876cbd12e1b64d6239a579e548d4a42ae97add56
parentMerge pull request #755 from Fred-Barclay/fixes (diff)
downloadfirejail-425c3c34c54366cadc6f97df99dc6fa5c964dc25.tar.gz
firejail-425c3c34c54366cadc6f97df99dc6fa5c964dc25.tar.zst
firejail-425c3c34c54366cadc6f97df99dc6fa5c964dc25.zip
extra dosbox files
-rw-r--r--README1
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--platform/debian/conffiles1
-rw-r--r--src/firecfg/firecfg.config1
6 files changed, 6 insertions, 2 deletions
diff --git a/README b/README
index c8cdbb6d8..fa67c1252 100644
--- a/README
+++ b/README
@@ -103,6 +103,7 @@ Fred-Barclay (https://github.com/Fred-Barclay)
103 - pidgin private-bin conversion 103 - pidgin private-bin conversion
104 - added eom profile 104 - added eom profile
105 - added gnome-chess profile 105 - added gnome-chess profile
106 - added DOSBox profile
106Jaykishan Mutkawoa (https://github.com/jmutkawoa) 107Jaykishan Mutkawoa (https://github.com/jmutkawoa)
107 - cpio profile 108 - cpio profile
108Paupiah Yash (https://github.com/CaffeinatedStud) 109Paupiah Yash (https://github.com/CaffeinatedStud)
diff --git a/README.md b/README.md
index 6785e3f7a..ebd39de5b 100644
--- a/README.md
+++ b/README.md
@@ -197,5 +197,5 @@ Browsers: Palemoon
197## New security profiles 197## New security profiles
198 198
199Gitter, gThumb, mpv, Franz messenger, LibreOffice, pix, audacity, xz, xzdec, gzip, cpio, less, Atom Beta, Atom, jitsi, eom, uudeview 199Gitter, gThumb, mpv, Franz messenger, LibreOffice, pix, audacity, xz, xzdec, gzip, cpio, less, Atom Beta, Atom, jitsi, eom, uudeview
200tar (gtar), unzip, unrar, file, skypeforlinux, gnome-chess, inox, Slack, Gajim IM client 200tar (gtar), unzip, unrar, file, skypeforlinux, gnome-chess, inox, Slack, Gajim IM client, DOSBox
201 201
diff --git a/RELNOTES b/RELNOTES
index 62171af35..3c69b0a1c 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -39,7 +39,7 @@ firejail (0.9.42~rc2) baseline; urgency=low
39 * profiles: pix, audacity, xz, xzdec, gzip, cpio, less 39 * profiles: pix, audacity, xz, xzdec, gzip, cpio, less
40 * profiles: Atom Beta, Atom, jitsi, eom, uudeview 40 * profiles: Atom Beta, Atom, jitsi, eom, uudeview
41 * profiles: tar (gtar), unzip, unrar, file, skypeforlinux, 41 * profiles: tar (gtar), unzip, unrar, file, skypeforlinux,
42 * profiles: inox, Slack, gnome-chess. Gajim IM client 42 * profiles: inox, Slack, gnome-chess. Gajim IM client, DOSBox
43 * bugfixes 43 * bugfixes
44 -- netblue30 <netblue30@yahoo.com> Thu, 26 Aug 2016 08:00:00 -0500 44 -- netblue30 <netblue30@yahoo.com> Thu, 26 Aug 2016 08:00:00 -0500
45 45
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 2f7584241..fb0f5a669 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -89,6 +89,7 @@ blacklist ${HOME}/.steam
89blacklist ${HOME}/.config/wesnoth 89blacklist ${HOME}/.config/wesnoth
90blacklist ${HOME}/.config/0ad 90blacklist ${HOME}/.config/0ad
91blacklist ${HOME}/.warzone2100-3.1 91blacklist ${HOME}/.warzone2100-3.1
92blacklist ${HOME}/.dosbox
92 93
93# Cryptocoins 94# Cryptocoins
94blacklist ${HOME}/.*coin 95blacklist ${HOME}/.*coin
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 2eaca90ce..691c536df 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -142,3 +142,4 @@
142/etc/firejail/xz.profile 142/etc/firejail/xz.profile
143/etc/firejail/xzdec.profile 143/etc/firejail/xzdec.profile
144/etc/firejail/strings.profile 144/etc/firejail/strings.profile
145/etc/firejail/dosbox.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index c909e6903..dd876c87c 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -75,6 +75,7 @@ unbound
75# emulators/compatibility layers 75# emulators/compatibility layers
76mupen64plus 76mupen64plus
77wine 77wine
78dosbox
78 79
79# games 80# games
800ad 810ad