Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Mar 2015 10:23:34 +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: r381069 - in head/mail: . cyrus-imapd25 cyrus-imapd25/files websieve
Message-ID:  <201503121023.t2CANYmO011349@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Thu Mar 12 10:23:33 2015
New Revision: 381069
URL: https://svnweb.freebsd.org/changeset/ports/381069
QAT: https://qat.redports.org/buildarchive/r381069/

Log:
  Add initial support for Cyrus-IMAPd 2.5.0.
  HTTP support doesn't work yet.

Added:
  head/mail/cyrus-imapd25/
     - copied from r381060, head/mail/cyrus-imapd24/
  head/mail/cyrus-imapd25/files/extra-patch-cmulocal__sasl2.m4
     - copied unchanged from r381060, head/mail/cyrus-imapd24/files/extra-patch-cmulocal::sasl2.m4
  head/mail/cyrus-imapd25/files/patch-configure
     - copied unchanged from r381060, head/mail/cyrus-imapd24/files/extra-patch-configure
  head/mail/cyrus-imapd25/files/patch-imap__http_client.h   (contents, props changed)
  head/mail/cyrus-imapd25/files/patch-imap__httpd.h   (contents, props changed)
Deleted:
  head/mail/cyrus-imapd25/files/extra-patch-cmulocal::sasl2.m4
  head/mail/cyrus-imapd25/files/extra-patch-configure
  head/mail/cyrus-imapd25/files/patch-Makefile.in
  head/mail/cyrus-imapd25/files/patch-imap__Makefile.in
  head/mail/cyrus-imapd25/files/patch-imap__statuscache_db.c
  head/mail/cyrus-imapd25/files/patch-imtest__imtest.c
  head/mail/cyrus-imapd25/files/patch-lib__Makefile.in
  head/mail/cyrus-imapd25/files/patch-lib__util.c
  head/mail/cyrus-imapd25/files/patch-man__Makefile.in
  head/mail/cyrus-imapd25/files/patch-master__Makefile.in
  head/mail/cyrus-imapd25/files/patch-notifyd__Makefile.in
  head/mail/cyrus-imapd25/files/patch-perl__imap__Makefile.PL
  head/mail/cyrus-imapd25/files/patch-perl__sieve__managesieve__Makefile.PL
  head/mail/cyrus-imapd25/files/patch-sieve__Makefile.in
  head/mail/cyrus-imapd25/files/patch-timsieved__Makefile.in
Modified:
  head/mail/Makefile
  head/mail/cyrus-imapd25/Makefile
  head/mail/cyrus-imapd25/distinfo
  head/mail/cyrus-imapd25/files/imapd.conf
  head/mail/cyrus-imapd25/pkg-plist
  head/mail/websieve/Makefile

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Thu Mar 12 09:43:10 2015	(r381068)
+++ head/mail/Makefile	Thu Mar 12 10:23:33 2015	(r381069)
@@ -80,6 +80,7 @@
     SUBDIR += cvsmail
     SUBDIR += cyrus-imapd23
     SUBDIR += cyrus-imapd24
+    SUBDIR += cyrus-imapd25
     SUBDIR += cyrus2courier
     SUBDIR += cyrus2dovecot
     SUBDIR += davmail

Modified: head/mail/cyrus-imapd25/Makefile
==============================================================================
--- head/mail/cyrus-imapd24/Makefile	Thu Mar 12 05:22:58 2015	(r381060)
+++ head/mail/cyrus-imapd25/Makefile	Thu Mar 12 10:23:33 2015	(r381069)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.17
-PORTREVISION=	11
+PORTVERSION=	2.5.0
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
-PKGNAMESUFFIX=	24
+PKGNAMESUFFIX=	25
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -17,13 +17,13 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
-CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].*
+CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].*
 
 PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
 
 USE_RC_SUBR=	imapd
 
-USES=		perl5
+USES=		perl5 libtool
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
@@ -35,23 +35,33 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/e
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
 		--with-perl=${PERL5}
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=		AUTOCREATE AUTOSIEVE BDB DRAC IDLED LDAP \
-			MURDER MYSQL NETSCAPEHACK NNTP PGSQL \
-			REPLICATION SNMP SQLITE DOCS EXAMPLES
+OPTIONS_DEFINE=		AUTOCREATE BDB CLAMAV HTTP IDLED LDAP MURDER MYSQL \
+			NETSCAPEHACK NNTP PGSQL REPLICATION SNMP SQLITE DOCS \
+			EXAMPLES
+#OPTIONS_DEFINE+=	DRAC
 OPTIONS_DEFAULT=	BDB IDLED
 OPTIONS_SUB=		yes
-AUTOCREATE_DESC=	Use autocreate INBOX patch (UoA)
-AUTOSIEVE_DESC=		Use autosievefolder patch (UoA)
+AUTOCREATE_DESC=	Enable autocreate support
+AUTOCREATE_CONFIGURE_ENABLE=	autocreate
 BDB_USE=		BDB=yes
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
+CLAMAV_DESC=		Use ClamAV
+CLAMAV_CONFIGURE_ON=	--with-clamav=${LOCALBASE}
+CLAMAV_CONFIGURE_OFF=	--with-clamav=no
+CLAMAV_LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
 DRAC_DESC=		Enable DRAC support
 DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
 DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
+HTTP_DESC=		Enable HTTP
+HTTP_CONFIGURE_ENABLE=	http
+HTTP_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
+			libical.so:${PORTSDIR}/devel/libical
+HTTP_USE=		GNOME=libxml2 SQLITE=yes
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
@@ -81,38 +91,26 @@ SQLITE_CONFIGURE_ON=	--with-sqlite=${LOC
 
 .include <bsd.port.pre.mk>
 
-# Autocreate Inbox and Autosieve patches from UoA
-# http://email.uoa.gr/projects/cyrus/
-# http://blog.vx.sk/archives/13-Cyrus-IMAP-UoA.html
-
-.if ${PORT_OPTIONS:MAUTOCREATE} || ${PORT_OPTIONS:MAUTOSIEVE}
-PATCH_DIST_STRIP=	-p1
-PATCH_SITES+=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	mm
-.endif
-
-.if ${PORT_OPTIONS:MAUTOCREATE}
-AUTOCREATE_VERSION=	0.10-0
-PATCHFILES+=	${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch
-PLIST_FILES+=	cyrus/bin/compile_sieve
-.endif
-
-.if ${PORT_OPTIONS:MAUTOSIEVE}
-AUTOSIEVE_VERSION=	0.6.0
-PATCHFILES+=	${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch
-.endif
-
 .if ${PORT_OPTIONS:MBDB}
 INVALID_BDB_VER=2
 .else
 BDB_LIB_NAME=	no
 .endif
 
-.if ${PORT_OPTIONS:MDRAC}
-.if ${OSVERSION} >= 800037
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
+.if ${PORT_OPTIONS:MCLAMAV}
+IGNORE=		CLAMAV is not available yet
 .endif
-USE_AUTOTOOLS=	autoconf autoheader
+
+.if ${PORT_OPTIONS:MHTTP}
+IGNORE=		HTTP is not available yet
+.endif
+
+.if ${PORT_OPTIONS:MDRAC}
+IGNORE=		DRAC is not available
+# .if ${OSVERSION} >= 800037
+# EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmulocal__sasl2.m4
+# .endif
+# USE_AUTOTOOLS=	autoconf autoheader
 .endif
 
 .if ${OSVERSION} >= 900022
@@ -125,10 +123,6 @@ PLIST_SUB+=	MANCONF="@comment "
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
-.if ${OSVERSION} >= 800037
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
-.endif
-
 CYRUS_USER?=	cyrus
 CYRUS_GROUP?=	cyrus
 
@@ -140,20 +134,26 @@ CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::A
 		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
 CYRUS_MAN8=	arbitron.8 chk_cyrus.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		ctl_mboxlist.8 cvt_cyrusdb.8 cyr_dbtool.8 cyr_df.8 \
-		cyr_expire.8 cyr_synclog.8 deliver.8 fetchnews.8 fud.8 \
-		idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 mbexamine.8 \
-		mbpath.8 nntpd.8 notifyd.8 pop3d.8 quota.8 reconstruct.8 \
-		rmnews.8 smmapd.8 squatter.8 sync_client.8 sync_reset.8 \
-		sync_server.8 syncnews.8 timsieved.8 tls_prune.8 unexpunge.8
+		cyr_expire.8 cyr_synclog.8 deliver.8 fud.8 idled.8 imapd.8 \
+		ipurge.8 lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 \
+		pop3d.8 quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \
+		sync_client.8 sync_reset.8 sync_server.8 timsieved.8 \
+		tls_prune.8 unexpunge.8
+.if ${PORT_OPTIONS:MHTTP}
+CYRUS_MAN8+=	ctl_zoneinfo.8 httpd.8
+.endif
+.if ${PORT_OPTIONS:MNNTP}
+CYRUS_MAN8+=	fetchnews.8 nntpd.8
+.endif
 
 DOCS=		ag altnamespace anoncvs bugs changes faq feedback index \
 		install-admin-mb install-auth install-compile \
-		install-configure install-murder install-netnews \
-		install-perf install-prereq install-replication \
-		install-sieve install-snmpmon install-testing \
-		install-upgrade install-virtdomains install mailing-list \
-		man notes os overview questions readme sieve-protocol \
-		sieve specs
+		install-configure install-http install-murder \
+		install-netnews install-perf install-prereq \
+		install-replication install-sieve install-snmpmon \
+		install-testing install-upgrade install-virtdomains install \
+		mailing-list man notes os overview questions readme \
+		sieve-protocol sieve specs
 
 CONFS=		cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
 		small.conf
@@ -183,8 +183,8 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/masssievec
-	@${REINPLACE_CMD} -e "s|-lpthread|\$$(PTHREAD_LIBS)|g" \
-		${WRKSRC}/imap/Makefile.in
+	@${REINPLACE_CMD} -e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
+		${WRKSRC}/Makefile.in
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \
 		${FILESDIR}/cyrus-imapd-man.conf \
 		> ${WRKDIR}/cyrus-imapd-man.conf
@@ -219,7 +219,7 @@ post-install:
 			>>${TMPPLIST}; \
 	fi
 .endfor
-.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
+.for f in cyrusv2.mc murder.fig netnews.fig
 	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
 .endfor

Modified: head/mail/cyrus-imapd25/distinfo
==============================================================================
--- head/mail/cyrus-imapd24/distinfo	Thu Mar 12 05:22:58 2015	(r381060)
+++ head/mail/cyrus-imapd25/distinfo	Thu Mar 12 10:23:33 2015	(r381069)
@@ -1,6 +1,2 @@
-SHA256 (cyrus-imapd-2.4.17.tar.gz) = b3e30052c764ee7163947ffde27bdd58bd4dd2e5697ad144491941e46300a583
-SIZE (cyrus-imapd-2.4.17.tar.gz) = 2486355
-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
-SIZE (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = 7626
+SHA256 (cyrus-imapd-2.5.0.tar.gz) = 7706bf80758debce681ae96ee9eac8be181e1066773075cf340727b306fe0543
+SIZE (cyrus-imapd-2.5.0.tar.gz) = 3058797

Copied: head/mail/cyrus-imapd25/files/extra-patch-cmulocal__sasl2.m4 (from r381060, head/mail/cyrus-imapd24/files/extra-patch-cmulocal::sasl2.m4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/cyrus-imapd25/files/extra-patch-cmulocal__sasl2.m4	Thu Mar 12 10:23:33 2015	(r381069, copy of r381060, head/mail/cyrus-imapd24/files/extra-patch-cmulocal::sasl2.m4)
@@ -0,0 +1,22 @@
+Index: cmulocal/sasl2.m4
+diff -u cmulocal/sasl2.m4.orig cmulocal/sasl2.m4
+--- cmulocal/sasl2.m4.orig	2009-05-20 21:24:48.000000000 +0900
++++ cmulocal/sasl2.m4	2009-12-22 00:31:16.153536453 +0900
+@@ -105,7 +105,7 @@
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
+     gss_failed=0
+     AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,
+-                 ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET})
++                 ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509)
+     if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
+       gss_impl="failed"
+     fi
+@@ -173,7 +173,7 @@
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+   elif test "$gss_impl" = "heimdal"; then
+     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+   elif test "$gss_impl" = "cybersafe03"; then
+ # Version of CyberSafe with two libraries

Modified: head/mail/cyrus-imapd25/files/imapd.conf
==============================================================================
--- head/mail/cyrus-imapd24/files/imapd.conf	Thu Mar 12 05:22:58 2015	(r381060)
+++ head/mail/cyrus-imapd25/files/imapd.conf	Thu Mar 12 10:23:33 2015	(r381069)
@@ -329,68 +329,68 @@ sasl_pwcheck_method: auxprop
 # File containing the global certificate used for ALL services (imap,
 # pop3, lmtp).
 #
-#tls_cert_file: <none>
+#tls_server_cert: <none>
 
 # File containing the private key belonging to the global server
 # certificate.
 #
-#tls_key_file: <none>
+#tls_server_key: <none>
 
 # File containing the certificate used for imap ONLY.  If not
 # specified, the global certificate is used.  A value of "disabled"
 # will disable SSL/TLS for imap.
 #
-#imap_tls_cert_file: <none>
+#imap_tls_server_cert: <none>
 
 # File containing the private key belonging to the imap-specific
 # server certificate.  If not specified, the global private key is
 # used.  A value of "disabled" will disable SSL/TLS for imap.
 #
-#imap_tls_key_file: <none>
+#imap_tls_server_key: <none>
 
 # File containing the certificate used for pop3 ONLY.  If not
 # specified, the global certificate is used.  A value of "disabled"
 # will disable SSL/TLS for pop3.
 #
-#pop3_tls_cert_file: <none>
+#pop3_tls_server_cert: <none>
 
 # File containing the private key belonging to the pop3-specific
 # server certificate.  If not specified, the global private key is
 # used.  A value of "disabled" will disable SSL/TLS for pop3.
 #
-#pop3_tls_key_file: <none>
+#pop3_tls_server_key: <none>
 
 # File containing the certificate used for lmtp ONLY.  If not
 # specified, the global certificate is used.  A value of "disabled"
 # will disable TLS for lmtp.
 #
-#lmtp_tls_cert_file: <none>
+#lmtp_tls_server_cert: <none>
 
 # File containing the private key belonging to the lmtp-specific
 # server certificate.  If not specified, the global private key is
 # used.  A value of "disabled" will disable TLS for lmtp.
 #
-#lmtp_tls_key_file: <none>
+#lmtp_tls_server_key: <none>
 
 # File containing the certificate used for sieve ONLY.  If not
 # specified, the global certificate is used.  A value of "disabled"
 # will disable TLS for sieve.
 #
-#sieve_tls_cert_file: <none>
+#sieve_tls_server_cert: <none>
 
 # File containing the private key belonging to the sieve-specific
 # server certificate.  If not specified, the global private key is
 # used.  A value of "disabled" will disable TLS for sieve.
 #
-#sieve_tls_key_file: <none>
+#sieve_tls_server_key: <none>
 
 # File containing one or more Certificate Authority (CA) certificates.
 #
-#tls_ca_file: <none>
+#tls_client_ca_file: <none>
 
 # Path to directory with certificates of CAs.
 #
-#tls_ca_path: <none>
+#tls_client_ca_dir: <none>
 
 # The length of time (in minutes) that a TLS session will be cached
 # for later reuse.  The maximum value is 1440 (24 hours), the default.

Copied: head/mail/cyrus-imapd25/files/patch-configure (from r381060, head/mail/cyrus-imapd24/files/extra-patch-configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/cyrus-imapd25/files/patch-configure	Thu Mar 12 10:23:33 2015	(r381069, copy of r381060, head/mail/cyrus-imapd24/files/extra-patch-configure)
@@ -0,0 +1,22 @@
+Index: configure
+diff -u configure.orig configure
+--- configure.orig	2010-10-18 21:36:00.000000000 +0900
++++ configure	2010-10-18 23:50:45.966557478 +0900
+@@ -9501,7 +9501,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -9803,7 +9803,7 @@
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+   elif test "$gss_impl" = "heimdal"; then
+     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
+     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+   elif test "$gss_impl" = "cybersafe03"; then
+ # Version of CyberSafe with two libraries

Added: head/mail/cyrus-imapd25/files/patch-imap__http_client.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/cyrus-imapd25/files/patch-imap__http_client.h	Thu Mar 12 10:23:33 2015	(r381069)
@@ -0,0 +1,13 @@
+Index: imap/http_client.h
+diff -u imap/http_client.h.orig imap/http_client.h
+--- imap/http_client.h.orig	2014-07-23 05:25:28.000000000 +0900
++++ imap/http_client.h	2014-07-29 00:33:01.254781310 +0900
+@@ -57,7 +57,7 @@
+     unsigned char framing;		/* Message framing   */
+     unsigned char te;			/* Transfer-Encoding */
+     unsigned max;			/* Max allowed len   */
+-    ulong len; 				/* Content-Length    */
++    unsigned long len;			/* Content-Length    */
+     struct buf payload;			/* Payload	     */
+ };
+ 

Added: head/mail/cyrus-imapd25/files/patch-imap__httpd.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/cyrus-imapd25/files/patch-imap__httpd.h	Thu Mar 12 10:23:33 2015	(r381069)
@@ -0,0 +1,13 @@
+Index: imap/httpd.h
+diff -u imap/httpd.h.orig imap/httpd.h
+--- imap/httpd.h.orig	2014-07-23 05:25:28.000000000 +0900
++++ imap/httpd.h	2014-07-29 00:31:32.053782690 +0900
+@@ -224,7 +224,7 @@
+ 
+ /* Meta-data for response body (payload & representation headers) */
+ struct resp_body_t {
+-    ulong len; 		/* Content-Length   */
++    unsigned long len;	/* Content-Length   */
+     struct range *range;/* Content-Range    */
+     const char *fname;	/* Content-Dispo    */
+     unsigned char enc;	/* Content-Encoding */

Modified: head/mail/cyrus-imapd25/pkg-plist
==============================================================================
--- head/mail/cyrus-imapd24/pkg-plist	Thu Mar 12 05:22:58 2015	(r381060)
+++ head/mail/cyrus-imapd25/pkg-plist	Thu Mar 12 10:23:33 2015	(r381069)
@@ -14,6 +14,7 @@ cyrus/bin/chk_cyrus
 cyrus/bin/ctl_cyrusdb
 cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
+%%HTTP%%cyrus/bin/ctl_zoneinfo
 cyrus/bin/cvt_cyrusdb
 cyrus/bin/cyr_dbtool
 cyrus/bin/cyr_df
@@ -21,10 +22,13 @@ cyrus/bin/cyr_expire
 cyrus/bin/cyr_sequence
 cyrus/bin/cyr_synclog
 cyrus/bin/cyr_userseen
+%%CLAMAV%%cyrus/bin/cyr_virusscan
 cyrus/bin/cyrdump
+%%HTTP%%cyrus/bin/dav_reconstruct
 cyrus/bin/deliver
 %%NNTP%%cyrus/bin/fetchnews
 cyrus/bin/fud
+%%HTTP%%cyrus/bin/httpd
 %%IDLED%%cyrus/bin/idled
 cyrus/bin/imapd
 cyrus/bin/ipurge
@@ -61,7 +65,6 @@ include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
 include/cyrus/bsearch.h
-include/cyrus/byteorder64.h
 include/cyrus/charset.h
 include/cyrus/crc32.h
 include/cyrus/cyr_lock.h
@@ -74,29 +77,35 @@ include/cyrus/imapurl.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
 include/cyrus/iptostring.h
-include/cyrus/libconfig.h
 include/cyrus/libcyr_cfg.h
 include/cyrus/lsort.h
 include/cyrus/map.h
-include/cyrus/md5.h
 include/cyrus/mkgmtime.h
 include/cyrus/mpool.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
-include/cyrus/prot.h
 include/cyrus/retry.h
-include/cyrus/rfc822date.h
 include/cyrus/signals.h
 include/cyrus/strarray.h
 include/cyrus/strhash.h
 include/cyrus/stristr.h
 include/cyrus/sysexits.h
-include/cyrus/util.h
 include/cyrus/xmalloc.h
-include/cyrus/xstrlcat.h
-include/cyrus/xstrlcpy.h
-lib/libcyrus.a
-lib/libcyrus_min.a
+lib/libcyrus.so
+lib/libcyrus.so.0
+lib/libcyrus.so.0.0.0
+lib/libcyrus_com_err.so
+lib/libcyrus_com_err.so.0
+lib/libcyrus_com_err.so.0.0.0
+lib/libcyrus_imap.so
+lib/libcyrus_imap.so.0
+lib/libcyrus_imap.so.0.0.0
+lib/libcyrus_min.so
+lib/libcyrus_min.so.0
+lib/libcyrus_min.so.0.0.0
+lib/libcyrus_sieve.so
+lib/libcyrus_sieve.so.0
+lib/libcyrus_sieve.so.0.0.0
 %%SITE_ARCH%%/Cyrus/IMAP/Admin.pm
 %%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm
 %%SITE_ARCH%%/Cyrus/IMAP/Shell.pm

Modified: head/mail/websieve/Makefile
==============================================================================
--- head/mail/websieve/Makefile	Thu Mar 12 09:43:10 2015	(r381068)
+++ head/mail/websieve/Makefile	Thu Mar 12 10:23:33 2015	(r381069)
@@ -22,15 +22,19 @@ NO_BUILD=	yes
 # highest select version number.  If no Cyrus IMAPd versions are
 # selected, use some generic IMAP modules
 
-OPTIONS_DEFINE=	CYRUS_IMAPD_23 CYRUS_IMAPD_24
-OPTIONS_DEFAULT=	CYRUS_IMAPD_23
+OPTIONS_DEFINE=	CYRUS_IMAPD_23 CYRUS_IMAPD_24 CYRUS_IMAPD_25
+OPTIONS_DEFAULT=	CYRUS_IMAPD_24
 
 CYRUS_IMAPD_23_DESC=	With Cyrus IMAPd version 2.3.x
 CYRUS_IMAPD_24_DESC=	With Cyrus IMAPd version 2.4.x
+CYRUS_IMAPD_25_DESC=	With Cyrus IMAPd version 2.5.x
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MCYRUS_IMAPD_24}
+.if ${PORT_OPTIONS:MCYRUS_IMAPD_25}
+RUN_DEPENDS+=	cyradm:${PORTSDIR}/mail/cyrus-imapd25
+FUNCLIB_PL=	funclib.cyrus
+.elif ${PORT_OPTIONS:MCYRUS_IMAPD_24}
 RUN_DEPENDS+=	cyradm:${PORTSDIR}/mail/cyrus-imapd24
 FUNCLIB_PL=	funclib.cyrus
 .elif ${PORT_OPTIONS:MCYRUS_IMAPD_23}



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