aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar avoidr <avoidr@users.noreply.github.com>2016-05-14 17:34:13 +0200
committerLibravatar avoidr <avoidr@users.noreply.github.com>2016-05-14 17:34:13 +0200
commit86fa3a51d76bbb62f7676dee106a5bd8c5c4fcc7 (patch)
tree1a80c8ba111ea62857c5f9e648d2258a932e6d16
parentnoblacklist mcabber (diff)
downloadfirejail-86fa3a51d76bbb62f7676dee106a5bd8c5c4fcc7.tar.gz
firejail-86fa3a51d76bbb62f7676dee106a5bd8c5c4fcc7.tar.zst
firejail-86fa3a51d76bbb62f7676dee106a5bd8c5c4fcc7.zip
edit Makefile.in, conffiles, README{.md,}
-rw-r--r--Makefile.in1
-rw-r--r--README3
-rw-r--r--README.md2
-rw-r--r--platform/debian/conffiles1
4 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 2d49f88e1..34daed387 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,6 +183,7 @@ realinstall:
183 install -c -m 0644 .etc/xplayer.profile $(DESTDIR)/$(sysconfdir)/firejail/. 183 install -c -m 0644 .etc/xplayer.profile $(DESTDIR)/$(sysconfdir)/firejail/.
184 install -c -m 0644 .etc/xreader.profile $(DESTDIR)/$(sysconfdir)/firejail/. 184 install -c -m 0644 .etc/xreader.profile $(DESTDIR)/$(sysconfdir)/firejail/.
185 install -c -m 0644 .etc/xviewer.profile $(DESTDIR)/$(sysconfdir)/firejail/. 185 install -c -m 0644 .etc/xviewer.profile $(DESTDIR)/$(sysconfdir)/firejail/.
186 install -c -m 0644 .etc/mcabber.profile $(DESTDIR)/$(sysconfdir)/firejail/.
186 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 187 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
187 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 188 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
188 rm -fr .etc 189 rm -fr .etc
diff --git a/README b/README
index fcd1c54cd..dd0c5a5b1 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ avoidr (https://github.com/avoidr)
29 - whitelist fix 29 - whitelist fix
30 - recently-used.xbel fix 30 - recently-used.xbel fix
31 - added parole profile 31 - added parole profile
32 - blacklist ncat, manpage fixes, 32 - blacklist ncat
33 - hostname support in profile file 33 - hostname support in profile file
34 - Google Chrome profile rework 34 - Google Chrome profile rework
35 - added cmus profile 35 - added cmus profile
@@ -37,6 +37,7 @@ avoidr (https://github.com/avoidr)
37 - add net iface support in profile files 37 - add net iface support in profile files
38 - paths fix 38 - paths fix
39 - lots of profile fixes 39 - lots of profile fixes
40 - added mcabber profile
40Ruan (https://github.com/ruany) 41Ruan (https://github.com/ruany)
41 - fixed hexchat profile 42 - fixed hexchat profile
42Vasya Novikov (https://github.com/vn971) 43Vasya Novikov (https://github.com/vn971)
diff --git a/README.md b/README.md
index eb4b1af81..4fa79d9f2 100644
--- a/README.md
+++ b/README.md
@@ -283,6 +283,6 @@ $ man firejail-profile
283lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril, qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars, qTox, 283lxterminal, Epiphany, cherrytree, Polari, Vivaldi, Atril, qutebrowser, SlimJet, Battle for Wesnoth, Hedgewars, qTox,
284OpenSSH client, OpenBox window manager, Dillo, cmus, dnsmasq, PaleMoon, Icedove, abrowser, 0ad, netsurf, 284OpenSSH client, OpenBox window manager, Dillo, cmus, dnsmasq, PaleMoon, Icedove, abrowser, 0ad, netsurf,
285Warzone2100, okular, gwenview, Gpredict, Aweather, Stellarium, Google-Play-Music-Desktop-Player, quiterss, 285Warzone2100, okular, gwenview, Gpredict, Aweather, Stellarium, Google-Play-Music-Desktop-Player, quiterss,
286cyberfox, generic Ubuntu snap application profile, xplayer, xreader, xviewer 286cyberfox, generic Ubuntu snap application profile, xplayer, xreader, xviewer, mcabber
287 287
288 288
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 4f118d571..8cf8f165c 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -97,3 +97,4 @@
97/etc/firejail/xplayer.profile 97/etc/firejail/xplayer.profile
98/etc/firejail/xreader.profile 98/etc/firejail/xreader.profile
99/etc/firejail/xviewer.profile 99/etc/firejail/xviewer.profile
100/etc/firejail/mcabber.profile