diff options
author | netblue30 <netblue30@yahoo.com> | 2017-07-30 10:03:50 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2017-07-30 10:03:50 -0400 |
commit | 2d97b52237889f7587115d2549796df7b08e7f20 (patch) | |
tree | f253b6f0f8ac23a39c675b761de3115e95a11f3c | |
parent | Merge pull request #1416 from rahiel/telegram (diff) | |
download | firejail-2d97b52237889f7587115d2549796df7b08e7f20.tar.gz firejail-2d97b52237889f7587115d2549796df7b08e7f20.tar.zst firejail-2d97b52237889f7587115d2549796df7b08e7f20.zip |
merges
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | README.md | 3 | ||||
-rw-r--r-- | RELNOTES | 2 | ||||
-rw-r--r-- | platform/debian/conffiles | 1 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 1 |
5 files changed, 6 insertions, 2 deletions
@@ -345,6 +345,7 @@ Rahiel Kasim (https://github.com/rahiel) | |||
345 | - Mathematica profile | 345 | - Mathematica profile |
346 | - whitelisted Dropbox profile | 346 | - whitelisted Dropbox profile |
347 | - whitelisted keysnail config for firefox | 347 | - whitelisted keysnail config for firefox |
348 | - added telegram-desktop profile | ||
348 | Rahul Golam (https://github.com/technoLord) | 349 | Rahul Golam (https://github.com/technoLord) |
349 | - strings profile | 350 | - strings profile |
350 | Raphaël Droz (https://github.com/drzraf) | 351 | Raphaël Droz (https://github.com/drzraf) |
@@ -128,5 +128,6 @@ ulimit, vhangup, vserver. This brings us to a total of 91 syscalls blacklisted b | |||
128 | 128 | ||
129 | curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite, Geary, Liferea, peek, silentarmy, | 129 | curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite, Geary, Liferea, peek, silentarmy, |
130 | IntelliJ IDEA, Android Studio, electron, riot-web, | 130 | IntelliJ IDEA, Android Studio, electron, riot-web, |
131 | Extreme Tux Racer, Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux | 131 | Extreme Tux Racer, Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux, |
132 | telegram-desktop | ||
132 | 133 | ||
@@ -9,7 +9,7 @@ firejail (0.9.49) baseline; urgency=low | |||
9 | * new profiles: Geary, Liferea, peek, silentarmy, IntelliJ IDEA, | 9 | * new profiles: Geary, Liferea, peek, silentarmy, IntelliJ IDEA, |
10 | * new profiles: Android Studio, electron, riot-web, Extreme Tux Racer, | 10 | * new profiles: Android Studio, electron, riot-web, Extreme Tux Racer, |
11 | * new profiles: Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux | 11 | * new profiles: Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux |
12 | 12 | * new profiles: telegram-desktop | |
13 | * bugfixes | 13 | * bugfixes |
14 | -- netblue30 <netblue30@yahoo.com> Mon, 12 Jun 2017 20:00:00 -0500 | 14 | -- netblue30 <netblue30@yahoo.com> Mon, 12 Jun 2017 20:00:00 -0500 |
15 | 15 | ||
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index a60bf92c3..ac619a046 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -330,3 +330,4 @@ | |||
330 | /etc/firejail/pingus.profile | 330 | /etc/firejail/pingus.profile |
331 | /etc/firejail/simutrans.profile | 331 | /etc/firejail/simutrans.profile |
332 | /etc/firejail/supertux2.profile | 332 | /etc/firejail/supertux2.profile |
333 | /etc/firejail/telegram-desktop.profile | ||
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index eb611034f..a6472a604 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -239,6 +239,7 @@ supertux2 | |||
239 | synfigstudio | 239 | synfigstudio |
240 | telegram | 240 | telegram |
241 | Telegram | 241 | Telegram |
242 | telegram-desktop | ||
242 | thunderbird | 243 | thunderbird |
243 | totem | 244 | totem |
244 | tracker | 245 | tracker |