disable-history.inc integration - included in all profile files

28 files changed, 38 insertions, 0 deletions

diff --git a/Makefile.in b/Makefile.in
index 6b9739524..da92ac138 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,6 +86,7 @@ install: all
         install -c -m 0644 etc/disable-mgmt.inc $(DESTDIR)/etc/firejail/.
         install -c -m 0644 etc/disable-secret.inc $(DESTDIR)/etc/firejail/.
         install -c -m 0644 etc/disable-common.inc $(DESTDIR)/etc/firejail/.
+        install -c -m 0644 etc/disable-history.inc $(DESTDIR)/etc/firejail/.
         install -c -m 0644 etc/dropbox.profile $(DESTDIR)/etc/firejail/.
         install -c -m 0644 etc/opera.profile $(DESTDIR)/etc/firejail/.
         install -c -m 0644 etc/thunderbird.profile $(DESTDIR)/etc/firejail/.
diff --git a/README b/README
index dde1bfcbb..4a33ebd74 100644
--- a/README
+++ b/README
@@ -24,5 +24,9 @@ Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
         - src/lib/libnetlink.c extracted from iproute2 software package
 G4JC (http://sourceforge.net/u/gaming4jc/profile/)
         - ARM support (ticket 17)
+dewbasaur (https://github.com/dewbasaur)
+        - block access to history files (issue 16)
+Peter Millerchip (https://github.com/pmillerchip)
+        - memory allocation fix (issue 13)
 
 Copyright (C) 2014, 2015 Firejail Authors
diff --git a/RELNOTES b/RELNOTES
index 379c8f1c3..4404d38f3 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,11 @@
+firejail (0.9.29) baseline; urgency=low
+  * added a disable-history.inc profile as a result of Firefox PDF.js exploit;
+    disable-history.inc included in all default profiles
+  * added --private-etc option
+  * support ${HOME} token in include directive in profile files
+  * bugfixes
+ -- netblue30 <netblue30@yahoo.com>  Sat, 12 Aug 2015 20:25:00 -0500
+
 firejail (0.9.28) baseline; urgency=low
   * network scanning, --scan option
   * interface MAC address support, --mac option
diff --git a/etc/audacious.profile b/etc/audacious.profile
index 23f223a29..923b70184 100644
--- a/etc/audacious.profile
+++ b/etc/audacious.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/chromium.profile b/etc/chromium.profile
index 4f6e7e450..13559a5a8 100644
--- a/etc/chromium.profile
+++ b/etc/chromium.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc chromium
+include /etc/firejail/disable-history.inc
 netfilter
 
 
diff --git a/etc/clementine.profile b/etc/clementine.profile
index dd855cc62..47c40506a 100644
--- a/etc/clementine.profile
+++ b/etc/clementine.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/deadbeef.profile b/etc/deadbeef.profile
index e2f5787cc..68027bd7c 100644
--- a/etc/deadbeef.profile
+++ b/etc/deadbeef.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/deluge.profile b/etc/deluge.profile
index 138d0a133..24a082099 100644
--- a/etc/deluge.profile
+++ b/etc/deluge.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/dropbox.profile b/etc/dropbox.profile
index 82b54adb1..008660f77 100644
--- a/etc/dropbox.profile
+++ b/etc/dropbox.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps
 seccomp
 noroot
diff --git a/etc/empathy.profile b/etc/empathy.profile
index d24cae528..7a9e53b86 100644
--- a/etc/empathy.profile
+++ b/etc/empathy.profile
@@ -2,5 +2,6 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
diff --git a/etc/evince.profile b/etc/evince.profile
index 4d96d5904..e81044314 100644
--- a/etc/evince.profile
+++ b/etc/evince.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/filezilla.profile b/etc/filezilla.profile
index a54b5a734..dc5086595 100644
--- a/etc/filezilla.profile
+++ b/etc/filezilla.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc .filezilla
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/firefox.profile b/etc/firefox.profile
index dc3489d35..cd504ab44 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc .mozilla
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/gnome-mplayer.profile b/etc/gnome-mplayer.profile
index b69cf3a57..4be1c1093 100644
--- a/etc/gnome-mplayer.profile
+++ b/etc/gnome-mplayer.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/midori.profile b/etc/midori.profile
index 5479ba172..b21bc94ef 100644
--- a/etc/midori.profile
+++ b/etc/midori.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc midori
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/opera.profile b/etc/opera.profile
index 852f10719..8f8dbc609 100644
--- a/etc/opera.profile
+++ b/etc/opera.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc opera
+include /etc/firejail/disable-history.inc
 netfilter
 noroot
 
diff --git a/etc/pidgin.profile b/etc/pidgin.profile
index 6f5594919..3574e4d66 100644
--- a/etc/pidgin.profile
+++ b/etc/pidgin.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/qbittorrent.profile b/etc/qbittorrent.profile
index f85dfc994..71ddff631 100644
--- a/etc/qbittorrent.profile
+++ b/etc/qbittorrent.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/quassel.profile b/etc/quassel.profile
index a2057ad01..931debc95 100644
--- a/etc/quassel.profile
+++ b/etc/quassel.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/rhythmbox.profile b/etc/rhythmbox.profile
index 42d4dc0fa..f2870d543 100644
--- a/etc/rhythmbox.profile
+++ b/etc/rhythmbox.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/thunderbird.profile b/etc/thunderbird.profile
index 8b63a6ec5..34594b837 100644
--- a/etc/thunderbird.profile
+++ b/etc/thunderbird.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc thunderbird icedove
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/totem.profile b/etc/totem.profile
index 50115deb5..6b26a4e0e 100644
--- a/etc/totem.profile
+++ b/etc/totem.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/transmission-gtk.profile b/etc/transmission-gtk.profile
index 9ccece285..dc1d9d524 100644
--- a/etc/transmission-gtk.profile
+++ b/etc/transmission-gtk.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/transmission-qt.profile b/etc/transmission-qt.profile
index 65a045f8e..64c2ba8ad 100644
--- a/etc/transmission-qt.profile
+++ b/etc/transmission-qt.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 netfilter
diff --git a/etc/vlc.profile b/etc/vlc.profile
index 76e1395f9..365ea838a 100644
--- a/etc/vlc.profile
+++ b/etc/vlc.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/etc/xchat.profile b/etc/xchat.profile
index b8d8cb1e2..45f0f15ba 100644
--- a/etc/xchat.profile
+++ b/etc/xchat.profile
@@ -2,6 +2,7 @@
 include /etc/firejail/disable-mgmt.inc
 include /etc/firejail/disable-secret.inc
 include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-history.inc
 caps.drop all
 seccomp
 noroot
diff --git a/mkdeb.sh b/mkdeb.sh
index 159649975..2a34b2699 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -77,6 +77,7 @@ cp etc/pidgin.profile debian/etc/firejail/.
 cp etc/filezilla.profile debian/etc/firejail/.
 cp etc/empathy.profile debian/etc/firejail/.
 cp etc/disable-common.inc debian/etc/firejail/.
+cp etc/disable-history.inc debian/etc/firejail/.
 cp etc/deadbeef.profile debian/etc/firejail/.
 cp etc/icecat.profile debian/etc/firejail/.
 cp platform/debian/conffiles $DEBIAN_CTRL_DIR/.
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 6f55cc021..7bf575dd8 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -29,5 +29,6 @@
 /etc/firejail/filezilla.profile
 /etc/firejail/empathy.profile
 /etc/firejail/disable-common.inc
+/etc/firejail/disable-history.inc
 /etc/firejail/deadbeef.profile
 /etc/firejail/icecat.profile