aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-12-22 21:58:46 -0500
committerLibravatar Tad <tad@spotco.us>2018-12-22 21:58:46 -0500
commit39ef880dd2469c0c09510e32535913551d6cbaf2 (patch)
treeb8997d2313d7ad68e1c94ff015be7128cda9c282
parentMerge pull request #2308 from rusty-snake/patch-2 (diff)
downloadfirejail-39ef880dd2469c0c09510e32535913551d6cbaf2.tar.gz
firejail-39ef880dd2469c0c09510e32535913551d6cbaf2.tar.zst
firejail-39ef880dd2469c0c09510e32535913551d6cbaf2.zip
Merges
-rw-r--r--README2
-rw-r--r--etc/bibletime.profile3
-rw-r--r--etc/disable-common.inc2
-rw-r--r--etc/emacs.profile2
4 files changed, 7 insertions, 2 deletions
diff --git a/README b/README
index 8953fc6fa..64e1bebdb 100644
--- a/README
+++ b/README
@@ -528,6 +528,8 @@ rusty-snake (https://github.com/rusty-snake)
528 - fixed kdenlive profile 528 - fixed kdenlive profile
529 - added thunderbird-wayland and supertuxcart profiles 529 - added thunderbird-wayland and supertuxcart profiles
530 - fix bible-time profile 530 - fix bible-time profile
531 - more blacklists in disable-common.inc
532 - fixed some missing paths in disable-programs.inc
531Salvo 'LtWorf' Tomaselli (https://github.com/ltworf) 533Salvo 'LtWorf' Tomaselli (https://github.com/ltworf)
532 - fixed ktorrent profile 534 - fixed ktorrent profile
533sarneaud (https://github.com/sarneaud) 535sarneaud (https://github.com/sarneaud)
diff --git a/etc/bibletime.profile b/etc/bibletime.profile
index 79ba735ac..07cb889e4 100644
--- a/etc/bibletime.profile
+++ b/etc/bibletime.profile
@@ -18,6 +18,9 @@ include disable-interpreters.inc
18include disable-passwdmgr.inc 18include disable-passwdmgr.inc
19include disable-programs.inc 19include disable-programs.inc
20 20
21mkdir ${HOME}/.bibletime
22mkdir ${HOME}/.sword
23mkdir ${HOME}/.local/share/bibletime
21whitelist ${HOME}/.bibletime 24whitelist ${HOME}/.bibletime
22whitelist ${HOME}/.sword 25whitelist ${HOME}/.sword
23whitelist ${HOME}/.local/share/bibletime 26whitelist ${HOME}/.local/share/bibletime
diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index b333293fd..6a599893e 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -271,8 +271,6 @@ read-only ${HOME}/bin
271read-only ${HOME}/.bin 271read-only ${HOME}/.bin
272read-only ${HOME}/.local/bin 272read-only ${HOME}/.local/bin
273read-only ${HOME}/.cargo/bin 273read-only ${HOME}/.cargo/bin
274
275# cargo
276read-only ${HOME}/.cargo/env 274read-only ${HOME}/.cargo/env
277blacklist ${HOME}/.cargo/registry 275blacklist ${HOME}/.cargo/registry
278blacklist ${HOME}/.cargo/config 276blacklist ${HOME}/.cargo/config
diff --git a/etc/emacs.profile b/etc/emacs.profile
index c2057f6fb..06f1a6c53 100644
--- a/etc/emacs.profile
+++ b/etc/emacs.profile
@@ -8,6 +8,8 @@ include globals.local
8 8
9noblacklist ${HOME}/.emacs 9noblacklist ${HOME}/.emacs
10noblacklist ${HOME}/.emacs.d 10noblacklist ${HOME}/.emacs.d
11# uncomment the following line if you need gpg
12#noblacklist ${HOME}/.gnupg
11 13
12include disable-common.inc 14include disable-common.inc
13include disable-passwdmgr.inc 15include disable-passwdmgr.inc