Index: head/mail/cyrus-imapd24/Makefile =================================================================== --- head/mail/cyrus-imapd24/Makefile (revision 448200) +++ head/mail/cyrus-imapd24/Makefile (revision 448201) @@ -1,216 +1,216 @@ # $FreeBSD$ PORTNAME= cyrus-imapd -PORTVERSION= 2.4.19 -PORTREVISION= 1 +PORTVERSION= 2.4.20 +#PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ PKGNAMESUFFIX= 24 MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libpcre.so:devel/pcre CONFLICTS_INSTALL= cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].* \ cyrus-imapd3* USE_RC_SUBR= imapd USES= cpe perl5 ssl GNU_CONFIGURE= yes CYRUS_PREFIX= ${PREFIX}/cyrus CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-cyrus-prefix=${CYRUS_PREFIX} \ --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} CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB DRAC IDLED LDAP \ MURDER MYSQL NETSCAPEHACK NNTP PGSQL \ REPLICATION SNMP SQLITE DOCS EXAMPLES OPTIONS_DEFAULT= BDB IDLED OPTIONS_SUB= yes AUTOCREATE_DESC= Use autocreate INBOX patch (UoA) AUTOSIEVE_DESC= Use autosievefolder patch (UoA) BDB_USES= bdb BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb-libdir=${LOCALBASE}/lib DRAC_DESC= Enable DRAC support DRAC_CONFIGURE_ON= --with-drac=${LOCALBASE} DRAC_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:mail/drac IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" 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 PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} REPLICATION_DESC= Enable replication (experimental) REPLICATION_CONFIGURE_ENABLE=replication SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ON= --with-snmp=${LOCALBASE} SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} OPTIONS_RADIO= GSSAPI OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT .if exists(/usr/lib/libkrb5.a) OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit # Autocreate Inbox and Autosieve patches from UoA # http://email.uoa.gr/projects/cyrus/ # http://blog.vx.sk/archives/13-Cyrus-IMAP-UoA.html AUTOCREATE_VERSION= 0.10-0 AUTOCREATE_PATCH_SITES= LOCAL/mm:autocreate AUTOCREATE_PATCHFILES= ${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch:-p1:autocreate AUTOCREATE_BROKEN= Patch is not applicable AUTOSIEVE_VERSION= 0.6.0 AUTOSIEVE_PATCH_SITES= LOCAL/mm:autosieve AUTOSIEVE_PATCHFILES= ${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve AUTOSIEVE_EXTRA_PATCHES=${FILESDIR}/extra-patch-imap__lmtp_sieve.c DRAC_EXTRA_PATCHES= ${FILESDIR}/extra-patch-cmulocal_sasl2.m4 DRAC_USE= AUTOTOOLS=autoconf,autoheader MANDIRS= ${CYRUS_PREFIX}/man PORTDOCS= * SUB_FILES= pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus MAN_MAN1= 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_df cyr_expire cyr_synclog deliver \ fetchnews fud idled imapd ipurge lmtpd master mbexamine \ mbpath nntpd notifyd pop3d quota reconstruct rmnews smmapd \ squatter sync_client sync_reset sync_server syncnews \ timsieved tls_prune unexpunge CYRUS_PERL_MAN1=cyradm CYRUS_PERL_MAN3=Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \ Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve CONFS= cmu-backend.conf cmu-frontend.conf normal.conf prefork.conf \ small.conf .include .if ${PORT_OPTIONS:MBDB} INVALID_BDB_VER=2 .else BDB_LIB_NAME= no .endif .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \ !${PORT_OPTIONS:MGSSAPI_MIT} CONFIGURE_ARGS+=--disable-gssapi .endif pre-patch-DRAC-on: ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \ < ${WRKSRC}/contrib/drac_auth.patch post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec post-patch-DRAC-on: @${RM} -r ${WRKSRC}/autom4te.cache post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ ${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf .for s in 1 3 5 . for m in ${MAN_MAN${s}} @${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST} . endfor .endfor .for s in 1 3 . for m in ${CYRUS_PERL_MAN${s}} @${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST} . endfor .endfor .for m in ${CYRUS_MAN8} @${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST} .endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "! ( -name Makefile.dist -o -name Makefile \ -o -name .cvsignore -o -name htmlstrip.c )" # there are already files in EXAMPLESDIR at that point, so no # need to create it. post-install-EXAMPLES-on: .for f in ${CONFS:Nnormal.conf} @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \ ${STAGEDIR}${EXAMPLESDIR} @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST} .endfor .include Index: head/mail/cyrus-imapd24/distinfo =================================================================== --- head/mail/cyrus-imapd24/distinfo (revision 448200) +++ head/mail/cyrus-imapd24/distinfo (revision 448201) @@ -1,7 +1,7 @@ -TIMESTAMP = 1494954318 -SHA256 (cyrus-imapd-2.4.19.tar.gz) = 5ef3cef8e394901fba162f14eb43f5e364b266234eff28d17273303c019f8ef1 -SIZE (cyrus-imapd-2.4.19.tar.gz) = 2488567 +TIMESTAMP = 1503022081 +SHA256 (cyrus-imapd-2.4.20.tar.gz) = 3a09146701cda2416d1a2be81f066e14397b211d72c714c54bac09fc65d8dd5e +SIZE (cyrus-imapd-2.4.20.tar.gz) = 2488878 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 Index: head/mail/cyrus-imapd24/files/patch-imap__lmtpd.c =================================================================== --- head/mail/cyrus-imapd24/files/patch-imap__lmtpd.c (revision 448200) +++ head/mail/cyrus-imapd24/files/patch-imap__lmtpd.c (nonexistent) @@ -1,34 +0,0 @@ ---- imap/lmtpd.c.orig 2017-05-15 05:43:30 UTC -+++ imap/lmtpd.c -@@ -712,9 +712,10 @@ int deliver(message_data_t *msgdata, cha - - /* loop through each recipient, attempting delivery for each */ - for (n = 0; n < nrcpts; n++) { -- char namebuf[MAX_MAILBOX_BUFFER] = "", *server; -+ char namebuf[MAX_MAILBOX_BUFFER] = ""; - char userbuf[MAX_MAILBOX_BUFFER]; - const char *rcpt, *user, *domain, *mailbox; -+ char *server = NULL; - int r = 0; - - rcpt = msg_getrcptall(msgdata, n); -@@ -954,7 +955,7 @@ static int verify_user(const char *user, - } - - if (!r) { -- char *server, *acl; -+ char *server = NULL, *acl = NULL; - long aclcheck = !user ? ACL_POST : 0; - /* - * check to see if mailbox exists and we can append to it: -@@ -1061,8 +1062,9 @@ FILE *spoolfile(message_data_t *msgdata) - (don't bother if we're only a proxy) */ - n = isproxy ? 0 : msg_getnumrcpt(msgdata); - for (i = 0; !f && (i < n); i++) { -- char namebuf[MAX_MAILBOX_BUFFER] = "", *server; -+ char namebuf[MAX_MAILBOX_BUFFER] = ""; - const char *user, *domain, *mailbox; -+ char *server = NULL; - int r; - - /* build the mailboxname from the recipient address */ Property changes on: head/mail/cyrus-imapd24/files/patch-imap__lmtpd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property