summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-07-24 08:32:30 -0400
committerLibravatar GitHub <noreply@github.com>2016-07-24 08:32:30 -0400
commite69581310c2bd6e579d3e291bfb5de4a9f46b9e5 (patch)
treef95268e2b275d88b52c4d139c1f71203bc4e8e87
parent0.9.42~rc1 testing (diff)
parentadded missing programmes (diff)
downloadfirejail-e69581310c2bd6e579d3e291bfb5de4a9f46b9e5.tar.gz
firejail-e69581310c2bd6e579d3e291bfb5de4a9f46b9e5.tar.zst
firejail-e69581310c2bd6e579d3e291bfb5de4a9f46b9e5.zip
Merge pull request #643 from Fred-Barclay/eom
Eom
-rw-r--r--Makefile.in1
-rw-r--r--README1
-rw-r--r--README.md6
-rw-r--r--RELNOTES2
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--etc/eom.profile20
-rw-r--r--platform/debian/conffiles1
-rw-r--r--src/firecfg/firecfg.config5
8 files changed, 32 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index db326d2db..c6147cee7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,6 +223,7 @@ realinstall:
223 install -c -m 0644 .etc/atom-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. 223 install -c -m 0644 .etc/atom-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/.
224 install -c -m 0644 .etc/atom.profile $(DESTDIR)/$(sysconfdir)/firejail/. 224 install -c -m 0644 .etc/atom.profile $(DESTDIR)/$(sysconfdir)/firejail/.
225 install -c -m 0644 .etc/jitsi.profile $(DESTDIR)/$(sysconfdir)/firejail/. 225 install -c -m 0644 .etc/jitsi.profile $(DESTDIR)/$(sysconfdir)/firejail/.
226 install -c -m 0644 .etc/eom.profile $(DESTDIR)/$(sysconfdir)/firejail/.
226 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 227 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
227 install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/. 228 install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.
228 rm -fr .etc 229 rm -fr .etc
diff --git a/README b/README
index 2055c221c..1c9d85d65 100644
--- a/README
+++ b/README
@@ -59,6 +59,7 @@ Fred-Barclay (https://github.com/Fred-Barclay)
59 - several private-bin conversions 59 - several private-bin conversions
60 - added jitsi profile 60 - added jitsi profile
61 - pidgin private-bin conversion 61 - pidgin private-bin conversion
62 - added eom profile
62Jaykishan Mutkawoa (https://github.com/jmutkawoa) 63Jaykishan Mutkawoa (https://github.com/jmutkawoa)
63 - cpio profile 64 - cpio profile
64Paupiah Yash (https://github.com/CaffeinatedStud) 65Paupiah Yash (https://github.com/CaffeinatedStud)
diff --git a/README.md b/README.md
index f36bbc3ae..3ab6f43be 100644
--- a/README.md
+++ b/README.md
@@ -136,9 +136,9 @@ BitTorrent: deluge, qbittorrent, rtorrent, transmission-gtk, transmission-qt, ug
136 136
137File transfer: filezilla 137File transfer: filezilla
138 138
139Media: vlc, mpv, gnome-mplayer, audacity, rhythmbox, spotify, xplayer, xviewer 139Media: vlc, mpv, gnome-mplayer, audacity, rhythmbox, spotify, xplayer, xviewer, eom
140 140
141Office: evince, gthumb, fbreader, pix, atril, xreader 141Office: evince, gthumb, fbreader, pix, atril, xreader,
142 142
143Chat/messaging: qtox, gitter, pidgin 143Chat/messaging: qtox, gitter, pidgin
144 144
@@ -152,5 +152,5 @@ Browsers: Palemoon
152 152
153## New security profiles 153## New security profiles
154 154
155Gitter, gThumb, mpv, Franz messenger, LibreOffice, pix, audacity, strings, xz, xzdec, gzip, cpio, less, Atom Beta, Atom, jitsi 155Gitter, gThumb, mpv, Franz messenger, LibreOffice, pix, audacity, strings, xz, xzdec, gzip, cpio, less, Atom Beta, Atom, jitsi, eom
156 156
diff --git a/RELNOTES b/RELNOTES
index 30672819c..be65b9fca 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -14,7 +14,7 @@ firejail (0.9.42~rc1) baseline; urgency=low
14 * compile time support to disable global configuration file 14 * compile time support to disable global configuration file
15 * new profiles: Gitter, gThumb, mpv, Franz messenger, LibreOffice 15 * new profiles: Gitter, gThumb, mpv, Franz messenger, LibreOffice
16 * new profiles: pix, audacity, strings, xz, xzdec, gzip, cpio, less 16 * new profiles: pix, audacity, strings, xz, xzdec, gzip, cpio, less
17 * new profiles: Atom Beta, Atom, jitsi 17 * new profiles: Atom Beta, Atom, jitsi, eom
18 -- netblue30 <netblue30@yahoo.com> Thu, 21 Jul 2016 08:00:00 -0500 18 -- netblue30 <netblue30@yahoo.com> Thu, 21 Jul 2016 08:00:00 -0500
19 19
20firejail (0.9.40) baseline; urgency=low 20firejail (0.9.40) baseline; urgency=low
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 837ac1e4c..0f155351d 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -20,6 +20,7 @@ blacklist ${HOME}/.config/xreader
20blacklist ${HOME}/.config/xviewer 20blacklist ${HOME}/.config/xviewer
21blacklist ${HOME}/.config/libreoffice 21blacklist ${HOME}/.config/libreoffice
22blacklist ${HOME}/.config/pix 22blacklist ${HOME}/.config/pix
23blacklist ${HOME}/.config/mate/eom
23blacklist ${HOME}/.kde/share/apps/okular 24blacklist ${HOME}/.kde/share/apps/okular
24blacklist ${HOME}/.kde/share/config/okularrc 25blacklist ${HOME}/.kde/share/config/okularrc
25blacklist ${HOME}/.kde/share/config/okularpartrc 26blacklist ${HOME}/.kde/share/config/okularpartrc
diff --git a/etc/eom.profile b/etc/eom.profile
new file mode 100644
index 000000000..81d993e96
--- /dev/null
+++ b/etc/eom.profile
@@ -0,0 +1,20 @@
1# Firejail profile for Eye of Mate (eom)
2noblacklist ~/.config/mate/eom
3
4include /etc/firejail/disable-common.inc
5include /etc/firejail/disable-programs.inc
6include /etc/firejail/disable-devel.inc
7include /etc/firejail/disable-passwdmgr.inc
8
9caps.drop all
10nogroups
11nonewprivs
12noroot
13nosound
14protocol unix
15seccomp
16shell none
17tracelog
18
19private-bin eom
20private-dev
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 3bbd93d3c..24884228e 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -129,3 +129,4 @@
129/etc/firejail/atom-beta.profile 129/etc/firejail/atom-beta.profile
130/etc/firejail/atom.profile 130/etc/firejail/atom.profile
131/etc/firejail/jitsi.profile 131/etc/firejail/jitsi.profile
132/etc/firejail/eom.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index ba975c4b4..48e205a58 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -40,6 +40,7 @@ midori
40netsurf 40netsurf
41opera-beta 41opera-beta
42opera 42opera
43palemoon
43qutebrowser 44qutebrowser
44seamonkey 45seamonkey
45seamonkey-bin 46seamonkey-bin
@@ -98,6 +99,7 @@ totem
98vlc 99vlc
99xplayer 100xplayer
100xviewer 101xviewer
102eom
101 103
102# news readers 104# news readers
103quiterss 105quiterss
@@ -110,10 +112,11 @@ fbreader
110gwenview 112gwenview
111gthumb 113gthumb
112libreoffice 114libreoffice
115localc
113lodraw 116lodraw
114loffice 117loffice
115lofromtemplate 118lofromtemplate
116loimpres 119loimpress
117lomath 120lomath
118loweb 121loweb
119lowriter 122lowriter