Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Oct 2018 04:49:03 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r481512 - in head/mail/cyrus-imapd25: . files
Message-ID:  <201810080449.w984n3m2068145@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Mon Oct  8 04:49:03 2018
New Revision: 481512
URL: https://svnweb.freebsd.org/changeset/ports/481512

Log:
  Update to 2.5.12.

Modified:
  head/mail/cyrus-imapd25/Makefile
  head/mail/cyrus-imapd25/distinfo
  head/mail/cyrus-imapd25/files/patch-imap__tls.c
  head/mail/cyrus-imapd25/pkg-plist

Modified: head/mail/cyrus-imapd25/Makefile
==============================================================================
--- head/mail/cyrus-imapd25/Makefile	Mon Oct  8 04:42:28 2018	(r481511)
+++ head/mail/cyrus-imapd25/Makefile	Mon Oct  8 04:49:03 2018	(r481512)
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.5.11
-PORTREVISION=	3
+PORTVERSION=	2.5.12
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
-		http://cyrusimap.org/releases/
+MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ \
+		http://cyrusimap.org/releases/ \
+		ftp://ftp.cyrusimap.org/cyrus-imapd/
 PKGNAMESUFFIX=	25
 
 MAINTAINER=	ume@FreeBSD.org
@@ -44,10 +45,10 @@ MAKE_JOBS_UNSAFE=	yes
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
-OPTIONS_DEFINE=		AUTOCREATE BDB HTTP IDLED LDAP MURDER MYSQL \
+OPTIONS_DEFINE=		AUTOCREATE BDB CLAMAV HTTP IDLED LDAP MURDER MYSQL \
 			NETSCAPEHACK NNTP PGSQL REPLICATION SNMP SQLITE DOCS \
 			EXAMPLES
-#OPTIONS_DEFINE+=	CLAMAV DRAC
+#OPTIONS_DEFINE+=	DRAC
 OPTIONS_DEFAULT=	BDB IDLED
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Enable autocreate support
@@ -152,9 +153,6 @@ INVALID_BDB_VER=2
 BDB_LIB_NAME=	no
 .endif
 
-.if ${PORT_OPTIONS:MCLAMAV}
-IGNORE=		CLAMAV is not available yet
-.endif
 PLIST_SUB+=	CLAMAV="@comment "
 
 .if ${PORT_OPTIONS:MDRAC}

Modified: head/mail/cyrus-imapd25/distinfo
==============================================================================
--- head/mail/cyrus-imapd25/distinfo	Mon Oct  8 04:42:28 2018	(r481511)
+++ head/mail/cyrus-imapd25/distinfo	Mon Oct  8 04:49:03 2018	(r481512)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494319304
-SHA256 (cyrus-imapd-2.5.11.tar.gz) = 36a79117b320c78d62bc6842c3024d970d3bec7aa12908f862d92cf1d63397d5
-SIZE (cyrus-imapd-2.5.11.tar.gz) = 3109188
+TIMESTAMP = 1538971373
+SHA256 (cyrus-imapd-2.5.12.tar.gz) = ea5132292338b7fbf290aca553937078cf5815ae0a06db4e03f189549aab8005
+SIZE (cyrus-imapd-2.5.12.tar.gz) = 3118995

Modified: head/mail/cyrus-imapd25/files/patch-imap__tls.c
==============================================================================
--- head/mail/cyrus-imapd25/files/patch-imap__tls.c	Mon Oct  8 04:42:28 2018	(r481511)
+++ head/mail/cyrus-imapd25/files/patch-imap__tls.c	Mon Oct  8 04:49:03 2018	(r481512)
@@ -1,14 +1,5 @@
---- imap/tls.c.orig	2017-05-09 00:40:13 UTC
+--- imap/tls.c.orig	2018-10-08 02:05:33 UTC
 +++ imap/tls.c
-@@ -222,7 +222,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
- }
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- /* replacements for new 1.1 API accessors */
- /* XXX probably put these somewhere central */
- static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
 @@ -726,7 +726,9 @@ EXPORTED int     tls_init_serverengine(c
      off |= SSL_OP_ALL;            /* Work around all known bugs */
      off |= SSL_OP_NO_SSLv2;       /* Disable insecure SSLv2 */
@@ -19,7 +10,7 @@
  
      const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);
  
-@@ -1448,7 +1450,9 @@ HIDDEN int tls_init_clientengine(int ver
+@@ -1452,7 +1454,9 @@ HIDDEN int tls_init_clientengine(int ver
      off |= SSL_OP_ALL;            /* Work around all known bugs */
      off |= SSL_OP_NO_SSLv2;       /* Disable insecure SSLv2 */
      off |= SSL_OP_NO_SSLv3;       /* Disable insecure SSLv3 */

Modified: head/mail/cyrus-imapd25/pkg-plist
==============================================================================
--- head/mail/cyrus-imapd25/pkg-plist	Mon Oct  8 04:42:28 2018	(r481511)
+++ head/mail/cyrus-imapd25/pkg-plist	Mon Oct  8 04:49:03 2018	(r481512)
@@ -16,6 +16,7 @@ cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
 %%HTTP%%cyrus/bin/ctl_zoneinfo
 cyrus/bin/cvt_cyrusdb
+cyrus/bin/cyr_buildinfo
 cyrus/bin/cyr_dbtool
 cyrus/bin/cyr_deny
 cyrus/bin/cyr_df



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810080449.w984n3m2068145>