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
---
 README.md        |  3 ++-
 RELNOTES         |  2 +-
 etc/meld.profile | 30 ++++++++++++++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 061535824..58c5cb5de 100644
--- a/README.md
+++ b/README.md
@@ -102,4 +102,5 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
 ## Current development version: 0.9.59
 
 ## New profiles:
-crow, nyx, klavaro, mypaint, celluoid, nano, transgui, sysprof, simplescreenrecorder, geekbench, xfce4-mixer, pavucontrol, d-feet, seahorse, secret-tool, gnome-keyring, regextester, hardinfo, gnome-system-log, gnome-nettool, netactview, redshift, devhelp, assogiate, subdownloader, font-manager, exfalso, gconf-editor, dconf-editor, mpdris2, sysprof-cli, seahorse-tool, secret-tool, dconf, gsettings, code-oss, pragha, Maelstrom, ostrichriders, bzflag, freeciv, lincity-ng, megaglest, openttd, crawl, crawl-tiles, teeworlds, torcs, tremulous, warsow, lugaru, manaplus, pioneer, scorched3d, widelands, freemind, kid3, kid3-cli, kid3-qt
+crow, nyx, klavaro, mypaint, celluoid, nano, transgui, sysprof, simplescreenrecorder, geekbench, xfce4-mixer, pavucontrol, d-feet, seahorse, secret-tool, gnome-keyring, regextester, hardinfo, gnome-system-log, gnome-nettool, netactview, redshift, devhelp, assogiate, subdownloader, font-manager, exfalso, gconf-editor, dconf-editor, mpdris2, sysprof-cli, seahorse-tool, secret-tool, dconf, gsettings, code-oss, pragha, Maelstrom, ostrichriders, bzflag, freeciv, lincity-ng, megaglest, openttd, crawl, crawl-tiles, teeworlds, torcs, tremulous, warsow, lugaru, manaplus, pioneer, scorched3d, widelands, freemind, kid3, kid3-cli, kid3-qt, nomacs
+
diff --git a/RELNOTES b/RELNOTES
index 3c30c4d65..070f68d37 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -10,7 +10,7 @@ firejail (0.9.59) baseline; urgency=low
   * new profiles: freeciv, lincity-ng, megaglest, openttd, crawl, crawl-tiles
   * new profiles: teeworlds, torcs, tremulous, warsow, lugaru, manaplus
   * new profiles: pioneer, scorched3d, widelands, freemind, kid3, kid3-qt
-  * new profiles: kid3-cli
+  * new profiles: kid3-cli, nomacs
   * memory-deny-write-execute now also blocks memfd_create
   * drop support for flatpak/snap packages
 
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