From 17f803513263f1488f344424ca01b1c3f95e2df0 Mon Sep 17 00:00:00 2001 From: rusty-snake Date: Sat, 1 Jun 2019 20:19:01 +0000 Subject: [PATCH] Create allow-INTERPETER.inc (#2736) * Create allow-INTERPETER.inc * allow-lua.inc * allow-perl.inc * allow-python2.inc * allow-python3.inc * Create allow-java.inc * Update profiles to use new allow-INTERPRETER.inc includes * Update profiles to use new allow-INTERPRETER.inc includes 2/x * Fix order of allow-INTERPRETER.inc includes * Update profiles to use new allow-INTERPRETER.inc includes 3/x * Fixup comment about allow-java.inc https://github.com/netblue30/firejail/pull/2736#discussion_r289597997 * Add Arch Linux specific paths to allow-perl.inc --- etc/JDownloader.profile | 7 ++----- etc/allow-java.inc | 4 ++++ etc/allow-lua.inc | 4 ++++ etc/allow-perl.inc | 7 +++++++ etc/allow-python2.inc | 5 +++++ etc/allow-python3.inc | 5 +++++ etc/anki.profile | 8 ++------ etc/arduino.profile | 7 ++----- etc/arm.profile | 8 ++------ etc/atool.profile | 6 +----- etc/authenticator.profile | 8 ++------ etc/autokey-common.profile | 10 ++-------- etc/bleachbit.profile | 8 ++------ etc/blender.profile | 8 ++------ etc/caja.profile | 8 ++------ etc/cantata.profile | 5 ++--- etc/catfish.profile | 8 ++------ etc/celluloid.profile | 8 ++------ etc/checkbashisms.profile | 6 +----- etc/cherrytree.profile | 8 ++------ etc/clawsker.profile | 6 +----- etc/d-feet.profile | 8 ++------ etc/deluge.profile | 8 ++------ etc/devilspie2.profile | 3 +++ etc/dex2jar.profile | 7 ++----- etc/display.profile | 8 ++------ etc/electrum.profile | 8 ++------ etc/exfalso.profile | 8 ++------ etc/exiftool.profile | 6 ++---- etc/filezilla.profile | 8 ++------ etc/firefox-common-addons.inc | 3 +-- etc/flowblade.profile | 8 ++------ etc/font-manager.profile | 8 ++------ etc/fontforge.profile | 8 ++------ etc/freecol.profile | 7 ++----- etc/freemind.profile | 7 +++---- etc/frozen-bubble.profile | 6 +----- etc/gajim.profile | 8 ++------ etc/gconf.profile | 8 ++------ etc/gnome-music.profile | 8 ++------ etc/gnome-schedule.profile | 8 ++------ etc/gramps.profile | 8 ++------ etc/hexchat.profile | 8 ++------ etc/imagej.profile | 7 ++----- etc/inkscape.profile | 8 ++------ etc/jd-gui.profile | 7 ++----- etc/jitsi.profile | 7 ++----- etc/kodi.profile | 8 ++------ etc/krita.profile | 8 ++------ etc/libreoffice.profile | 10 ++++------ etc/liferea.profile | 8 ++------ etc/lollypop.profile | 8 ++------ etc/macrofusion.profile | 8 ++------ etc/mediathekview.profile | 7 ++----- etc/meld.profile | 15 +++++---------- etc/mendeleydesktop.profile | 8 ++------ etc/meteo-qt.profile | 4 +--- etc/mpDris2.profile | 8 ++------ etc/mpsyt.profile | 8 ++------ etc/mpv.profile | 8 ++------ etc/ms-office.profile | 8 ++------ etc/multimc5.profile | 7 ++----- etc/mypaint.profile | 6 ++++-- etc/natron.profile | 12 ++++-------- etc/nautilus.profile | 8 ++------ etc/nemo.profile | 8 ++------ etc/nitroshare.profile | 8 ++------ etc/nyx.profile | 7 +++---- etc/obs.profile | 8 ++------ etc/onionshare-gui.profile | 4 +--- etc/openshot.profile | 8 ++------ etc/pdfsam.profile | 7 ++----- etc/picard.profile | 8 ++------ etc/pithos.profile | 8 ++------ etc/pitivi.profile | 8 ++------ etc/playonlinux.profile | 14 +++----------- etc/pybitmessage.profile | 8 ++------ etc/pycharm-community.profile | 7 ++----- etc/qbittorrent.profile | 8 ++------ etc/qgis.profile | 4 +--- etc/qutebrowser.profile | 13 ++++--------- etc/ranger.profile | 13 +++---------- etc/scribus.profile | 8 ++------ etc/sdat2img.profile | 8 ++------ etc/smplayer.profile | 8 ++------ etc/soundconverter.profile | 8 ++------ etc/spectre-meltdown-checker.profile | 8 ++------ etc/steam.profile | 15 ++++----------- etc/subdownloader.profile | 8 ++------ etc/terasology.profile | 7 ++----- etc/torbrowser-launcher.profile | 8 ++------ etc/transmission-remote-cli.profile | 8 ++------ etc/tuxguitar.profile | 7 ++----- etc/uzbl-browser.profile | 8 ++------ etc/wireshark.profile | 7 ++----- etc/xed.profile | 8 ++------ etc/xplayer.profile | 8 ++------ etc/xpra.profile | 8 ++------ etc/youtube-dl.profile | 8 ++------ etc/zaproxy.profile | 7 ++----- 100 files changed, 225 insertions(+), 544 deletions(-) create mode 100644 etc/allow-java.inc create mode 100644 etc/allow-lua.inc create mode 100644 etc/allow-perl.inc create mode 100644 etc/allow-python2.inc create mode 100644 etc/allow-python3.inc diff --git a/etc/JDownloader.profile b/etc/JDownloader.profile index d1bd5c9b2..c00730ef4 100644 --- a/etc/JDownloader.profile +++ b/etc/JDownloader.profile @@ -8,11 +8,8 @@ include globals.local noblacklist ${HOME}/.jd -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/allow-java.inc b/etc/allow-java.inc new file mode 100644 index 000000000..c6ab3b2eb --- /dev/null +++ b/etc/allow-java.inc @@ -0,0 +1,4 @@ +noblacklist ${PATH}/java +noblacklist /usr/lib/java +noblacklist /etc/java +noblacklist /usr/share/java diff --git a/etc/allow-lua.inc b/etc/allow-lua.inc new file mode 100644 index 000000000..51d76f9b1 --- /dev/null +++ b/etc/allow-lua.inc @@ -0,0 +1,4 @@ +noblacklist ${PATH}/lua* +noblacklist /usr/include/lua* +noblacklist /usr/lib/lua +noblacklist /usr/share/lua diff --git a/etc/allow-perl.inc b/etc/allow-perl.inc new file mode 100644 index 000000000..d37328936 --- /dev/null +++ b/etc/allow-perl.inc @@ -0,0 +1,7 @@ +noblacklist ${PATH}/cpan* +noblacklist ${PATH}/core_perl +noblacklist ${PATH}/perl +noblacklist ${PATH}/site_perl +noblacklist ${PATH}/vendor_perl +noblacklist /usr/lib/perl* +noblacklist /usr/share/perl* diff --git a/etc/allow-python2.inc b/etc/allow-python2.inc new file mode 100644 index 000000000..8ea61648b --- /dev/null +++ b/etc/allow-python2.inc @@ -0,0 +1,5 @@ +noblacklist ${PATH}/python2* +noblacklist /usr/include/python2* +noblacklist /usr/lib/python2* +noblacklist /usr/local/lib/python2* +noblacklist /usr/share/python2* diff --git a/etc/allow-python3.inc b/etc/allow-python3.inc new file mode 100644 index 000000000..91c7ffca4 --- /dev/null +++ b/etc/allow-python3.inc @@ -0,0 +1,5 @@ +noblacklist ${PATH}/python3* +noblacklist /usr/include/python3* +noblacklist /usr/lib/python3* +noblacklist /usr/local/lib/python3* +noblacklist /usr/share/python3* diff --git a/etc/anki.profile b/etc/anki.profile index 6ab95dd52..f7fa8c780 100644 --- a/etc/anki.profile +++ b/etc/anki.profile @@ -10,12 +10,8 @@ noblacklist ${DOCUMENTS} noblacklist ${HOME}/.local/share/Anki2 # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/arduino.profile b/etc/arduino.profile index 2ea8445fe..26bd3d0a7 100644 --- a/etc/arduino.profile +++ b/etc/arduino.profile @@ -11,11 +11,8 @@ noblacklist ${HOME}/.java noblacklist ${HOME}/Arduino noblacklist ${DOCUMENTS} -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/arm.profile b/etc/arm.profile index ae93e9665..dd3fa190a 100644 --- a/etc/arm.profile +++ b/etc/arm.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.arm # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/atool.profile b/etc/atool.profile index b17498e9d..4ea3c02dc 100644 --- a/etc/atool.profile +++ b/etc/atool.profile @@ -10,11 +10,7 @@ include globals.local blacklist /tmp/.X11-unix # Allow perl (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/cpan* -noblacklist ${PATH}/core_perl -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +include allow-perl.inc include disable-common.inc # include disable-devel.inc diff --git a/etc/authenticator.profile b/etc/authenticator.profile index e08dc12eb..39546112e 100644 --- a/etc/authenticator.profile +++ b/etc/authenticator.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.cache/Authenticator noblacklist ${HOME}/.config/Authenticator # Allow python (blacklisted by disable-interpreters.inc) -#noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -#noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -#noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +#include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/autokey-common.profile b/etc/autokey-common.profile index 44c0a3c15..47396fe43 100644 --- a/etc/autokey-common.profile +++ b/etc/autokey-common.profile @@ -10,14 +10,8 @@ noblacklist ${HOME}/.config/autokey noblacklist ${HOME}/.local/share/autokey # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* -noblacklist /usr/share/python2* -noblacklist /usr/share/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/bleachbit.profile b/etc/bleachbit.profile index cbc8c25d6..47c0cfa48 100644 --- a/etc/bleachbit.profile +++ b/etc/bleachbit.profile @@ -7,12 +7,8 @@ include bleachbit.local include globals.local # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/blender.profile b/etc/blender.profile index bfe906408..6a72fb602 100644 --- a/etc/blender.profile +++ b/etc/blender.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.config/blender # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/caja.profile b/etc/caja.profile index f38110dc9..2a95649af 100644 --- a/etc/caja.profile +++ b/etc/caja.profile @@ -14,12 +14,8 @@ noblacklist ${HOME}/.local/share/Trash # noblacklist ${HOME}/.local/share/caja-python # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/cantata.profile b/etc/cantata.profile index e4a4de9c1..19abbfea2 100644 --- a/etc/cantata.profile +++ b/etc/cantata.profile @@ -11,9 +11,8 @@ noblacklist ${HOME}/.config/cantata noblacklist ${HOME}/.local/share/cantata noblacklist ${MUSIC} -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +# Allow perl (blacklisted by disable-interpreters.inc) +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/catfish.profile b/etc/catfish.profile index 341348ff9..f615b5323 100644 --- a/etc/catfish.profile +++ b/etc/catfish.profile @@ -12,12 +12,8 @@ include globals.local noblacklist ${HOME}/.config/catfish # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc # include disable-devel.inc diff --git a/etc/celluloid.profile b/etc/celluloid.profile index 5604a16b9..190a49588 100644 --- a/etc/celluloid.profile +++ b/etc/celluloid.profile @@ -12,12 +12,8 @@ noblacklist ${MUSIC} noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/checkbashisms.profile b/etc/checkbashisms.profile index 5afbf2d56..1bb9b1860 100644 --- a/etc/checkbashisms.profile +++ b/etc/checkbashisms.profile @@ -10,11 +10,7 @@ include globals.local noblacklist ${DOCUMENTS} # Allow perl (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/cpan* -noblacklist ${PATH}/core_perl -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/cherrytree.profile b/etc/cherrytree.profile index 44ef12aa2..70dea5bd9 100644 --- a/etc/cherrytree.profile +++ b/etc/cherrytree.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.config/cherrytree noblacklist ${DOCUMENTS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/clawsker.profile b/etc/clawsker.profile index c519ecedb..95f15398a 100644 --- a/etc/clawsker.profile +++ b/etc/clawsker.profile @@ -9,11 +9,7 @@ include globals.local noblacklist ${HOME}/.claws-mail # Allow perl (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/cpan* -noblacklist ${PATH}/core_perl -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/d-feet.profile b/etc/d-feet.profile index 9475bdd2a..30749ab40 100644 --- a/etc/d-feet.profile +++ b/etc/d-feet.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.config/d-feet # Allow python (disabled by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/deluge.profile b/etc/deluge.profile index e86c84272..e86255d22 100644 --- a/etc/deluge.profile +++ b/etc/deluge.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.config/deluge # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc # include disable-devel.inc diff --git a/etc/devilspie2.profile b/etc/devilspie2.profile index 2f599366b..9d67ee76e 100644 --- a/etc/devilspie2.profile +++ b/etc/devilspie2.profile @@ -8,6 +8,9 @@ include globals.local noblacklist ${HOME}/.config/devilspie2 +# Allow lua (blacklisted by disable-interpreters.inc) +include allow-lua.inc + include disable-common.inc include disable-devel.inc include disable-exec.inc diff --git a/etc/dex2jar.profile b/etc/dex2jar.profile index 06a6be3aa..a6fed6c78 100644 --- a/etc/dex2jar.profile +++ b/etc/dex2jar.profile @@ -6,11 +6,8 @@ include dex2jar.local # Persistent global definitions include globals.local -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/display.profile b/etc/display.profile index 0bab32db1..0b9d685e8 100644 --- a/etc/display.profile +++ b/etc/display.profile @@ -8,12 +8,8 @@ include globals.local noblacklist ${PICTURES} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/electrum.profile b/etc/electrum.profile index ffa0fb5f6..ab554b21f 100644 --- a/etc/electrum.profile +++ b/etc/electrum.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.electrum # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/exfalso.profile b/etc/exfalso.profile index 6146a8952..978629452 100644 --- a/etc/exfalso.profile +++ b/etc/exfalso.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.quodlibet noblacklist ${MUSIC} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/exiftool.profile b/etc/exiftool.profile index f694ea212..b33d73233 100644 --- a/etc/exiftool.profile +++ b/etc/exiftool.profile @@ -8,10 +8,8 @@ include globals.local blacklist /tmp/.X11-unix -# Allow access to perl -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +# Allow perl (blacklisted by disable-interpreters.inc) +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/filezilla.profile b/etc/filezilla.profile index d1bebafb5..af535880d 100644 --- a/etc/filezilla.profile +++ b/etc/filezilla.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.config/filezilla noblacklist ${HOME}/.filezilla # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/firefox-common-addons.inc b/etc/firefox-common-addons.inc index 7a0c3e99f..7d9e512b2 100644 --- a/etc/firefox-common-addons.inc +++ b/etc/firefox-common-addons.inc @@ -56,8 +56,7 @@ whitelist ${HOME}/dwhelper noblacklist ${HOME}/.local/share/gnome-shell whitelist ${HOME}/.local/share/gnome-shell ignore nodbus -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python3* +include allow-python3.inc # Flash plugin # private-etc must first be enabled in firefox-common.profile and in profiles including it. diff --git a/etc/flowblade.profile b/etc/flowblade.profile index 1e84d4ca6..40472ab93 100644 --- a/etc/flowblade.profile +++ b/etc/flowblade.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.config/flowblade noblacklist ${HOME}/.flowblade # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/font-manager.profile b/etc/font-manager.profile index 98952e1cc..a1280124a 100644 --- a/etc/font-manager.profile +++ b/etc/font-manager.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.cache/font-manager noblacklist ${HOME}/.config/font-manager # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/fontforge.profile b/etc/fontforge.profile index f98ad9983..6d305e2af 100644 --- a/etc/fontforge.profile +++ b/etc/fontforge.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.FontForge noblacklist ${DOCUMENTS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/freecol.profile b/etc/freecol.profile index 7987cc076..2d2853c9c 100644 --- a/etc/freecol.profile +++ b/etc/freecol.profile @@ -12,11 +12,8 @@ noblacklist ${HOME}/.cache/freecol noblacklist ${HOME}/.config/freecol noblacklist ${HOME}/.local/share/freecol -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/freemind.profile b/etc/freemind.profile index 507bd564d..7ab4ae129 100644 --- a/etc/freemind.profile +++ b/etc/freemind.profile @@ -7,12 +7,11 @@ include freemind.local include globals.local noblacklist ${DOCUMENTS} -noblacklist ${PATH}/java -noblacklist /etc/java -noblacklist /usr/lib/java -noblacklist /usr/share/java noblacklist ${HOME}/.freemind +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc + include disable-common.inc include disable-devel.inc include disable-exec.inc diff --git a/etc/frozen-bubble.profile b/etc/frozen-bubble.profile index 6de61840c..9596bc610 100644 --- a/etc/frozen-bubble.profile +++ b/etc/frozen-bubble.profile @@ -9,11 +9,7 @@ include globals.local noblacklist ${HOME}/.frozen-bubble # Allow perl (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/cpan* -noblacklist ${PATH}/core_perl -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/gajim.profile b/etc/gajim.profile index 238b4fca9..75d2f0774 100644 --- a/etc/gajim.profile +++ b/etc/gajim.profile @@ -11,12 +11,8 @@ noblacklist ${HOME}/.config/gajim noblacklist ${HOME}/.local/share/gajim # Allow python (blacklisted by disable-interpreters.inc) -#noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -#noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -#noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +#include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/gconf.profile b/etc/gconf.profile index 5cc6b87a0..a795afa17 100644 --- a/etc/gconf.profile +++ b/etc/gconf.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.config/gconf # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -#noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -#noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -#noblacklist /usr/local/lib/python3* +include allow-python2.inc +#include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/gnome-music.profile b/etc/gnome-music.profile index 6bebeb526..f843452c9 100644 --- a/etc/gnome-music.profile +++ b/etc/gnome-music.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.local/share/gnome-music noblacklist ${MUSIC} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/gnome-schedule.profile b/etc/gnome-schedule.profile index 931efbbab..08256f3a5 100644 --- a/etc/gnome-schedule.profile +++ b/etc/gnome-schedule.profile @@ -36,12 +36,8 @@ noblacklist ${PATH}/xfce4-terminal noblacklist ${PATH}/xfce4-terminal.wrapper # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/gramps.profile b/etc/gramps.profile index 764c14b60..54b154964 100644 --- a/etc/gramps.profile +++ b/etc/gramps.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.gramps # Allow python (blacklisted by disable-interpreters.inc) -#noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -#noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -#noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +#include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/hexchat.profile b/etc/hexchat.profile index ee70e6655..d032c93e6 100644 --- a/etc/hexchat.profile +++ b/etc/hexchat.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.config/hexchat noblacklist /usr/share/perl* # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/imagej.profile b/etc/imagej.profile index 9d0ab43a0..be656bafa 100644 --- a/etc/imagej.profile +++ b/etc/imagej.profile @@ -8,11 +8,8 @@ include globals.local noblacklist ${HOME}/.imagej -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/inkscape.profile b/etc/inkscape.profile index ecc5e5d35..bc0377e53 100644 --- a/etc/inkscape.profile +++ b/etc/inkscape.profile @@ -13,12 +13,8 @@ noblacklist ${DOCUMENTS} noblacklist ${PICTURES} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/jd-gui.profile b/etc/jd-gui.profile index dce44e5d4..8442c6ed7 100644 --- a/etc/jd-gui.profile +++ b/etc/jd-gui.profile @@ -8,11 +8,8 @@ include globals.local noblacklist ${HOME}/.config/jd-gui.cfg noblacklist ${HOME}/.java -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/jitsi.profile b/etc/jitsi.profile index 5a575bb71..223c360b8 100644 --- a/etc/jitsi.profile +++ b/etc/jitsi.profile @@ -7,11 +7,8 @@ include globals.local noblacklist ${HOME}/.jitsi -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/kodi.profile b/etc/kodi.profile index dad085967..86afe46b5 100644 --- a/etc/kodi.profile +++ b/etc/kodi.profile @@ -15,12 +15,8 @@ noblacklist ${PICTURES} noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/krita.profile b/etc/krita.profile index 8f275f8df..49c36274a 100644 --- a/etc/krita.profile +++ b/etc/krita.profile @@ -15,12 +15,8 @@ noblacklist ${DOCUMENTS} noblacklist ${PICTURES} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/libreoffice.profile b/etc/libreoffice.profile index 5bb943323..05dfd4ca6 100644 --- a/etc/libreoffice.profile +++ b/etc/libreoffice.profile @@ -10,12 +10,10 @@ noblacklist ${HOME}/.java noblacklist /usr/local/sbin noblacklist ${HOME}/.config/libreoffice -# libreoffice uses java; if you don't care about java functionality, -# comment the next four lines -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# libreoffice uses java for some certain operations +# comment if you don't care about java functionality +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/liferea.profile b/etc/liferea.profile index e778d7b55..70d317199 100644 --- a/etc/liferea.profile +++ b/etc/liferea.profile @@ -11,12 +11,8 @@ noblacklist ${HOME}/.config/liferea noblacklist ${HOME}/.local/share/liferea # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/lollypop.profile b/etc/lollypop.profile index 76b8ed75c..6667815b9 100644 --- a/etc/lollypop.profile +++ b/etc/lollypop.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.local/share/lollypop noblacklist ${MUSIC} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/macrofusion.profile b/etc/macrofusion.profile index 7d42f2bfe..f7a059f50 100644 --- a/etc/macrofusion.profile +++ b/etc/macrofusion.profile @@ -9,12 +9,8 @@ noblacklist ${HOME}/.config/mfusion noblacklist ${PICTURES} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/mediathekview.profile b/etc/mediathekview.profile index 497014dab..4ebb5429a 100644 --- a/etc/mediathekview.profile +++ b/etc/mediathekview.profile @@ -18,11 +18,8 @@ noblacklist ${HOME}/.mediathek3 noblacklist ${HOME}/.mplayer noblacklist ${VIDEOS} -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/meld.profile b/etc/meld.profile index 14e0f238d..8aa30feff 100644 --- a/etc/meld.profile +++ b/etc/meld.profile @@ -6,22 +6,17 @@ include meld.local # Persistent global definitions include globals.local -noblacklist ${HOME}/.local/share/meld - -# Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* - noblacklist ${HOME}/.config/git noblacklist ${HOME}/.gitconfig noblacklist ${HOME}/.git-credentials +noblacklist ${HOME}/.local/share/meld noblacklist ${HOME}/.ssh noblacklist ${HOME}/.subversion +# Allow python (blacklisted by disable-interpreters.inc) +include allow-python2.inc +include allow-python3.inc + # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. #include disable-common.inc include disable-devel.inc diff --git a/etc/mendeleydesktop.profile b/etc/mendeleydesktop.profile index d54371371..ed6cc3ae0 100644 --- a/etc/mendeleydesktop.profile +++ b/etc/mendeleydesktop.profile @@ -15,12 +15,8 @@ noblacklist ${HOME}/.pki noblacklist ${HOME}/.local/share/pki # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/meteo-qt.profile b/etc/meteo-qt.profile index a769a97ec..7c9b5f7f1 100644 --- a/etc/meteo-qt.profile +++ b/etc/meteo-qt.profile @@ -10,9 +10,7 @@ noblacklist ${HOME}/.config/autostart noblacklist ${HOME}/.config/meteo-qt # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python3* +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/mpDris2.profile b/etc/mpDris2.profile index 81bf88b8b..db2bb6a93 100644 --- a/etc/mpDris2.profile +++ b/etc/mpDris2.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${HOME}/.config/mpDris2 # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/mpsyt.profile b/etc/mpsyt.profile index 0808c5a1a..88d464b5f 100644 --- a/etc/mpsyt.profile +++ b/etc/mpsyt.profile @@ -7,12 +7,8 @@ include mpsyt.local include globals.local # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc noblacklist ${HOME}/.config/mpv noblacklist ${HOME}/.mplayer diff --git a/etc/mpv.profile b/etc/mpv.profile index 34542b11b..aa2335516 100644 --- a/etc/mpv.profile +++ b/etc/mpv.profile @@ -13,12 +13,8 @@ noblacklist ${MUSIC} noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/ms-office.profile b/etc/ms-office.profile index f8e75379e..25b097d72 100644 --- a/etc/ms-office.profile +++ b/etc/ms-office.profile @@ -9,12 +9,8 @@ noblacklist ${HOME}/.cache/ms-office-online noblacklist ${HOME}/.jak # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/multimc5.profile b/etc/multimc5.profile index b6407c4f9..88dd4c536 100644 --- a/etc/multimc5.profile +++ b/etc/multimc5.profile @@ -10,11 +10,8 @@ noblacklist ${HOME}/.local/share/multimc noblacklist ${HOME}/.local/share/multimc5 noblacklist ${HOME}/.multimc5 -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/mypaint.profile b/etc/mypaint.profile index 615bb60d1..19643e749 100644 --- a/etc/mypaint.profile +++ b/etc/mypaint.profile @@ -9,10 +9,12 @@ include globals.local noblacklist ${HOME}/.cache/mypaint noblacklist ${HOME}/.config/mypaint noblacklist ${HOME}/.local/share/mypaint -noblacklist ${PATH}/python2* -noblacklist /usr/lib/python2* noblacklist ${PICTURES} +# Allow python (blacklisted by disable-interpreters.inc) +include allow-python2.inc +include allow-python3.inc + include disable-common.inc include disable-devel.inc include disable-exec.inc diff --git a/etc/natron.profile b/etc/natron.profile index 3f997a7a0..329f79f9b 100644 --- a/etc/natron.profile +++ b/etc/natron.profile @@ -5,19 +5,15 @@ include natron.local # Persistent global definitions include globals.local -# Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* - noblacklist ${HOME}/.Natron noblacklist ${HOME}/.cache/INRIA/Natron noblacklist ${HOME}/.config/INRIA noblacklist /opt/natron +# Allow python (blacklisted by disable-interpreters.inc) +include allow-python2.inc +include allow-python3.inc + include disable-common.inc include disable-devel.inc include disable-exec.inc diff --git a/etc/nautilus.profile b/etc/nautilus.profile index 1d68ef8e3..b81313b6a 100644 --- a/etc/nautilus.profile +++ b/etc/nautilus.profile @@ -15,12 +15,8 @@ noblacklist ${HOME}/.local/share/nautilus noblacklist ${HOME}/.local/share/nautilus-python # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/nemo.profile b/etc/nemo.profile index a23ba1700..26cfedb66 100644 --- a/etc/nemo.profile +++ b/etc/nemo.profile @@ -12,12 +12,8 @@ noblacklist ${HOME}/.local/share/nemo noblacklist ${HOME}/.local/share/nemo-python # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/nitroshare.profile b/etc/nitroshare.profile index 7aba69490..19b6615ef 100644 --- a/etc/nitroshare.profile +++ b/etc/nitroshare.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.config/Nathan Osman noblacklist ${HOME}/.config/NitroShare # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/nyx.profile b/etc/nyx.profile index ed39283b2..f50014a4d 100644 --- a/etc/nyx.profile +++ b/etc/nyx.profile @@ -6,10 +6,9 @@ include nyx.local # Persistent global definitions include globals.local -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* +# Allow python (blacklisted by disable-interpreters.inc) +include allow-python2.inc +include allow-python3.inc noblacklist ${HOME}/.nyx mkdir ${HOME}/.nyx diff --git a/etc/obs.profile b/etc/obs.profile index 1f02efc7f..038242cae 100644 --- a/etc/obs.profile +++ b/etc/obs.profile @@ -11,12 +11,8 @@ noblacklist ${PICTURES} noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/onionshare-gui.profile b/etc/onionshare-gui.profile index 3ee78c59d..5bfcd0527 100644 --- a/etc/onionshare-gui.profile +++ b/etc/onionshare-gui.profile @@ -8,9 +8,7 @@ include globals.local noblacklist ${HOME}/.config/onionshare # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python3* +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/openshot.profile b/etc/openshot.profile index cfda1d0ce..0222243ed 100644 --- a/etc/openshot.profile +++ b/etc/openshot.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.openshot noblacklist ${HOME}/.openshot_qt # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/pdfsam.profile b/etc/pdfsam.profile index 98dcce0b7..bd3592f48 100644 --- a/etc/pdfsam.profile +++ b/etc/pdfsam.profile @@ -9,11 +9,8 @@ include globals.local noblacklist ${HOME}/.java noblacklist ${DOCUMENTS} -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/picard.profile b/etc/picard.profile index b756ed629..15fc7a454 100644 --- a/etc/picard.profile +++ b/etc/picard.profile @@ -11,12 +11,8 @@ noblacklist ${HOME}/.config/MusicBrainz noblacklist ${MUSIC} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/pithos.profile b/etc/pithos.profile index d6a0a7822..62050eb55 100644 --- a/etc/pithos.profile +++ b/etc/pithos.profile @@ -7,12 +7,8 @@ include pithos.local include globals.local # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/pitivi.profile b/etc/pitivi.profile index 83f5ccbb9..89a6a020b 100644 --- a/etc/pitivi.profile +++ b/etc/pitivi.profile @@ -10,12 +10,8 @@ include globals.local noblacklist ${HOME}/.config/pitivi # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/playonlinux.profile b/etc/playonlinux.profile index 2f287223b..03091af6d 100644 --- a/etc/playonlinux.profile +++ b/etc/playonlinux.profile @@ -16,19 +16,11 @@ noblacklist ${HOME}/.PlayOnLinux noblacklist ${PATH}/nc # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc # Allow perl (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/cpan* -noblacklist ${PATH}/core_perl -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/pybitmessage.profile b/etc/pybitmessage.profile index 28ab8caa6..3bce425d9 100644 --- a/etc/pybitmessage.profile +++ b/etc/pybitmessage.profile @@ -10,12 +10,8 @@ noblacklist /usr/local/sbin noblacklist /usr/sbin # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/pycharm-community.profile b/etc/pycharm-community.profile index 1a6f171c8..0531aee4a 100644 --- a/etc/pycharm-community.profile +++ b/etc/pycharm-community.profile @@ -10,11 +10,8 @@ noblacklist ${HOME}/.python-history noblacklist ${HOME}/.pythonrc.py noblacklist ${HOME}/.java -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/qbittorrent.profile b/etc/qbittorrent.profile index 63810c1d0..82e237d54 100644 --- a/etc/qbittorrent.profile +++ b/etc/qbittorrent.profile @@ -12,12 +12,8 @@ noblacklist ${HOME}/.config/qBittorrentrc noblacklist ${HOME}/.local/share/data/qBittorrent # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/qgis.profile b/etc/qgis.profile index 45fe59cf7..c3d6011eb 100644 --- a/etc/qgis.profile +++ b/etc/qgis.profile @@ -13,9 +13,7 @@ noblacklist ${HOME}/.qgis2 noblacklist ${DOCUMENTS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python3* +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/qutebrowser.profile b/etc/qutebrowser.profile index 9e3853a09..e556ecf1f 100644 --- a/etc/qutebrowser.profile +++ b/etc/qutebrowser.profile @@ -9,18 +9,13 @@ include globals.local noblacklist ${HOME}/.cache/qutebrowser noblacklist ${HOME}/.config/qutebrowser noblacklist ${HOME}/.local/share/qutebrowser - -# Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* - # with >=llvm-4 mesa drivers need llvm stuff noblacklist /usr/lib/llvm* +# Allow python (blacklisted by disable-interpreters.inc) +include allow-python2.inc +include allow-python3.inc + include disable-common.inc include disable-devel.inc include disable-interpreters.inc diff --git a/etc/ranger.profile b/etc/ranger.profile index 1e50ca9fa..13e8911ea 100644 --- a/etc/ranger.profile +++ b/etc/ranger.profile @@ -11,18 +11,11 @@ noblacklist ${HOME}/.config/ranger noblacklist ${HOME}/.nanorc # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc # Allow perl -# noblacklist ${PATH}/cpan* -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/scribus.profile b/etc/scribus.profile index d8dc7b0e0..c50e0861c 100644 --- a/etc/scribus.profile +++ b/etc/scribus.profile @@ -27,12 +27,8 @@ noblacklist ${DOCUMENTS} noblacklist ${PICTURES} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/sdat2img.profile b/etc/sdat2img.profile index 485326fcc..176842c44 100644 --- a/etc/sdat2img.profile +++ b/etc/sdat2img.profile @@ -7,12 +7,8 @@ include sdat2img.local include globals.local # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/smplayer.profile b/etc/smplayer.profile index 5ae498ab2..0363a2475 100644 --- a/etc/smplayer.profile +++ b/etc/smplayer.profile @@ -12,12 +12,8 @@ noblacklist ${MUSIC} noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/soundconverter.profile b/etc/soundconverter.profile index 4d6e80840..d875146de 100644 --- a/etc/soundconverter.profile +++ b/etc/soundconverter.profile @@ -9,12 +9,8 @@ include globals.local noblacklist ${MUSIC} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/spectre-meltdown-checker.profile b/etc/spectre-meltdown-checker.profile index 74582dd2f..edbe0e772 100644 --- a/etc/spectre-meltdown-checker.profile +++ b/etc/spectre-meltdown-checker.profile @@ -11,12 +11,8 @@ include globals.local noblacklist ${PATH}/mount noblacklist ${PATH}/umount -# Allow access to perl -noblacklist ${PATH}/cpan* -noblacklist ${PATH}/core_perl -noblacklist ${PATH}/perl -noblacklist /usr/lib/perl* -noblacklist /usr/share/perl* +# Allow perl (blacklisted by disable-interpreters.inc) +include allow-perl.inc include disable-common.inc include disable-devel.inc diff --git a/etc/steam.profile b/etc/steam.profile index 8f08b18f0..5ab600bfb 100644 --- a/etc/steam.profile +++ b/etc/steam.profile @@ -25,19 +25,12 @@ noblacklist /usr/lib/llvm* # needed for STEAM_RUNTIME_PREFER_HOST_LIBRARIES=1 to work noblacklist /sbin -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/subdownloader.profile b/etc/subdownloader.profile index c07131893..b55300c88 100644 --- a/etc/subdownloader.profile +++ b/etc/subdownloader.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.config/SubDownloader noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/terasology.profile b/etc/terasology.profile index 43865b6fb..b01b4fdb3 100644 --- a/etc/terasology.profile +++ b/etc/terasology.profile @@ -8,11 +8,8 @@ include globals.local noblacklist ${HOME}/.java noblacklist ${HOME}/.local/share/terasology -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/torbrowser-launcher.profile b/etc/torbrowser-launcher.profile index c7c810cda..ff4a85871 100644 --- a/etc/torbrowser-launcher.profile +++ b/etc/torbrowser-launcher.profile @@ -12,12 +12,8 @@ noblacklist ${HOME}/.config/torbrowser noblacklist ${HOME}/.local/share/torbrowser # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/transmission-remote-cli.profile b/etc/transmission-remote-cli.profile index 3e3ad1a07..7b7a47f14 100644 --- a/etc/transmission-remote-cli.profile +++ b/etc/transmission-remote-cli.profile @@ -8,12 +8,8 @@ include transmission-remote-cli.local #include globals.local # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc mkdir ${HOME}/.cache/transmission mkdir ${HOME}/.config/transmission diff --git a/etc/tuxguitar.profile b/etc/tuxguitar.profile index 1b657d083..3111a1e22 100644 --- a/etc/tuxguitar.profile +++ b/etc/tuxguitar.profile @@ -11,11 +11,8 @@ noblacklist ${HOME}/.tuxguitar* noblacklist ${DOCUMENTS} noblacklist ${MUSIC} -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc diff --git a/etc/uzbl-browser.profile b/etc/uzbl-browser.profile index dbee819cd..d4e54235b 100644 --- a/etc/uzbl-browser.profile +++ b/etc/uzbl-browser.profile @@ -10,12 +10,8 @@ noblacklist ${HOME}/.gnupg noblacklist ${HOME}/.local/share/uzbl # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/wireshark.profile b/etc/wireshark.profile index 9b9757cd5..b44eae128 100644 --- a/etc/wireshark.profile +++ b/etc/wireshark.profile @@ -10,11 +10,8 @@ noblacklist ${HOME}/.config/wireshark noblacklist ${HOME}/.wireshark noblacklist ${DOCUMENTS} -# Wireshark can use Lua for scripting -noblacklist ${PATH}/lua* -noblacklist /usr/lib/lua -noblacklist /usr/include/lua* -noblacklist /usr/share/lua +# Allow lua (blacklisted by disable-interpreters.inc) +include allow-lua.inc include disable-common.inc include disable-devel.inc diff --git a/etc/xed.profile b/etc/xed.profile index cce0432a4..9a7806b19 100644 --- a/etc/xed.profile +++ b/etc/xed.profile @@ -9,12 +9,8 @@ noblacklist ${HOME}/.config/xed noblacklist ${HOME}/.pythonrc.py # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/xplayer.profile b/etc/xplayer.profile index b4932c99e..5f4e3bf4c 100644 --- a/etc/xplayer.profile +++ b/etc/xplayer.profile @@ -11,12 +11,8 @@ noblacklist ${MUSIC} noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/xpra.profile b/etc/xpra.profile index d58810228..fc861176f 100644 --- a/etc/xpra.profile +++ b/etc/xpra.profile @@ -17,12 +17,8 @@ include globals.local blacklist /media # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc include disable-common.inc include disable-devel.inc diff --git a/etc/youtube-dl.profile b/etc/youtube-dl.profile index 621ffb2b0..237f24fd1 100644 --- a/etc/youtube-dl.profile +++ b/etc/youtube-dl.profile @@ -12,12 +12,8 @@ noblacklist ${MUSIC} noblacklist ${VIDEOS} # Allow python (blacklisted by disable-interpreters.inc) -noblacklist ${PATH}/python2* -noblacklist ${PATH}/python3* -noblacklist /usr/lib/python2* -noblacklist /usr/lib/python3* -noblacklist /usr/local/lib/python2* -noblacklist /usr/local/lib/python3* +include allow-python2.inc +include allow-python3.inc # breaks when installed via pip ignore noexec ${HOME} diff --git a/etc/zaproxy.profile b/etc/zaproxy.profile index dc3164da1..9ef3e713e 100644 --- a/etc/zaproxy.profile +++ b/etc/zaproxy.profile @@ -9,11 +9,8 @@ include globals.local noblacklist ${HOME}/.java noblacklist ${HOME}/.ZAP -# Allow access to java -noblacklist ${PATH}/java -noblacklist /usr/lib/java -noblacklist /etc/java -noblacklist /usr/share/java +# Allow java (blacklisted by disable-devel.inc) +include allow-java.inc include disable-common.inc include disable-devel.inc