From nobody Wed Feb 1 03:27:23 2023 X-Original-To: dev-commits-src-all@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 4P66mX1x9Lz3btj0; Wed, 1 Feb 2023 03:27:24 +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 4P66mX11vCz4P4N; Wed, 1 Feb 2023 03:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675222044; 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=U/AMhOsqWfOISt3ZxmBlOTDl3X9uzRGRxc0O6a+6F38=; b=Wl5IplWXy2/0H1E6Z5PdygTKY54tQnzhkb6LnDHXpLZt/Ux1A6CAcmAQqqzOFy4vWTWX32 ZZPpHgqtEvrPHhkZPkAoNXOBvjDNV+gQxCFt9FHHOmedjgEA3WK9g/bvu9UZBH7gPGN/tD 81dhc1hfHdm0ykhElJszq0wvI/OaOEqCVP5UYLSleFQxkJNpU0UmyI0y8deJmz0Rl2Mo4E bd66605wVT/Kn1l1yZ0DvOd5GiVZn0I+K79A7t+1XJqgPJMC4fUTLbJnP75i582w6nIQSZ awPoK+flKJ2dj+Vn1HqvhVICkAcEZ3jq+qHqDkpCj9SPSBP9xbbfPdWxrGdESA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675222044; 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=U/AMhOsqWfOISt3ZxmBlOTDl3X9uzRGRxc0O6a+6F38=; b=kng42FmK9RoDww84Fbs7XR1Ocnt5wvhMqfmo4MbdYxwjSXQIwWNaDVjjsoDHjIMayxjuvn r/BuNLdGtF/Qy/04HxhG6flIIDevXY3Gw1TZNC0ryxRlJ5kv7VQrvhKQ1EJ8jtaufS09ZQ zfBjA6AR8pU1GWjO9SzTiNB8d1t7mYw0RR5p8PrGe6hqOtPHhCS6hkE8W0CQRq90sW1JB3 7VB20zg1j791F0VwgHZIl1FG7LoYmgUbvqYlEc/vdMUcBgM//qhdn+P2ELQUgGNivfJ86f FN9SCFj6CPA7WK4lFI2U+DJ83BHST8n56llMy7BWJDsoCNCPwlln134t7t64sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675222044; a=rsa-sha256; cv=none; b=Lw83/wsTydzzLoLT0R6PMeNX5kkhb9Qw8U2KORx4nseGjOBsTCvgcCOvWOi7217OSS+Cyn eJ72KW3g/0hzmIwnVHw+2EJuT5xqrgdbbScVasx5kxtHl9cct3U92hv5s57ZydqOXJpkZo rGyoohudhBns68WvaNNEFkl+iklMn6CO2MF5/BfWe93Y9mH/sDeUjLhMjnG1yXw4gNxxa1 X1HXcgXey7NFzG9NAnb/qSBnRFq8WbF2BEJArHgZsygSNm13w4g00EPWNlRFNpbxpSU6Db lfj9sU/xc1780bdfBIVLAE4emYUoT5Hb291ZCYym7XqjxKnP0YxoIDyN1kV73Q== 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 4P66mW6p8Cz1DcS; Wed, 1 Feb 2023 03:27:23 +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 3113RNPr051253; Wed, 1 Feb 2023 03:27:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3113RNXp051252; Wed, 1 Feb 2023 03:27:23 GMT (envelope-from git) Date: Wed, 1 Feb 2023 03:27:23 GMT Message-Id: <202302010327.3113RNXp051252@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: a7ce4a295346 - stable/12 - MFC: Add -DSTARTTLS CFLAG in order to enable DANE in sendmail builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: a7ce4a295346d207d835a2f3318231cebc7d4ccd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ce4a295346d207d835a2f3318231cebc7d4ccd commit a7ce4a295346d207d835a2f3318231cebc7d4ccd Author: Gregory Neil Shapiro AuthorDate: 2023-01-15 21:24:38 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-02-01 03:20:12 +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}