aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2017-09-30 02:36:19 -0400
committerLibravatar Tad <tad@spotco.us>2017-09-30 02:36:19 -0400
commitf359a4e68bc0f92cb2f5c85d5269ffbd53488413 (patch)
tree5def9575d833d8fde6e99d4dd2d7a0929dd263fd
parentMerge pull request #1582 from PharmaceuticalCobweb/master (diff)
downloadfirejail-f359a4e68bc0f92cb2f5c85d5269ffbd53488413.tar.gz
firejail-f359a4e68bc0f92cb2f5c85d5269ffbd53488413.tar.zst
firejail-f359a4e68bc0f92cb2f5c85d5269ffbd53488413.zip
Merges
-rw-r--r--README1
-rw-r--r--README.md2
-rw-r--r--etc/gnome-ring.profile4
3 files changed, 5 insertions, 2 deletions
diff --git a/README b/README
index 875147361..214e358a2 100644
--- a/README
+++ b/README
@@ -361,6 +361,7 @@ Petter Reinholdtsen (pere@hungry.com)
361 - Opera profile patch 361 - Opera profile patch
362PharmaceuticalCobweb (https://github.com/PharmaceuticalCobweb) 362PharmaceuticalCobweb (https://github.com/PharmaceuticalCobweb)
363 - fix quiterss profile 363 - fix quiterss profile
364 - added profile for gnome-ring
364pirate486743186 (https://github.com/pirate486743186) 365pirate486743186 (https://github.com/pirate486743186)
365 - KMail profile 366 - KMail profile
366Pixel Fairy (https://github.com/xahare) 367Pixel Fairy (https://github.com/xahare)
diff --git a/README.md b/README.md
index 303bd3359..57f9a3e25 100644
--- a/README.md
+++ b/README.md
@@ -181,4 +181,4 @@ calligrawords, cin, dooble, dooble-qt4, fetchmail, freecad, freecadcmd, google-e
181imagej, karbon, kdenlive, krita, linphone, lmms, macrofusion, mpd, natron, Natron, 181imagej, karbon, kdenlive, krita, linphone, lmms, macrofusion, mpd, natron, Natron,
182ricochet, shotcut, teamspeak3, tor, tor-browser-en, Viber, x-terminal-emulator, zart, 182ricochet, shotcut, teamspeak3, tor, tor-browser-en, Viber, x-terminal-emulator, zart,
183conky, arch-audit, ffmpeg, bluefish, cliqz, cinelerra, openshot-qt, pinta, uefitool, 183conky, arch-audit, ffmpeg, bluefish, cliqz, cinelerra, openshot-qt, pinta, uefitool,
184aosp 184aosp, pdfmod, gnome-ring
diff --git a/etc/gnome-ring.profile b/etc/gnome-ring.profile
index a16f13603..3e6e82dac 100644
--- a/etc/gnome-ring.profile
+++ b/etc/gnome-ring.profile
@@ -1,7 +1,7 @@
1# Firejail profile for gnome-ring 1# Firejail profile for gnome-ring
2# This file is overwritten after every install/update 2# This file is overwritten after every install/update
3# Persistent local customizations 3# Persistent local customizations
4include /etc/firejail/default.local 4include /etc/firejail/gnome-ring.local
5# Persistent global definitions 5# Persistent global definitions
6include /etc/firejail/globals.local 6include /etc/firejail/globals.local
7 7
@@ -12,6 +12,8 @@ include /etc/firejail/disable-devel.inc
12include /etc/firejail/disable-passwdmgr.inc 12include /etc/firejail/disable-passwdmgr.inc
13include /etc/firejail/disable-programs.inc 13include /etc/firejail/disable-programs.inc
14 14
15include /etc/firejail/whitelist-var-common.inc
16
15caps.drop all 17caps.drop all
16ipc-namespace 18ipc-namespace
17netfilter 19netfilter