Received: by mail.netbsd.org (Postfix, from userid 605) id 07AF684CFC; Thu, 12 Jan 2023 11:09:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3947184CF9 for ; Thu, 12 Jan 2023 11:09:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 7FybBrPQkdrM for ; Thu, 12 Jan 2023 11:09:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A695D84CD9 for ; Thu, 12 Jan 2023 11:09:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A0051FA90; Thu, 12 Jan 2023 11:09:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1673521774113860" MIME-Version: 1.0 Date: Thu, 12 Jan 2023 11:09:34 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/mail/sendmail To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20230112110934.A0051FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1673521774113860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Thu Jan 12 11:09:34 UTC 2023 Modified Files: pkgsrc/mail/sendmail: distinfo Added Files: pkgsrc/mail/sendmail/patches: patch-sendmail_tls.c Log Message: sendmail: fix build with openssl3 To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 pkgsrc/mail/sendmail/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/mail/sendmail/patches/patch-sendmail_tls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1673521774113860 Content-Disposition: inline Content-Length: 2013 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/sendmail/distinfo diff -u pkgsrc/mail/sendmail/distinfo:1.68 pkgsrc/mail/sendmail/distinfo:1.69 --- pkgsrc/mail/sendmail/distinfo:1.68 Tue May 10 13:46:49 2022 +++ pkgsrc/mail/sendmail/distinfo Thu Jan 12 11:09:34 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.68 2022/05/10 13:46:49 sborrill Exp $ +$NetBSD: distinfo,v 1.69 2023/01/12 11:09:34 markd Exp $ BLAKE2s (sendmail.8.16.1.tar.gz) = 6f92d35a8dfe1ba071da197ae53559a1d67290f7042e5650ebbdac3d3045fe2f SHA512 (sendmail.8.16.1.tar.gz) = d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2 @@ -36,3 +36,4 @@ SHA1 (patch-bp) = 9a1daac264aba6c4fc39a6 SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2 SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36 SHA1 (patch-bs) = f73a66b3f747480505b26876430135364e9aa99e +SHA1 (patch-sendmail_tls.c) = 42b4af86be50f3b0c79fb3a2699b0c683ab34844 Added files: Index: pkgsrc/mail/sendmail/patches/patch-sendmail_tls.c diff -u /dev/null pkgsrc/mail/sendmail/patches/patch-sendmail_tls.c:1.1 --- /dev/null Thu Jan 12 11:09:34 2023 +++ pkgsrc/mail/sendmail/patches/patch-sendmail_tls.c Thu Jan 12 11:09:34 2023 @@ -0,0 +1,21 @@ +$NetBSD: patch-sendmail_tls.c,v 1.1 2023/01/12 11:09:34 markd Exp $ + +Support openssl3 + +--- sendmail/tls.c.orig 2020-06-02 09:41:43.000000000 +0000 ++++ sendmail/tls.c +@@ -29,7 +29,13 @@ SM_RCSID("@(#)$Id: tls.c,v 8.127 2013-11 + # ERROR: OpenSSL version OPENSSL_VERSION_NUMBER is unsupported. + # endif + +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_VERSION_NUMBER < 0x20000000L ++/* ++ ** *SSL version numbers: ++ ** OpenSSL 0.9 - 1.1 (so far), 3.0 (in alpha) ++ ** LibreSSL 2.0 (0x20000000L - part of "These will never change") ++ */ ++ ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000L && OPENSSL_VERSION_NUMBER < 0x20000000L) || OPENSSL_VERSION_NUMBER >= 0x30000000L + # define MTA_HAVE_DH_set0_pqg 1 + # define MTA_HAVE_DSA_GENERATE_EX 1 + --_----------=_1673521774113860--