rpms/mutt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

remove writehead patch

Browse Source
This commit is contained in:
Jan Pacner 2013-12-05 11:53:58 +01:00
parent a3b0d1204a
commit 360591c33a
3 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mutt-1.5.21-notation.patch
View File

@ -1,13 +0,0 @@
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. */

12
mutt-1.5.21-writehead.patch
View File

@ -1,12 +0,0 @@
diff -up mutt-1.5.21/sendlib.c.writehead mutt-1.5.21/sendlib.c
--- mutt-1.5.21/sendlib.c.writehead 2012-06-25 14:41:34.681483226 +0200
+++ mutt-1.5.21/sendlib.c 2012-06-25 14:41:44.485408610 +0200
@@ -1799,7 +1799,7 @@ static int write_one_header (FILE *fp, i
else
{
t = strchr (start, ':');
- if (t > end)
+ if (t == NULL || t > end)
{
dprint (1, (debugfile, "mwoh: warning: header not in "
"'key: value' format!\n"));

4
mutt.spec
View File

@ -31,7 +31,6 @@ Patch4: mutt-1.5.18-manual.patch
Patch8: mutt-1.5.21-cabundle.patch
Patch9: mutt-1.5.21-gpgme-1.2.0.patch
Patch13: mutt-1.5.21-syncdebug.patch
Patch14: mutt-1.5.21-writehead.patch
Patch15: mutt-1.5.21-tmpdir.patch
Patch16: mutt-1.5.21-verpeers.patch
Patch17: mutt-1.5.21-manhelp.patch
@ -75,7 +74,6 @@ for selecting groups of messages.
%patch8 -p1 -b .cabundle
%patch9 -p1 -b .gpgme-1.2.0
%patch13 -p1 -b .syncdebug
%patch14 -p1 -b .writehead
%patch15 -p1 -b .tmpdir
%patch16 -p1 -b .verpeers
%patch17 -p1 -b .manhelp
@ -171,7 +169,7 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5
* Mon Dec 02 2013 Jan Pacner <jpacner@redhat.com> - 5:1.5.22-1
- new release (Resolves: #1034263)
- use inline sed instead of nodotlock patch
- patches removed: testcert, hdrcnt, certscomp, updating, pophash, notation
- patches removed: testcert, hdrcnt, certscomp, updating, pophash, notation, writehead
* Mon Oct 21 2013 Honza Horak <hhorak@redhat.com> - 5:1.5.21-26
- Fixed patch for certificates comparison