From 35dbc9028874c03d39e39d1168048bc52d1a03a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Hor=C3=A1k?= <hhorak@redhat.com>
Date: Wed, 25 Apr 2012 10:34:35 +0200
Subject: [PATCH] Patch from Petr Pisar fixing verification of PGP signatures
 with NULL notation (rhbz#816044)

---
 mutt-1.5.21-notation.patch | 13 +++++++++++++
 mutt.spec                  |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 mutt-1.5.21-notation.patch

diff --git a/mutt-1.5.21-notation.patch b/mutt-1.5.21-notation.patch
new file mode 100644
index 0000000..ebdbdca
--- /dev/null
+++ b/mutt-1.5.21-notation.patch
@@ -0,0 +1,13 @@
+diff -up mutt-1.5.21/crypt-gpgme.c.notation mutt-1.5.21/crypt-gpgme.c
+--- mutt-1.5.21/crypt-gpgme.c.notation	2012-04-25 10:26:20.589226791 +0200
++++ mutt-1.5.21/crypt-gpgme.c	2012-04-25 10:28:02.075915855 +0200
+@@ -72,7 +72,8 @@
+ #define xtoi_2(p)   ((xtoi_1(p) * 16) + xtoi_1((p)+1))
+ 
+ #define PKA_NOTATION_NAME "pka-address@gnupg.org"
+-#define is_pka_notation(notation) (! strcmp ((notation)->name, \
++#define is_pka_notation(notation) ((notation)->name && \ 
++                                   ! strcmp ((notation)->name, \ 
+ 					     PKA_NOTATION_NAME))
+ 
+ /* Values used for comparing addresses. */
diff --git a/mutt.spec b/mutt.spec
index 822a018..287e690 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.21
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -34,6 +34,7 @@ Patch8: mutt-1.5.21-cabundle.patch
 Patch9: mutt-1.5.21-gpgme-1.2.0.patch
 Patch10: mutt-1.5.21-pophash.patch
 Patch11: mutt-1.5.21-certscomp.patch
+Patch12: mutt-1.5.21-notation.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,6 +81,7 @@ for selecting groups of messages.
 %patch9 -p1 -b .gpgme-1.2.0
 %patch10 -p1 -b .pophash
 %patch11 -p1 -b .certscomp
+%patch12 -p1 -b .notation
 
 sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
 
@@ -162,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Apr 25 2012 Honza Horak <hhorak@redhat.com> - 5:1.5.21-11
+- Patch from Petr Pisar fixing verification of PGP signatures 
+  with NULL notation
+  (rhbz#816044)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5:1.5.21-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild