Change from using ${OPSYS} to looking for /usr/include/blacklist.h

to determine whether to use the blacklistd feature.  This allows
for automatically picking up new OSes that provide blacklistd as
well as ignoring older versions of NetBSD and FreeBSD that don't
have blacklistd.

Add UseBlacklist to M4 config generator.  This means that you can
turn it on by doing something like:

LOCAL_CONFIG
...
define(`confUSE_BLACKLIST', `True')dnl
...

It is set to false as the feature is experimental having just been
created.

Ride previous PKGREVISION bump as it was less than an hour ago.

5 files changed, 50 insertions, 5 deletions

diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index 89fe07ac0cf..eb6ddf6b35f 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2019/07/15 04:32:49 jnemeth Exp $
+$NetBSD: distinfo,v 1.60 2019/07/15 05:30:33 jnemeth Exp $
 
 SHA1 (sendmail.8.15.2.tar.gz) = 5801d4b06f4e38ef228a5954a44d17636eaa5a16
 RMD160 (sendmail.8.15.2.tar.gz) = 1fe2210e1ded1fe2ee640fceb1de29f19ceaa8e4
@@ -32,6 +32,9 @@ SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a
 SHA1 (patch-bg) = 17b750d84333eacd39a23aa313d5ba24dc7d2156
 SHA1 (patch-bk) = 0b0b85fb6c5c80c8419c783dc3e35d28edbdb70b
 SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd
-SHA1 (patch-bm) = a30f2152407a1f5ac84d95f5c28c506b5645f4bc
+SHA1 (patch-bm) = b1ec82ab5a97c2dc7f7230d31e47c89b7b5ac1d9
 SHA1 (patch-bn) = 3af37c9d3523d6093181ae3b7d4c25bc8173b7f9
 SHA1 (patch-bo) = b92941be46a3dc86226a774b5df31ce62e9fbc17
+SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb
+SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2
+SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index c9cb86bd9c7..706b059d861 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.25 2019/07/15 04:32:49 jnemeth Exp $
+# $NetBSD: options.mk,v 1.26 2019/07/15 05:30:33 jnemeth Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl tls tcpwrappers
@@ -7,10 +7,12 @@ PKG_SUGGESTED_OPTIONS=	inet6 tcpwrappers tls
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
+.for dir in ${COMPILER_INCLUDE_DIRS}
+.  if exists(${dir}/blacklist.h)
 PKG_SUPPORTED_OPTIONS+=	blacklistd
 PKG_SUGGESTED_OPTIONS+=	blacklistd
-.endif
+.  endif
+.endfor
 
 PKG_OPTIONS_LEGACY_OPTS+=	starttls:tls ffr_tls_1:sendmail-ffr-tls
 
diff --git a/mail/sendmail/patches/patch-bp b/mail/sendmail/patches/patch-bp
new file mode 100644
index 00000000000..3f09d811964
--- /dev/null
+++ b/mail/sendmail/patches/patch-bp
@@ -0,0 +1,14 @@
+$NetBSD: patch-bp,v 1.1 2019/07/15 05:30:33 jnemeth Exp $
+
+--- cf/README.orig	2015-06-17 16:51:58.000000000 +0000
++++ cf/README
+@@ -4456,6 +4456,9 @@ confMILTER_MACROS_EOH		Milter.macros.eoh
+ confMILTER_MACROS_DATA		Milter.macros.data
+ 					Macros to transmit to milters
+ 					after DATA command is received.
++confUSE_BLACKLIST	UseBlacklist	[False] Whether to send authentication
++					failure and success information to
++					blacklistd.
+ 
+ 
+ See also the description of OSTYPE for some parameters that can be
diff --git a/mail/sendmail/patches/patch-bq b/mail/sendmail/patches/patch-bq
new file mode 100644
index 00000000000..51cd8ec0dc4
--- /dev/null
+++ b/mail/sendmail/patches/patch-bq
@@ -0,0 +1,12 @@
+$NetBSD: patch-bq,v 1.1 2019/07/15 05:30:33 jnemeth Exp $
+
+--- cf/m4/cfhead.m4.orig	2015-02-28 00:20:38.000000000 +0000
++++ cf/m4/cfhead.m4
+@@ -304,6 +304,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_
+ define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
+ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
+ define(`confMILTER_MACROS_EOM', `{msg_id}')
++define(`confUSE_BLACKLIST', `False')
+ 
+ 
+ divert(0)dnl
diff --git a/mail/sendmail/patches/patch-br b/mail/sendmail/patches/patch-br
new file mode 100644
index 00000000000..fe4387ca562
--- /dev/null
+++ b/mail/sendmail/patches/patch-br
@@ -0,0 +1,14 @@
+$NetBSD: patch-br,v 1.1 2019/07/15 05:30:33 jnemeth Exp $
+
+--- cf/m4/proto.m4.orig	2015-05-22 13:42:27.000000000 +0000
++++ cf/m4/proto.m4
+@@ -695,6 +695,9 @@ _OPTION(MaxNOOPCommands, `confMAX_NOOP_C
+ # Name to use for EHLO (defaults to $j)
+ _OPTION(HeloName, `confHELO_NAME')
+ 
++# blacklistd
++_OPTION(UseBlacklist, `confUSE_BLACKLIST', `False')
++
+ ifdef(`_NEED_SMTPOPMODES_', `dnl
+ # SMTP operation modes
+ C{SMTPOpModes} s d D')