Merge branch 'master' of https://github.com/chiraag-nataraj/firejail-…

…profiles

Viber.profile

@@ -1,14 +1,21 @@
+<<<<<<< HEAD
 include /etc/firejail/globals.local
 
 private-bin sh,dig,awk,xdg-mime,cut,touch,mv
 private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf
 private-tmp
+=======
+# Firejail profile for Viber
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/Viber.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
-whitelist /opt/viber
 
-whitelist ${HOME}/.ViberPC
 whitelist ${DOWNLOADS}
-
+whitelist ${HOME}/.ViberPC
 whitelist /dev/dri
 whitelist /dev/full
 whitelist /dev/null
@@ -21,17 +28,36 @@ whitelist /dev/tty
 whitelist /dev/urandom
 whitelist /dev/video0
 whitelist /dev/zero
+whitelist /opt/viber
+include /etc/firejail/whitelist-common.inc
 
+<<<<<<< HEAD
 noexec ${HOME}
 noexec /tmp
 
 shell none
 seccomp
 # noroot
+=======
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 caps.drop all
+ipc-namespace
 nogroups
+<<<<<<< HEAD
 ipc-namespace
 
 # x11 xpra
 
-env QML_DISABLE_DISK_CACHE=1
+env QML_DISABLE_DISK_CACHE=1
+=======
+noroot
+seccomp
+shell none
+
+private-bin sh,dig,awk
+private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf
+private-tmp
+
+noexec ${HOME}
+noexec /tmp
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db

akregator.profile

@@ -1,28 +1,42 @@
+<<<<<<< HEAD
 include /etc/firejail/globals.local
 
 blacklist /usr/local/bin
 blacklist /usr/local/sbin
 
 whitelist ${HOME}/.config/
 whitelist ${HOME}/.local/share/akregator/
+=======
+# Firejail profile for akregator
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/akregator.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
+blacklist /usr/local/bin
+blacklist /usr/local/sbin
 
-private-bin akregator,akregatorstorageexporter,dbus-launch,kdeinit5,kshell5,kdeinit5_shutdown,kdeinit5_wrapper,kdeinit4,kshell4,kdeinit4_shutdown,kdeinit4_wrapper
-private-dev
-private-etc fonts,alternatives,X11,passwd
-
+whitelist ${HOME}/.config/
+whitelist ${HOME}/.local/share/akregator/
 whitelist /tmp/.X11-unix
-# I have forced DBus to use an ordinary unix socket
+# DBus is forced to use an ordinary unix socket
 whitelist /tmp/dbus_session_socket
+include /etc/firejail/whitelist-common.inc
 
-shell none
-seccomp
 caps.drop all
-noroot
-nonewprivs
+ipc-namespace
 nogroups
-ipc-namespace
+nonewprivs
+noroot
+seccomp
+shell none
+
+private-bin akregator,akregatorstorageexporter,dbus-launch,kdeinit5,kshell5,kdeinit5_shutdown,kdeinit5_wrapper,kdeinit4,kshell4,kdeinit4_shutdown,kdeinit4_wrapper
+private-dev
+private-etc fonts,alternatives,X11,passwd

amule.profile

@@ -1,5 +1,19 @@
+<<<<<<< HEAD
 include /etc/firejail/globals.local
 
+=======
+# Firejail profile for amule
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/amule.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+
+blacklist /boot
+blacklist /media
+blacklist /mnt
+blacklist /opt
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 blacklist /usr/local/bin
 blacklist /usr/local/sbin
 
@@ -8,21 +22,17 @@ whitelist ${HOME}/.aMule
 whitelist ${HOME}/.gtkrc-2.0
 whitelist ${HOME}/.gtkrc.mine
 whitelist ${HOME}/.themes
+include /etc/firejail/whitelist-common.inc
 
-blacklist /boot
-blacklist /media
-blacklist /mnt
-blacklist /opt
+caps.drop all
+ipc-namespace
+nogroups
+nonewprivs
+noroot
+seccomp
+shell none
 
 private-bin amule
 private-dev
 private-etc fonts,hosts
 private-tmp
-
-shell none
-seccomp
-caps.drop all
-noroot
-nonewprivs
-nogroups
-ipc-namespace

ardour5.profile

@@ -1,18 +1,36 @@
+<<<<<<< HEAD
 include /etc/firejail/globals.local
 
+=======
+# Firejail profile for ardour5
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/ardour5.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+
+blacklist /boot
+blacklist /media
+blacklist /mnt
+blacklist /opt
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 blacklist /usr/local/bin
 
 whitelist ${DOWNLOADS}
-whitelist ${HOME}/Documents
 whitelist ${HOME}/.config/ardour4
 whitelist ${HOME}/.config/ardour5
 whitelist ${HOME}/.lv2
 whitelist ${HOME}/.vst
+whitelist ${HOME}/Documents
+include /etc/firejail/whitelist-common.inc
 
-blacklist /boot
-blacklist /media
-blacklist /mnt
-blacklist /opt
+caps.drop all
+ipc-namespace
+net none
+nogroups
+noroot
+seccomp
+shell none
 
 private-bin sh,ardour5,ardour5-copy-mixer,ardour5-export,ardour5-fix_bbtppq,grep,sed,ldd,nm
 private-dev
@@ -21,11 +39,3 @@ private-tmp
 
 noexec /home
 noexec /tmp
-
-shell none
-seccomp
-caps.drop all
-net none
-noroot
-nogroups
-ipc-namespace

blender.profile

@@ -1,28 +1,41 @@
+<<<<<<< HEAD
 include /etc/firejail/globals.local
 
 whitelist ${HOME}/.config/blender
 
 whitelist ${DOWNLOADS}
 whitelist ${HOME}/Videos
+=======
+# Firejail profile for blender
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/blender.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
 
+whitelist ${DOWNLOADS}
+whitelist ${HOME}/.config/blender
+whitelist ${HOME}/Videos
+whitelist /tmp/.X11-unix
+include /etc/firejail/whitelist-common.inc
+
+caps.drop all
+ipc-namespace
+net none
+nogroups
+noroot
+seccomp
+shell none
+
 private-bin blender
 private-dev
 private-etc pulse,fonts
 
-whitelist /tmp/.X11-unix
-
 noexec /home
 noexec /tmp
-
-shell none
-seccomp
-caps.drop all
-net none
-noroot
-nogroups
-ipc-namespace

brackets.profile

@@ -1,27 +1,36 @@
+<<<<<<< HEAD
 include /etc/firejail/globals.local
 
+=======
+# Firejail profile for brackets
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/brackets.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+
+blacklist /boot
+blacklist /media
+blacklist /mnt
+
+whitelist ${DOWNLOADS}
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 whitelist ${HOME}/.config/Brackets
 whitelist ${HOME}/.gtkrc-2.0
 whitelist ${HOME}/.themes
-whitelist ${DOWNLOADS}
 whitelist ${HOME}/Documents
-
 whitelist /opt/brackets/
 whitelist /opt/google/
-
-blacklist /boot
-blacklist /media
-blacklist /mnt
-
-private-bin bash,brackets,readlink,dirname,google-chrome,cat
-private-dev
 whitelist /tmp/.X11-unix
+include /etc/firejail/whitelist-common.inc
 
+caps.drop all
 # Comment out or use --ignore=net if you want to install extensions or themes
 net none
-
 # Disable these if you use live preview (until I figure out a workaround)
 # Doing so should be relatively safe since there is no network access
-seccomp
 noroot
-caps.drop all
+seccomp
+
+private-bin bash,brackets,readlink,dirname,google-chrome,cat
+private-dev

calligra.profile

@@ -1,33 +1,46 @@
+<<<<<<< HEAD
 include /etc/firejail/globals.local
 
 whitelist ${HOME}/.config/Trolltech.conf
 whitelist ${HOME}/.gtkrc-2.0
 whitelist ${HOME}/.kde
 whitelist ${HOME}/.themes
+=======
+# Firejail profile for calligra
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/calligra.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+>>>>>>> 7bf44969dff7201d9239c0a606510cc67ed688db
 
 blacklist /boot
 blacklist /media
 blacklist /mnt
 blacklist /opt
 
 whitelist ${DOWNLOADS}
+whitelist ${HOME}/.config/Trolltech.conf
+whitelist ${HOME}/.gtkrc-2.0
+whitelist ${HOME}/.kde
+whitelist ${HOME}/.themes
 whitelist ${HOME}/Documents
+whitelist /tmp/.X11-unix
+# DBus is forced to use an ordinary unix socket
+whitelist /tmp/dbus_session_socket
+include /etc/firejail/whitelist-common.inc
+
+caps.drop all
+ipc-namespace
+net none
+nogroups
+noroot
+seccomp
+shell none
 
 private-bin calligra,calligraauthor,calligraconverter,calligraflow,calligraplan,calligraplanwork,calligrasheets,calligrastage,calligrawords,dbus-launch
 private-dev
 private-etc fonts,passwd,alternatives,X11
 
-whitelist /tmp/.X11-unix
-# I have forced DBus to use an ordinary unix socket
-whitelist /tmp/dbus_session_socket
-
 noexec /home
 noexec /tmp
-
-shell none
-seccomp
-caps.drop all
-net none
-noroot
-nogroups
-ipc-namespace

calligraauthor.profile

@@ -1 +1,5 @@
-include ${HOME}/.config/firejail/calligra.profile
+# Firejail profile alias for calligra
+# This file is overwritten after every install/update
+
+
+include ${HOME}/.config/firejail/calligra.profile