diff options
author | intrigeri <intrigeri@boum.org> | 2012-10-05 20:26:33 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2012-10-05 20:26:33 +0200 |
commit | aca0c78b5907e5e8d6091f8833ce72c719f697dd (patch) | |
tree | 42e17645f63c00840b2a9e90ca7b2664b74e675e | |
parent | 2a3dfa69eb2d177a7020ffc8ca729a2be622704c (diff) |
Import upstream Git commit: Bypass root's mutt configuration file.
In case the root user has configured mutt, in their $HOME, for their own
interactive use, we don't want these tweaks to impact the non-interactive use
metche makes of mutt in any way.
In case the administrator wants to configure mutt for interactive *and*
non-interactive use, they'd better edit its system-wide configuration file.
As mentioned by Andreas Beckmann, a mutt configuration file for the root user
may trigger more occurrences of Debian bug #657071 than needed :)
-rw-r--r-- | debian/patches/0001-Bypass-root-s-mutt-configuration-file.patch | 30 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/0001-Bypass-root-s-mutt-configuration-file.patch b/debian/patches/0001-Bypass-root-s-mutt-configuration-file.patch new file mode 100644 index 0000000..1e537d6 --- /dev/null +++ b/debian/patches/0001-Bypass-root-s-mutt-configuration-file.patch @@ -0,0 +1,30 @@ +From: intrigeri <intrigeri@boum.org> +Date: Fri, 5 Oct 2012 19:56:13 +0200 +Subject: Bypass root's mutt configuration file. + +In case the root user has configured mutt, in their $HOME, for their own +interactive use, we don't want these tweaks to impact the non-interactive use +metche makes of mutt in any way. + +In case the administrator wants to configure mutt for interactive *and* +non-interactive use, they'd better edit its system-wide configuration file. + +As mentioned by Andreas Beckmann, a mutt configuration file for the root user +may trigger more occurrences of Debian bug #657071 than needed :) +--- + metche | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/metche b/metche +index 4bf511c..ef1983e 100755 +--- a/metche ++++ b/metche +@@ -82,7 +82,7 @@ add_header() { + _mail() { + local subject="$1" + if which mutt > /dev/null ; then +- LC_ALL="$LOCALE" mutt -s "$subject" "$EMAIL_ADDRESS" ++ LC_ALL="$LOCALE" mutt -F/dev/null -s "$subject" "$EMAIL_ADDRESS" + elif which mail > /dev/null ; then + LC_ALL="$LOCALE" mail -s "$subject" "$EMAIL_ADDRESS" + elif [ -x /usr/sbin/sendmail ]; then diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a7a60e4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Bypass-root-s-mutt-configuration-file.patch |