diff options
author | netblue30 <netblue30@yahoo.com> | 2017-01-20 08:57:37 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2017-01-20 08:57:37 -0500 |
commit | 9419181ebb5deab89b86c31fa095f3584cb14fc8 (patch) | |
tree | f3fc66214e8dead128e495e3ae7555f54cbe2722 | |
parent | Merge pull request #1060 from GSI/uzbl-browser (diff) | |
download | firejail-9419181ebb5deab89b86c31fa095f3584cb14fc8.tar.gz firejail-9419181ebb5deab89b86c31fa095f3584cb14fc8.tar.zst firejail-9419181ebb5deab89b86c31fa095f3584cb14fc8.zip |
profile merges
-rw-r--r-- | README | 3 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | etc/disable-common.inc | 5 | ||||
-rw-r--r-- | platform/debian/conffiles | 2 |
4 files changed, 11 insertions, 1 deletions
@@ -97,6 +97,8 @@ valoq (https://github.com/valoq) | |||
97 | - added skanlite, ssh-agent, transmission-cli, tracker, transmission-show, w3m, xfburn, xpra profiles | 97 | - added skanlite, ssh-agent, transmission-cli, tracker, transmission-show, w3m, xfburn, xpra profiles |
98 | - added wget profile | 98 | - added wget profile |
99 | - disable gnupg and systemd directories under /run/user | 99 | - disable gnupg and systemd directories under /run/user |
100 | GSI (https://github.com/GSI) | ||
101 | - added Uzbl browser profile | ||
100 | Mike Frysinger (vapier@gentoo.org) | 102 | Mike Frysinger (vapier@gentoo.org) |
101 | - Gentoo compile patch | 103 | - Gentoo compile patch |
102 | Jericho (https://github.com/attritionorg) | 104 | Jericho (https://github.com/attritionorg) |
@@ -224,6 +226,7 @@ KellerFuchs (https://github.com/KellerFuchs) | |||
224 | - disable-common.inc additions | 226 | - disable-common.inc additions |
225 | - make mutt and msmtp's rc files read-only | 227 | - make mutt and msmtp's rc files read-only |
226 | - added support for .local profile files in /etc/firejail | 228 | - added support for .local profile files in /etc/firejail |
229 | - fixed Cryptocat profile | ||
227 | ValdikSS (https://github.com/ValdikSS) | 230 | ValdikSS (https://github.com/ValdikSS) |
228 | - Psi+, Corebird, Konversation profiles | 231 | - Psi+, Corebird, Konversation profiles |
229 | - various profile fixes | 232 | - various profile fixes |
@@ -98,5 +98,5 @@ gjs, gnome-books, gnome-clocks, gnome-documents, gnome-maps, gnome-music, gnome- | |||
98 | goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext, | 98 | goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext, |
99 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, | 99 | simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, |
100 | xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, | 100 | xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, |
101 | PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail | 101 | PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser |
102 | 102 | ||
diff --git a/etc/disable-common.inc b/etc/disable-common.inc index 5a281a91f..8e1e052a9 100644 --- a/etc/disable-common.inc +++ b/etc/disable-common.inc | |||
@@ -99,6 +99,11 @@ read-only ${HOME}/.tcshrc | |||
99 | read-only ${HOME}/.cshrc | 99 | read-only ${HOME}/.cshrc |
100 | read-only ${HOME}/.csh_files | 100 | read-only ${HOME}/.csh_files |
101 | read-only ${HOME}/.profile | 101 | read-only ${HOME}/.profile |
102 | read-only ${HOME}/.login | ||
103 | read-only ${HOME}/.logout | ||
104 | read-only ${HOME}/.pgpkey | ||
105 | read-only ${HOME}/.plan | ||
106 | read-only ${HOME}/.project | ||
102 | 107 | ||
103 | # Initialization files that allow arbitrary command execution | 108 | # Initialization files that allow arbitrary command execution |
104 | read-only ${HOME}/.caffrc | 109 | read-only ${HOME}/.caffrc |
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 56a5c8e7e..6b07f72f8 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -242,3 +242,5 @@ | |||
242 | /etc/firejail/qupzilla.profile | 242 | /etc/firejail/qupzilla.profile |
243 | /etc/firejail/FossaMail.profile | 243 | /etc/firejail/FossaMail.profile |
244 | /etc/firejail/fossamail.profile | 244 | /etc/firejail/fossamail.profile |
245 | /etc/firejail/uzbl-browser.profile | ||
246 | |||