From 8995a9944d3042646073878cbe5727d23bdca322 Mon Sep 17 00:00:00 2001
From: rusty-snake <print_hello_world+GitHub@protonmail.com>
Date: Thu, 28 Mar 2019 14:15:40 +0000
Subject: Add VCS support to meld (#2615)

* Add hg,bzr,git,svn,cvs to meld's private-bin

* Update meld.profile

* Update meld.profile

* Update meld.profile
---
 etc/meld.profile | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'etc/meld.profile')

diff --git a/etc/meld.profile b/etc/meld.profile
index 4e298e4e7..395771cf2 100644
--- a/etc/meld.profile
+++ b/etc/meld.profile
@@ -7,18 +7,27 @@ include meld.local
 include globals.local
 
 noblacklist ${HOME}/.local/share/meld
-noblacklist ${PATH}/python*
-noblacklist /usr/include/python*
-noblacklist /usr/lib/python*
-noblacklist /usr/local/lib/python*
-noblacklist /usr/share/python*
 
-include disable-common.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*
+
+noblacklist ${HOME}/.gitconfig
+noblacklist ${HOME}/.ssh
+noblacklist ${HOME}/.subversion
+
+# Uncomment the next line if you don't need to compare files in disable-common.inc.
+#include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
 include disable-passwdmgr.inc
-include disable-programs.inc
+# Uncomment the next line if you don't need to compare files in disable-programs.inc.
+#include disable-programs.inc
 
 include whitelist-var-common.inc
 
@@ -26,6 +35,7 @@ apparmor
 caps.drop all
 ipc-namespace
 machine-id
+netfilter
 no3d
 nodvd
 nogroups
@@ -35,15 +45,15 @@ nosound
 notv
 nou2f
 novideo
-protocol unix
+protocol unix,inet,inet6
 seccomp
 shell none
 tracelog
 
-private-bin meld,python*
+private-bin bzr,cvs,git,hg,meld,python*,svn
 private-cache
 private-dev
 # Uncomment the next line if you don't need to compare in /etc.
-# private-etc fonts,alternatives
+#private-etc alternatives,ca-certificates,crypto-policies,fonts,hostname,hosts,pki,resolv.conf,ssl,subversion
 private-tmp
 
-- 
cgit v1.2.3-70-g09d2