upstream/542817-smimekeys-tmpdir.patch: smime_keys.pl will skip tmpdir if it contain...

diff --git a/debian/changelog b/debian/changelog
index e6f76c1cb41292c5368fe9d66fe2dc4b5c246369..32f3788126c47fe00809cdb575a480e31ef9f411 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mutt (1.5.20-3) UNRELEASED; urgency=low
+mutt (1.5.20-3) unstable; urgency=low
 
   [ Adeodato Simó ]
   * Remove myself from Uploaders.
@@ -28,6 +28,8 @@ mutt (1.5.20-3) UNRELEASED; urgency=low
       correctly even if pgp_auto_decode is set (Closes: 533370)
     + upstream/533520-signature-highlight.patch: fixed a problem in signature
       hightlighting if text_flowed was set to 'yes' (Closes: 533520)
+    + upstream/542817-smimekeys-tmpdir.patch: smime_keys.pl will skip tmpdir 
+      if it contains '=' (Closes: 542817)
   * debian/control:
     + Standards-Version bumped to 3.8.3
   * debian/extra/lib/mailto-mutt: patch from madduck@ to correctly handle the
@@ -37,7 +39,7 @@ mutt (1.5.20-3) UNRELEASED; urgency=low
   * Recommend default-mta instead of exim4 (Closes: 533442)
   * Remove redudant hard-coded libgpgme11 from Recommends.
 
- -- Christoph Berg <myon@debian.org>  Sun, 13 Sep 2009 13:30:05 +0200
+ -- Antonio Radici <antonio@dyne.org>  Sun, 13 Sep 2009 18:34:48 +0100
 
 mutt (1.5.20-2) unstable; urgency=low
 

diff --git a/debian/patches/series b/debian/patches/series
index efa7cb04e189f0a791e8d4dc9fa2c0f528e5881c..55397bc7c5aacf8c08aa03a08c4a106ac1dd5b46 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,6 +45,7 @@ upstream/533520-signature-highlight.patch
 upstream/393926-internal-viewer.patch
 upstream/543467-thread-segfault.patch
 upstream/544180-italian-yesorno.patch
+upstream/542817-smimekeys-tmpdir.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/542817-smimekeys-tmpdir.patch b/debian/patches/upstream/542817-smimekeys-tmpdir.patch
new file mode 100644 (file)
index 0000000..cca99a7
--- /dev/null
+++ b/debian/patches/upstream/542817-smimekeys-tmpdir.patch
@@ -0,0 +1,13 @@
+skip the configured tmpdir if it contains '=', that convention is used only by
+mutt, see upstream http://bugs.mutt.org/3324
+
+--- a/smime_keys.pl
++++ b/smime_keys.pl
+@@ -946,6 +946,7 @@
+       $option = "notemp" if (not defined($option));
+       if (! $tmpdir and $option eq "temp") {
+               $tmpdir = mutt_Q 'tmpdir';
++                $tmpdir = '/tmp' if ($tmpdir =~ m/=/); # if the tmpdir contains '=', use the default
+               $tmpdir = newfile("$tmpdir/smime");
+               mkdir $tmpdir, 0700 || die "Can't create $tmpdir: $!\n";
+       }