02/08: gnu: mutt: Don't retain reference to GCC.

[Ludovic Courtès]

civodul pushed a commit to branch wip-diet
in repository guix.

commit 397c6c3cab37e3f2bebe35cfa88ee4f6f7ccdf94
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jun 26 23:01:43 2015 +0200

    gnu: mutt: Don't retain reference to GCC.
    
    * gnu/packages/patches/mutt-store-references.patch: New file.
    * gnu/packages/mail.scm (mutt)[source]: Use it.
    * gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am                                    |    1 +
 gnu/packages/mail.scm                            |    4 +++-
 gnu/packages/patches/mutt-store-references.patch |   16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 2adffd5..3c1ca9b 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -520,6 +520,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/module-init-tools-moduledir.patch       \
   gnu/packages/patches/mupdf-buildsystem-fix.patch             \
   gnu/packages/patches/mutt-CVE-2014-9116.patch                        \
+  gnu/packages/patches/mutt-store-references.patch             \
   gnu/packages/patches/net-tools-bitrot.patch                  \
   gnu/packages/patches/ngircd-handle-zombies.patch             \
   gnu/packages/patches/ngircd-no-dns-in-tests.patch            \
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 70b0b02..d14fdc7 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -184,7 +184,9 @@ aliasing facilities to work just as they would on normal 
mail.")
              (sha256
               (base32
                "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s"))
-             (patches (list (search-patch "mutt-CVE-2014-9116.patch")))))
+             (patches (map search-patch
+                           '("mutt-CVE-2014-9116.patch"
+                             "mutt-store-references.patch")))))
     (build-system gnu-build-system)
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
diff --git a/gnu/packages/patches/mutt-store-references.patch 
b/gnu/packages/patches/mutt-store-references.patch
new file mode 100644
index 0000000..3b69c7b
--- /dev/null
+++ b/gnu/packages/patches/mutt-store-references.patch
@@ -0,0 +1,16 @@
+By default 'mutt' embeds configure flags and the output of 'gcc -v',
+which contains the store file name of Bash and GCC.  This patch makes
+sure we don't embed a reference to these in 'mutt'.
+
+--- mutt-1.5.23/txt2c.sh       2015-06-26 22:56:56.500731643 +0200
++++ mutt-1.5.23/txt2c.sh       2015-06-26 22:57:26.664583900 +0200
+@@ -21,6 +21,8 @@ txt2c_fallback () {
+       echo ";"
+ }
+ 
++echo "unsigned char $1[] = \"value of '$1' not kept\";"
++exit 0
+ ./txt2c test </dev/null >/dev/null 2>&1 &&
+ ./txt2c "$1" ||
+ txt2c_fallback "$1"
+