aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-02-12 10:44:28 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2017-02-12 10:44:28 -0500
commit68e10f174920746c306bc431d0a66008bdcb8082 (patch)
tree9d4de557331c00304b5ea9eb809d6a0e247f4130
parentMerge pull request #1099 from valoq/master (diff)
downloadfirejail-68e10f174920746c306bc431d0a66008bdcb8082.tar.gz
firejail-68e10f174920746c306bc431d0a66008bdcb8082.tar.zst
firejail-68e10f174920746c306bc431d0a66008bdcb8082.zip
profile merges
-rw-r--r--README1
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--platform/debian/conffiles3
4 files changed, 6 insertions, 2 deletions
diff --git a/README b/README
index 70577700c..66e196e97 100644
--- a/README
+++ b/README
@@ -100,6 +100,7 @@ valoq (https://github.com/valoq)
100 - added skanlite, ssh-agent, transmission-cli, tracker, transmission-show, w3m, xfburn, xpra profiles 100 - added skanlite, ssh-agent, transmission-cli, tracker, transmission-show, w3m, xfburn, xpra profiles
101 - added wget profile 101 - added wget profile
102 - disable gnupg and systemd directories under /run/user 102 - disable gnupg and systemd directories under /run/user
103 - added iridium browser profile
103Igor Bukanov (https://github.com/ibukanov) 104Igor Bukanov (https://github.com/ibukanov)
104 - found/fiixed privilege escalation in --hosts-file option 105 - found/fiixed privilege escalation in --hosts-file option
105Cat (https://github.com/ecat3) 106Cat (https://github.com/ecat3)
diff --git a/README.md b/README.md
index 5bc7868c2..dd97057c0 100644
--- a/README.md
+++ b/README.md
@@ -150,5 +150,5 @@ gjs, gnome-books, gnome-clocks, gnome-documents, gnome-maps, gnome-music, gnome-
150goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext, 150goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext,
151simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, 151simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget,
152xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, 152xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5,
153PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms 153PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser
154 154
diff --git a/RELNOTES b/RELNOTES
index 0af08404c..bef255458 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -34,7 +34,7 @@ firejail (0.9.45) baseline; urgency=low
34 * new profiles: Cryptocat, Bless, Gnome 2048, Gnome Calculator, 34 * new profiles: Cryptocat, Bless, Gnome 2048, Gnome Calculator,
35 * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos, 35 * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos,
36 * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail, 36 * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail,
37 * new profiles: Uzbl browser 37 * new profiles: Uzbl browser, iridium browser
38 * bugfixes 38 * bugfixes
39 -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 39 -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500
40 40
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 61e72583e..4d63c3d54 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -244,3 +244,6 @@
244/etc/firejail/fossamail.profile 244/etc/firejail/fossamail.profile
245/etc/firejail/uzbl-browser.profile 245/etc/firejail/uzbl-browser.profile
246/etc/firejail/xmms.profile 246/etc/firejail/xmms.profile
247/etc/firejail/iridium-browser.profile
248/etc/firejail/iridium.profile
249