Update to 2.4.19.

4 files changed, 5 insertions, 67 deletions

diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 046f16b3974d..228b723b5e94 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.18
-PORTREVISION=	4
+PORTVERSION=	2.4.19
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 93723c93afb1..56ef0ba2cd9f 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,5 +1,6 @@
-SHA256 (cyrus-imapd-2.4.18.tar.gz) = 166a0a1efbf01f71d9d8449569152b3cda4949cd689f299a5e77a38d7026012c
-SIZE (cyrus-imapd-2.4.18.tar.gz) = 2495098
+TIMESTAMP = 1494954318
+SHA256 (cyrus-imapd-2.4.19.tar.gz) = 5ef3cef8e394901fba162f14eb43f5e364b266234eff28d17273303c019f8ef1
+SIZE (cyrus-imapd-2.4.19.tar.gz) = 2488567
 SHA256 (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 1130e80b6604901ba8cf887c792fa8e4ef181b4cfc212720bcfc984163fe8a13
 SIZE (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 74039
 SHA256 (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = daafab6c1a824d1d16745ea25a0bb6e404655ef690961e1dc236805e5c923135
diff --git a/mail/cyrus-imapd24/files/patch-CVE-2015-8077 b/mail/cyrus-imapd24/files/patch-CVE-2015-8077
deleted file mode 100644
index 3432bbdbec4e..000000000000
--- a/mail/cyrus-imapd24/files/patch-CVE-2015-8077
+++ /dev/null
@@ -1,40 +0,0 @@
-From 745e161c834f1eb6d62fc14477f51dae799e1e08 Mon Sep 17 00:00:00 2001
-From: ellie timoney <ellie@fastmail.com>
-Date: Mon, 26 Oct 2015 16:15:40 +1100
-Subject: urlfetch: protect against overflow in range checks
-
-
---- imap/index.c.orig	2015-07-06 03:38:29 UTC
-+++ imap/index.c
-@@ -2712,7 +2712,8 @@ int index_urlfetch(struct index_state *s
-     int fetchmime = 0, domain = DOMAIN_7BIT;
-     unsigned size;
-     int32_t skip = 0;
--    int n, r = 0;
-+    unsigned long n;
-+    int r = 0;
-     char *decbuf = NULL;
-     struct mailbox *mailbox = state->mailbox;
-     struct index_map *im = &state->map[msgno-1];
-@@ -2849,7 +2850,7 @@ int index_urlfetch(struct index_state *s
-         start_octet = size;
-         n = 0;
-     }
--    else if (start_octet + n > size) {
-+    else if (start_octet + n < start_octet || start_octet + n > size) {
-         n = size - start_octet;
-     }
- 
-@@ -2861,10 +2862,10 @@ int index_urlfetch(struct index_state *s
- 
- 	if (domain == DOMAIN_BINARY) {
- 	    /* Write size of literal8 */
--	    prot_printf(pout, " ~{%u}\r\n", n);
-+	    prot_printf(pout, " ~{%lu}\r\n", n);
- 	} else {
- 	    /* Write size of literal */
--	    prot_printf(pout, " {%u}\r\n", n);
-+	    prot_printf(pout, " {%lu}\r\n", n);
- 	}
-     }
- 
diff --git a/mail/cyrus-imapd24/files/patch-CVE-2015-8078 b/mail/cyrus-imapd24/files/patch-CVE-2015-8078
deleted file mode 100644
index 040b9e7f919f..000000000000
--- a/mail/cyrus-imapd24/files/patch-CVE-2015-8078
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6fb6a272171f49c79ba6ab7c6403eb25b39ec1b2 Mon Sep 17 00:00:00 2001
-From: ellie timoney <ellie@fastmail.com>
-Date: Mon, 26 Oct 2015 16:21:01 +1100
-Subject: urlfetch: and the other bit
-
-
-diff --git a/imap/index.c b/imap/index.c
-index f5161cd..da8ce3d 100644
---- imap/index.c
-+++ imap/index.c
-@@ -4244,7 +4244,8 @@ EXPORTED int index_urlfetch(struct index_state *state, uint32_t msgno,
-         size_t section_offset = CACHE_ITEM_BIT32(cacheitem);
-         size_t section_size = CACHE_ITEM_BIT32(cacheitem + CACHE_ITEM_SIZE_SKIP);
- 
--        if (section_offset + section_size > size) {
-+        if (section_offset + section_size < section_offset
-+            || section_offset + section_size > size) {
-             r = IMAP_INTERNAL;
-             goto done;
-         }
--- 
-cgit v0.10.2
-