remove pophash patch

This commit is contained in:
Jan Pacner 2013-12-05 10:51:52 +01:00
parent c74eb40ace
commit fdc9eec14c
2 changed files with 1 additions and 22 deletions

View File

@ -1,19 +0,0 @@
diff -up mutt/pop.c.pophash mutt/pop.c
--- mutt/pop.c.pophash 2009-12-14 19:24:59.000000000 +0100
+++ mutt/pop.c 2011-10-04 16:51:23.307236908 +0200
@@ -618,8 +618,15 @@ int pop_fetch_message (MESSAGE* msg, CON
}
rewind (msg->fp);
uidl = h->data;
+
+ /* we replace envelop, key in subj_hash has to be updated as well */
+ if (ctx->subj_hash && h->env->real_subj)
+ hash_delete (ctx->subj_hash, h->env->real_subj, h, NULL);
mutt_free_envelope (&h->env);
h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
+ if (ctx->subj_hash && h->env->real_subj)
+ hash_insert (ctx->subj_hash, h->env->real_subj, h, 1);
+
h->data = uidl;
h->lines = 0;
fgets (buf, sizeof (buf), msg->fp);

View File

@ -30,7 +30,6 @@ Patch3: mutt-1.5.18-muttrc.patch
Patch4: mutt-1.5.18-manual.patch Patch4: mutt-1.5.18-manual.patch
Patch8: mutt-1.5.21-cabundle.patch Patch8: mutt-1.5.21-cabundle.patch
Patch9: mutt-1.5.21-gpgme-1.2.0.patch Patch9: mutt-1.5.21-gpgme-1.2.0.patch
Patch10: mutt-1.5.21-pophash.patch
Patch12: mutt-1.5.21-notation.patch Patch12: mutt-1.5.21-notation.patch
Patch13: mutt-1.5.21-syncdebug.patch Patch13: mutt-1.5.21-syncdebug.patch
Patch14: mutt-1.5.21-writehead.patch Patch14: mutt-1.5.21-writehead.patch
@ -76,7 +75,6 @@ for selecting groups of messages.
%patch4 -p1 -b .manual %patch4 -p1 -b .manual
%patch8 -p1 -b .cabundle %patch8 -p1 -b .cabundle
%patch9 -p1 -b .gpgme-1.2.0 %patch9 -p1 -b .gpgme-1.2.0
%patch10 -p1 -b .pophash
%patch12 -p1 -b .notation %patch12 -p1 -b .notation
%patch13 -p1 -b .syncdebug %patch13 -p1 -b .syncdebug
%patch14 -p1 -b .writehead %patch14 -p1 -b .writehead
@ -175,7 +173,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 * Mon Dec 02 2013 Jan Pacner <jpacner@redhat.com> - 5:1.5.22-1
- new release (Resolves: #1034263) - new release (Resolves: #1034263)
- use inline sed instead of nodotlock patch - use inline sed instead of nodotlock patch
- patches removed: testcert, hdrcnt, certscomp, updating - patches removed: testcert, hdrcnt, certscomp, updating, pophash
* Mon Oct 21 2013 Honza Horak <hhorak@redhat.com> - 5:1.5.21-26 * Mon Oct 21 2013 Honza Horak <hhorak@redhat.com> - 5:1.5.21-26
- Fixed patch for certificates comparison - Fixed patch for certificates comparison