aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-05-30 18:12:51 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-05-30 18:12:51 -0400
commitb146aefde53cf7c27985c566098605f50e0bf15f (patch)
treef48824ba7aaa05e875b25afa7fbe78de8edc75af
parentMerge pull request #1322 from hawkeye116477/master (diff)
downloadfirejail-b146aefde53cf7c27985c566098605f50e0bf15f.tar.gz
firejail-b146aefde53cf7c27985c566098605f50e0bf15f.tar.zst
firejail-b146aefde53cf7c27985c566098605f50e0bf15f.zip
profile merges
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--platform/debian/conffiles1
-rw-r--r--src/firecfg/firecfg.config1
4 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index 54d1cd475..83cb1d58a 100644
--- a/README.md
+++ b/README.md
@@ -76,4 +76,4 @@ The plan is to have all bittorrent clients whitelisted in the next release.**
76 76
77## New profiles 77## New profiles
78 78
79vym, darktable 79vym, darktable, Waterfox
diff --git a/RELNOTES b/RELNOTES
index 763282fb8..24e340e01 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,8 @@
1firejail (0.9.47) baseline; urgency=low 1firejail (0.9.47) baseline; urgency=low
2 * work in progress 2 * work in progress
3 * added /etc/firejail/globals.local for global customizations 3 * added /etc/firejail/globals.local for global customizations
4 * whitelisted Transmission, Deluge, qBitTorrent, KTorrent
5 * new profiles: vym, darktable, Waterfox
4 * bugfixes 6 * bugfixes
5 -- netblue30 <netblue30@yahoo.com> Tue, 23 May 2017 08:00:00 -0500 7 -- netblue30 <netblue30@yahoo.com> Tue, 23 May 2017 08:00:00 -0500
6 8
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 9c99a918a..a03f23cc1 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -303,3 +303,4 @@
303/etc/firejail/zoom.profile 303/etc/firejail/zoom.profile
304/etc/firejail/vym.profile 304/etc/firejail/vym.profile
305/etc/firejail/darktable.profile 305/etc/firejail/darktable.profile
306/etc/firejail/waterfox.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index e58c8ee52..aa9d4c32c 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -224,6 +224,7 @@ vlc
224vym 224vym
225w3m 225w3m
226warzone2100 226warzone2100
227waterfox
227weechat 228weechat
228weechat-curses 229weechat-curses
229wesnot 230wesnot