aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2016-04-19 11:04:24 +1000
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2016-04-19 11:04:24 +1000
commite42a45614a31eb06a9741490666ffc11a64d9931 (patch)
treeded8074778b5b0607eae75c345b425ee6ae21be2
parentadded aweather profile (diff)
downloadfirejail-e42a45614a31eb06a9741490666ffc11a64d9931.tar.gz
firejail-e42a45614a31eb06a9741490666ffc11a64d9931.tar.zst
firejail-e42a45614a31eb06a9741490666ffc11a64d9931.zip
extra aweather files
-rw-r--r--Makefile.in1
-rw-r--r--README1
-rw-r--r--README.md2
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--platform/debian/conffiles1
-rw-r--r--src/firecfg/firecfg.config4
6 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index cb897c23d..0ba490454 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,6 +169,7 @@ realinstall:
169 install -c -m 0644 .etc/okular.profile $(DESTDIR)/$(sysconfdir)/firejail/. 169 install -c -m 0644 .etc/okular.profile $(DESTDIR)/$(sysconfdir)/firejail/.
170 install -c -m 0644 .etc/gwenview.profile $(DESTDIR)/$(sysconfdir)/firejail/. 170 install -c -m 0644 .etc/gwenview.profile $(DESTDIR)/$(sysconfdir)/firejail/.
171 install -c -m 0644 .etc/gpredict.profile $(DESTDIR)/$(sysconfdir)/firejail/. 171 install -c -m 0644 .etc/gpredict.profile $(DESTDIR)/$(sysconfdir)/firejail/.
172 install -c -m 0644 .etc/aweather.profile $(DESTDIR)/$(sysconfdir)/firejail/.
172 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 173 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
173 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 174 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/firejail.config ]; then install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
174 rm -fr .etc 175 rm -fr .etc
diff --git a/README b/README
index d0a7aaf8d..db7410a73 100644
--- a/README
+++ b/README
@@ -35,6 +35,7 @@ Fred-Barclay (https://github.com/Fred-Barclay)
35 - added Warzone2100 profile 35 - added Warzone2100 profile
36 - blacklisted VeraCrypt 36 - blacklisted VeraCrypt
37 - added Gpredict profile 37 - added Gpredict profile
38 - added Aweather profile
38avoidr (https://github.com/avoidr) 39avoidr (https://github.com/avoidr)
39 - whitelist fix 40 - whitelist fix
40 - recently-used.xbel fix 41 - recently-used.xbel fix
diff --git a/README.md b/README.md
index ca7927fff..99ded275e 100644
--- a/README.md
+++ b/README.md
@@ -282,5 +282,5 @@ $ man firejail-profile
282## New security profiles 282## New security profiles
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 285Warzone2100, okular, gwenview, Gpredict, Aweather
286 286
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 6c5515894..2b3a933a5 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -9,6 +9,7 @@ blacklist ${HOME}/.config/mupen64plus
9blacklist ${HOME}/.config/transmission 9blacklist ${HOME}/.config/transmission
10blacklist ${HOME}/.config/uGet 10blacklist ${HOME}/.config/uGet
11blacklist ${HOME}/.config/Gpredict 11blacklist ${HOME}/.config/Gpredict
12blacklist ${HOME}/.config/aweather
12blacklist ~/.kde/share/apps/okular 13blacklist ~/.kde/share/apps/okular
13blacklist ~/.kde/share/config/okularrc 14blacklist ~/.kde/share/config/okularrc
14blacklist ~/.kde/share/config/okularpartrc 15blacklist ~/.kde/share/config/okularpartrc
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 6f5b564a0..1cdf3d0f4 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -88,3 +88,4 @@
88/etc/firejail/okular.profile 88/etc/firejail/okular.profile
89/etc/firejail/gwenview.profile 89/etc/firejail/gwenview.profile
90/etc/firejail/gpredict.profile 90/etc/firejail/gpredict.profile
91/etc/firejail/aweather.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 8bebf76af..da31a7c7e 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -5,6 +5,9 @@
5# astronomy 5# astronomy
6gpredict 6gpredict
7 7
8# weather/climate
9aweather
10
8# browsers/email 11# browsers/email
9firefox 12firefox
10iceweasel 13iceweasel
@@ -78,6 +81,7 @@ quassel
78xchat 81xchat
79 82
80# games 83# games
840ad
81hedgewars 85hedgewars
82wesnot 86wesnot
83warzone2100 87warzone2100