Thu Jan 12 11:09:34 2023 UTC ()
sendmail: fix build with openssl3


(markd)
diff -r1.68 -r1.69 pkgsrc/mail/sendmail/distinfo
diff -r0 -r1.1 pkgsrc/mail/sendmail/patches/patch-sendmail_tls.c
cvs diff -r1.68 -r1.69 pkgsrc/mail/sendmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/distinfo 2022/05/10 13:46:49 1.68
+++ pkgsrc/mail/sendmail/distinfo 2023/01/12 11:09:34 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.68 2022/05/10 13:46:49 sborrill Exp $ 1$NetBSD: distinfo,v 1.69 2023/01/12 11:09:34 markd Exp $
2 2
3BLAKE2s (sendmail.8.16.1.tar.gz) = 6f92d35a8dfe1ba071da197ae53559a1d67290f7042e5650ebbdac3d3045fe2f 3BLAKE2s (sendmail.8.16.1.tar.gz) = 6f92d35a8dfe1ba071da197ae53559a1d67290f7042e5650ebbdac3d3045fe2f
4SHA512 (sendmail.8.16.1.tar.gz) = d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2 4SHA512 (sendmail.8.16.1.tar.gz) = d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
5Size (sendmail.8.16.1.tar.gz) = 2236402 bytes 5Size (sendmail.8.16.1.tar.gz) = 2236402 bytes
6SHA1 (patch-aa) = bd1ab754f7146d002eaf8c0347e114b4049a7776 6SHA1 (patch-aa) = bd1ab754f7146d002eaf8c0347e114b4049a7776
7SHA1 (patch-af) = 21f8c93a13d038fe49f0acbe38ad1453eb67788b 7SHA1 (patch-af) = 21f8c93a13d038fe49f0acbe38ad1453eb67788b
8SHA1 (patch-ag) = 6dcca8944aa854f1767c7ee12fe14872a4e14d2e 8SHA1 (patch-ag) = 6dcca8944aa854f1767c7ee12fe14872a4e14d2e
9SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028 9SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
10SHA1 (patch-ai) = 7a306d7239f4036cd8d80d6dbe2a07eb80f02d13 10SHA1 (patch-ai) = 7a306d7239f4036cd8d80d6dbe2a07eb80f02d13
11SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433 11SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
12SHA1 (patch-an) = 1481dd98d6aae000e71ba1c42f3d84197a4e4dc0 12SHA1 (patch-an) = 1481dd98d6aae000e71ba1c42f3d84197a4e4dc0
13SHA1 (patch-ao) = 88dd76b71ad57a8d0efdb6e8518ff01689ecf634 13SHA1 (patch-ao) = 88dd76b71ad57a8d0efdb6e8518ff01689ecf634
14SHA1 (patch-aq) = 5c083d9f9f71bcc42811a3d085e936eaaa404c96 14SHA1 (patch-aq) = 5c083d9f9f71bcc42811a3d085e936eaaa404c96
@@ -26,13 +26,14 @@ SHA1 (patch-bb) = 6c86a60af25b02fc0389f1 @@ -26,13 +26,14 @@ SHA1 (patch-bb) = 6c86a60af25b02fc0389f1
26SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683 26SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683
27SHA1 (patch-bd) = 1a6d035c585838e771a1a677892b95bb82000a7b 27SHA1 (patch-bd) = 1a6d035c585838e771a1a677892b95bb82000a7b
28SHA1 (patch-be) = d2f3397b7880f23f8cbd5d3c4eb5ccfe6a6ca75b 28SHA1 (patch-be) = d2f3397b7880f23f8cbd5d3c4eb5ccfe6a6ca75b
29SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a 29SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a
30SHA1 (patch-bg) = 716c90ff76edbdcb223111412bdd011d4a252ca6 30SHA1 (patch-bg) = 716c90ff76edbdcb223111412bdd011d4a252ca6
31SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd 31SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd
32SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9 32SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9
33SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9 33SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9
34SHA1 (patch-bo) = e55b2cb4ee31fdfa593a307b4ec8ca0799f55060 34SHA1 (patch-bo) = e55b2cb4ee31fdfa593a307b4ec8ca0799f55060
35SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb 35SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb
36SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2 36SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2
37SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36 37SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36
38SHA1 (patch-bs) = f73a66b3f747480505b26876430135364e9aa99e 38SHA1 (patch-bs) = f73a66b3f747480505b26876430135364e9aa99e
 39SHA1 (patch-sendmail_tls.c) = 42b4af86be50f3b0c79fb3a2699b0c683ab34844
File Added: pkgsrc/mail/sendmail/patches/patch-sendmail_tls.c
$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