aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2019-05-29 17:14:05 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2019-05-29 17:14:05 +0000
commit303b6fe55e8a4a036e9a551ddf5ee9c00fd43179 (patch)
treea89d9be143b1420d22fd1c170f56bd3249b40346
parent3d628cbf6bfed706ea9b1cad7c07101fda51f5af (diff)
downloadports-303b6fe55e8a4a036e9a551ddf5ee9c00fd43179.tar.gz
ports-303b6fe55e8a4a036e9a551ddf5ee9c00fd43179.zip
MFH: r502795
Update to 3.0.10. Approved by: ports-secteam (miwi) Security: CVE-2019-11356
Notes
Notes: svn path=/branches/2019Q2/; revision=502974
-rw-r--r--mail/cyrus-imapd30/Makefile5
-rw-r--r--mail/cyrus-imapd30/distinfo6
-rw-r--r--mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c11
-rw-r--r--mail/cyrus-imapd30/pkg-plist1
4 files changed, 6 insertions, 17 deletions
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 2764bb17c506..50bb459a4ba9 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cyrus-imapd
-PORTVERSION= 3.0.9
-PORTREVISION= 1
+PORTVERSION= 3.0.10
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= https://www.cyrusimap.org/releases/
@@ -140,7 +139,7 @@ CYRUS_MAN8= arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \
cyr_buildinfo cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \
cyr_synclog cyr_virusscan deliver fud idled imapd ipurge lmtpd \
master mbexamine mbpath mbtool notifyd pop3d quota reconstruct \
- restore rmnews smmapd timsieved tls_prune unexpunge
+ restore smmapd timsieved tls_prune unexpunge
CYRUS_PERL_MAN1=cyradm
CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \
Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \
diff --git a/mail/cyrus-imapd30/distinfo b/mail/cyrus-imapd30/distinfo
index 9cfd74679d35..cac8d07e7840 100644
--- a/mail/cyrus-imapd30/distinfo
+++ b/mail/cyrus-imapd30/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552656652
-SHA256 (cyrus-imapd-3.0.9.tar.gz) = d5270fa4930ff8738af3893692647e25c114c842f58ecf4433fc0a74311bd765
-SIZE (cyrus-imapd-3.0.9.tar.gz) = 10771916
+TIMESTAMP = 1558960089
+SHA256 (cyrus-imapd-3.0.10.tar.gz) = a2b24bdf3ddebef8689c30ff5b6083d6b4708d4c41032d27f90f15393191020b
+SIZE (cyrus-imapd-3.0.10.tar.gz) = 10766263
diff --git a/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c b/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c
deleted file mode 100644
index ba9644dbf65c..000000000000
--- a/mail/cyrus-imapd30/files/patch-imap__cyr_virusscan.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap/cyr_virusscan.c.orig 2019-03-15 00:31:20 UTC
-+++ imap/cyr_virusscan.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
diff --git a/mail/cyrus-imapd30/pkg-plist b/mail/cyrus-imapd30/pkg-plist
index 50a1b0f65f15..d387a659b066 100644
--- a/mail/cyrus-imapd30/pkg-plist
+++ b/mail/cyrus-imapd30/pkg-plist
@@ -149,6 +149,7 @@ lib/libcyrus_sieve.so.0.0.0
%%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so
%%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
libdata/pkgconfig/libcyrus.pc
+libdata/pkgconfig/libcyrus_imap.pc
libdata/pkgconfig/libcyrus_min.pc
libdata/pkgconfig/libcyrus_sieve.pc
@sample %%EXAMPLESDIR%%/imapd.conf etc/imapd.conf