Tue May 10 13:46:49 2022 UTC ()
sendmail: fix SMTP AUTH

Pull in SMTP AUTH fix from 8.17.1.9.
Bump PKGREVISION


(sborrill)
diff -r1.140 -r1.141 pkgsrc/mail/sendmail/Makefile
diff -r1.67 -r1.68 pkgsrc/mail/sendmail/distinfo
diff -r1.4 -r1.5 pkgsrc/mail/sendmail/patches/patch-bo
cvs diff -r1.140 -r1.141 pkgsrc/mail/sendmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/Makefile 2021/11/09 22:02:36 1.140
+++ pkgsrc/mail/sendmail/Makefile 2022/05/10 13:46:49 1.141
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.140 2021/11/09 22:02:36 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.141 2022/05/10 13:46:49 sborrill Exp $
2 2
3PKGNAME= sendmail-${DIST_VERS} 3PKGNAME= sendmail-${DIST_VERS}
4PKGREVISION= 1 4PKGREVISION= 2
5COMMENT= The well known Mail Transport Agent 5COMMENT= The well known Mail Transport Agent
6 6
7CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]* 7CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
8CONFLICTS+= esmtp>=1.2 8CONFLICTS+= esmtp>=1.2
9 9
10.include "options.mk" 10.include "options.mk"
11.include "../../mail/sendmail/Makefile.common" 11.include "../../mail/sendmail/Makefile.common"
12 12
13USE_TOOLS+= pax 13USE_TOOLS+= pax
14 14
15MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC 15MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
16PLIST_SRC= ${WRKDIR}/.PLIST_SRC 16PLIST_SRC= ${WRKDIR}/.PLIST_SRC
17 17
cvs diff -r1.67 -r1.68 pkgsrc/mail/sendmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/distinfo 2021/12/19 04:01:11 1.67
+++ pkgsrc/mail/sendmail/distinfo 2022/05/10 13:46:49 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.67 2021/12/19 04:01:11 jnemeth Exp $ 1$NetBSD: distinfo,v 1.68 2022/05/10 13:46:49 sborrill 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
@@ -21,18 +21,18 @@ SHA1 (patch-aw) = 89a0f2c3102f6baea966c8 @@ -21,18 +21,18 @@ SHA1 (patch-aw) = 89a0f2c3102f6baea966c8
21SHA1 (patch-ax) = 771c9c8a951a09c80eb85233986af1fc7fedbe77 21SHA1 (patch-ax) = 771c9c8a951a09c80eb85233986af1fc7fedbe77
22SHA1 (patch-ay) = af4c41b9f7671920cd3db95552dc67edffaf729a 22SHA1 (patch-ay) = af4c41b9f7671920cd3db95552dc67edffaf729a
23SHA1 (patch-az) = 53738dc9d3618838a6e6fd2f0ec9c4fd1f19ae2e 23SHA1 (patch-az) = 53738dc9d3618838a6e6fd2f0ec9c4fd1f19ae2e
24SHA1 (patch-ba) = c190b11b9874f00a18b9c75b6e734f4a9dd3f68f 24SHA1 (patch-ba) = c190b11b9874f00a18b9c75b6e734f4a9dd3f68f
25SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1 25SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1
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) = ca819c8f8de9bd67b7e6d5738020c90b03c6fad8 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
cvs diff -r1.4 -r1.5 pkgsrc/mail/sendmail/patches/patch-bo (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/patches/patch-bo 2021/07/04 07:57:13 1.4
+++ pkgsrc/mail/sendmail/patches/patch-bo 2022/05/10 13:46:49 1.5
@@ -1,24 +1,37 @@ @@ -1,24 +1,37 @@
1$NetBSD: patch-bo,v 1.4 2021/07/04 07:57:13 jnemeth Exp $ 1$NetBSD: patch-bo,v 1.5 2022/05/10 13:46:49 sborrill Exp $
 2
 3Add blacklist support.
 4Pull up SMTP AUTH fix from 8.17.1.9 as per:
 5 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262935
2 6
3--- sendmail/sendmail.h.orig 2020-07-02 05:00:37.000000000 +0000 7--- sendmail/sendmail.h.orig 2020-07-02 05:00:37.000000000 +0000
4+++ sendmail/sendmail.h 8+++ sendmail/sendmail.h 2022-05-10 09:51:29.162720330 +0000
5@@ -63,6 +63,10 @@ SM_UNUSED(static char SmailId[]) = "@(#) 9@@ -63,6 +63,10 @@
6 #endif 10 #endif
7  11
8 #include "bf.h" 12 #include "bf.h"
9+#ifdef USE_BLACKLIST 13+#ifdef USE_BLACKLIST
10+#include <blacklist.h> 14+#include <blacklist.h>
11+#endif 15+#endif
12+#include "blacklist_client.h" 16+#include "blacklist_client.h"
13 #include "timers.h" 17 #include "timers.h"
14 #include <sm/exc.h> 18 #include <sm/exc.h>
15 #include <sm/heap.h> 19 #include <sm/heap.h>
16@@ -2576,6 +2580,8 @@ EXTERN int Hacks; /* bit field of run-ti 20@@ -706,7 +710,7 @@
 21 # define SASL_IS_AUTH 2 /* authenticated */
 22
 23 /* SASL options */
 24-# define SASL_AUTH_AUTH 0x1000 /* use auth= only if authenticated */
 25+# define SASL_AUTH_AUTH 0x10000 /* use auth= only if authenticated */
 26 # if SASL >= 20101
 27 # define SASL_SEC_MASK SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */
 28 # else /* SASL >= 20101 */
 29@@ -2576,6 +2580,8 @@
17  30
18 EXTERN int ConnectionRateWindowSize; 31 EXTERN int ConnectionRateWindowSize;
19  32
20+EXTERN bool UseBlacklist; 33+EXTERN bool UseBlacklist;
21+ 34+
22 /* 35 /*
23 ** Declarations of useful functions 36 ** Declarations of useful functions
24 */ 37 */