diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/cue/Makefile | 5 | ||||
-rw-r--r-- | mail/cue/distinfo | 13 | ||||
-rw-r--r-- | mail/cue/patches/patch-message.c | 35 | ||||
-rw-r--r-- | mail/cue/patches/patch-pgp.c | 4 |
4 files changed, 10 insertions, 47 deletions
diff --git a/mail/cue/Makefile b/mail/cue/Makefile index 40ce5935bef..915474cb2f4 100644 --- a/mail/cue/Makefile +++ b/mail/cue/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2016/03/05 11:28:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.70 2016/05/01 04:54:01 mef Exp $ -DISTNAME= cue-snap-20140217 +DISTNAME= cue-snap-20151214 PKGNAME= ${DISTNAME:S/snap-//} -PKGREVISION= 1 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 4b9b7dfe3b0..815e9cc47d4 100644 --- a/mail/cue/distinfo +++ b/mail/cue/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.36 2015/11/03 23:27:02 agc Exp $ +$NetBSD: distinfo,v 1.37 2016/05/01 04:54:01 mef Exp $ -SHA1 (cue-snap-20140217.tar.gz) = 44d49f978074cd605b76f2bfd2271912926d3447 -RMD160 (cue-snap-20140217.tar.gz) = 0f7dad95b319e8c5cc19c6b656076ee6f2c3e22a -SHA512 (cue-snap-20140217.tar.gz) = 3e868d93b358c3e6c9fa978100a2ea148af33a4c50cfdaadc50abf3673e0328c08c3428ee4eee2340242580b1c2ce6daea2c4d550ff66f4cd95970a73fd9da81 -Size (cue-snap-20140217.tar.gz) = 258218 bytes +SHA1 (cue-snap-20151214.tar.gz) = a176eeda20f4f8ee41182d6ad3e45f8bd0c3ebe8 +RMD160 (cue-snap-20151214.tar.gz) = 16657cac021f398d51359f096b738327ac848ad1 +SHA512 (cue-snap-20151214.tar.gz) = 74d7050755d34cd4092298f481df6d9288f262be7d6c403511798f147e18b63a3e2792b98dabbe4412396ca6d8de80b7219a1096d99853f4471be33c8ecca0e0 +Size (cue-snap-20151214.tar.gz) = 259848 bytes SHA1 (patch-aa) = c83665ce01f9a56652a3ad650910f9b810cae4b4 SHA1 (patch-configure.in) = 3f7c2fe9ce3ab851d06cc6d4e31e8c3bdde6d709 -SHA1 (patch-message.c) = bd58dfbdb560ec231a6505c021a8e7a33d4c8503 -SHA1 (patch-pgp.c) = 88f370cf04d8806c2df02653f7857460151c93f6 +SHA1 (patch-pgp.c) = b6142c2bf9d2a1341663ac0902d1014bc66ec323 diff --git a/mail/cue/patches/patch-message.c b/mail/cue/patches/patch-message.c deleted file mode 100644 index e348017309f..00000000000 --- a/mail/cue/patches/patch-message.c +++ /dev/null @@ -1,35 +0,0 @@ -$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) { diff --git a/mail/cue/patches/patch-pgp.c b/mail/cue/patches/patch-pgp.c index 3d1cf977ce7..7f4137f3054 100644 --- a/mail/cue/patches/patch-pgp.c +++ b/mail/cue/patches/patch-pgp.c @@ -1,4 +1,4 @@ -$NetBSD: patch-pgp.c,v 1.1 2011/12/18 11:33:42 obache Exp $ +$NetBSD: patch-pgp.c,v 1.2 2016/05/01 04:54:01 mef Exp $ * for OpenSSL without MD2 support. @@ -16,7 +16,7 @@ $NetBSD: patch-pgp.c,v 1.1 2011/12/18 11:33:42 obache Exp $ } @@ -1418,11 +1420,13 @@ pgp_comp_data(struct pgp_pkt *pkt) static const EVP_MD * - pgp_asn1_md(u_char **pp, int len) + pgp_asn1_md(const u_char **pp, int len) { +#ifndef OPENSSL_NO_MD2 static const u_char asn1_md2[] = { |