diff options
author | 2019-02-17 22:47:41 +0000 | |
---|---|---|
committer | 2019-02-17 22:47:41 +0000 | |
commit | e65f492798565b06b3af3b9a80e66ffcbdcbace6 (patch) | |
tree | 960ce614a54cb445e23beb1bb37faf3927959b75 | |
parent | Fix #2414 by providing optional relaxed include file (diff) | |
parent | merges (diff) | |
download | firejail-e65f492798565b06b3af3b9a80e66ffcbdcbace6.tar.gz firejail-e65f492798565b06b3af3b9a80e66ffcbdcbace6.tar.zst firejail-e65f492798565b06b3af3b9a80e66ffcbdcbace6.zip |
Merge upstream changes
-rw-r--r-- | README | 3 | ||||
-rw-r--r-- | etc/keepassxc.profile | 1 | ||||
-rw-r--r-- | etc/pluma.profile | 2 | ||||
-rw-r--r-- | etc/thunderbird.profile | 2 |
4 files changed, 7 insertions, 1 deletions
@@ -445,6 +445,9 @@ nyancat18 (https://github.com/nyancat18) | |||
445 | - added ardour4, dooble, karbon, krita profiles | 445 | - added ardour4, dooble, karbon, krita profiles |
446 | Ondra Nekola (https://github.com/satai) | 446 | Ondra Nekola (https://github.com/satai) |
447 | - allow firefox theming with non-global themes | 447 | - allow firefox theming with non-global themes |
448 | Lorenzo "Palinuro" Faletra (https://github.com/PalinuroSec) | ||
449 | - prevent thunderbird conflicts when firefox is running | ||
450 | - add join-or-start to pluma to open multiple files in tabs | ||
448 | Panzerfather (https://github.com/Panzerfather) | 451 | Panzerfather (https://github.com/Panzerfather) |
449 | - allow eog to access user's trash | 452 | - allow eog to access user's trash |
450 | Patrick Toomey (https://sourceforge.net/u/ptoomey/profile/) | 453 | Patrick Toomey (https://sourceforge.net/u/ptoomey/profile/) |
diff --git a/etc/keepassxc.profile b/etc/keepassxc.profile index d565373f4..fba709a78 100644 --- a/etc/keepassxc.profile +++ b/etc/keepassxc.profile | |||
@@ -42,6 +42,7 @@ shell none | |||
42 | 42 | ||
43 | private-bin keepassxc | 43 | private-bin keepassxc |
44 | private-dev | 44 | private-dev |
45 | |||
45 | private-etc alternatives,fonts,ld.so.cache,machine-id | 46 | private-etc alternatives,fonts,ld.so.cache,machine-id |
46 | private-tmp | 47 | private-tmp |
47 | 48 | ||
diff --git a/etc/pluma.profile b/etc/pluma.profile index 79e4b89b3..a8b1e4cc6 100644 --- a/etc/pluma.profile +++ b/etc/pluma.profile | |||
@@ -44,3 +44,5 @@ private-tmp | |||
44 | memory-deny-write-execute | 44 | memory-deny-write-execute |
45 | noexec ${HOME} | 45 | noexec ${HOME} |
46 | noexec /tmp | 46 | noexec /tmp |
47 | |||
48 | join-or-start pluma | ||
diff --git a/etc/thunderbird.profile b/etc/thunderbird.profile index db563b25c..c3358a9e8 100644 --- a/etc/thunderbird.profile +++ b/etc/thunderbird.profile | |||
@@ -44,4 +44,4 @@ writable-run-user | |||
44 | # Redirect | 44 | # Redirect |
45 | # Uncomment if you use enigmail | 45 | # Uncomment if you use enigmail |
46 | # ignore nodbus | 46 | # ignore nodbus |
47 | include firefox.profile | 47 | include firefox-common.profile |