svn commit: r495799 - in head/mail/cyrus-imapd30: . files

[Hajimu UMEMOTO]

Author: ume
Date: Fri Mar 15 16:59:17 2019
New Revision: 495799
URL: https://svnweb.freebsd.org/changeset/ports/495799

Log:
  Update to 3.0.9.

Modified:
  head/mail/cyrus-imapd30/Makefile
  head/mail/cyrus-imapd30/distinfo
  head/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c

Modified: head/mail/cyrus-imapd30/Makefile
==============================================================================
--- head/mail/cyrus-imapd30/Makefile	Fri Mar 15 16:52:10 2019	(r495798)
+++ head/mail/cyrus-imapd30/Makefile	Fri Mar 15 16:59:17 2019	(r495799)
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	3.0.8
-PORTREVISION=	2
+PORTVERSION=	3.0.9
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
-		https://www.cyrusimap.org/releases/
+MASTER_SITES=	https://www.cyrusimap.org/releases/
 PKGNAMESUFFIX=	30
 
 MAINTAINER=	ume at FreeBSD.org

Modified: head/mail/cyrus-imapd30/distinfo
==============================================================================
--- head/mail/cyrus-imapd30/distinfo	Fri Mar 15 16:52:10 2019	(r495798)
+++ head/mail/cyrus-imapd30/distinfo	Fri Mar 15 16:59:17 2019	(r495799)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533907459
-SHA256 (cyrus-imapd-3.0.8.tar.gz) = 76586dbf2e237b380effb63568faf42a058b3dd3a1ff48032559ae460185d5ab
-SIZE (cyrus-imapd-3.0.8.tar.gz) = 10735462
+TIMESTAMP = 1552656652
+SHA256 (cyrus-imapd-3.0.9.tar.gz) = d5270fa4930ff8738af3893692647e25c114c842f58ecf4433fc0a74311bd765
+SIZE (cyrus-imapd-3.0.9.tar.gz) = 10771916

Modified: head/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c
==============================================================================
--- head/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c	Fri Mar 15 16:52:10 2019	(r495798)
+++ head/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c	Fri Mar 15 16:59:17 2019	(r495799)
@@ -1,20 +1,11 @@
---- imap/cyr_virusscan.c.orig	2018-08-10 02:59:00 UTC
+--- imap/cyr_virusscan.c.orig	2019-03-15 00:31:20 UTC
 +++ imap/cyr_virusscan.c
-@@ -193,8 +193,17 @@ int clamav_scanfile(void *state, const c
+@@ -193,7 +193,7 @@ int clamav_scanfile(void *state, const c
      int r;
  
      /* scan file */
+-#if LIBCLAMAV_MAJORVER < 9
 +#ifdef CL_SCAN_STDOPT
      r = cl_scanfile(fname, virname, NULL, st->av_engine,
                      CL_SCAN_STDOPT);
-+#else
-+    static struct cl_scan_options options;
-+
-+    memset(&options, 0, sizeof(struct cl_scan_options));
-+    options.parse |= ~0; /* enable all parsers */
-+
-+    r = cl_scanfile(fname, virname, NULL, st->av_engine, &options);
-+#endif
- 
-     switch (r) {
-     case CL_CLEAN:
+ #else