Date: Mon, 19 Oct 2020 11:56:43 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552735 - in head/mail/sendmail: . files Message-ID: <202010191156.09JBuhKV057748@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Mon Oct 19 11:56:42 2020 New Revision: 552735 URL: https://svnweb.freebsd.org/changeset/ports/552735 Log: - new option DANE - add PREVENTS for LDAP PR: 250383 Modified: head/mail/sendmail/Makefile head/mail/sendmail/files/site.config.m4.tls Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Mon Oct 19 11:34:15 2020 (r552734) +++ head/mail/sendmail/Makefile Mon Oct 19 11:56:42 2020 (r552735) @@ -46,15 +46,16 @@ SENDMAIL= ${PREFIX}/sbin/sendmail BASEMAIL= /usr/libexec/sendmail/sendmail MILTER_SOVER?= 6 -OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB \ - GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \ +OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS DANE SASL SASLAUTHD LDAP \ + BDB GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \ PICKY_HELO_CHECK MILTER DOCS -OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS SASL SASLAUTHD BDB1 \ +OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS DANE SASL SASLAUTHD BDB1 \ BLACKLISTD PICKY_HELO_CHECK MILTER NO_OPTIONS_SORT=yes SHMEM_DESC= System V shared memory support LA_DESC= load averages support TLS_DESC= SMTP-TLS and SMTPS support +DANE_DESC= Enable DANE support SASLAUTHD_DESC= SASLAUTHD support BDB_DESC= Berkeley DB version 4+ support GDBM_DESC= GNU dbm library support (option COMPAT needed) @@ -68,7 +69,9 @@ SMTPUTF8_DESC= Enable unicode address support TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd +DANE_IMPLIES= TLS LDAP_USE= OPENLDAP=yes +LDAP_PREVENTS= DANE BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= compat @@ -126,6 +129,9 @@ CONFLICTS+= ${CONFLICTS2} SITE+= ${FILESDIR}/site.config.m4 .if ${PORT_OPTIONS:MIPV6} SITE+= ${FILESDIR}/site.config.m4.ipv6 +.endif +.if ${PORT_OPTIONS:MDANE} +SITE+= ${FILESDIR}/site.config.m4.dane .endif .if ${PORT_OPTIONS:MSASL} SITE+= ${FILESDIR}/site.config.m4.sasl2 Modified: head/mail/sendmail/files/site.config.m4.tls ============================================================================== --- head/mail/sendmail/files/site.config.m4.tls Mon Oct 19 11:34:15 2020 (r552734) +++ head/mail/sendmail/files/site.config.m4.tls Mon Oct 19 11:56:42 2020 (r552735) @@ -1,2 +1,2 @@ -APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DTLS_EC -DDANE') +APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DTLS_EC') APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010191156.09JBuhKV057748>