Support Enpass v6 (#2672)

* Refactor enpass profile

Upstream enpass version 6 needs profile adjustments. These are integrated into the refactored profile without dropping support for older versions.

* Support newer Enpass in disable-programs.inc

* Re-add no3d and move whitelist lines in enpass.profile

2 files changed, 22 insertions, 4 deletions

diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index f0d6611ad..3b540b8a2 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -100,6 +100,7 @@ blacklist ${HOME}/.config/Rambox
 blacklist ${HOME}/.config/Riot
 blacklist ${HOME}/.config/Rocket.Chat
 blacklist ${HOME}/.config/Signal
+blacklist ${HOME}/.config/Sinew Software Systems
 blacklist ${HOME}/.config/Slack
 blacklist ${HOME}/.config/Standard Notes
 blacklist ${HOME}/.config/SubDownloader
@@ -261,6 +262,7 @@ blacklist ${HOME}/.config/redshift.conf
 blacklist ${HOME}/.config/remmina
 blacklist ${HOME}/.config/ristretto
 blacklist ${HOME}/.config/scribus
+blacklist ${HOME}/.config/sinew.in
 blacklist ${HOME}/.config/skypeforlinux
 blacklist ${HOME}/.config/slimjet
 blacklist ${HOME}/.config/smplayer
@@ -428,6 +430,7 @@ blacklist ${HOME}/.local/share/0ad
 blacklist ${HOME}/.local/share/3909/PapersPlease
 blacklist ${HOME}/.local/share/Anki2
 blacklist ${HOME}/.local/share/Empathy
+blacklist ${HOME}/.local/share/Enpass
 blacklist ${HOME}/.local/share/JetBrains
 blacklist ${HOME}/.local/share/Mendeley Ltd.
 blacklist ${HOME}/.local/share/Mumble
@@ -633,6 +636,7 @@ blacklist ${HOME}/.cache/8pecxstudios
 blacklist ${HOME}/.cache/Authenticator
 blacklist ${HOME}/.cache/Clementine
 blacklist ${HOME}/.cache/Enox
+blacklist ${HOME}/.cache/Enpass
 blacklist ${HOME}/.cache/Franz
 blacklist ${HOME}/.cache/INRIA
 blacklist ${HOME}/.cache/MusicBrainz
diff --git a/etc/enpass.profile b/etc/enpass.profile
index 284b9259d..b337c721d 100644
--- a/etc/enpass.profile
+++ b/etc/enpass.profile
@@ -6,7 +6,10 @@ include enpass.local
 # Persistent global definitions
 include globals.local
 
+noblacklist ${HOME}/.cache/Enpass
+noblacklist ${HOME}/.config/sinew.in
 noblacklist ${HOME}/.config/Sinew Software Systems
+noblacklist ${HOME}/.local/share/Enpass
 noblacklist ${DOCUMENTS}
 
 include disable-common.inc
@@ -17,11 +20,21 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
 
+whitelist ${HOME}/.cache/Enpass
+whitelist ${HOME}/.config/sinew.in
+whitelist ${HOME}/.config/Sinew Software Systems
+whitelist ${HOME}/.local/share/Enpass
+whitelist ${DOCUMENTS}
+
 include whitelist-var-common.inc
 
+# machine-id and nosound break audio notification functionality
+# comment both if you need that functionality or put 'ignore machine-id'
+# and 'ignore nosound' in your enpass.local
+
 caps.drop all
 machine-id
-net none
+netfilter
 no3d
 nodvd
 nogroups
@@ -31,14 +44,15 @@ nosound
 notv
 nou2f
 novideo
-protocol unix
+protocol unix,inet,inet6,netlink
 seccomp
 shell none
 tracelog
 
-private-bin sh,readlink,dirname
+private-bin dirname,Enpass,importer_enpass,sh,readlink
+?HAS_APPIMAGE: ignore private-dev
 private-dev
 private-opt Enpass
 private-tmp
 
-memory-deny-write-execute
+#memory-deny-write-execute - breaks on Arch