Hi,
sorry for the delay but I wasn't in Ireland for a while; do you need a sponsor
for this?

On Sun, Aug 23, 2015 at 03:01:33PM +0200, Ruben Undheim wrote:
> 
> Dear maintainer,
> 
> I've prepared an NMU for mutt (versioned as 1.5.23-3.2) and
> will soon ask a sponsor to upload it to the DELAYED queue.
> Please feel free to tell me if I don't need to do this.
> 
> Regards.

> diff -Nru mutt-1.5.23/debian/changelog mutt-1.5.23/debian/changelog
> --- mutt-1.5.23/debian/changelog      2015-08-01 13:57:01.000000000 +0200
> +++ mutt-1.5.23/debian/changelog      2015-08-23 09:54:19.000000000 +0200
> @@ -1,3 +1,11 @@
> +mutt (1.5.23-3.2) unstable; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * debian/patches/upstream/763522-fix-segv-gpg.patch:
> +    - Fixes SEGV when choosing key (Closes: #763522)
> +
> + -- Ruben Undheim <ruben.undh...@gmail.com>  Sun, 23 Aug 2015 09:48:27 +0200
> +
>  mutt (1.5.23-3.1) unstable; urgency=low
>  
>    * Non-maintainer upload.
> diff -Nru mutt-1.5.23/debian/patches/series mutt-1.5.23/debian/patches/series
> --- mutt-1.5.23/debian/patches/series 2015-08-01 13:47:26.000000000 +0200
> +++ mutt-1.5.23/debian/patches/series 2015-08-23 09:53:49.000000000 +0200
> @@ -36,6 +36,7 @@
>  translations/update_german_translation.patch
>  upstream/771125-CVE-2014-9116-jessie.patch
>  upstream/624058-gnutls-deprecated.patch
> +upstream/763522-fix-segv-gpg.patch
>  __separator__mutt.org.patch
>  mutt-patched/sidebar.patch
>  mutt-patched/sidebar-dotpathsep.patch
> diff -Nru mutt-1.5.23/debian/patches/upstream/763522-fix-segv-gpg.patch 
> mutt-1.5.23/debian/patches/upstream/763522-fix-segv-gpg.patch
> --- mutt-1.5.23/debian/patches/upstream/763522-fix-segv-gpg.patch     
> 1970-01-01 01:00:00.000000000 +0100
> +++ mutt-1.5.23/debian/patches/upstream/763522-fix-segv-gpg.patch     
> 2015-08-23 09:48:21.000000000 +0200
> @@ -0,0 +1,24 @@
> +Description: This fixes a SEGV when choosing pgp keyID from list
> +Author: Ruben Undheim <ruben.undh...@gmail.com>
> +Origin: http://dev.mutt.org/hg/mutt/rev/5a86319adad0
> +
> +Index: mutt-1.5.23/pgpkey.c
> +===================================================================
> +--- mutt-1.5.23.orig/pgpkey.c        2014-03-12 16:03:44.000000000 +0000
> ++++ mutt-1.5.23/pgpkey.c     2015-08-23 07:10:41.445078707 +0000
> +@@ -985,13 +985,13 @@
> +       pgp_remove_key (&matches, k);
> + 
> +     pgp_free_key (&matches);
> +-    if (!p[l-1])
> ++    if (l && !p[l-1])
> +       p[l-1] = '!';
> +     return k;
> +   }
> + 
> + out:
> +-  if (!p[l-1])
> ++  if (l && !p[l-1])
> +     p[l-1] = '!';
> +   return NULL;
> + }

Reply via email to