diff options
author | Tad <tad@spotco.us> | 2018-05-09 16:05:38 -0400 |
---|---|---|
committer | Tad <tad@spotco.us> | 2018-05-09 16:05:38 -0400 |
commit | 81fa843daf0e0fce8e7b931d5d51670528794499 (patch) | |
tree | 25e6ff41eaec4fb4f1feff98b29d64efe2d60e84 | |
parent | Merge pull request #1934 from pizzadude/patch-7 (diff) | |
download | firejail-81fa843daf0e0fce8e7b931d5d51670528794499.tar.gz firejail-81fa843daf0e0fce8e7b931d5d51670528794499.tar.zst firejail-81fa843daf0e0fce8e7b931d5d51670528794499.zip |
merges
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | RELNOTES | 3 | ||||
-rw-r--r-- | etc/disable-programs.inc | 2 | ||||
-rw-r--r-- | etc/qmmp.profile | 3 | ||||
-rw-r--r-- | etc/sayonara.profile | 3 |
6 files changed, 8 insertions, 6 deletions
@@ -435,6 +435,7 @@ Pixel Fairy (https://github.com/xahare) | |||
435 | PizzaDude (https://github.com/pizzadude) | 435 | PizzaDude (https://github.com/pizzadude) |
436 | - add mpv support to smplayer | 436 | - add mpv support to smplayer |
437 | - added profile for torbrowser-launcher | 437 | - added profile for torbrowser-launcher |
438 | - added profile for sayonara and qmmp | ||
438 | probonopd (https://github.com/probonopd) | 439 | probonopd (https://github.com/probonopd) |
439 | - automatic build on Travis CI | 440 | - automatic build on Travis CI |
440 | pshpsh (https://github.com/pshpsh) | 441 | pshpsh (https://github.com/pshpsh) |
@@ -376,4 +376,4 @@ gnome-recipes, akonadi_control, evince-previewer, evince-thumbnailer, blender-2. | |||
376 | thunderbird-beta, ncdu, gnome-logs, gcloud, musixmatch, gunzip, bunzip2, enchant, | 376 | thunderbird-beta, ncdu, gnome-logs, gcloud, musixmatch, gunzip, bunzip2, enchant, |
377 | enchant-2, enchant-lsmod, enchant-lsmod-2, Discord, acat, adiff, als, apack, arepack, | 377 | enchant-2, enchant-lsmod, enchant-lsmod-2, Discord, acat, adiff, als, apack, arepack, |
378 | aunpack profiles, ppsspp, scallion, clion, baloo_filemetadata_temp_extractor, | 378 | aunpack profiles, ppsspp, scallion, clion, baloo_filemetadata_temp_extractor, |
379 | AnyDesk, webstorm, xmind | 379 | AnyDesk, webstorm, xmind, qmmp, sayonara |
@@ -43,7 +43,8 @@ firejail (0.9.54~rc1) baseline; urgency=low | |||
43 | * new profiles: musixmatch, gunzip, bunzip2, enchant-lsmod, enchant-lsmod-2, | 43 | * new profiles: musixmatch, gunzip, bunzip2, enchant-lsmod, enchant-lsmod-2, |
44 | * new profiles: enchant, enchant-2, Discord, acat, adiff, als, apack, | 44 | * new profiles: enchant, enchant-2, Discord, acat, adiff, als, apack, |
45 | * new profiles: arepack, aunpack profiles, ppsspp, scallion, clion, | 45 | * new profiles: arepack, aunpack profiles, ppsspp, scallion, clion, |
46 | * new profiles: baloo_filemetadata_temp_extractor, AnyDesk, webstorm, xmind | 46 | * new profiles: baloo_filemetadata_temp_extractor, AnyDesk, webstorm, xmind, |
47 | * new profiles: qmmp, sayonara | ||
47 | -- netblue30 <netblue30@yahoo.com> Sun, 6 May 2018 08:00:00 -0500 | 48 | -- netblue30 <netblue30@yahoo.com> Sun, 6 May 2018 08:00:00 -0500 |
48 | 49 | ||
49 | firejail (0.9.52) baseline; urgency=low | 50 | firejail (0.9.52) baseline; urgency=low |
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index ea334c289..c7605d660 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -16,6 +16,7 @@ blacklist ${HOME}/.LuminanceHDR | |||
16 | blacklist ${HOME}/.Mathematica | 16 | blacklist ${HOME}/.Mathematica |
17 | blacklist ${HOME}/.Natron | 17 | blacklist ${HOME}/.Natron |
18 | blacklist ${HOME}/.PyCharm* | 18 | blacklist ${HOME}/.PyCharm* |
19 | blacklist ${HOME}/.Sayonara | ||
19 | blacklist ${HOME}/.Skype | 20 | blacklist ${HOME}/.Skype |
20 | blacklist ${HOME}/.Steam | 21 | blacklist ${HOME}/.Steam |
21 | blacklist ${HOME}/.Steampath | 22 | blacklist ${HOME}/.Steampath |
@@ -465,6 +466,7 @@ blacklist ${HOME}/.passwd-s3fs | |||
465 | blacklist ${HOME}/.pingus | 466 | blacklist ${HOME}/.pingus |
466 | blacklist ${HOME}/.purple | 467 | blacklist ${HOME}/.purple |
467 | blacklist ${HOME}/.qemu-launcher | 468 | blacklist ${HOME}/.qemu-launcher |
469 | blacklist ${HOME}/.qmmp | ||
468 | blacklist ${HOME}/.redeclipse | 470 | blacklist ${HOME}/.redeclipse |
469 | blacklist ${HOME}/.remmina | 471 | blacklist ${HOME}/.remmina |
470 | blacklist ${HOME}/.repo_.gitconfig.json | 472 | blacklist ${HOME}/.repo_.gitconfig.json |
diff --git a/etc/qmmp.profile b/etc/qmmp.profile index 49b400c26..d785ddbbe 100644 --- a/etc/qmmp.profile +++ b/etc/qmmp.profile | |||
@@ -5,14 +5,13 @@ include /etc/firejail/qmmp.local | |||
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | include /etc/firejail/globals.local |
7 | 7 | ||
8 | noblacklist ${HOME}/.qmmp | ||
8 | 9 | ||
9 | include /etc/firejail/disable-common.inc | 10 | include /etc/firejail/disable-common.inc |
10 | include /etc/firejail/disable-devel.inc | 11 | include /etc/firejail/disable-devel.inc |
11 | include /etc/firejail/disable-passwdmgr.inc | 12 | include /etc/firejail/disable-passwdmgr.inc |
12 | include /etc/firejail/disable-programs.inc | 13 | include /etc/firejail/disable-programs.inc |
13 | 14 | ||
14 | noblacklist ~/.qmmp | ||
15 | |||
16 | caps.drop all | 15 | caps.drop all |
17 | netfilter | 16 | netfilter |
18 | # no3d | 17 | # no3d |
diff --git a/etc/sayonara.profile b/etc/sayonara.profile index 3b593945a..756bd99eb 100644 --- a/etc/sayonara.profile +++ b/etc/sayonara.profile | |||
@@ -5,14 +5,13 @@ include /etc/firejail/sayonara.local | |||
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | include /etc/firejail/globals.local |
7 | 7 | ||
8 | noblacklist ${HOME}/.Sayonara | ||
8 | 9 | ||
9 | include /etc/firejail/disable-common.inc | 10 | include /etc/firejail/disable-common.inc |
10 | include /etc/firejail/disable-devel.inc | 11 | include /etc/firejail/disable-devel.inc |
11 | include /etc/firejail/disable-passwdmgr.inc | 12 | include /etc/firejail/disable-passwdmgr.inc |
12 | include /etc/firejail/disable-programs.inc | 13 | include /etc/firejail/disable-programs.inc |
13 | 14 | ||
14 | noblacklist ~/.Sayonara | ||
15 | |||
16 | caps.drop all | 15 | caps.drop all |
17 | netfilter | 16 | netfilter |
18 | no3d | 17 | no3d |