Sun Apr 12 09:11:42 2020 UTC ()
Allow the UseBlacklist configuration option, but ignore it, on
systems that don't have blacklistd.  This prevents configuration
errors as the default config files have:

O UseBlacklist=false


(jnemeth)
diff -r1.135 -r1.136 pkgsrc/mail/sendmail/Makefile
diff -r1.61 -r1.62 pkgsrc/mail/sendmail/distinfo
diff -r1.5 -r1.6 pkgsrc/mail/sendmail/patches/patch-aw
diff -r1.2 -r1.3 pkgsrc/mail/sendmail/patches/patch-bo
cvs diff -r1.135 -r1.136 pkgsrc/mail/sendmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/Makefile 2020/01/18 21:49:54 1.135
+++ pkgsrc/mail/sendmail/Makefile 2020/04/12 09:11:41 1.136
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.135 2020/01/18 21:49:54 jperkin Exp $ 1# $NetBSD: Makefile,v 1.136 2020/04/12 09:11:41 jnemeth Exp $
2 2
3PKGNAME= sendmail-${DIST_VERS} 3PKGNAME= sendmail-${DIST_VERS}
4PKGREVISION= 7 4PKGREVISION= 8
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.61 -r1.62 pkgsrc/mail/sendmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/distinfo 2019/07/26 19:33:33 1.61
+++ pkgsrc/mail/sendmail/distinfo 2020/04/12 09:11:41 1.62
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: distinfo,v 1.61 2019/07/26 19:33:33 jnemeth Exp $ 1$NetBSD: distinfo,v 1.62 2020/04/12 09:11:41 jnemeth Exp $
2 2
3SHA1 (sendmail.8.15.2.tar.gz) = 5801d4b06f4e38ef228a5954a44d17636eaa5a16 3SHA1 (sendmail.8.15.2.tar.gz) = 5801d4b06f4e38ef228a5954a44d17636eaa5a16
4RMD160 (sendmail.8.15.2.tar.gz) = 1fe2210e1ded1fe2ee640fceb1de29f19ceaa8e4 4RMD160 (sendmail.8.15.2.tar.gz) = 1fe2210e1ded1fe2ee640fceb1de29f19ceaa8e4
5SHA512 (sendmail.8.15.2.tar.gz) = 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9 5SHA512 (sendmail.8.15.2.tar.gz) = 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
6Size (sendmail.8.15.2.tar.gz) = 2207417 bytes 6Size (sendmail.8.15.2.tar.gz) = 2207417 bytes
7SHA1 (patch-aa) = bd1ab754f7146d002eaf8c0347e114b4049a7776 7SHA1 (patch-aa) = bd1ab754f7146d002eaf8c0347e114b4049a7776
8SHA1 (patch-af) = bd3e26b0e78eadd610713430ae6deac888176442 8SHA1 (patch-af) = bd3e26b0e78eadd610713430ae6deac888176442
9SHA1 (patch-ag) = f76de45c7e8d16207670e151265b7edbca4c045c 9SHA1 (patch-ag) = f76de45c7e8d16207670e151265b7edbca4c045c
10SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028 10SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
11SHA1 (patch-ai) = 0bd3676dce988cf1167fae09443da0d1a1363abb 11SHA1 (patch-ai) = 0bd3676dce988cf1167fae09443da0d1a1363abb
12SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433 12SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
13SHA1 (patch-an) = 56b8b82880b9ef8fefd7cbbe98dad30b8db753f1 13SHA1 (patch-an) = 56b8b82880b9ef8fefd7cbbe98dad30b8db753f1
14SHA1 (patch-ao) = 88dd76b71ad57a8d0efdb6e8518ff01689ecf634 14SHA1 (patch-ao) = 88dd76b71ad57a8d0efdb6e8518ff01689ecf634
15SHA1 (patch-ap) = 9c83d9ed1b4d8c851c106597638763515923a4ab 15SHA1 (patch-ap) = 9c83d9ed1b4d8c851c106597638763515923a4ab
16SHA1 (patch-aq) = 722382daf085ac2f4a06d0c812bb00f49bcdfd2c 16SHA1 (patch-aq) = 722382daf085ac2f4a06d0c812bb00f49bcdfd2c
17SHA1 (patch-ar) = 1ecf39ddded8504079c5c446625bf9ad9497044f 17SHA1 (patch-ar) = 1ecf39ddded8504079c5c446625bf9ad9497044f
18SHA1 (patch-as) = 652b107d5f68507a0b2fb7c5402186eff96c6bc0 18SHA1 (patch-as) = 652b107d5f68507a0b2fb7c5402186eff96c6bc0
19SHA1 (patch-at) = 7c206df88d29671faef950276a5119ef2f525f4b 19SHA1 (patch-at) = 7c206df88d29671faef950276a5119ef2f525f4b
20SHA1 (patch-au) = 87e907f36482f3ca03754160bc1ee106e17e3aaa 20SHA1 (patch-au) = 87e907f36482f3ca03754160bc1ee106e17e3aaa
21SHA1 (patch-av) = 1b6bd4547930507ab67427bcf8a390c0afce0fb0 21SHA1 (patch-av) = 1b6bd4547930507ab67427bcf8a390c0afce0fb0
22SHA1 (patch-aw) = 33066ae7770e7f8ea6520b3fc0ecbe46dd4d958d 22SHA1 (patch-aw) = 2fb31bda2cafb41347c80e0809976f4d24fa169a
23SHA1 (patch-ax) = adba9177404e10d5f461e1e8f0c4dd5840d78dd1 23SHA1 (patch-ax) = adba9177404e10d5f461e1e8f0c4dd5840d78dd1
24SHA1 (patch-ay) = 94f9c633c1d15037ddd0a6ed46a4f3aaec236fc2 24SHA1 (patch-ay) = 94f9c633c1d15037ddd0a6ed46a4f3aaec236fc2
25SHA1 (patch-az) = 5885c524fcae3a314c07eadf661bbe6ae1c081e7 25SHA1 (patch-az) = 5885c524fcae3a314c07eadf661bbe6ae1c081e7
26SHA1 (patch-ba) = c190b11b9874f00a18b9c75b6e734f4a9dd3f68f 26SHA1 (patch-ba) = c190b11b9874f00a18b9c75b6e734f4a9dd3f68f
27SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1 27SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1
28SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683 28SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683
29SHA1 (patch-bd) = 1a6d035c585838e771a1a677892b95bb82000a7b 29SHA1 (patch-bd) = 1a6d035c585838e771a1a677892b95bb82000a7b
30SHA1 (patch-be) = d2f3397b7880f23f8cbd5d3c4eb5ccfe6a6ca75b 30SHA1 (patch-be) = d2f3397b7880f23f8cbd5d3c4eb5ccfe6a6ca75b
31SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a 31SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a
32SHA1 (patch-bg) = 17b750d84333eacd39a23aa313d5ba24dc7d2156 32SHA1 (patch-bg) = 17b750d84333eacd39a23aa313d5ba24dc7d2156
33SHA1 (patch-bk) = 0b0b85fb6c5c80c8419c783dc3e35d28edbdb70b 33SHA1 (patch-bk) = 0b0b85fb6c5c80c8419c783dc3e35d28edbdb70b
34SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd 34SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd
35SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9 35SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9
36SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9 36SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9
37SHA1 (patch-bo) = f5bc3abd58f2d0dd89929ea4aed2abd0e2993df5 37SHA1 (patch-bo) = d338b035b54f87fc2e786ed85204c565fcc2c140
38SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb 38SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb
39SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2 39SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2
40SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36 40SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36
cvs diff -r1.5 -r1.6 pkgsrc/mail/sendmail/patches/patch-aw (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/patches/patch-aw 2019/07/15 04:32:49 1.5
+++ pkgsrc/mail/sendmail/patches/patch-aw 2020/04/12 09:11:42 1.6
@@ -1,56 +1,52 @@ @@ -1,56 +1,52 @@
1$NetBSD: patch-aw,v 1.5 2019/07/15 04:32:49 jnemeth Exp $ 1$NetBSD: patch-aw,v 1.6 2020/04/12 09:11:42 jnemeth Exp $
2 2
3--- sendmail/readcf.c.orig 2015-06-17 16:51:58.000000000 +0000 3--- sendmail/readcf.c.orig 2015-06-17 16:51:58.000000000 +0000
4+++ sendmail/readcf.c 4+++ sendmail/readcf.c
5@@ -20,6 +20,10 @@ SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013 5@@ -20,6 +20,10 @@ SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013
6 # include <arpa/inet.h> 6 # include <arpa/inet.h>
7 #endif /* NETINET || NETINET6 */ 7 #endif /* NETINET || NETINET6 */
8  8
9+#if NAMED_BIND 9+#if NAMED_BIND
10+extern struct __res_state sm_res; 10+extern struct __res_state sm_res;
11+#endif 11+#endif
12+ 12+
13  13
14 #define SECONDS 14 #define SECONDS
15 #define MINUTES * 60 15 #define MINUTES * 60
16@@ -2910,6 +2914,10 @@ static struct optioninfo 16@@ -2910,6 +2914,8 @@ static struct optioninfo
17 #endif 17 #endif
18 #define O_USECOMPRESSEDIPV6ADDRESSES 0xec 18 #define O_USECOMPRESSEDIPV6ADDRESSES 0xec
19 { "UseCompressedIPv6Addresses", O_USECOMPRESSEDIPV6ADDRESSES, OI_NONE }, 19 { "UseCompressedIPv6Addresses", O_USECOMPRESSEDIPV6ADDRESSES, OI_NONE },
20+#ifdef USE_BLACKLIST 
21+# define O_BLACKLIST 0xf2 20+# define O_BLACKLIST 0xf2
22+ { "UseBlacklist", O_BLACKLIST, OI_NONE }, 21+ { "UseBlacklist", O_BLACKLIST, OI_NONE },
23+#endif 
24  22
25 { NULL, '\0', OI_NONE } 23 { NULL, '\0', OI_NONE }
26 }; 24 };
27@@ -3318,13 +3326,13 @@ setoption(opt, val, safe, sticky, e) 25@@ -3318,13 +3324,13 @@ setoption(opt, val, safe, sticky, e)
28 if (rfp->rf_name == NULL) 26 if (rfp->rf_name == NULL)
29 syserr("readcf: I option value %s unrecognized", q); 27 syserr("readcf: I option value %s unrecognized", q);
30 else if (clearmode) 28 else if (clearmode)
31- _res.options &= ~rfp->rf_bits; 29- _res.options &= ~rfp->rf_bits;
32+ sm_res.options &= ~rfp->rf_bits; 30+ sm_res.options &= ~rfp->rf_bits;
33 else 31 else
34- _res.options |= rfp->rf_bits; 32- _res.options |= rfp->rf_bits;
35+ sm_res.options |= rfp->rf_bits; 33+ sm_res.options |= rfp->rf_bits;
36 } 34 }
37 if (tTd(8, 2)) 35 if (tTd(8, 2))
38 sm_dprintf("_res.options = %x, HasWildcardMX = %d\n", 36 sm_dprintf("_res.options = %x, HasWildcardMX = %d\n",
39- (unsigned int) _res.options, HasWildcardMX); 37- (unsigned int) _res.options, HasWildcardMX);
40+ (unsigned int) sm_res.options, HasWildcardMX); 38+ (unsigned int) sm_res.options, HasWildcardMX);
41 #else /* NAMED_BIND */ 39 #else /* NAMED_BIND */
42 usrerr("name server (I option) specified but BIND not compiled in"); 40 usrerr("name server (I option) specified but BIND not compiled in");
43 #endif /* NAMED_BIND */ 41 #endif /* NAMED_BIND */
44@@ -4540,6 +4548,12 @@ setoption(opt, val, safe, sticky, e) 42@@ -4540,6 +4546,10 @@ setoption(opt, val, safe, sticky, e)
45 UseCompressedIPv6Addresses = atobool(val); 43 UseCompressedIPv6Addresses = atobool(val);
46 break; 44 break;
47  45
48+#ifdef USE_BLACKLIST 
49+ case O_BLACKLIST: 46+ case O_BLACKLIST:
50+ UseBlacklist = atobool(val); 47+ UseBlacklist = atobool(val);
51+ break; 48+ break;
52+#endif 
53+ 49+
54 default: 50 default:
55 if (tTd(37, 1)) 51 if (tTd(37, 1))
56 { 52 {
cvs diff -r1.2 -r1.3 pkgsrc/mail/sendmail/patches/patch-bo (expand / switch to unified diff)

--- pkgsrc/mail/sendmail/patches/patch-bo 2019/07/26 19:33:33 1.2
+++ pkgsrc/mail/sendmail/patches/patch-bo 2020/04/12 09:11:42 1.3
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1$NetBSD: patch-bo,v 1.2 2019/07/26 19:33:33 jnemeth Exp $ 1$NetBSD: patch-bo,v 1.3 2020/04/12 09:11:42 jnemeth Exp $
2 2
3--- sendmail/sendmail.h.orig 2015-06-19 12:59:29.000000000 +0000 3--- sendmail/sendmail.h.orig 2015-06-19 12:59:29.000000000 +0000
4+++ sendmail/sendmail.h 4+++ sendmail/sendmail.h
5@@ -57,6 +57,10 @@ SM_UNUSED(static char SmailId[]) = "@(#) 5@@ -57,6 +57,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)
6 #endif /* _DEFINE */ 6 #endif /* _DEFINE */
7  7
8 #include "bf.h" 8 #include "bf.h"
9+#ifdef USE_BLACKLIST 9+#ifdef USE_BLACKLIST
10+#include <blacklist.h> 10+#include <blacklist.h>
11+#endif 11+#endif
12+#include "blacklist_client.h" 12+#include "blacklist_client.h"
13 #include "timers.h" 13 #include "timers.h"
14 #include <sm/exc.h> 14 #include <sm/exc.h>
15 #include <sm/heap.h> 15 #include <sm/heap.h>
16@@ -2544,6 +2548,10 @@ EXTERN int ConnectionRateWindowSize; 16@@ -2544,6 +2548,8 @@ EXTERN int ConnectionRateWindowSize;
17 EXTERN bool SSLEngineInitialized; 17 EXTERN bool SSLEngineInitialized;
18 #endif /* STARTTLS && USE_OPENSSL_ENGINE */ 18 #endif /* STARTTLS && USE_OPENSSL_ENGINE */
19  19
20+#ifdef USE_BLACKLIST 
21+EXTERN bool UseBlacklist; 20+EXTERN bool UseBlacklist;
22+#endif 
23+ 21+
24 /* 22 /*
25 ** Declarations of useful functions 23 ** Declarations of useful functions
26 */ 24 */