From cebf8f070296592500646cc48e58d6eea8fdb31a Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Sun, 13 Sep 2009 18:35:42 +0100 Subject: [PATCH] upstream/542817-smimekeys-tmpdir.patch: smime_keys.pl will skip tmpdir if it contains '=' (Closes: 542817) --- debian/changelog | 6 ++++-- debian/patches/series | 1 + .../patches/upstream/542817-smimekeys-tmpdir.patch | 13 +++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 debian/patches/upstream/542817-smimekeys-tmpdir.patch diff --git a/debian/changelog b/debian/changelog index e6f76c1..32f3788 100644 --- 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 Sun, 13 Sep 2009 13:30:05 +0200 + -- Antonio Radici 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 efa7cb0..55397bc 100644 --- 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 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"; + } -- 2.43.0