From 33d538bbe551580d771a30417f3c103394ee9a4b Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Fri, 27 Jan 2023 19:38:54 -0300
Subject: [PATCH 1/3] mutt.profile: add ~/.mutthistory

From the manual of mutt 2.2.9:

> 3.125. history_file
>
>    Type: path
>    Default: "~/.mutthistory"
>
>    The file in which Mutt will save its history.
---
 etc/inc/disable-common.inc   | 1 +
 etc/profile-m-z/mutt.profile | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/etc/inc/disable-common.inc b/etc/inc/disable-common.inc
index 44e45d4169e..81aac0b53b7 100644
--- a/etc/inc/disable-common.inc
+++ b/etc/inc/disable-common.inc
@@ -25,6 +25,7 @@ blacklist-nolog ${HOME}/.local/share/nvim
 blacklist-nolog ${HOME}/.local/state/nvim
 blacklist-nolog ${HOME}/.macromedia
 blacklist-nolog ${HOME}/.mupdf.history
+blacklist-nolog ${HOME}/.mutthistory
 blacklist-nolog ${HOME}/.python-history
 blacklist-nolog ${HOME}/.python_history
 blacklist-nolog ${HOME}/.pythonhist
diff --git a/etc/profile-m-z/mutt.profile b/etc/profile-m-z/mutt.profile
index 52d30669f85..a26a25573c5 100644
--- a/etc/profile-m-z/mutt.profile
+++ b/etc/profile-m-z/mutt.profile
@@ -23,6 +23,7 @@ noblacklist ${HOME}/.mail
 noblacklist ${HOME}/.mailcap
 noblacklist ${HOME}/.msmtprc
 noblacklist ${HOME}/.mutt
+noblacklist ${HOME}/.mutthistory
 noblacklist ${HOME}/.muttrc
 noblacklist ${HOME}/.nanorc
 noblacklist ${HOME}/.signature
@@ -89,6 +90,7 @@ whitelist ${HOME}/.mail
 whitelist ${HOME}/.mailcap
 whitelist ${HOME}/.msmtprc
 whitelist ${HOME}/.mutt
+whitelist ${HOME}/.mutthistory
 whitelist ${HOME}/.muttrc
 whitelist ${HOME}/.nanorc
 whitelist ${HOME}/.signature

From 3d82b71a48c8e5013c4aeed3cd00c7979060c298 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Fri, 27 Jan 2023 18:35:15 -0300
Subject: [PATCH 2/3] mutt.profile: stop creating editor/browser paths

To reduce the amount of spam created in the user home directory.

It's unlikely that these paths are going to be both:

* Created only after mutt is first opened through firejail and
* Created from within mutt

Also, no other profile does that:

    $ git grep -El '(mkdir|mkfile) \$\{HOME\}/\.(emacs|nano|vim)' -- etc
    etc/profile-m-z/mutt.profile

So just whitelist them if they already exist.

Added on commit a8a8e33bc ("Add whitelisting to mutt; improve geary, new
profile for neomutt", 2020-12-28) / PR #3849.
---
 etc/profile-m-z/mutt.profile | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/etc/profile-m-z/mutt.profile b/etc/profile-m-z/mutt.profile
index a26a25573c5..7e18490795f 100644
--- a/etc/profile-m-z/mutt.profile
+++ b/etc/profile-m-z/mutt.profile
@@ -55,26 +55,17 @@ mkdir ${HOME}/.Mail
 mkdir ${HOME}/.bogofilter
 mkdir ${HOME}/.cache/mutt
 mkdir ${HOME}/.config/mutt
-mkdir ${HOME}/.config/nano
-mkdir ${HOME}/.elinks
-mkdir ${HOME}/.emacs.d
 mkdir ${HOME}/.gnupg
 mkdir ${HOME}/.mail
 mkdir ${HOME}/.mutt
-mkdir ${HOME}/.vim
-mkdir ${HOME}/.w3m
 mkdir ${HOME}/Mail
 mkdir ${HOME}/mail
 mkdir ${HOME}/postponed
 mkdir ${HOME}/sent
-mkfile ${HOME}/.emacs
 mkfile ${HOME}/.mailcap
 mkfile ${HOME}/.msmtprc
 mkfile ${HOME}/.muttrc
-mkfile ${HOME}/.nanorc
 mkfile ${HOME}/.signature
-mkfile ${HOME}/.viminfo
-mkfile ${HOME}/.vimrc
 whitelist ${DOCUMENTS}
 whitelist ${DOWNLOADS}
 whitelist ${HOME}/.Mail

From 4a3e0d8789edd0cfd26c66f5ba85138e7fea06e7 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Fri, 27 Jan 2023 19:45:03 -0300
Subject: [PATCH 3/3] mutt.profile: stop creating config files for other
 programs

Let either the respective program or the user create the file.

* ~/.bogofilter: Used by the bogofilter program
* ~/.msmtprc: Used by the msmtp program

Added on commit a8a8e33bc ("Add whitelisting to mutt; improve geary, new
profile for neomutt", 2020-12-28) / PR #3849.
---
 etc/profile-m-z/mutt.profile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/etc/profile-m-z/mutt.profile b/etc/profile-m-z/mutt.profile
index 7e18490795f..bce56743ab4 100644
--- a/etc/profile-m-z/mutt.profile
+++ b/etc/profile-m-z/mutt.profile
@@ -52,7 +52,6 @@ include disable-programs.inc
 include disable-xdg.inc
 
 mkdir ${HOME}/.Mail
-mkdir ${HOME}/.bogofilter
 mkdir ${HOME}/.cache/mutt
 mkdir ${HOME}/.config/mutt
 mkdir ${HOME}/.gnupg
@@ -63,7 +62,6 @@ mkdir ${HOME}/mail
 mkdir ${HOME}/postponed
 mkdir ${HOME}/sent
 mkfile ${HOME}/.mailcap
-mkfile ${HOME}/.msmtprc
 mkfile ${HOME}/.muttrc
 mkfile ${HOME}/.signature
 whitelist ${DOCUMENTS}