aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-06-09 08:58:20 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-06-09 08:58:20 -0400
commit1cceda11ad83b8e46ebe4293911046a35e2a748f (patch)
tree2e01cc8581ddfa793376a3c49625cccabf502ae8
parentMerge pull request #558 from maces/master (diff)
downloadfirejail-1cceda11ad83b8e46ebe4293911046a35e2a748f.tar.gz
firejail-1cceda11ad83b8e46ebe4293911046a35e2a748f.tar.zst
firejail-1cceda11ad83b8e46ebe4293911046a35e2a748f.zip
Franz messenger profile
-rw-r--r--Makefile.in1
-rw-r--r--README2
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--etc/disable-programs.inc2
-rw-r--r--platform/debian/conffiles1
6 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index c7897145a..7a4590bcf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,6 +191,7 @@ realinstall:
191 install -c -m 0644 .etc/gitter.profile $(DESTDIR)/$(sysconfdir)/firejail/. 191 install -c -m 0644 .etc/gitter.profile $(DESTDIR)/$(sysconfdir)/firejail/.
192 install -c -m 0644 .etc/gthumb.profile $(DESTDIR)/$(sysconfdir)/firejail/. 192 install -c -m 0644 .etc/gthumb.profile $(DESTDIR)/$(sysconfdir)/firejail/.
193 install -c -m 0644 .etc/mpv.profile $(DESTDIR)/$(sysconfdir)/firejail/. 193 install -c -m 0644 .etc/mpv.profile $(DESTDIR)/$(sysconfdir)/firejail/.
194 install -c -m 0644 .etc/franz.profile $(DESTDIR)/$(sysconfdir)/firejail/.
194 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 195 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
195 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 196 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
196 rm -fr .etc 197 rm -fr .etc
diff --git a/README b/README
index 437703b9b..d08a11680 100644
--- a/README
+++ b/README
@@ -25,6 +25,8 @@ Reiner Herrmann (https://github.com/reinerh)
25 - clang-analyzer fixes 25 - clang-analyzer fixes
26 - Debian reproducible build 26 - Debian reproducible build
27 - unit testing framework 27 - unit testing framework
28maces (https://github.com/maces)
29 - Franz messenger profile
28KellerFuchs (https://github.com/KellerFuchs) 30KellerFuchs (https://github.com/KellerFuchs)
29 - nonewpriv support, extended profiles for this feature 31 - nonewpriv support, extended profiles for this feature
30 - make `restricted-network` prevent use of netfilter 32 - make `restricted-network` prevent use of netfilter
diff --git a/README.md b/README.md
index efbb97f36..bc5717fb7 100644
--- a/README.md
+++ b/README.md
@@ -67,4 +67,4 @@ AppImage project home: https://github.com/probonopd/AppImageKit
67 67
68## New security profiles 68## New security profiles
69 69
70Gitter, gThumb, mpv 70Gitter, gThumb, mpv, Franz messenger
diff --git a/RELNOTES b/RELNOTES
index 7731c88f2..c2552c533 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,6 @@
1firejail (0.9.41) baseline; urgency=low 1firejail (0.9.41) baseline; urgency=low
2 * work in progress... 2 * work in progress...
3 * new profiles: Gitter, gThumb, mpv 3 * new profiles: Gitter, gThumb, mpv, Franz messenger
4 -- netblue30 <netblue30@yahoo.com> Tue, 31 May 2016 08:00:00 -0500 4 -- netblue30 <netblue30@yahoo.com> Tue, 31 May 2016 08:00:00 -0500
5 5
6firejail (0.9.40) baseline; urgency=low 6firejail (0.9.40) baseline; urgency=low
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 04cc1ac7a..6e79b3be0 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -68,6 +68,7 @@ blacklist ${HOME}/.Skype
68blacklist ${HOME}/.config/tox 68blacklist ${HOME}/.config/tox
69blacklist ${HOME}/.TelegramDesktop 69blacklist ${HOME}/.TelegramDesktop
70blacklist ${HOME}/.config/Gitter 70blacklist ${HOME}/.config/Gitter
71blacklist ${HOME}/.config/Franz
71 72
72# Games 73# Games
73blacklist ${HOME}/.hedgewars 74blacklist ${HOME}/.hedgewars
@@ -106,6 +107,7 @@ blacklist ${HOME}/.cache/wesnoth
106blacklist ${HOME}/.cache/0ad 107blacklist ${HOME}/.cache/0ad
107blacklist ${HOME}/.cache/8pecxstudios 108blacklist ${HOME}/.cache/8pecxstudios
108blacklist ${HOME}/.cache/xreader 109blacklist ${HOME}/.cache/xreader
110blacklist ${HOME}/.cache/Franz
109 111
110# share 112# share
111blacklist ${HOME}/.local/share/epiphany 113blacklist ${HOME}/.local/share/epiphany
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index b4bbdb36a..3ada0256a 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -105,3 +105,4 @@
105/etc/firejail/gitter.profile 105/etc/firejail/gitter.profile
106/etc/firejail/gthumb.profile 106/etc/firejail/gthumb.profile
107/etc/firejail/mpv.profile 107/etc/firejail/mpv.profile
108/etc/firejail/franz.profile