From 9419181ebb5deab89b86c31fa095f3584cb14fc8 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Fri, 20 Jan 2017 08:57:37 -0500
Subject: [PATCH] profile merges

---
 README                    | 3 +++
 README.md                 | 2 +-
 etc/disable-common.inc    | 5 +++++
 platform/debian/conffiles | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 67d9a555f..3a843ba5c 100644
--- a/README
+++ b/README
@@ -97,6 +97,8 @@ valoq (https://github.com/valoq)
 	- added skanlite, ssh-agent, transmission-cli, tracker, transmission-show, w3m, xfburn, xpra profiles
 	- added wget profile
 	- disable gnupg and systemd directories under /run/user
+GSI (https://github.com/GSI)
+	- added Uzbl browser profile
 Mike Frysinger (vapier@gentoo.org)
 	- Gentoo compile patch
 Jericho (https://github.com/attritionorg)
@@ -224,6 +226,7 @@ KellerFuchs (https://github.com/KellerFuchs)
 	- disable-common.inc additions
 	- make mutt and msmtp's rc files read-only
 	- added support for .local profile files in /etc/firejail
+	- fixed Cryptocat profile
 ValdikSS (https://github.com/ValdikSS)
 	- Psi+, Corebird, Konversation profiles
 	- various profile fixes
diff --git a/README.md b/README.md
index f4fa7282f..2e029bb0b 100644
--- a/README.md
+++ b/README.md
@@ -98,5 +98,5 @@ gjs, gnome-books, gnome-clocks, gnome-documents, gnome-maps, gnome-music, gnome-
 goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nautilus, odt2txt, pdftotext,
 simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget,
 xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5,
-PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail
+PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser
 
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
 read-only ${HOME}/.cshrc
 read-only ${HOME}/.csh_files
 read-only ${HOME}/.profile
+read-only ${HOME}/.login
+read-only ${HOME}/.logout
+read-only ${HOME}/.pgpkey
+read-only ${HOME}/.plan
+read-only ${HOME}/.project
 
 # Initialization files that allow arbitrary command execution
 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 @@
 /etc/firejail/qupzilla.profile
 /etc/firejail/FossaMail.profile
 /etc/firejail/fossamail.profile
+/etc/firejail/uzbl-browser.profile
+