diff options
author | jnemeth <jnemeth@pkgsrc.org> | 2020-04-12 09:11:41 +0000 |
---|---|---|
committer | jnemeth <jnemeth@pkgsrc.org> | 2020-04-12 09:11:41 +0000 |
commit | 88087e4bff5fd625fb3a54843727caaa118b34fb (patch) | |
tree | 1224de8d7fde53ce8e0cd1bb052b2483c8938786 /mail | |
parent | 0a619188fa60ad660d00e6565d32d6dcc384ce32 (diff) | |
download | pkgsrc-88087e4bff5fd625fb3a54843727caaa118b34fb.tar.gz |
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
Diffstat (limited to 'mail')
-rw-r--r-- | mail/sendmail/Makefile | 4 | ||||
-rw-r--r-- | mail/sendmail/distinfo | 6 | ||||
-rw-r--r-- | mail/sendmail/patches/patch-aw | 12 | ||||
-rw-r--r-- | mail/sendmail/patches/patch-bo | 6 |
4 files changed, 11 insertions, 17 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index fa1a504a0fd..a579c871fc9 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.135 2020/01/18 21:49:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.136 2020/04/12 09:11:41 jnemeth Exp $ PKGNAME= sendmail-${DIST_VERS} -PKGREVISION= 7 +PKGREVISION= 8 COMMENT= The well known Mail Transport Agent CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]* diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index c4781cbc392..ee91f533a23 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.61 2019/07/26 19:33:33 jnemeth Exp $ +$NetBSD: distinfo,v 1.62 2020/04/12 09:11:41 jnemeth Exp $ SHA1 (sendmail.8.15.2.tar.gz) = 5801d4b06f4e38ef228a5954a44d17636eaa5a16 RMD160 (sendmail.8.15.2.tar.gz) = 1fe2210e1ded1fe2ee640fceb1de29f19ceaa8e4 @@ -19,7 +19,7 @@ SHA1 (patch-as) = 652b107d5f68507a0b2fb7c5402186eff96c6bc0 SHA1 (patch-at) = 7c206df88d29671faef950276a5119ef2f525f4b SHA1 (patch-au) = 87e907f36482f3ca03754160bc1ee106e17e3aaa SHA1 (patch-av) = 1b6bd4547930507ab67427bcf8a390c0afce0fb0 -SHA1 (patch-aw) = 33066ae7770e7f8ea6520b3fc0ecbe46dd4d958d +SHA1 (patch-aw) = 2fb31bda2cafb41347c80e0809976f4d24fa169a SHA1 (patch-ax) = adba9177404e10d5f461e1e8f0c4dd5840d78dd1 SHA1 (patch-ay) = 94f9c633c1d15037ddd0a6ed46a4f3aaec236fc2 SHA1 (patch-az) = 5885c524fcae3a314c07eadf661bbe6ae1c081e7 @@ -34,7 +34,7 @@ SHA1 (patch-bk) = 0b0b85fb6c5c80c8419c783dc3e35d28edbdb70b SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9 SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9 -SHA1 (patch-bo) = f5bc3abd58f2d0dd89929ea4aed2abd0e2993df5 +SHA1 (patch-bo) = d338b035b54f87fc2e786ed85204c565fcc2c140 SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2 SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36 diff --git a/mail/sendmail/patches/patch-aw b/mail/sendmail/patches/patch-aw index 2a103b16d11..674f43f09dd 100644 --- a/mail/sendmail/patches/patch-aw +++ b/mail/sendmail/patches/patch-aw @@ -1,4 +1,4 @@ -$NetBSD: patch-aw,v 1.5 2019/07/15 04:32:49 jnemeth Exp $ +$NetBSD: patch-aw,v 1.6 2020/04/12 09:11:42 jnemeth Exp $ --- sendmail/readcf.c.orig 2015-06-17 16:51:58.000000000 +0000 +++ sendmail/readcf.c @@ -13,18 +13,16 @@ $NetBSD: patch-aw,v 1.5 2019/07/15 04:32:49 jnemeth Exp $ #define SECONDS #define MINUTES * 60 -@@ -2910,6 +2914,10 @@ static struct optioninfo +@@ -2910,6 +2914,8 @@ static struct optioninfo #endif #define O_USECOMPRESSEDIPV6ADDRESSES 0xec { "UseCompressedIPv6Addresses", O_USECOMPRESSEDIPV6ADDRESSES, OI_NONE }, -+#ifdef USE_BLACKLIST +# define O_BLACKLIST 0xf2 + { "UseBlacklist", O_BLACKLIST, OI_NONE }, -+#endif { NULL, '\0', OI_NONE } }; -@@ -3318,13 +3326,13 @@ setoption(opt, val, safe, sticky, e) +@@ -3318,13 +3324,13 @@ setoption(opt, val, safe, sticky, e) if (rfp->rf_name == NULL) syserr("readcf: I option value %s unrecognized", q); else if (clearmode) @@ -41,15 +39,13 @@ $NetBSD: patch-aw,v 1.5 2019/07/15 04:32:49 jnemeth Exp $ #else /* NAMED_BIND */ usrerr("name server (I option) specified but BIND not compiled in"); #endif /* NAMED_BIND */ -@@ -4540,6 +4548,12 @@ setoption(opt, val, safe, sticky, e) +@@ -4540,6 +4546,10 @@ setoption(opt, val, safe, sticky, e) UseCompressedIPv6Addresses = atobool(val); break; -+#ifdef USE_BLACKLIST + case O_BLACKLIST: + UseBlacklist = atobool(val); + break; -+#endif + default: if (tTd(37, 1)) diff --git a/mail/sendmail/patches/patch-bo b/mail/sendmail/patches/patch-bo index 0086bb268b2..f42f02bb1d1 100644 --- a/mail/sendmail/patches/patch-bo +++ b/mail/sendmail/patches/patch-bo @@ -1,4 +1,4 @@ -$NetBSD: patch-bo,v 1.2 2019/07/26 19:33:33 jnemeth Exp $ +$NetBSD: patch-bo,v 1.3 2020/04/12 09:11:42 jnemeth Exp $ --- sendmail/sendmail.h.orig 2015-06-19 12:59:29.000000000 +0000 +++ sendmail/sendmail.h @@ -13,13 +13,11 @@ $NetBSD: patch-bo,v 1.2 2019/07/26 19:33:33 jnemeth Exp $ #include "timers.h" #include <sm/exc.h> #include <sm/heap.h> -@@ -2544,6 +2548,10 @@ EXTERN int ConnectionRateWindowSize; +@@ -2544,6 +2548,8 @@ EXTERN int ConnectionRateWindowSize; EXTERN bool SSLEngineInitialized; #endif /* STARTTLS && USE_OPENSSL_ENGINE */ -+#ifdef USE_BLACKLIST +EXTERN bool UseBlacklist; -+#endif + /* ** Declarations of useful functions |