summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-01-26 08:49:54 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-01-26 08:49:54 -0500
commit9194101f1f033361ae3ee145da3c23be1253cca4 (patch)
treeb926b8d73f13720107bf40cb57175813009fa5b6
parentMerge pull request #262 from rahiel/master (diff)
downloadfirejail-9194101f1f033361ae3ee145da3c23be1253cca4.tar.gz
firejail-9194101f1f033361ae3ee145da3c23be1253cca4.tar.zst
firejail-9194101f1f033361ae3ee145da3c23be1253cca4.zip
Mahtematica profile
-rw-r--r--Makefile.in2
-rw-r--r--README2
-rw-r--r--RELNOTES2
-rw-r--r--platform/debian/conffiles3
4 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 762872b4e..35cabb21e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,6 +132,8 @@ realinstall:
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 install -c -m 0644 .etc/telegram.profile $(DESTDIR)/$(sysconfdir)/firejail/.
135 install -c -m 0644 .etc/mathematica.profile $(DESTDIR)/$(sysconfdir)/firejail/.
136 install -c -m 0644 .etc/Mathematica.profile $(DESTDIR)/$(sysconfdir)/firejail/.
135 bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 137 bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
136 rm -fr .etc 138 rm -fr .etc
137 # man pages 139 # man pages
diff --git a/README b/README
index 452b1f91d..42e443070 100644
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ License: GPL v2
18Firejail Authors: 18Firejail Authors:
19 19
20netblue30 (netblue30@yahoo.com) 20netblue30 (netblue30@yahoo.com)
21Rahiel Kasim (https://github.com/rahiel)
22 - Mathematica profile
21creideiki (https://github.com/creideiki) 23creideiki (https://github.com/creideiki)
22 - make the sandbox process reap all children 24 - make the sandbox process reap all children
23curiosity-seeker (https://github.com/curiosity-seeker) 25curiosity-seeker (https://github.com/curiosity-seeker)
diff --git a/RELNOTES b/RELNOTES
index d8d03b912..f1ec5e678 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -4,7 +4,7 @@ firejail (0.9.37) baseline; urgency=low
4 * added --user command 4 * added --user command
5 * added --disable-network and --disable-userns compile time flags 5 * added --disable-network and --disable-userns compile time flags
6 * symlink invocation 6 * symlink invocation
7 * added KMail, Seamonkey, Telegram profiles 7 * added KMail, Seamonkey, Telegram, Mathematica profiles
8 * --tmpfs option allowed only running as root 8 * --tmpfs option allowed only running as root
9 * added --private-tmp option 9 * added --private-tmp option
10 * bugfixes 10 * bugfixes
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index ccaaa1f34..3aa2a8028 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -58,5 +58,6 @@
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 60/etc/firejail/telegram.profile
61 61/etc/firejail/mathematica.profile
62/etc/firejail/Mathematica.profile
62 63