aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-01-22 09:08:35 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-01-22 09:08:35 -0500
commit59f60106a6b26c4a30668331e6978588861c59ec (patch)
tree6a16fbaca08f8e4a43161f583d6177aac24acf3f
parentMerge pull request #251 from sinkuu/patch-1 (diff)
downloadfirejail-59f60106a6b26c4a30668331e6978588861c59ec.tar.gz
firejail-59f60106a6b26c4a30668331e6978588861c59ec.tar.zst
firejail-59f60106a6b26c4a30668331e6978588861c59ec.zip
profile cleanup
-rw-r--r--Makefile.in1
-rw-r--r--README4
-rw-r--r--RELNOTES2
-rw-r--r--etc/disable-common.inc4
-rw-r--r--platform/debian/conffiles2
-rw-r--r--todo6
6 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 2a03e6fdf..762872b4e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,6 +131,7 @@ realinstall:
131 install -c -m 0644 .etc/kmail.profile $(DESTDIR)/$(sysconfdir)/firejail/. 131 install -c -m 0644 .etc/kmail.profile $(DESTDIR)/$(sysconfdir)/firejail/.
132 install -c -m 0644 .etc/seamonkey.profile $(DESTDIR)/$(sysconfdir)/firejail/. 132 install -c -m 0644 .etc/seamonkey.profile $(DESTDIR)/$(sysconfdir)/firejail/.
133 install -c -m 0644 .etc/seamonkey-bin.profile $(DESTDIR)/$(sysconfdir)/firejail/. 133 install -c -m 0644 .etc/seamonkey-bin.profile $(DESTDIR)/$(sysconfdir)/firejail/.
134 install -c -m 0644 .etc/telegram.profile $(DESTDIR)/$(sysconfdir)/firejail/.
134 bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 135 bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
135 rm -fr .etc 136 rm -fr .etc
136 # man pages 137 # man pages
diff --git a/README b/README
index 34217608a..2e852c5c7 100644
--- a/README
+++ b/README
@@ -18,6 +18,10 @@ License: GPL v2
18Firejail Authors: 18Firejail Authors:
19 19
20netblue30 (netblue30@yahoo.com) 20netblue30 (netblue30@yahoo.com)
21sinkuu (https://github.com/sinkuu)
22 - blacklisting kwalletd
23Bader Zaidan (https://github.com/BaderSZ)
24 - Telegram profile
21Holger Heinz (https://github.com/hheinz) 25Holger Heinz (https://github.com/hheinz)
22 - manpage work 26 - manpage work
23Andrey Alekseenko (https://github.com/al42and) 27Andrey Alekseenko (https://github.com/al42and)
diff --git a/RELNOTES b/RELNOTES
index 91ebb960e..4e903eece 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -3,7 +3,7 @@ firejail (0.9.37) baseline; urgency=low
3 * security profiles fixes 3 * security profiles fixes
4 * dynamic allocation of noblacklist buffer 4 * dynamic allocation of noblacklist buffer
5 * --ip6 option - IPv6 support 5 * --ip6 option - IPv6 support
6 * added KMail, Seamonkey profiles 6 * added KMail, Seamonkey, Telegram profiles
7 * --join command enhancement (--join-network, --join-filesystem) 7 * --join command enhancement (--join-network, --join-filesystem)
8 * symlink invocation 8 * symlink invocation
9 -- netblue30 <netblue30@yahoo.com> Tue, 5 Jan 2016 08:00:00 -0500 9 -- netblue30 <netblue30@yahoo.com> Tue, 5 Jan 2016 08:00:00 -0500
diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index e7974f02d..f04702618 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -119,3 +119,7 @@ read-only ${HOME}/.xmonad
119# The user ~/bin directory can override commands such as ls 119# The user ~/bin directory can override commands such as ls
120read-only ${HOME}/bin 120read-only ${HOME}/bin
121 121
122# syslog
123blacklist /dev/kmsg
124blacklist /proc/kmsg
125
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index d72b5ffe6..ccaaa1f34 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -57,4 +57,6 @@
57/etc/firejail/kmail.profile 57/etc/firejail/kmail.profile
58/etc/firejail/seamonkey.profile 58/etc/firejail/seamonkey.profile
59/etc/firejail/seamonkey-bin.profile 59/etc/firejail/seamonkey-bin.profile
60/etc/firejail/telegram.profile
61
60 62
diff --git a/todo b/todo
index 25fda9e74..8e8ffc9f2 100644
--- a/todo
+++ b/todo
@@ -115,3 +115,9 @@ The POSIX standard defines what a “portable filename” is. This turns out to
115http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_276 115http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_276
116 116
11722. --shutdown does not clear sandboxes started with --join on Debian jessie 11722. --shutdown does not clear sandboxes started with --join on Debian jessie
118
11923. to document:
120
121http://lwn.net/Articles/414813/
122echo 1 > /proc/sys/kernel/dmesg_restrict
123