Date: Mon, 16 Apr 2018 17:03:19 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467490 - head/mail/exim Message-ID: <201804161703.w3GH3JR4020143@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Mon Apr 16 17:03:19 2018 New Revision: 467490 URL: https://svnweb.freebsd.org/changeset/ports/467490 Log: Fix SPF support, add experimental ARC option Reported by: pi via email Modified: head/mail/exim/Makefile head/mail/exim/options Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Mon Apr 16 16:44:20 2018 (r467489) +++ head/mail/exim/Makefile Mon Apr 16 17:03:19 2018 (r467490) @@ -3,6 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ @@ -71,13 +72,19 @@ IGNORE= you cannot enable OCSP stapling with gnutls .endif .endif -# DMARC implies SPF +# DMARC implies SPF and DKIM .if ${PORT_OPTIONS:MDMARC} .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} IGNORE= you cannot enable DMARC without SPF and DKIM support .endif .endif +# ARC implies SPF and DKIM +.if ${PORT_OPTIONS:MARC} +.if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} +IGNORE= you cannot enable ARC without SPF and DKIM support +.endif +.endif # DANE implies DNSSEC .if ${PORT_OPTIONS:MDANE} .if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS} @@ -210,6 +217,10 @@ SEDLIST+= -e 's,^\# (EXPERIMENTAL_DSN=),\1,' SEDLIST+= -e 's,^\# (EXPERIMENTAL_DANE=),\1,' .endif +.if ${PORT_OPTIONS:MARC} +SEDLIST+= -e 's,^\# (EXPERIMENTAL_ARC=),\1,' +.endif + .if !${PORT_OPTIONS:MEVENT} SEDLIST+= -e 's,^\# (DISABLE_EVENT=),\1,' .endif @@ -460,7 +471,7 @@ SEDLIST+= -e 's,^(ALT_CONFIG_PREFIX=),\# \1,' .if ${PORT_OPTIONS:MSPF} SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ -e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 -lpthread,' \ - -e 's,^\# (EXPERIMENTAL_SPF=),\1,' + -e 's,^\# (SUPPORT_SPF=),\1,' .else SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ -e 's,XX_SPF_LIBS_XX,,' Modified: head/mail/exim/options ============================================================================== --- head/mail/exim/options Mon Apr 16 16:44:20 2018 (r467489) +++ head/mail/exim/options Mon Apr 16 17:03:19 2018 (r467490) @@ -4,6 +4,7 @@ OPTIONS_DEFINE+= ALT_CONFIG_PREFIX \ DEBUG \ DISABLE_D_OPT \ DKIM \ + SPF \ DNSSEC \ DOCS \ EMBEDDED_PERL \ @@ -65,11 +66,12 @@ OPTIONS_GROUP_LOOKUP= CDB BDB DNSDB DSEARCH LSEARCH MY LOOKUP_DESC= Lookup support OPTIONS_GROUP_STORAGE= MAILDIR MAILSTORE MBX STORAGE_DESC= Supported storage formats -OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN SPF LMDB QUEUEFILE +OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN ARC LMDB QUEUEFILE EXPERIMENTAL_DESC= Experimental options OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL ALT_CONFIG_PREFIX_DESC= Restrict the set of configuration files +ARC_DESC= Enable experimental ARC support AUTH_CRAM_MD5_DESC= Enable CRAM-MD5 authentication mechanisms AUTH_DOVECOT_DESC= Enable Dovecot authentication mechanisms AUTH_PLAINTEXT_DESC= Enable plaintext authentication
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804161703.w3GH3JR4020143>