From b66c0a7c40d3e1b64411cb19c1f893c64df1c0a9 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Tue, 15 Dec 2020 18:56:59 +0000 Subject: rename softmaker-common.inc to softmaker-common.profile (#3825) * Rename etc/inc/softmaker-common.inc to etc/profile-m-z/softmaker-common.profile As per suggestion by @rusty-snake in https://github.com/netblue30/firejail/pull/3819#issuecomment-745244982 * softmaker-common.profile name change * softmaker-common.profile name change * softmaker-common.profile name change * softmaker-common.profile name change * softmaker-common.profile name change * softmaker-common.profile name change * softmaker-common.profile name change * softmaker-common.profile name change * softmaker-common.profile name change --- etc/inc/softmaker-common.inc | 50 ------------------------ etc/profile-a-l/freeoffice-planmaker.profile | 2 +- etc/profile-a-l/freeoffice-presentations.profile | 2 +- etc/profile-a-l/freeoffice-textmaker.profile | 2 +- etc/profile-m-z/planmaker18.profile | 2 +- etc/profile-m-z/planmaker18free.profile | 2 +- etc/profile-m-z/presentations18.profile | 2 +- etc/profile-m-z/presentations18free.profile | 2 +- etc/profile-m-z/softmaker-common.profile | 50 ++++++++++++++++++++++++ etc/profile-m-z/textmaker18.profile | 2 +- etc/profile-m-z/textmaker18free.profile | 2 +- 11 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 etc/inc/softmaker-common.inc create mode 100644 etc/profile-m-z/softmaker-common.profile diff --git a/etc/inc/softmaker-common.inc b/etc/inc/softmaker-common.inc deleted file mode 100644 index a8ec5848c..000000000 --- a/etc/inc/softmaker-common.inc +++ /dev/null @@ -1,50 +0,0 @@ -# Firejail profile for softmaker-common -# This file is overwritten after every install/update -# Persistent local customizations -include softmaker-common.local -# Persistent global definitions -# added by caller profile -#include globals.local - -# The offical packages install the desktop file under /usr/local/share/applications -# with an absolute Exec line. These files are NOT handelt by firecfg, -# therefore you must manualy copy them in you home and remove '/usr/bin/'. - -noblacklist ${HOME}/SoftMaker - -include disable-common.inc -include disable-devel.inc -include disable-exec.inc -include disable-interpreters.inc -include disable-passwdmgr.inc -include disable-programs.inc - -whitelist /usr/share/office2018 -whitelist /usr/share/freeoffice2018 -include whitelist-usr-share-common.inc -include whitelist-var-common.inc - -apparmor -caps.drop all -ipc-namespace -netfilter -nodvd -nogroups -nonewprivs -noroot -notv -nou2f -novideo -protocol unix,inet,inet6 -seccomp -shell none -tracelog - -private-bin freeoffice-planmaker,freeoffice-presentations,freeoffice-textmaker,planmaker18,planmaker18free,presentations18,presentations18free,sh,textmaker18,textmaker18free -private-cache -private-dev -private-etc ca-certificates,crypto-policies,fonts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,machine-id,nsswitch.conf,pki,SoftMaker,ssl -private-tmp - -dbus-user none -dbus-system none diff --git a/etc/profile-a-l/freeoffice-planmaker.profile b/etc/profile-a-l/freeoffice-planmaker.profile index 9449e7c48..b6ca167eb 100644 --- a/etc/profile-a-l/freeoffice-planmaker.profile +++ b/etc/profile-a-l/freeoffice-planmaker.profile @@ -7,4 +7,4 @@ include freeoffice-planmaker.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-a-l/freeoffice-presentations.profile b/etc/profile-a-l/freeoffice-presentations.profile index 636868e2e..43661028c 100644 --- a/etc/profile-a-l/freeoffice-presentations.profile +++ b/etc/profile-a-l/freeoffice-presentations.profile @@ -7,4 +7,4 @@ include freeoffice-presentations.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-a-l/freeoffice-textmaker.profile b/etc/profile-a-l/freeoffice-textmaker.profile index 5d98d1cc6..f7d30eaed 100644 --- a/etc/profile-a-l/freeoffice-textmaker.profile +++ b/etc/profile-a-l/freeoffice-textmaker.profile @@ -6,4 +6,4 @@ include freeoffice-textmaker.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-m-z/planmaker18.profile b/etc/profile-m-z/planmaker18.profile index 2ba8e86c0..4cf1efb7f 100644 --- a/etc/profile-m-z/planmaker18.profile +++ b/etc/profile-m-z/planmaker18.profile @@ -7,4 +7,4 @@ include planmaker18.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-m-z/planmaker18free.profile b/etc/profile-m-z/planmaker18free.profile index d0bce44f5..bb85f1fc7 100644 --- a/etc/profile-m-z/planmaker18free.profile +++ b/etc/profile-m-z/planmaker18free.profile @@ -7,4 +7,4 @@ include planmaker18free.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-m-z/presentations18.profile b/etc/profile-m-z/presentations18.profile index d4f531060..65d684c40 100644 --- a/etc/profile-m-z/presentations18.profile +++ b/etc/profile-m-z/presentations18.profile @@ -7,5 +7,5 @@ include presentations18.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-m-z/presentations18free.profile b/etc/profile-m-z/presentations18free.profile index e2319f13f..218747224 100644 --- a/etc/profile-m-z/presentations18free.profile +++ b/etc/profile-m-z/presentations18free.profile @@ -7,4 +7,4 @@ include presentations18free.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-m-z/softmaker-common.profile b/etc/profile-m-z/softmaker-common.profile new file mode 100644 index 000000000..a8ec5848c --- /dev/null +++ b/etc/profile-m-z/softmaker-common.profile @@ -0,0 +1,50 @@ +# Firejail profile for softmaker-common +# This file is overwritten after every install/update +# Persistent local customizations +include softmaker-common.local +# Persistent global definitions +# added by caller profile +#include globals.local + +# The offical packages install the desktop file under /usr/local/share/applications +# with an absolute Exec line. These files are NOT handelt by firecfg, +# therefore you must manualy copy them in you home and remove '/usr/bin/'. + +noblacklist ${HOME}/SoftMaker + +include disable-common.inc +include disable-devel.inc +include disable-exec.inc +include disable-interpreters.inc +include disable-passwdmgr.inc +include disable-programs.inc + +whitelist /usr/share/office2018 +whitelist /usr/share/freeoffice2018 +include whitelist-usr-share-common.inc +include whitelist-var-common.inc + +apparmor +caps.drop all +ipc-namespace +netfilter +nodvd +nogroups +nonewprivs +noroot +notv +nou2f +novideo +protocol unix,inet,inet6 +seccomp +shell none +tracelog + +private-bin freeoffice-planmaker,freeoffice-presentations,freeoffice-textmaker,planmaker18,planmaker18free,presentations18,presentations18free,sh,textmaker18,textmaker18free +private-cache +private-dev +private-etc ca-certificates,crypto-policies,fonts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,machine-id,nsswitch.conf,pki,SoftMaker,ssl +private-tmp + +dbus-user none +dbus-system none diff --git a/etc/profile-m-z/textmaker18.profile b/etc/profile-m-z/textmaker18.profile index d28947394..e5a4b6454 100644 --- a/etc/profile-m-z/textmaker18.profile +++ b/etc/profile-m-z/textmaker18.profile @@ -7,5 +7,5 @@ include textmaker18.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile diff --git a/etc/profile-m-z/textmaker18free.profile b/etc/profile-m-z/textmaker18free.profile index 7b4fd5b08..0e918bf0a 100644 --- a/etc/profile-m-z/textmaker18free.profile +++ b/etc/profile-m-z/textmaker18free.profile @@ -7,5 +7,5 @@ include textmaker18free.local include globals.local # Redirect -include softmaker-common.inc +include softmaker-common.profile -- cgit v1.2.3-54-g00ecf