summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2014-03-05 12:11:46 +0000
committerobache <obache@pkgsrc.org>2014-03-05 12:11:46 +0000
commit94767a71ddd95011764e748c1f281b7ff645c920 (patch)
tree8e735b111446c6e463ec5f3519101f141551af42
parente1d15dfed68d9c8f9502adf98544b85c3c5e7dce (diff)
downloadpkgsrc-94767a71ddd95011764e748c1f281b7ff645c920.tar.gz
Update cue to new snapshot 20140217 includes a fix for crashes.
PR pkg/48636 by YAMAMOTO Takashi.
-rw-r--r--mail/cue/Makefile5
-rw-r--r--mail/cue/distinfo9
-rw-r--r--mail/cue/patches/patch-message.c35
3 files changed, 42 insertions, 7 deletions
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index 366b92d2ce4..fd6dc63026b 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2014/02/12 23:18:06 tron Exp $
+# $NetBSD: Makefile,v 1.68 2014/03/05 12:11:46 obache Exp $
-DISTNAME= cue-snap-20100426
+DISTNAME= cue-snap-20140217
PKGNAME= ${DISTNAME:S/snap-//}
-PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/cue/snap/
diff --git a/mail/cue/distinfo b/mail/cue/distinfo
index ff5da9ece79..48c0e88ae69 100644
--- a/mail/cue/distinfo
+++ b/mail/cue/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.34 2011/12/18 11:33:42 obache Exp $
+$NetBSD: distinfo,v 1.35 2014/03/05 12:11:46 obache Exp $
-SHA1 (cue-snap-20100426.tar.gz) = 37f758bb65a9b5e6089b23aabd655d2fdadc76e2
-RMD160 (cue-snap-20100426.tar.gz) = cb908dc73c662ee22811cc4c09a64d81684eedea
-Size (cue-snap-20100426.tar.gz) = 256759 bytes
+SHA1 (cue-snap-20140217.tar.gz) = 44d49f978074cd605b76f2bfd2271912926d3447
+RMD160 (cue-snap-20140217.tar.gz) = 0f7dad95b319e8c5cc19c6b656076ee6f2c3e22a
+Size (cue-snap-20140217.tar.gz) = 258218 bytes
SHA1 (patch-aa) = c83665ce01f9a56652a3ad650910f9b810cae4b4
SHA1 (patch-configure.in) = 3f7c2fe9ce3ab851d06cc6d4e31e8c3bdde6d709
+SHA1 (patch-message.c) = bd58dfbdb560ec231a6505c021a8e7a33d4c8503
SHA1 (patch-pgp.c) = 88f370cf04d8806c2df02653f7857460151c93f6
diff --git a/mail/cue/patches/patch-message.c b/mail/cue/patches/patch-message.c
new file mode 100644
index 00000000000..e348017309f
--- /dev/null
+++ b/mail/cue/patches/patch-message.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-message.c,v 1.1 2014/03/05 12:11:46 obache Exp $
+
+Fixes a crash on a mail with many headers.
+2014-02-24 Sent upstream.
+
+--- message.c.orig 2014-02-03 14:27:20.000000000 +0000
++++ message.c
+@@ -663,7 +663,7 @@ message_multipart_next(struct filedb *fd
+ fdb->flags |= FDB_INLINE;
+ i = fdb->hdrs + nfdb->hdrs;
+ if (i > fdb->hdr_size) {
+- p = realloc(fdb->hdr, i);
++ p = realloc(fdb->hdr, sizeof(*p) * i);
+ if (!p)
+ abort();
+ fdb->hdr = p;
+@@ -739,12 +739,17 @@ message_header(struct filedb *fdb)
+ fdb->hdr = malloc(sizeof(struct header) * fdb->hdr_size);
+ n = message_header_readbuf(fdb, fdb->hdr, fdb->hdr_size);
+ if (n > fdb->hdr_size) {
++ int n2;
++
+ p = realloc(fdb->hdr, sizeof(struct header) * n);
+ if (!p)
+ abort();
+ fdb->hdr = p;
+- n = message_header_readbuf(fdb, fdb->hdr + fdb->hdr_size,
++ n2 = message_header_readbuf(fdb, fdb->hdr + fdb->hdr_size,
+ n - fdb->hdr_size);
++ if (n != n2 + fdb->hdr_size)
++ abort();
++ fdb->hdr_size = n;
+ }
+ fdb->hdrs = n;
+ if (fdb->flags & FDB_MULTIPART) {