aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-03-16 12:02:58 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-03-16 12:02:58 -0400
commit02fa127cbbee5b35e63bb7aef49ca5ba57956b1e (patch)
tree8536950acf7c0145238ae4d0525876f21ac6f1a0
parentMerge branch 'master' of https://github.com/netblue30/firejail (diff)
downloadfirejail-02fa127cbbee5b35e63bb7aef49ca5ba57956b1e.tar.gz
firejail-02fa127cbbee5b35e63bb7aef49ca5ba57956b1e.tar.zst
firejail-02fa127cbbee5b35e63bb7aef49ca5ba57956b1e.zip
added qutebrowser profile
-rw-r--r--Makefile.in1
-rw-r--r--README2
-rw-r--r--README.md3
-rw-r--r--platform/debian/conffiles2
4 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 1a22700e8..8dc052352 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,6 +146,7 @@ realinstall:
146 install -c -m 0644 .etc/vivaldi.profile $(DESTDIR)/$(sysconfdir)/firejail/. 146 install -c -m 0644 .etc/vivaldi.profile $(DESTDIR)/$(sysconfdir)/firejail/.
147 install -c -m 0644 .etc/vivaldi-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. 147 install -c -m 0644 .etc/vivaldi-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/.
148 install -c -m 0644 .etc/atril.profile $(DESTDIR)/$(sysconfdir)/firejail/. 148 install -c -m 0644 .etc/atril.profile $(DESTDIR)/$(sysconfdir)/firejail/.
149 install -c -m 0644 .etc/qutebrowser.profile $(DESTDIR)/$(sysconfdir)/firejail/.
149 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 150 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
150 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 151 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
151 rm -fr .etc 152 rm -fr .etc
diff --git a/README b/README
index 1bb6bb998..5875ddff7 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)
21Alexander Stein (https://github.com/ajstein)
22 - added profile for qutebrowser
21Benjamin Kampmann (https://github.com/ligthyear) 23Benjamin Kampmann (https://github.com/ligthyear)
22 - Forward exit code from child process 24 - Forward exit code from child process
23dshmgh (https://github.com/dshmgh) 25dshmgh (https://github.com/dshmgh)
diff --git a/README.md b/README.md
index 73d52af71..0865bc966 100644
--- a/README.md
+++ b/README.md
@@ -154,4 +154,5 @@ $ man firejail-profile
154 154
155## New security profiles 155## New security profiles
156 156
157lxterminal, Epiphany, cherrytree, Battle for Wesnoth, Hedgewars 157lxterminal, Epiphany, cherrytree, Battle for Wesnoth, Hedgewars, qutebrowser
158
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 5240d87a6..5f552414f 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -72,3 +72,5 @@
72/etc/firejail/vivaldi.profile 72/etc/firejail/vivaldi.profile
73/etc/firejail/vivaldi-beta.profile 73/etc/firejail/vivaldi-beta.profile
74/etc/firejail/atril.profile 74/etc/firejail/atril.profile
75/etc/firejail/firejail.config
76/etc/firejail/qutebrowser.profile