aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in8
-rw-r--r--etc/disable-devel.inc2
-rw-r--r--etc/libreoffice.profile4
-rw-r--r--etc/localc.profile5
-rw-r--r--etc/lodraw.profile5
-rw-r--r--etc/loffice.profile5
-rw-r--r--etc/lofromtemplate.profile5
-rw-r--r--etc/loimpress.profile5
-rw-r--r--etc/lomath.profile5
-rw-r--r--etc/loweb.profile5
-rw-r--r--etc/lowriter.profile5
-rw-r--r--platform/debian/conffiles10
-rw-r--r--src/firecfg/firecfg.config9
13 files changed, 71 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 7f21811f5..c7ecab5ac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,6 +197,14 @@ realinstall:
197 install -c -m 0644 .etc/mpv.profile $(DESTDIR)/$(sysconfdir)/firejail/. 197 install -c -m 0644 .etc/mpv.profile $(DESTDIR)/$(sysconfdir)/firejail/.
198 install -c -m 0644 .etc/franz.profile $(DESTDIR)/$(sysconfdir)/firejail/. 198 install -c -m 0644 .etc/franz.profile $(DESTDIR)/$(sysconfdir)/firejail/.
199 install -c -m 0644 .etc/libreoffice.profile $(DESTDIR)/$(sysconfdir)/firejail/. 199 install -c -m 0644 .etc/libreoffice.profile $(DESTDIR)/$(sysconfdir)/firejail/.
200 install -c -m 0644 .etc/localc.profile $(DESTDIR)/$(sysconfdir)/firejail/.
201 install -c -m 0644 .etc/lodraw.profile $(DESTDIR)/$(sysconfdir)/firejail/.
202 install -c -m 0644 .etc/loffice.profile $(DESTDIR)/$(sysconfdir)/firejail/.
203 install -c -m 0644 .etc/lofromtemplate.profile $(DESTDIR)/$(sysconfdir)/firejail/.
204 install -c -m 0644 .etc/loimpress.profile $(DESTDIR)/$(sysconfdir)/firejail/.
205 install -c -m 0644 .etc/lomath.profile $(DESTDIR)/$(sysconfdir)/firejail/.
206 install -c -m 0644 .etc/loweb.profile $(DESTDIR)/$(sysconfdir)/firejail/.
207 install -c -m 0644 .etc/lowriter.profile $(DESTDIR)/$(sysconfdir)/firejail/.
200 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 208 sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
201 install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/. 209 install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/.
202 rm -fr .etc 210 rm -fr .etc
diff --git a/etc/disable-devel.inc b/etc/disable-devel.inc
index 4e401055a..821aa1ea4 100644
--- a/etc/disable-devel.inc
+++ b/etc/disable-devel.inc
@@ -37,7 +37,7 @@ blacklist /usr/lib/php*
37blacklist /usr/bin/ruby 37blacklist /usr/bin/ruby
38blacklist /usr/lib/ruby 38blacklist /usr/lib/ruby
39 39
40# Programs using python: deluge, firefox addons, filezilla, cherrytree, xchat, hexchat 40# Programs using python: deluge, firefox addons, filezilla, cherrytree, xchat, hexchat, libreoffice
41# Python 2 41# Python 2
42#blacklist /usr/bin/python2* 42#blacklist /usr/bin/python2*
43#blacklist /usr/lib/python2* 43#blacklist /usr/lib/python2*
diff --git a/etc/libreoffice.profile b/etc/libreoffice.profile
index 9056b1df2..6cbdbfd66 100644
--- a/etc/libreoffice.profile
+++ b/etc/libreoffice.profile
@@ -12,3 +12,7 @@ noroot
12protocol unix,inet,inet6,netlink 12protocol unix,inet,inet6,netlink
13seccomp 13seccomp
14tracelog 14tracelog
15
16private-dev
17whitelist /tmp/.X11-unix/
18
diff --git a/etc/localc.profile b/etc/localc.profile
new file mode 100644
index 000000000..fecd08822
--- /dev/null
+++ b/etc/localc.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/libreoffice.profile
5
diff --git a/etc/lodraw.profile b/etc/lodraw.profile
new file mode 100644
index 000000000..9a53d9fb0
--- /dev/null
+++ b/etc/lodraw.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/liberoffice.profile
5
diff --git a/etc/loffice.profile b/etc/loffice.profile
new file mode 100644
index 000000000..fecd08822
--- /dev/null
+++ b/etc/loffice.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/libreoffice.profile
5
diff --git a/etc/lofromtemplate.profile b/etc/lofromtemplate.profile
new file mode 100644
index 000000000..fecd08822
--- /dev/null
+++ b/etc/lofromtemplate.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/libreoffice.profile
5
diff --git a/etc/loimpress.profile b/etc/loimpress.profile
new file mode 100644
index 000000000..fecd08822
--- /dev/null
+++ b/etc/loimpress.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/libreoffice.profile
5
diff --git a/etc/lomath.profile b/etc/lomath.profile
new file mode 100644
index 000000000..fecd08822
--- /dev/null
+++ b/etc/lomath.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/libreoffice.profile
5
diff --git a/etc/loweb.profile b/etc/loweb.profile
new file mode 100644
index 000000000..fecd08822
--- /dev/null
+++ b/etc/loweb.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/libreoffice.profile
5
diff --git a/etc/lowriter.profile b/etc/lowriter.profile
new file mode 100644
index 000000000..fecd08822
--- /dev/null
+++ b/etc/lowriter.profile
@@ -0,0 +1,5 @@
1################################
2# LibreOffice profile
3################################
4include /etc/firejail/libreoffice.profile
5
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 6635a594b..b3aa62217 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -107,3 +107,13 @@
107/etc/firejail/mpv.profile 107/etc/firejail/mpv.profile
108/etc/firejail/franz.profile 108/etc/firejail/franz.profile
109/etc/firejail/libreoffice.profile 109/etc/firejail/libreoffice.profile
110/etc/firejail/localc.profile
111/etc/firejail/lodraw.profile
112/etc/firejail/loffice.profile
113/etc/firejail/lofromtemplate.profile
114/etc/firejail/loimpress.profile
115/etc/firejail/lomath.profile
116/etc/firejail/loweb.profile
117/etc/firejail/lowriter.profile
118
119
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index eeac7a088..fa2dee81d 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -106,7 +106,14 @@ evince
106fbreader 106fbreader
107gwenview 107gwenview
108gthumb 108gthumb
109LibreOffice 109libreoffice
110lodraw
111loffice
112lofromtemplate
113loimpres
114lomath
115loweb
116lowriter
110Mathematica 117Mathematica
111mathematica 118mathematica
112okular 119okular