From nobody Wed Feb 1 02:42:14 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P65mQ4hq0z3bnlq; Wed, 1 Feb 2023 02:42:14 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P65mQ3St5z4H2J; Wed, 1 Feb 2023 02:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675219334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiqXKhC7Z5FKaEHtQNPkLxppwsh9eHGZ1IJLe3jU1S8=; b=liNQG3BsYnQpfid06dIdiGRvjYIX35nzipwAqiM5DMjR2RQkfepsa3fMlV/Ta2CWjlCcvV CNFC+P1enJnWZOPwQQ7jYv0MsW1K5nWRyA9fAAEpMnBj2Bpq1Ly4RF26HKZoiv5y6HZ5WQ gszBhbNJen7VWeF9Xqp+yc5dZLdiFkCWwX7Iloh2Rvn+AMl4H4Wax6aLiv+le4T9iLQbC0 SW8LagJqfwB6lz4NLPhI+dtINw0vngXgo4j4jJxFVWnMh2Z3XNhaIl3VNsDwfijSWniiBs /eePAxDZPVg+e4MaDetQUXeHXnELQIj1WsOWwJfJogqOtnqRL3S15ItzToR8tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675219334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aiqXKhC7Z5FKaEHtQNPkLxppwsh9eHGZ1IJLe3jU1S8=; b=tKWSOHKQevNNJ7hGOhNgBrrPITMe1iedEQIChSNlr+XNR9xB2yOpmO5qKAS57VVpNOF3Fl jzft6mGapUYu20XUL+0YvCRhhtX70nogUftIqUsdmIli91pY0CCnJPeNWomgxLavFOZkfW I5ILm7mWtZdAQNJuY98SJDZuMLRZlX1UfalUqJj2V6+2lpvqE4jNEbE2zR/k5w0tCtrlTN SCBhzwduL9NjuS2bes8CfczUycR2fGtdG4H2QSidA1+695Bk6s5hzZy8/aZ/YDeKb9x4Cf +HTQWEI74CC8jYaUFlJ99b3nbShZejOUwkuteFzlMSNdzkUGEbI1oM5cI/1b4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675219334; a=rsa-sha256; cv=none; b=Qmv2g5B4Qv8oAH7pU1TQihDIbemieFqqqwCFTFe0qGVodQ3C7fCoiZSvcxM/xWn1OM7e4U JYXOcG0bfUS5oIlR3ombPN/cgG6zxhObMQ6SWrXcxkoQZW8NZfaHTWcvartNbAP5WUCbAn qZAPGrFpgi7TztOvokKqHvIl22pq5JRwVzUKkSEni2clCoKQEJ0SueyYxAPkk7o9zDPCjO 2C5B94a8qHFUhloNwarVVfm+H8mUYBynq3neHTQByFsVOlCcwq4IO8CB1RAkgxhgbaqIwv YJO28/69jp0hIbgx5fuGNcmiL83pQGscbopRChE3eJvFntPsV7Mx1QecQjgINQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P65mQ1k6jz1By9; Wed, 1 Feb 2023 02:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3112gEbP091634; Wed, 1 Feb 2023 02:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112gEDI091633; Wed, 1 Feb 2023 02:42:14 GMT (envelope-from git) Date: Wed, 1 Feb 2023 02:42:14 GMT Message-Id: <202302010242.3112gEDI091633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 59f5a5cb724e - stable/13 - MFC: Add -DSTARTTLS CFLAG in order to enable DANE in sendmail builds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59f5a5cb724ea7dac7a6a2a1341549074c8aba49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=59f5a5cb724ea7dac7a6a2a1341549074c8aba49 commit 59f5a5cb724ea7dac7a6a2a1341549074c8aba49 Author: Gregory Neil Shapiro AuthorDate: 2023-01-15 21:24:38 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-02-01 02:31:59 +0000 MFC: Add -DSTARTTLS CFLAG in order to enable DANE in sendmail builds (cherry picked from commit 3413ee88c39dbfedfa7d00db536a8e8dc073a562) --- lib/libmilter/Makefile | 5 +++++ lib/libsmutil/Makefile | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile index 17bb09857fcf..b3243c2a66cf 100644 --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -15,6 +15,11 @@ CFLAGS+=-DSM_CONF_POLL CFLAGS+=-DNETINET6 .endif +.if ${MK_OPENSSL} != "no" +# STARTTLS support +CFLAGS+=-DSTARTTLS +.endif + # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index ff3f8491225b..7bbd21e21bbb 100644 --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + PACKAGE=lib${LIB} SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmutil @@ -7,6 +9,11 @@ SENDMAIL_DIR=${SRCTOP}/contrib/sendmail CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL +.if ${MK_OPENSSL} != "no" +# STARTTLS support +CFLAGS+=-DSTARTTLS +.endif + # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS}