Date: Fri, 10 Mar 2017 02:05:02 +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: r435817 - in head/mail: . cyrus-imapd23 cyrus-imapd24 cyrus-imapd25 cyrus-imapd30 cyrus-imapd30/files websieve Message-ID: <201703100205.v2A2525F080731@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Fri Mar 10 02:05:01 2017 New Revision: 435817 URL: https://svnweb.freebsd.org/changeset/ports/435817 Log: Add Cyrus IMAP 3.0 series. Now, it is the third release candidate from the Cyrus IMAP 3.0 series: 3.0.0-rc3. As a release candidate, it is considered near-stable for production usage. Interfaces, APIs, features, etc are not likely to change between now and the full release. Added: head/mail/cyrus-imapd30/ - copied from r435748, head/mail/cyrus-imapd25/ head/mail/cyrus-imapd30/files/patch-imap__sync_support.c (contents, props changed) Deleted: head/mail/cyrus-imapd30/files/patch-imap__tls.c head/mail/cyrus-imapd30/files/patch-imtest__imtest.c head/mail/cyrus-imapd30/files/patch-lib__imclient.c head/mail/cyrus-imapd30/files/patch-lib__util.h Modified: head/mail/Makefile head/mail/cyrus-imapd23/Makefile head/mail/cyrus-imapd24/Makefile head/mail/cyrus-imapd25/Makefile head/mail/cyrus-imapd30/Makefile head/mail/cyrus-imapd30/distinfo head/mail/cyrus-imapd30/files/imapd.conf head/mail/cyrus-imapd30/files/imapd.in head/mail/cyrus-imapd30/files/patch-imap__http_client.h head/mail/cyrus-imapd30/files/patch-imap__httpd.h head/mail/cyrus-imapd30/files/pkg-message.in head/mail/cyrus-imapd30/pkg-plist head/mail/websieve/Makefile Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Fri Mar 10 02:04:19 2017 (r435816) +++ head/mail/Makefile Fri Mar 10 02:05:01 2017 (r435817) @@ -82,6 +82,7 @@ SUBDIR += cyrus-imapd23 SUBDIR += cyrus-imapd24 SUBDIR += cyrus-imapd25 + SUBDIR += cyrus-imapd30 SUBDIR += cyrus2courier SUBDIR += cyrus2dovecot SUBDIR += davmail Modified: head/mail/cyrus-imapd23/Makefile ============================================================================== --- head/mail/cyrus-imapd23/Makefile Fri Mar 10 02:04:19 2017 (r435816) +++ head/mail/cyrus-imapd23/Makefile Fri Mar 10 02:05:01 2017 (r435817) @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].* +CONFLICTS_INSTALL= cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].* \ + cyrus-imapd3* USE_RC_SUBR= imapd Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Fri Mar 10 02:04:19 2017 (r435816) +++ head/mail/cyrus-imapd24/Makefile Fri Mar 10 02:05:01 2017 (r435817) @@ -17,7 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].* +CONFLICTS_INSTALL= cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].* \ + cyrus-imapd3* USE_RC_SUBR= imapd Modified: head/mail/cyrus-imapd25/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Fri Mar 10 02:04:19 2017 (r435816) +++ head/mail/cyrus-imapd25/Makefile Fri Mar 10 02:05:01 2017 (r435817) @@ -17,7 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].* +CONFLICTS_INSTALL= cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].* \ + cyrus-imapd3* USE_RC_SUBR= imapd Modified: head/mail/cyrus-imapd30/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/Makefile Fri Mar 10 02:05:01 2017 (r435817) @@ -1,12 +1,13 @@ # $FreeBSD$ PORTNAME= cyrus-imapd -PORTVERSION= 2.5.10 +PORTVERSION= 3.0.0rc3 +DISTVERSION= 3.0.0-rc3 #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ -PKGNAMESUFFIX= 25 +PKGNAMESUFFIX= 30 MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols @@ -15,21 +16,23 @@ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ + libicuuc.so:devel/icu \ + libjansson.so:devel/jansson \ libpcre.so:devel/pcre -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].* +CONFLICTS_INSTALL= cyrus-imapd-2.* cyrus-imapd2* USE_RC_SUBR= imapd -USES= cpe libtool perl5 ssl +USES= cpe gmake libtool perl5 ssl GNU_CONFIGURE= yes CYRUS_PREFIX= ${PREFIX}/cyrus -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ - --with-cyrus-prefix=${CYRUS_PREFIX} \ +CONFIGURE_ARGS= --libexecdir=${CYRUS_PREFIX}/libexec \ + --sbindir=${CYRUS_PREFIX}/sbin \ + --sysconfdir=${PREFIX}/etc \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ - --with-bdb=${BDB_LIB_NAME} \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL} @@ -40,27 +43,32 @@ MAKE_JOBS_UNSAFE= yes CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server -OPTIONS_DEFINE= AUTOCREATE BDB HTTP IDLED LDAP MURDER MYSQL \ - NETSCAPEHACK NNTP PGSQL REPLICATION SNMP SQLITE DOCS \ - EXAMPLES -#OPTIONS_DEFINE+= CLAMAV DRAC -OPTIONS_DEFAULT= BDB IDLED +OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER MYSQL \ + NNTP PGSQL REPLICATION SNMP SQLITE SQUAT DOCS EXAMPLES +#OPTIONS_DEFINE+= DRAC +OPTIONS_DEFAULT= CLAMAV IDLED SQUAT OPTIONS_SUB= yes AUTOCREATE_DESC= Enable autocreate support AUTOCREATE_CONFIGURE_ENABLE= autocreate -BDB_USES= bdb -BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ - --with-bdb-libdir=${LOCALBASE}/lib +BACKUP_DESC= Enable backup support (experimental) +BACKUP_CONFIGURE_ENABLE=backup CLAMAV_DESC= Use ClamAV CLAMAV_CONFIGURE_WITH= clamav CLAMAV_LIB_DEPENDS= libclamav.so:security/clamav DRAC_DESC= Enable DRAC support DRAC_CONFIGURE_ON= --with-drac=${LOCALBASE} DRAC_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:mail/drac -HTTP_DESC= Enable HTTP (beta quality) +HTTP_DESC= Enable HTTP support HTTP_CONFIGURE_ENABLE= http -HTTP_LIB_DEPENDS= libjansson.so:devel/jansson \ - libical.so:devel/libical +#HTTP_BUILD_DEPENDS= ${LOCALBASE}/bin/xxd:editors/vim-lite +HTTP_LIB_DEPENDS= libical.so:devel/libical \ + libnghttp2.so:www/libnghttp2 \ + libshp.so:devel/shapelib +# Our libbrotli is too old +#HTTP_LIB_DEPENDS+= libbrotlidec.so:devel/libbrotli +# Need additional patch to opendkim +#HTTP_LIB_DEPENDS+= libopendkim.so:mail/opendkim +#HTTP_CPPFLAGS+= -I${LOCALBASE}/include/opendkim HTTP_USES= pkgconfig HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support @@ -75,8 +83,6 @@ MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-mysql=yes \ --with-mysql-libdir=${LOCALBASE}/lib/mysql \ --with-mysql-incdir=${LOCALBASE}/include/mysql -NETSCAPEHACK_DESC= Enable X-NETSCAPE extensions -NETSCAPEHACK_CONFIGURE_ENABLE=netscapehack NNTP_DESC= Enable NNTP support NNTP_CONFIGURE_ENABLE= nntp PGSQL_USES= pgsql @@ -87,6 +93,13 @@ SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt SNMP_CONFIGURE_ON= --with-snmp=${LOCALBASE} SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} +SQUAT_DESC= Enable Squat support +SQUAT_CONFIGURE_OFF= --disable-squat +# Need additional patch to xapian +#OPTIONS_DEFINE+= XAPIAN +#XAPIAN_DESC= Enable Xapian support +#XAPIAN_CONFIGURE_ENABLE=xapian +#XAPIAN_LIB_DEPENDS= libxapian.so:databases/xapian-core UNAMER!= uname -r OSMAJOR= ${UNAMER:C/[.-].*//} @@ -120,18 +133,17 @@ SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus -MAN_MAN1= imtest installsieve lmtptest mupdatetest nntptest pop3test \ - sieveshell sivtest smtptest +MAN_MAN1= httptest imtest installsieve lmtptest mupdatetest nntptest \ + pop3test sieveshell sivtest smtptest MAN_MAN3= imclient MAN_MAN5= cyrus.conf imapd.conf krb.equiv -CYRUS_MAN8= arbitron chk_cyrus ctl_cyrusdb ctl_deliver ctl_mboxlist \ - cvt_cyrusdb cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \ - cyr_synclog deliver fud idled imapd ipurge lmtpd master \ - mbexamine mbpath notifyd pop3d quota reconstruct rmnews \ - smmapd squatter sync_client sync_reset sync_server timsieved \ - tls_prune unexpunge - +CYRUS_MAN8= arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \ + ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb cyr_backup \ + 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 squatter 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 \ @@ -142,17 +154,6 @@ CONFS= cmu-backend.conf cmu-frontend.co .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MBDB} -INVALID_BDB_VER=2 -.else -BDB_LIB_NAME= no -.endif - -.if ${PORT_OPTIONS:MCLAMAV} -IGNORE= CLAMAV is not available yet -.endif -PLIST_SUB+= CLAMAV="@comment " - .if ${PORT_OPTIONS:MDRAC} IGNORE= DRAC is not available # EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal__sasl2.m4 @@ -174,6 +175,9 @@ CYRUS_MAN8+= ctl_zoneinfo httpd .if ${PORT_OPTIONS:MNNTP} CYRUS_MAN8+= fetchnews nntpd .endif +.if ${PORT_OPTIONS:MREPLICATION} +CYRUS_MAN8+= sync_client sync_reset sync_server +.endif .if ${PORT_OPTIONS:MDRAC} pre-patch: @@ -204,9 +208,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ - ${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap + ${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ - ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec + ${STAGEDIR}${CYRUS_PREFIX}/sbin/masssievec ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf .for s in 1 3 5 @@ -225,7 +229,9 @@ post-install: post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ + "! ( -path */html/_sources* -o -name .buildinfo )" + ${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source # there are already files in EXAMPLESDIR at that point, so no # need to create it. Modified: head/mail/cyrus-imapd30/distinfo ============================================================================== --- head/mail/cyrus-imapd25/distinfo Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/distinfo Fri Mar 10 02:05:01 2017 (r435817) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476753608 -SHA256 (cyrus-imapd-2.5.10.tar.gz) = b38f4fd72825a298ac47426dcd2a50c8437c2947864ba50d79a9a53fe9845c5f -SIZE (cyrus-imapd-2.5.10.tar.gz) = 3103914 +TIMESTAMP = 1487345999 +SHA256 (cyrus-imapd-3.0.0-rc3.tar.gz) = ed846ac7410d204a408a5c2506069fbc3b123c8be4fc96c5c239718da91f8489 +SIZE (cyrus-imapd-3.0.0-rc3.tar.gz) = 9925693 Modified: head/mail/cyrus-imapd30/files/imapd.conf ============================================================================== --- head/mail/cyrus-imapd25/files/imapd.conf Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/files/imapd.conf Fri Mar 10 02:05:01 2017 (r435817) @@ -20,12 +20,12 @@ partition-default: /var/spool/imap # Use the UNIX separator character '/' for delimiting levels of # mailbox hierarchy. The default is to use the netnews separator # character '.'. -#unixhierarchysep: no +#unixhierarchysep: yes # Use the alternate IMAP namespace, where personal folders reside at # the same level in the hierarchy as INBOX. # -#altnamespace: no +#altnamespace: yes # If using the alternate IMAP namespace, the prefix for the other # users namespace. The hierarchy delimiter will be automatically @@ -260,47 +260,41 @@ sievedir: /var/imap/sieve #sieve_maxscripts: 5 # The cyrusdb backend to use for mailbox annotations. -# Allowed values: berkeley, skiplist +# Allowed values: skiplist, twoskip # -#annotation_db: skiplist +#annotation_db: twoskip # The cyrusdb backend to use for the duplicate delivery suppression # and sieve. -# Allowed values: berkeley, berkeley-nosync, skiplist +# Allowed values: skiplist, sql, twoskip # -#duplicate_db: skiplist +#duplicate_db: twoskip # The cyrusdb backend to use for the mailbox list. -# Allowed values: flat, berkeley, skiplist +# Allowed values: skiplist, twoskip # -#mboxlist_db: skiplist +#mboxlist_db: twoskip # The cyrusdb backend to use for the pts cache. -# Allowed values: berkeley, skiplist +# Allowed values: skiplist, twoskip # -#ptscache_db: skiplist +#ptscache_db: twoskip # The cyrusdb backend to use for the seen state. -# Allowed values: flat, berkeley, skiplist +# Allowed values: flat, skiplist, twoskip # -#seenstate_db: skiplist +#seenstate_db: twoskip # The cyrusdb backend to use for the imap status cache. -# Allowed values: berkeley, berkeley-nosync, berkeley-hash, -# berkeley-hash-nosync, skiplist +# Allowed values: skiplist, sql, twoskip # -#statuscache_db: skiplist +#statuscache_db: twoskip # The cyrusdb backend to use for the subscriptions list. -# Allowed values: flat, berkeley, skiplist +# Allowed values: flat, skiplist, twoskip # #subscription_db: flat -# The cyrusdb backend to use for the TLS cache. -# Allowed values: berkeley, berkeley-nosync, skiplist -# -#tlscache_db: skiplist - # Maximum SSF (security strength factor) that the server will allow a # client to negotiate. # @@ -342,54 +336,6 @@ sasl_pwcheck_method: auxprop # #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_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_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_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_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_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_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_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_server_key: <none> - # File containing one or more Certificate Authority (CA) certificates. # #tls_client_ca_file: <none> @@ -398,6 +344,11 @@ sasl_pwcheck_method: auxprop # #tls_client_ca_dir: <none> +# The cyrusdb backend to use for the TLS cache. +# Allowed values: skiplist, sql, twoskip +# +#tls_sessions_db: twoskip + # 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. # A value of 0 will disable session caching. Modified: head/mail/cyrus-imapd30/files/imapd.in ============================================================================== --- head/mail/cyrus-imapd25/files/imapd.in Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/files/imapd.in Fri Mar 10 02:05:01 2017 (r435817) @@ -16,14 +16,14 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd +#cyrus_imapd_program="%%PREFIX%%/cyrus/libexec/master" # Location of imapd [ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program . /etc/rc.subr name="cyrus_imapd" rcvar=cyrus_imapd_enable -command="%%PREFIX%%/cyrus/bin/master" +command="%%PREFIX%%/cyrus/libexec/master" pidfile="/var/run/cyrus-master.pid" required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf" stop_postcmd="cyrus_imapd_poststop" Modified: head/mail/cyrus-imapd30/files/patch-imap__http_client.h ============================================================================== --- head/mail/cyrus-imapd25/files/patch-imap__http_client.h Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/files/patch-imap__http_client.h Fri Mar 10 02:05:01 2017 (r435817) @@ -1,13 +1,11 @@ -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 */ +--- imap/http_client.h.orig 2016-04-11 02:02:11 UTC ++++ imap/http_client.h +@@ -57,7 +57,7 @@ struct body_t { + 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 */ }; Modified: head/mail/cyrus-imapd30/files/patch-imap__httpd.h ============================================================================== --- head/mail/cyrus-imapd25/files/patch-imap__httpd.h Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/files/patch-imap__httpd.h Fri Mar 10 02:05:01 2017 (r435817) @@ -1,13 +1,11 @@ -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 @@ +--- imap/httpd.h.orig 2016-04-11 02:02:11 UTC ++++ imap/httpd.h +@@ -264,7 +264,7 @@ struct patch_doc_t { /* 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 */ +- ulong len; /* Content-Length */ ++ unsigned long len; /* Content-Length */ + struct range *range; /* Content-Range */ + const char *fname; /* Content-Dispo */ + unsigned char enc; /* Content-Encoding */ Added: head/mail/cyrus-imapd30/files/patch-imap__sync_support.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd30/files/patch-imap__sync_support.c Fri Mar 10 02:05:01 2017 (r435817) @@ -0,0 +1,20 @@ +--- imap/sync_support.c.orig 2015-08-04 05:50:45 UTC ++++ imap/sync_support.c +@@ -3099,7 +3099,7 @@ int sync_apply_message(struct dlist *kin + const char *fname; + + /* XXX - complain more? */ +- if (!dlist_tofile(ki, &part, &guid, (ulong *) &size, &fname)) ++ if (!dlist_tofile(ki, &part, &guid, (unsigned long *) &size, &fname)) + continue; + + part_list = sync_reserve_partlist(reserve_list, part); +@@ -3806,7 +3806,7 @@ static int fetch_file(struct mailbox *ma + return r; + } + +- if (!dlist_tofile(kin->head, NULL, &guid, (ulong *) &size, &fname)) { ++ if (!dlist_tofile(kin->head, NULL, &guid, (unsigned long *) &size, &fname)) { + r = IMAP_MAILBOX_NONEXISTENT; + syslog(LOG_ERR, "IOERROR: fetch_file failed tofile %s", error_message(r)); + goto done; Modified: head/mail/cyrus-imapd30/files/pkg-message.in ============================================================================== --- head/mail/cyrus-imapd25/files/pkg-message.in Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/files/pkg-message.in Fri Mar 10 02:05:01 2017 (r435817) @@ -1,7 +1,7 @@ **************************************************************************** To setup mail spool, modify %%PREFIX%%/etc/imapd.conf appropriately, -then run %%PREFIX%%/cyrus/bin/mkimap. +then run %%PREFIX%%/cyrus/sbin/mkimap. To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your /etc/rc.conf. Modified: head/mail/cyrus-imapd30/pkg-plist ============================================================================== --- head/mail/cyrus-imapd25/pkg-plist Thu Mar 9 07:13:04 2017 (r435748) +++ head/mail/cyrus-imapd30/pkg-plist Fri Mar 10 02:05:01 2017 (r435817) @@ -1,4 +1,5 @@ bin/cyradm +bin/httptest bin/imtest bin/installsieve bin/lmtptest @@ -9,60 +10,66 @@ bin/sieveshell bin/sivtest bin/smtptest bin/synctest -cyrus/bin/arbitron -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_deny -cyrus/bin/cyr_df -cyrus/bin/cyr_expire -cyrus/bin/cyr_info -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 -cyrus/bin/lmtpd -cyrus/bin/lmtpproxyd -cyrus/bin/masssievec -cyrus/bin/master -cyrus/bin/mbexamine -cyrus/bin/mbpath -cyrus/bin/mbtool -cyrus/bin/mkimap -%%MURDER%%cyrus/bin/mupdate -%%NNTP%%cyrus/bin/nntpd -cyrus/bin/notifyd -cyrus/bin/pop3d -cyrus/bin/pop3proxyd -cyrus/bin/proxyd -%%LDAP%%cyrus/bin/ptdump -%%LDAP%%cyrus/bin/ptexpire -%%LDAP%%cyrus/bin/ptloader -cyrus/bin/quota -cyrus/bin/reconstruct -cyrus/bin/sievec -cyrus/bin/sieved -cyrus/bin/smmapd -cyrus/bin/squatter -%%REPLICATION%%cyrus/bin/sync_client -%%REPLICATION%%cyrus/bin/sync_reset -%%REPLICATION%%cyrus/bin/sync_server -cyrus/bin/timsieved -cyrus/bin/tls_prune -cyrus/bin/unexpunge +%%BACKUP%%cyrus/libexec/backupd +cyrus/libexec/fud +%%HTTP%%cyrus/libexec/httpd +%%IDLED%%cyrus/libexec/idled +cyrus/libexec/imapd +cyrus/libexec/lmtpd +cyrus/libexec/lmtpproxyd +cyrus/libexec/master +%%NNTP%%cyrus/libexec/nntpd +cyrus/libexec/notifyd +cyrus/libexec/pop3d +cyrus/libexec/pop3proxyd +cyrus/libexec/proxyd +cyrus/libexec/smmapd +cyrus/libexec/timsieved +cyrus/sbin/arbitron +cyrus/sbin/chk_cyrus +%%BACKUP%%cyrus/sbin/ctl_backups +cyrus/sbin/ctl_conversationsdb +cyrus/sbin/ctl_cyrusdb +cyrus/sbin/ctl_deliver +cyrus/sbin/ctl_mboxlist +%%HTTP%%cyrus/sbin/ctl_zoneinfo +cyrus/sbin/cvt_cyrusdb +cyrus/sbin/cvt_xlist_specialuse +%%BACKUP%%cyrus/sbin/cyr_backup +cyrus/sbin/cyr_buildinfo +cyrus/sbin/cyr_dbtool +cyrus/sbin/cyr_deny +cyrus/sbin/cyr_df +cyrus/sbin/cyr_expire +cyrus/sbin/cyr_info +cyrus/sbin/cyr_sequence +cyrus/sbin/cyr_synclog +cyrus/sbin/cyr_userseen +cyrus/sbin/cyr_virusscan +cyrus/sbin/cyrdump +%%HTTP%%cyrus/sbin/dav_reconstruct +cyrus/sbin/deliver +%%NNTP%%cyrus/sbin/fetchnews +cyrus/sbin/ipurge +cyrus/sbin/masssievec +cyrus/sbin/mbexamine +cyrus/sbin/mbpath +cyrus/sbin/mbtool +cyrus/sbin/mkimap +%%MURDER%%cyrus/libexec/mupdate +%%LDAP%%cyrus/sbin/ptdump +%%LDAP%%cyrus/sbin/ptexpire +%%LDAP%%cyrus/libexec/ptloader +cyrus/sbin/quota +cyrus/sbin/reconstruct +cyrus/sbin/sievec +cyrus/sbin/sieved +cyrus/sbin/squatter +%%REPLICATION%%cyrus/sbin/sync_client +%%REPLICATION%%cyrus/sbin/sync_reset +%%REPLICATION%%cyrus/libexec/sync_server +cyrus/sbin/tls_prune +cyrus/sbin/unexpunge etc/man.d/cyrus-imapd.conf include/cyrus/acl.h include/cyrus/arrayu64.h @@ -70,11 +77,14 @@ include/cyrus/assert.h include/cyrus/auth.h include/cyrus/auth_pts.h include/cyrus/bitvector.h +include/cyrus/bloom.h include/cyrus/bsearch.h +include/cyrus/bufarray.h include/cyrus/charset.h include/cyrus/chartable.h include/cyrus/command.h include/cyrus/crc32.h +include/cyrus/crc32c.h include/cyrus/cyr_lock.h include/cyrus/cyrusdb.h include/cyrus/exitcodes.h @@ -94,6 +104,7 @@ include/cyrus/map.h include/cyrus/mappedfile.h include/cyrus/mkgmtime.h include/cyrus/mpool.h +include/cyrus/murmurhash2.h include/cyrus/nonblock.h include/cyrus/parseaddr.h include/cyrus/retry.h @@ -101,6 +112,7 @@ include/cyrus/rfc822tok.h include/cyrus/sieve/sieve_err.h include/cyrus/sieve/sieve_interface.h include/cyrus/signals.h +include/cyrus/sqldb.h include/cyrus/strarray.h include/cyrus/strhash.h include/cyrus/stristr.h Modified: head/mail/websieve/Makefile ============================================================================== --- head/mail/websieve/Makefile Fri Mar 10 02:04:19 2017 (r435816) +++ head/mail/websieve/Makefile Fri Mar 10 02:05:01 2017 (r435817) @@ -26,7 +26,8 @@ NO_ARCH= yes OPTIONS_SINGLE= TYPE OPTIONS_SINGLE_TYPE= PERL CYRUS OPTIONS_RADIO= CYRDEP -OPTIONS_RADIO_CYRDEP= CYRUS_IMAPD_23 CYRUS_IMAPD_24 CYRUS_IMAPD_25 +OPTIONS_RADIO_CYRDEP= CYRUS_IMAPD_23 CYRUS_IMAPD_24 CYRUS_IMAPD_25 \ + CYRUS_IMAPD_30 OPTIONS_DEFAULT= CYRUS CYRUS_IMAPD_24 TYPE_DESC= Choose which sieve backend to use @@ -36,7 +37,9 @@ CYRDEP_DESC= Which version of Cyrus IMAP CYRUS_IMAPD_23_DESC= Cyrus IMAPd version 2.3.x CYRUS_IMAPD_24_DESC= Cyrus IMAPd version 2.4.x CYRUS_IMAPD_25_DESC= Cyrus IMAPd version 2.5.x +CYRUS_IMAPD_30_DESC= Cyrus IMAPd version 3.0.x +CYRUS_IMAPD_30_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd30 CYRUS_IMAPD_25_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd25 CYRUS_IMAPD_24_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd24 CYRUS_IMAPD_23_RUN_DEPENDS= ${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd23 @@ -57,7 +60,10 @@ SUB_FILES= pkg-message _check-config: my-check-config my-check-config: .if ${PORT_OPTIONS:MPERL} -.if !empty(PORT_OPTIONS:MCYRUS_IMAPD_23) || !empty(PORT_OPTIONS:MCYRUS_IMAPD_24) || !empty(PORT_OPTIONS:MCYRUS_IMAPD_25) +.if !empty(PORT_OPTIONS:MCYRUS_IMAPD_23) || \ + !empty(PORT_OPTIONS:MCYRUS_IMAPD_24) || \ + !empty(PORT_OPTIONS:MCYRUS_IMAPD_25) || \ + !empty(PORT_OPTIONS:MCYRUS_IMAPD_30) @${ECHO_MSG} "====> You cannot select a dependency on cyrus with the PERL option" _CHECK_CONFIG_ERROR= true .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703100205.v2A2525F080731>