From owner-svn-ports-head@freebsd.org Mon Oct 19 11:56:43 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A47AA44CF7C; Mon, 19 Oct 2020 11:56:43 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CFFbb3sQXz4VSS; Mon, 19 Oct 2020 11:56:43 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67FBC230D1; Mon, 19 Oct 2020 11:56:43 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09JBuh7b057750; Mon, 19 Oct 2020 11:56:43 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09JBuhKV057748; Mon, 19 Oct 2020 11:56:43 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <202010191156.09JBuhKV057748@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Mon, 19 Oct 2020 11:56:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552735 - in head/mail/sendmail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/mail/sendmail: . files X-SVN-Commit-Revision: 552735 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 11:56:43 -0000 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')