aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred Barclay <Fred-Barclay@users.noreply.github.com>2017-03-23 16:19:00 +0000
committerLibravatar GitHub <noreply@github.com>2017-03-23 16:19:00 +0000
commite917150d3574a25be75db14dc9f7b30a8439956d (patch)
tree64b4fb2b88bc256480cb872d8840c16e0d48e78c
parentmerges (diff)
parentextra mousepad files (diff)
downloadfirejail-e917150d3574a25be75db14dc9f7b30a8439956d.tar.gz
firejail-e917150d3574a25be75db14dc9f7b30a8439956d.tar.zst
firejail-e917150d3574a25be75db14dc9f7b30a8439956d.zip
Merge pull request #1154 from Fred-Barclay/mousepad
Mousepad profile
-rw-r--r--README.md2
-rw-r--r--RELNOTES4
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--etc/mousepad.profile26
-rw-r--r--platform/debian/conffiles1
-rw-r--r--src/firecfg/firecfg.config1
6 files changed, 32 insertions, 3 deletions
diff --git a/README.md b/README.md
index bcdcc54ca..8987b1fd0 100644
--- a/README.md
+++ b/README.md
@@ -195,4 +195,4 @@ goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nau
195simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, 195simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget,
196xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, 196xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5,
197PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser, 197PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser,
198Kino, Thunar, Geeqie, Engrampa, Scribus 198Kino, Thunar, Geeqie, Engrampa, Scribus, mousepad
diff --git a/RELNOTES b/RELNOTES
index 46f45e3a8..61732c390 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -26,7 +26,7 @@ firejail (0.9.45) baseline; urgency=low
26 * feature: AppImage type 2 support 26 * feature: AppImage type 2 support
27 * feature: pass command line arguments to appimages 27 * feature: pass command line arguments to appimages
28 * feature: allow non-seccomp setup for OverlayFS sandboxes - more work to come 28 * feature: allow non-seccomp setup for OverlayFS sandboxes - more work to come
29 * feature: added a number o Python scripts for handling sandboxes 29 * feature: added a number of Python scripts for handling sandboxes
30 * feature: allow local customization using .local files under /etc/firejail 30 * feature: allow local customization using .local files under /etc/firejail
31 * feature: follow-symlink-as-user runtime config option in /etc/firejail/firejail.config 31 * feature: follow-symlink-as-user runtime config option in /etc/firejail/firejail.config
32 * feature: follow-symlink-private-bin option in /etc/firejail/firejail.config 32 * feature: follow-symlink-private-bin option in /etc/firejail/firejail.config
@@ -44,7 +44,7 @@ firejail (0.9.45) baseline; urgency=low
44 * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos, 44 * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos,
45 * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail, 45 * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail,
46 * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa 46 * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa
47 * new profiles: Scribus 47 * new profiles: Scribus, mousepad
48 * bugfixes 48 * bugfixes
49 -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 49 -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500
50 50
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index e61715ea2..00c6e195a 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -29,6 +29,7 @@ blacklist ${HOME}/.config/Gpredict
29blacklist ${HOME}/.config/INRIA 29blacklist ${HOME}/.config/INRIA
30blacklist ${HOME}/.config/Luminance 30blacklist ${HOME}/.config/Luminance
31blacklist ${HOME}/.config/Meltytech 31blacklist ${HOME}/.config/Meltytech
32blacklist ${HOME}/.config/Mousepad
32blacklist ${HOME}/.config/Mumble 33blacklist ${HOME}/.config/Mumble
33blacklist ${HOME}/.config/QuiteRss 34blacklist ${HOME}/.config/QuiteRss
34blacklist ${HOME}/.config/QuiteRssrc 35blacklist ${HOME}/.config/QuiteRssrc
diff --git a/etc/mousepad.profile b/etc/mousepad.profile
new file mode 100644
index 000000000..3901c8a0e
--- /dev/null
+++ b/etc/mousepad.profile
@@ -0,0 +1,26 @@
1# This file is overwritten during software install.
2# Persistent customizations should go in a .local file.
3include /etc/firejail/mousepad.local
4
5# Firejail profile for mousepad
6noblacklist ~/.config/Mousepad
7
8include /etc/firejail/disable-common.inc
9include /etc/firejail/disable-programs.inc
10include /etc/firejail/disable-devel.inc
11include /etc/firejail/disable-passwdmgr.inc
12
13caps.drop all
14netfilter
15nogroups
16nonewprivs
17noroot
18nosound
19protocol unix
20seccomp
21shell none
22tracelog
23
24private-bin mousepad
25private-dev
26private-tmp
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index c68852f26..253af3f01 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -132,6 +132,7 @@
132/etc/firejail/mcabber.profile 132/etc/firejail/mcabber.profile
133/etc/firejail/mediainfo.profile 133/etc/firejail/mediainfo.profile
134/etc/firejail/midori.profile 134/etc/firejail/midori.profile
135/etc/firejail/mousepad.profile
135/etc/firejail/mpv.profile 136/etc/firejail/mpv.profile
136/etc/firejail/mumble.profile 137/etc/firejail/mumble.profile
137/etc/firejail/mupdf.profile 138/etc/firejail/mupdf.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 656e3b14a..1db8736e9 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -192,6 +192,7 @@ keepass
192keepass2 192keepass2
193keepassx 193keepassx
194keepassx2 194keepassx2
195mousepad
195pluma 196pluma
196Thunar 197Thunar
197thunar 198thunar