pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/sendmail
Module Name: pkgsrc
Committed By: jnemeth
Date: Mon Mar 2 07:39:30 UTC 2026
Modified Files:
pkgsrc/mail/sendmail: Makefile Makefile.common PLIST distinfo
options.mk
pkgsrc/mail/sendmail/patches: patch-an patch-ar patch-at patch-au
patch-aw patch-ay patch-az patch-bl patch-bm patch-bn patch-bo
patch-bp patch-bq patch-br
Added Files:
pkgsrc/mail/sendmail/files: site.config.m4-blocklistd
Removed Files:
pkgsrc/mail/sendmail/files: site.config.m4-blacklistd
Log Message:
Update to sendmail 8.18.2
pkgsrc changes:
- fix one thing related to resn
- convert from NetBSD's old blocklistd to blacklistd
NOTE: UseBlocklist is now UseBlacklist
SENDMAIL RELEASE NOTES
This listing shows the version of the sendmail binary, the version
of the sendmail configuration files, the date of release, and a
summary of the changes in that release.
8.18.2/8.18.2 2025/12/27
Avoid adding a second To: header to DSNs, instead any
additional addresses are appended to an existing
To: header (this also applies to Cc: and Bcc:).
Fix matching of wildcard SANs in the experimental support
for SMTP MTA Strict Transport Security (MTA-STS).
Problem reported by Dilyan Palauzo.
The experimental support for SMTP MTA Strict Transport
Security has been significantly rewritten to handle
the problems caused by it being tied to the domain
of a RCPT address (instead to an SMTP server for
all the domains it handles - compare DANE).
The most visible change is that an SMTP transaction
where the first RCPT has an STS policy will have
only RCPTs with the same domain instead of all
RCPTs going to the same servers (MX).
Accordingly, MTA-STS can be disabled per RCPT domain
by adding access map entries of the form
STS:domain NO
Successful deliveries to RCPTs which have an STS
policy show STS=OK in the to=... stat=Sent log entry.
If an STS policy for a RCPT could not be fulfilled
then the RCPT is not being sent and an error containing
the string "STS" is logged.
MaxQueueAge is now observed for all types of QueueSortOrder
even those which internally skip some code (including
the MaxQueueAge check).
On some systems the rejection of a RCPT by a milter could
silently be ignored.
Increase size for an internal buffer which can contain AUTH
data because XOAUTH2 could use very long tokens.
Patch from Frank Schmirler.
Portability:
Add support for Darwin 24 and 25.
LIBSM: Fix compilation of vfscanf.c with gcc-15. Problem
reported by Jaroslav Škarvada of RedHat.
MAILSTATS: Fix compilation with gcc-15. Problem reported by
Jaroslav Škarvada of RedHat.
New Files:
cf/feature/same_domain_only.m4
devtools/OS/Darwin.24.x
devtools/OS/Darwin.25.x
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 pkgsrc/mail/sendmail/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/mail/sendmail/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/sendmail/PLIST \
pkgsrc/mail/sendmail/options.mk
cvs rdiff -u -r1.72 -r1.73 pkgsrc/mail/sendmail/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/sendmail/files/site.config.m4-blacklistd
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/sendmail/files/site.config.m4-blocklistd
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/sendmail/patches/patch-an
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/sendmail/patches/patch-ar \
pkgsrc/mail/sendmail/patches/patch-au
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/sendmail/patches/patch-at \
pkgsrc/mail/sendmail/patches/patch-ay
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/sendmail/patches/patch-aw
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/sendmail/patches/patch-az \
pkgsrc/mail/sendmail/patches/patch-bo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/sendmail/patches/patch-bl \
pkgsrc/mail/sendmail/patches/patch-bm \
pkgsrc/mail/sendmail/patches/patch-bn
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/sendmail/patches/patch-bp \
pkgsrc/mail/sendmail/patches/patch-bq \
pkgsrc/mail/sendmail/patches/patch-br
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/sendmail/Makefile
diff -u pkgsrc/mail/sendmail/Makefile:1.152 pkgsrc/mail/sendmail/Makefile:1.153
--- pkgsrc/mail/sendmail/Makefile:1.152 Wed Jan 7 08:47:49 2026
+++ pkgsrc/mail/sendmail/Makefile Mon Mar 2 07:39:29 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2026/01/07 08:47:49 wiz Exp $
+# $NetBSD: Makefile,v 1.153 2026/03/02 07:39:29 jnemeth Exp $
PKGNAME= sendmail-${DIST_VERS}
-PKGREVISION= 9
COMMENT= The well known Mail Transport Agent
CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
@@ -109,8 +108,8 @@ post-patch: make-sendmail-siteconfig
.if !empty(PKG_OPTIONS:Msendmail-ffr-badrcptshutdown)
cat ${FILESDIR}/site.config.m4-ffr_badrcptshutdown >>${SITECONFIG}
.endif
-.if !empty(PKG_OPTIONS:Mblacklist)
- cat ${FILESDIR}/site.config.m4-blacklistd >>${SITECONFIG}
+.if !empty(PKG_OPTIONS:Mblocklist)
+ cat ${FILESDIR}/site.config.m4-blocklistd >>${SITECONFIG}
.endif
.if !empty(PKG_OPTIONS:Msmtputf8)
cat ${FILESDIR}/site.config.m4-smtputf8 >>${SITECONFIG}
Index: pkgsrc/mail/sendmail/Makefile.common
diff -u pkgsrc/mail/sendmail/Makefile.common:1.71 pkgsrc/mail/sendmail/Makefile.common:1.72
--- pkgsrc/mail/sendmail/Makefile.common:1.71 Mon Mar 31 14:13:21 2025
+++ pkgsrc/mail/sendmail/Makefile.common Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.71 2025/03/31 14:13:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.72 2026/03/02 07:39:29 jnemeth Exp $
#
# used by mail/libmilter/Makefile
# used by mail/sendmail/Makefile
@@ -22,7 +22,7 @@ PATCHDIR= ${.CURDIR}/../../mail/sendmail
USE_CC_FEATURES= c99
-DIST_VERS= 8.18.1
+DIST_VERS= 8.18.2
MAKE_ENV+= BSD_BINOWN=${BINOWN} BSD_BINGRP=${BINGRP} \
BSD_MANOWN=${MANOWN} BSD_MANGRP=${MANGRP} \
Index: pkgsrc/mail/sendmail/PLIST
diff -u pkgsrc/mail/sendmail/PLIST:1.27 pkgsrc/mail/sendmail/PLIST:1.28
--- pkgsrc/mail/sendmail/PLIST:1.27 Mon Feb 12 03:23:05 2024
+++ pkgsrc/mail/sendmail/PLIST Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2024/02/12 03:23:05 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.28 2026/03/02 07:39:29 jnemeth Exp $
bin/hoststat
bin/mailq
bin/newaliases
@@ -145,6 +145,7 @@ share/sendmail/feature/relay_hosts_only.
share/sendmail/feature/relay_local_from.m4
share/sendmail/feature/relay_mail_from.m4
share/sendmail/feature/require_rdns.m4
+share/sendmail/feature/same_domain_only.m4
share/sendmail/feature/smrsh.m4
share/sendmail/feature/stickyhost.m4
share/sendmail/feature/sts.m4
Index: pkgsrc/mail/sendmail/options.mk
diff -u pkgsrc/mail/sendmail/options.mk:1.27 pkgsrc/mail/sendmail/options.mk:1.28
--- pkgsrc/mail/sendmail/options.mk:1.27 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/options.mk Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2024/01/15 04:43:22 jnemeth Exp $
+# $NetBSD: options.mk,v 1.28 2026/03/02 07:39:29 jnemeth Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers
@@ -9,10 +9,11 @@ PKG_SUGGESTED_OPTIONS= inet6 tcpwrappers
.include "../../mk/bsd.prefs.mk"
.for dir in ${COMPILER_INCLUDE_DIRS}
-. if exists(${dir}/blacklist.h)
-PKG_SUPPORTED_OPTIONS+= blacklist
-PKG_SUGGESTED_OPTIONS+= blacklist
-PKG_OPTIONS_LEGACY_OPTS+= blacklistd:blacklist
+. if exists(${dir}/blocklist.h)
+PKG_SUPPORTED_OPTIONS+= blocklist
+PKG_SUGGESTED_OPTIONS+= blocklist
+PKG_OPTIONS_LEGACY_OPTS+= blacklistd:blocklist
+PKG_OPTIONS_LEGACY_OPTS+= blacklist:blocklist
. endif
.endfor
@@ -75,7 +76,7 @@ PKG_OPTIONS_LEGACY_OPTS+= starttls:tls f
.endif
###
-### NetBSD blacklistd(8) support.
+### NetBSD blocklistd(8) support.
###
# Nothing to do here, activation is done in Makefile
Index: pkgsrc/mail/sendmail/distinfo
diff -u pkgsrc/mail/sendmail/distinfo:1.72 pkgsrc/mail/sendmail/distinfo:1.73
--- pkgsrc/mail/sendmail/distinfo:1.72 Mon Feb 19 04:12:36 2024
+++ pkgsrc/mail/sendmail/distinfo Mon Mar 2 07:39:29 2026
@@ -1,26 +1,26 @@
-$NetBSD: distinfo,v 1.72 2024/02/19 04:12:36 jnemeth Exp $
+$NetBSD: distinfo,v 1.73 2026/03/02 07:39:29 jnemeth Exp $
-BLAKE2s (sendmail.8.18.1.tar.gz) = 959e83d47978867cf89f817e51ce16a834998ef94a417ead59ddfdfdf0debff0
-SHA512 (sendmail.8.18.1.tar.gz) = 9ce713b44439d4de6faa9e3cdfa2226b44b4fbeb352a5f81584c062570e9472da244158287e489aabe258d28fe54ca4964565c7b0adc7e1763d212be42f98061
-Size (sendmail.8.18.1.tar.gz) = 2401566 bytes
+BLAKE2s (sendmail.8.18.2.tar.gz) = cb60d07b3cc6f9b456e185a5ada94170abdb5865bbcf4ece6fa81dc40aa6b3d4
+SHA512 (sendmail.8.18.2.tar.gz) = 55515220ea84db4b56b8154efbf21aeb7161943c92bd63527cfc20169ea566e299cc289f0a6e160dc5637f656bdc451707003750d4b42a7894d40f35f51f6040
+Size (sendmail.8.18.2.tar.gz) = 2372458 bytes
SHA1 (patch-aa) = bd1ab754f7146d002eaf8c0347e114b4049a7776
SHA1 (patch-af) = 8c80610916000dfb4e4e28a64eeb0b283535fc93
SHA1 (patch-ag) = 6dcca8944aa854f1767c7ee12fe14872a4e14d2e
SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
SHA1 (patch-ai) = 7a306d7239f4036cd8d80d6dbe2a07eb80f02d13
SHA1 (patch-aj) = e65e6fe44380de2f9c397c1a97677eb4ad285433
-SHA1 (patch-an) = 8015196ab361df50cc4a63611f3fe5f1f547cbbe
+SHA1 (patch-an) = 6e44e552ec282efb20b07447e5be3d0e6a04fd58
SHA1 (patch-ao) = 88dd76b71ad57a8d0efdb6e8518ff01689ecf634
SHA1 (patch-aq) = 5c083d9f9f71bcc42811a3d085e936eaaa404c96
-SHA1 (patch-ar) = 4e9162c96329716f844c0c64efb9d0a2915ad1cb
+SHA1 (patch-ar) = 5a229036d8db14077debe0295068ca28543b5cd0
SHA1 (patch-as) = e5e266d3c488494a12c303b068c15edde24e0504
-SHA1 (patch-at) = abb43369d751cf5969db2729da3454c67934b0af
-SHA1 (patch-au) = 08a96e145a9c37ba1ba836457157f1ab781380dc
+SHA1 (patch-at) = 7bfdcd36bd37bac6dafe3fba9aa9dc994019ae6d
+SHA1 (patch-au) = ecf9c2ec74380aa26ad1d7fb217f88c4dd01af35
SHA1 (patch-av) = bb6ecd69f6b0db22056b492890d2c6369cd08977
-SHA1 (patch-aw) = e340bd366ce04c4d5ddd15f964bc4040e715a6c9
+SHA1 (patch-aw) = 948776628bed043344ed41fad531456b0c8779a6
SHA1 (patch-ax) = 771c9c8a951a09c80eb85233986af1fc7fedbe77
-SHA1 (patch-ay) = 0a043f2ff0028d475ee852b302844626f4ff4609
-SHA1 (patch-az) = f2683b7bf5f52cd9baedbe8a84ea691734f74b41
+SHA1 (patch-ay) = a7f6b597c95e8616f478de2c2d768f30cbd7fa5e
+SHA1 (patch-az) = 9aee2f52e0fadd7e6026cad17da74eb1f24ecdf3
SHA1 (patch-ba) = c190b11b9874f00a18b9c75b6e734f4a9dd3f68f
SHA1 (patch-bb) = 6c86a60af25b02fc0389f1d40f59c5031d9679f1
SHA1 (patch-bc) = 9e7346342dfe1ca5d84053b913df4be41a979683
@@ -28,12 +28,12 @@ SHA1 (patch-bd) = 1a6d035c585838e771a1a6
SHA1 (patch-be) = d2f3397b7880f23f8cbd5d3c4eb5ccfe6a6ca75b
SHA1 (patch-bf) = 9c5faf5b38c18623e5ce4ffafc00a4430965e41a
SHA1 (patch-bg) = 716c90ff76edbdcb223111412bdd011d4a252ca6
-SHA1 (patch-bl) = 4fff262691deb2fcacf5013bfeb5aede45783dcd
-SHA1 (patch-bm) = ef40555ed40961f76ceedf58c100ac91ce2b0657
-SHA1 (patch-bn) = 8ba1998d579bb7d33ee92bfdf4e4bb2dafab23a0
-SHA1 (patch-bo) = 7dc9b24ebcfdf571c5f8428032325e9d55187daf
-SHA1 (patch-bp) = 9a1daac264aba6c4fc39a63a464b942dd25b06eb
-SHA1 (patch-bq) = 548bf6d373cb49958437548a65803b6f3c6b35d2
-SHA1 (patch-br) = 1f0b9716906b91ce2b867bf65e5c06ad16749e36
+SHA1 (patch-bl) = 9236f33f92093deed3305a76e27c0f6118237c4b
+SHA1 (patch-bm) = d573b8f79768b214b82db9f8d3611a240ba0f051
+SHA1 (patch-bn) = e46c20f965cb25c6e5c316f8d0d10e412d54121f
+SHA1 (patch-bo) = 491e67dd110e68a5ac69bcef039f03544f996e2b
+SHA1 (patch-bp) = c8ff1aa3ddc1be48aea8017e3082057e1f206c02
+SHA1 (patch-bq) = 408ce77d1f463a5cac0065fac135e76893661835
+SHA1 (patch-br) = 85e8c965db385341be5416233ae8f26a8b5c5341
SHA1 (patch-bs) = 2af257532fd837d9817b0b5572027947881b0396
SHA1 (patch-bt) = 44a297b44071c5c84680af137ed00962f9ea35d4
Index: pkgsrc/mail/sendmail/patches/patch-an
diff -u pkgsrc/mail/sendmail/patches/patch-an:1.5 pkgsrc/mail/sendmail/patches/patch-an:1.6
--- pkgsrc/mail/sendmail/patches/patch-an:1.5 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/patches/patch-an Mon Mar 2 07:39:29 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.5 2024/01/15 04:43:22 jnemeth Exp $
+$NetBSD: patch-an,v 1.6 2026/03/02 07:39:29 jnemeth Exp $
---- sendmail/Makefile.m4.orig 2023-02-09 18:24:38.000000000 +0000
+--- sendmail/Makefile.m4.orig 2025-10-20 19:09:43.000000000 +0000
+++ sendmail/Makefile.m4
@@ -4,9 +4,10 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
define(`confREQUIRE_LIBSM', `true')
@@ -10,11 +10,11 @@ $NetBSD: patch-an,v 1.5 2024/01/15 04:43
+dnl define(`bldBIN_TYPE', `G')
define(`bldINSTALL_DIR', `')
define(`bldSOURCES', `main.c alias.c arpadate.c bf.c collect.c conf.c control.c convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c macro.c map.c mci.c milter.c mime.c parseaddr.c
queue.c ratectrl.c readcf.c recipient.c sasl.c savemail.c sched.c sfsasl.c shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c tlsh.c tls.c trace.c udb.c usersmtp.c util.c
version.c ')
-+APPENDDEF(`bldSOURCES',`blacklist.c ')
++APPENDDEF(`bldSOURCES',`blocklist.c ')
PREPENDDEF(`confENVDEF', `confMAPDEF')
- bldPUSH_SMLIB(`sm')
- bldPUSH_SMLIB(`smutil')
-@@ -68,7 +69,7 @@ ifdef(`confNO_STATISTICS_INSTALL',, `bld
+ PUSHDIVERT(3)
+ ldap.c:
+@@ -73,7 +74,7 @@ ifdef(`confNO_STATISTICS_INSTALL',, `bld
divert(bldTARGETS_SECTION)
install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
@@ -23,7 +23,7 @@ $NetBSD: patch-an,v 1.5 2024/01/15 04:43
for i in ${sendmailTARGET_LINKS}; do \
rm -f $$i; \
${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
-@@ -76,7 +77,7 @@ install-set-user-id: bldCURRENT_PRODUCT
+@@ -81,7 +82,7 @@ install-set-user-id: bldCURRENT_PRODUCT
define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
install-sm-mta: bldCURRENT_PRODUCT
@@ -32,7 +32,7 @@ $NetBSD: patch-an,v 1.5 2024/01/15 04:43
for i in confMTA_LINKS; do \
rm -f $$i; \
${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
-@@ -84,14 +85,14 @@ install-sm-mta: bldCURRENT_PRODUCT
+@@ -89,14 +90,14 @@ install-sm-mta: bldCURRENT_PRODUCT
install-hf:
if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
Index: pkgsrc/mail/sendmail/patches/patch-ar
diff -u pkgsrc/mail/sendmail/patches/patch-ar:1.3 pkgsrc/mail/sendmail/patches/patch-ar:1.4
--- pkgsrc/mail/sendmail/patches/patch-ar:1.3 Sun Jul 4 07:57:13 2021
+++ pkgsrc/mail/sendmail/patches/patch-ar Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.3 2021/07/04 07:57:13 jnemeth Exp $
+$NetBSD: patch-ar,v 1.4 2026/03/02 07:39:29 jnemeth Exp $
--- sendmail/daemon.c.orig 2020-06-02 09:41:43.000000000 +0000
+++ sendmail/daemon.c
@@ -17,7 +17,7 @@ $NetBSD: patch-ar,v 1.3 2021/07/04 07:57
anynet_ntoa(&RealHostAddr));
}
-+ BLACKLIST_INIT();
++ BLOCKLIST_INIT();
+
if (pipefd[0] != -1)
{
Index: pkgsrc/mail/sendmail/patches/patch-au
diff -u pkgsrc/mail/sendmail/patches/patch-au:1.3 pkgsrc/mail/sendmail/patches/patch-au:1.4
--- pkgsrc/mail/sendmail/patches/patch-au:1.3 Sun Jul 4 07:57:13 2021
+++ pkgsrc/mail/sendmail/patches/patch-au Mon Mar 2 07:39:29 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.3 2021/07/04 07:57:13 jnemeth Exp $
+$NetBSD: patch-au,v 1.4 2026/03/02 07:39:29 jnemeth Exp $
---- sendmail/main.c.orig 2020-06-02 09:41:43.000000000 +0000
+--- sendmail/main.c.orig 2025-11-26 16:02:45.000000000 +0000
+++ sendmail/main.c
-@@ -153,6 +153,10 @@ int SyslogPrefixLen; /* estimated lengt
+@@ -159,6 +159,10 @@ int SyslogPrefixLen; /* estimated lengt
} \
}
@@ -13,8 +13,8 @@ $NetBSD: patch-au,v 1.3 2021/07/04 07:57
int
main(argc, argv, envp)
int argc;
-@@ -215,6 +219,15 @@ main(argc, argv, envp)
- envp = environ;
+@@ -230,6 +234,15 @@ main(argc, argv, envp)
+ DNSErrName = NULL;
#endif
+#if NAMED_BIND
@@ -29,7 +29,7 @@ $NetBSD: patch-au,v 1.3 2021/07/04 07:57
/* turn off profiling */
SM_PROF(0);
-@@ -697,21 +710,25 @@ main(argc, argv, envp)
+@@ -724,21 +737,25 @@ main(argc, argv, envp)
*/
#if NAMED_BIND
@@ -65,7 +65,7 @@ $NetBSD: patch-au,v 1.3 2021/07/04 07:57
#endif /* NAMED_BIND */
errno = 0;
-@@ -1394,8 +1411,8 @@ main(argc, argv, envp)
+@@ -1450,8 +1467,8 @@ main(argc, argv, envp)
}
#if NAMED_BIND
@@ -76,7 +76,7 @@ $NetBSD: patch-au,v 1.3 2021/07/04 07:57
#endif
/*
-@@ -2944,8 +2961,8 @@ main(argc, argv, envp)
+@@ -3031,8 +3048,8 @@ main(argc, argv, envp)
sm_getla();
GrabTo = false;
#if NAMED_BIND
Index: pkgsrc/mail/sendmail/patches/patch-at
diff -u pkgsrc/mail/sendmail/patches/patch-at:1.4 pkgsrc/mail/sendmail/patches/patch-at:1.5
--- pkgsrc/mail/sendmail/patches/patch-at:1.4 Mon Feb 12 03:23:06 2024
+++ pkgsrc/mail/sendmail/patches/patch-at Mon Mar 2 07:39:29 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-at,v 1.4 2024/02/12 03:23:06 jnemeth Exp $
+$NetBSD: patch-at,v 1.5 2026/03/02 07:39:29 jnemeth Exp $
---- sendmail/domain.c.orig 2024-01-31 06:38:32.000000000 +0000
+--- sendmail/domain.c.orig 2025-11-26 16:02:45.000000000 +0000
+++ sendmail/domain.c
-@@ -23,6 +23,7 @@ SM_RCSID("@(#)$Id: domain.c,v 8.205 2013
- #include <sm/sendmail.h>
+@@ -27,6 +27,7 @@ SM_RCSID("@(#)$Id: domain.c,v 8.205 2013
+ #endif
#if NAMED_BIND
+extern struct __res_state sm_res;
@@ -19,7 +19,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
# endif
# ifndef HFIXEDSZ
-@@ -909,9 +910,9 @@ getmxrr(host, mxhosts, mxprefs, flags, r
+@@ -877,9 +878,9 @@ getmxrr(host, mxhosts, mxprefs, flags, r
# if DANE
cname2mx = false;
qname[0] = '\0';
@@ -31,7 +31,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
# endif
if ((fallbackMX != NULL && (flags & DROPLOCALHOST) != 0 &&
-@@ -1072,7 +1073,7 @@ getmxrr(host, mxhosts, mxprefs, flags, r
+@@ -1040,7 +1041,7 @@ getmxrr(host, mxhosts, mxprefs, flags, r
# endif
if (type != T_MX)
{
@@ -40,7 +40,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
# if DANE
&& type != T_RRSIG
# endif
-@@ -1410,13 +1411,13 @@ punt:
+@@ -1378,13 +1379,13 @@ punt:
}
done:
# if DANE
@@ -56,7 +56,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
# endif
return -1;
}
-@@ -1486,7 +1487,7 @@ bestmx_map_lookup(map, name, av, statp)
+@@ -1454,7 +1455,7 @@ bestmx_map_lookup(map, name, av, statp)
int *statp;
{
int nmx;
@@ -65,7 +65,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
int i;
ssize_t len = 0;
char *result;
-@@ -1498,9 +1499,9 @@ bestmx_map_lookup(map, name, av, statp)
+@@ -1466,9 +1467,9 @@ bestmx_map_lookup(map, name, av, statp)
char buf[PSBUFSIZE / 2];
# endif
@@ -77,23 +77,34 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
if (nmx <= 0)
return NULL;
if (bitset(MF_MATCHONLY, map->map_mflags))
-@@ -1650,16 +1651,22 @@ dns_getcanonname(host, hbsize, trymx, st
+@@ -1621,22 +1622,28 @@ dns_getcanonname(host, hbsize, trymx, st
if (tTd(8, 2))
sm_dprintf("dns_getcanonname(%s, trymx=%d)\n", host, trymx);
-- if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+- if (!bitset(RES_INIT, _res.options) && res_init() == -1)
- {
+- if (LogLevel > 7)
+- sm_syslog(LOG_ERR, NOQID,
+- "res_init()=failed, h_errno=%d", h_errno);
- *statp = EX_UNAVAILABLE;
-- return HOST_NOTFOUND;
+-# if _FFR_DNS_ERR_NAME
+- DNSErrName = sm_strdup(host);
+ if ((sm_res.options & RES_INIT) == 0) {
+# if NAMED_RESN
+ memset(&sm_res, 0, sizeof(sm_res));
+ if (res_ninit(&sm_res) == -1) {
+# else
+ if (res_init() == -1) {
-+# endif
+ # endif
+- return HOST_NOTFOUND;
++ if (LogLevel > 7)
++ sm_syslog(LOG_ERR, NOQID,
++ "res_init()=failed, h_errno=%d", h_errno);
+ *statp = EX_UNAVAILABLE;
-+ return false;
++ # if _FFR_DNS_ERR_NAME
++ DNSErrName = sm_strdup(host);
++ # endif
++ return HOST_NOTFOUND;
+ }
}
@@ -106,7 +117,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
# endif
*statp = EX_OK;
-@@ -1709,7 +1716,7 @@ cnameloop:
+@@ -1686,7 +1693,7 @@ cnameloop:
searchlist[sli++] = NameSearchList;
}
# endif
@@ -115,7 +126,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
{
/* make sure there are less than MAXDNSRCH domains */
for (domain = RES_DNSRCH_VARIABLE, ret = 0;
-@@ -1717,10 +1724,10 @@ cnameloop:
+@@ -1694,10 +1701,10 @@ cnameloop:
ret++)
searchlist[sli++] = *domain++;
}
@@ -128,7 +139,7 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
}
else if (*cp == '.')
{
-@@ -2026,13 +2033,13 @@ nexttype:
+@@ -2003,13 +2010,13 @@ nexttype:
if (ttl > 0 && pttl != NULL)
*pttl = ttl;
# if DANE
@@ -142,5 +153,5 @@ $NetBSD: patch-at,v 1.4 2024/02/12 03:23
- _res.options = old_options;
+ sm_res.options = old_options;
# endif
- return HOST_NOTFOUND;
- }
+ # if _FFR_DNS_ERR_NAME
+ DNSErrName = sm_strdup(host);
Index: pkgsrc/mail/sendmail/patches/patch-ay
diff -u pkgsrc/mail/sendmail/patches/patch-ay:1.4 pkgsrc/mail/sendmail/patches/patch-ay:1.5
--- pkgsrc/mail/sendmail/patches/patch-ay:1.4 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/patches/patch-ay Mon Mar 2 07:39:29 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-ay,v 1.4 2024/01/15 04:43:22 jnemeth Exp $
+$NetBSD: patch-ay,v 1.5 2026/03/02 07:39:29 jnemeth Exp $
---- sendmail/sm_resolve.c.orig 2023-02-09 18:24:38.000000000 +0000
+--- sendmail/sm_resolve.c.orig 2025-11-26 16:08:32.000000000 +0000
+++ sendmail/sm_resolve.c
@@ -61,2 +61,6 @@ SM_RCSID("$Id: sm_resolve.c,v 8.40 2013-
@@ -114,8 +114,16 @@ $NetBSD: patch-ay,v 1.4 2024/01/15 04:43
+ sm_res.nsaddr_list[nsidx].sin_port = htons(port);
+ sm_res.nscount = ++nsidx;
if (tTd(8, 61))
-@@ -1639,3 +1656,3 @@ nsportip(p)
+@@ -1639,4 +1656,10 @@ nsportip(p)
{
-- if ((_res.options & RES_INIT) == 0)
-+ if ((sm_res.options & RES_INIT) == 0)
- (void) res_init();
+- if (!bitset(RES_INIT, _res.options))
+- (void) res_init();
++ if ((sm_res.options & RES_INIT) == 0) {
++# if NAMED_RESN
++ memset(&sm_res, 0, sizeof(sm_res));
++ (void) res_ninit(&sm_res)
++# else
++ (void) res_init()
++# endif
++ }
+ dns_addns(&nsip, port);
Index: pkgsrc/mail/sendmail/patches/patch-aw
diff -u pkgsrc/mail/sendmail/patches/patch-aw:1.8 pkgsrc/mail/sendmail/patches/patch-aw:1.9
--- pkgsrc/mail/sendmail/patches/patch-aw:1.8 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/patches/patch-aw Mon Mar 2 07:39:29 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.8 2024/01/15 04:43:22 jnemeth Exp $
+$NetBSD: patch-aw,v 1.9 2026/03/02 07:39:29 jnemeth Exp $
---- sendmail/readcf.c.orig 2023-04-27 10:39:42.000000000 +0000
+--- sendmail/readcf.c.orig 2025-11-26 16:02:45.000000000 +0000
+++ sendmail/readcf.c
@@ -26,6 +26,10 @@ SM_RCSID("@(#)$Id: readcf.c,v 8.692 2013
# include <arpa/inet.h>
@@ -13,17 +13,17 @@ $NetBSD: patch-aw,v 1.8 2024/01/15 04:43
#define SECONDS
#define MINUTES * 60
-@@ -3210,6 +3214,9 @@ static struct optioninfo
- { "CipherSuites", O_CIPHERSUITES, OI_NONE },
+@@ -3213,6 +3217,9 @@ static struct optioninfo
+ { "SameDomainOnly", O_SAMEDOMAINONLY, OI_NONE },
#endif
-+# define O_BLACKLIST 0xfb
-+ { "UseBlacklist", O_BLACKLIST, OI_NONE },
++# define O_BLOCKLIST 0xfc
++ { "UseBlocklist", O_BLOCKLIST, OI_NONE },
+
{ NULL, '\0', OI_NONE }
};
-@@ -3620,13 +3627,13 @@ setoption(opt, val, safe, sticky, e)
+@@ -3623,13 +3630,13 @@ setoption(opt, val, safe, sticky, e)
if (rfp->rf_name == NULL)
syserr("readcf: I option value %s unrecognized", q);
else if (clearmode)
@@ -41,12 +41,12 @@ $NetBSD: patch-aw,v 1.8 2024/01/15 04:43
#else /* NAMED_BIND */
usrerr("name server (I option) specified but BIND not compiled in");
#endif /* NAMED_BIND */
-@@ -4949,6 +4956,10 @@ setoption(opt, val, safe, sticky, e)
+@@ -4963,6 +4970,10 @@ setoption(opt, val, safe, sticky, e)
break;
- #endif
+ #endif /* _FFR_SAMEDOMAIN */
-+ case O_BLACKLIST:
-+ UseBlacklist = atobool(val);
++ case O_BLOCKLIST:
++ UseBlocklist = atobool(val);
+ break;
+
default:
Index: pkgsrc/mail/sendmail/patches/patch-az
diff -u pkgsrc/mail/sendmail/patches/patch-az:1.6 pkgsrc/mail/sendmail/patches/patch-az:1.7
--- pkgsrc/mail/sendmail/patches/patch-az:1.6 Mon Feb 19 04:12:36 2024
+++ pkgsrc/mail/sendmail/patches/patch-az Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.6 2024/02/19 04:12:36 jnemeth Exp $
+$NetBSD: patch-az,v 1.7 2026/03/02 07:39:29 jnemeth Exp $
--- sendmail/srvrsmtp.c.orig 2024-01-31 06:38:32.000000000 +0000
+++ sendmail/srvrsmtp.c
@@ -17,7 +17,7 @@ $NetBSD: patch-az,v 1.6 2024/02/19 04:12
(int) tp->tv_sec +
(tp->tv_usec >= 500000 ? 1 : 0)
);
-+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "pre-greeting traffic");
++ BLOCKLIST_NOTIFY(BLOCKLIST_AUTH_FAIL, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "pre-greeting traffic");
}
}
}
@@ -29,7 +29,7 @@ $NetBSD: patch-az,v 1.6 2024/02/19 04:12
+
authenticated:
+ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
-+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_OK, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "AUTH OK");
++ BLOCKLIST_NOTIFY(BLOCKLIST_AUTH_OK, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "AUTH OK");
+
message("235 2.0.0 OK Authenticated");
authenticating = SASL_IS_AUTH;
@@ -38,7 +38,7 @@ $NetBSD: patch-az,v 1.6 2024/02/19 04:12
{ \
SET_AUTH_USER_CONDITIONALLY \
message("535 5.7.0 authentication failed"); \
-+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "AUTH FAIL"); \
++ BLOCKLIST_NOTIFY(BLOCKLIST_AUTH_FAIL, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "AUTH FAIL"); \
if (LogLevel >= 9) \
sm_syslog(LOG_WARNING, e->e_id, \
"AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s", \
@@ -49,7 +49,7 @@ $NetBSD: patch-az,v 1.6 2024/02/19 04:12
+ int fd;
+
+ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
-+ BLACKLIST_NOTIFY(BLACKLIST_ABUSIVE_BEHAVIOR, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "too many bad commands");
++ BLOCKLIST_NOTIFY(BLOCKLIST_ABUSIVE_BEHAVIOR, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "too many bad commands");
message("421 4.7.0 %s Too many bad commands; closing connection",
MyHostName);
@@ -61,7 +61,7 @@ $NetBSD: patch-az,v 1.6 2024/02/19 04:12
+
stopattack:
+ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL);
-+ BLACKLIST_NOTIFY(BLACKLIST_ABUSIVE_BEHAVIOR, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "too many bad commands");
++ BLOCKLIST_NOTIFY(BLOCKLIST_ABUSIVE_BEHAVIOR, sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL), "too many bad commands");
message("421 4.7.0 %s Too many bad commands; closing connection",
MyHostName);
Index: pkgsrc/mail/sendmail/patches/patch-bo
diff -u pkgsrc/mail/sendmail/patches/patch-bo:1.6 pkgsrc/mail/sendmail/patches/patch-bo:1.7
--- pkgsrc/mail/sendmail/patches/patch-bo:1.6 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/patches/patch-bo Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-bo,v 1.6 2024/01/15 04:43:22 jnemeth Exp $
+$NetBSD: patch-bo,v 1.7 2026/03/02 07:39:29 jnemeth Exp $
--- sendmail/sendmail.h.orig 2023-04-27 10:39:42.000000000 +0000
+++ sendmail/sendmail.h
@@ -6,10 +6,10 @@ $NetBSD: patch-bo,v 1.6 2024/01/15 04:43
#endif
#include "bf.h"
-+#ifdef USE_BLACKLIST
-+#include <blacklist.h>
++#ifdef USE_BLOCKLIST
++#include <blocklist.h>
+#endif
-+#include "blacklist_client.h"
++#include "blocklist_client.h"
#include "timers.h"
#include <sm/exc.h>
#include <sm/gen.h>
@@ -17,7 +17,7 @@ $NetBSD: patch-bo,v 1.6 2024/01/15 04:43
EXTERN int ConnectionRateWindowSize;
-+EXTERN bool UseBlacklist;
++EXTERN bool UseBlocklist;
+
/*
** Declarations of useful functions
Index: pkgsrc/mail/sendmail/patches/patch-bl
diff -u pkgsrc/mail/sendmail/patches/patch-bl:1.2 pkgsrc/mail/sendmail/patches/patch-bl:1.3
--- pkgsrc/mail/sendmail/patches/patch-bl:1.2 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/patches/patch-bl Mon Mar 2 07:39:29 2026
@@ -1,7 +1,7 @@
-$NetBSD: patch-bl,v 1.2 2024/01/15 04:43:22 jnemeth Exp $
+$NetBSD: patch-bl,v 1.3 2026/03/02 07:39:29 jnemeth Exp $
---- sendmail/blacklist.c.orig 2018-01-02 20:16:44 UTC
-+++ sendmail/blacklist.c
+--- sendmail/blocklist.c.orig 2018-01-02 20:16:44 UTC
++++ sendmail/blocklist.c
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2016 The FreeBSD Foundation
@@ -33,30 +33,30 @@ $NetBSD: patch-bl,v 1.2 2024/01/15 04:43
+
+/* $FreeBSD$ */
+
-+#ifdef USE_BLACKLIST
++#ifdef USE_BLOCKLIST
+#include <sm/gen.h>
-+#include <sendmail.h> /* for EXTERN UseBlacklist */
++#include <sendmail.h> /* for EXTERN UseBlocklist */
+
-+#include <blacklist.h>
-+#include "blacklist_client.h"
++#include <blocklist.h>
++#include "blocklist_client.h"
+
-+static struct blacklist *blstate;
++static struct blocklist *blstate;
+
+void
-+blacklist_init(void)
++blocklist_init(void)
+{
+
-+ if (UseBlacklist)
-+ blstate = blacklist_open();
++ if (UseBlocklist)
++ blstate = blocklist_open();
+}
+
+void
-+blacklist_notify(int action, int fd, const char *msg)
++blocklist_notify(int action, int fd, const char *msg)
+{
+
+ if (blstate == NULL)
+ return;
-+ (void)blacklist_r(blstate, action, fd, msg);
++ (void)blocklist_r(blstate, action, fd, msg);
+}
+
-+#endif /* USE_BLACKLIST */
++#endif /* USE_BLOCKLIST */
Index: pkgsrc/mail/sendmail/patches/patch-bm
diff -u pkgsrc/mail/sendmail/patches/patch-bm:1.2 pkgsrc/mail/sendmail/patches/patch-bm:1.3
--- pkgsrc/mail/sendmail/patches/patch-bm:1.2 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/patches/patch-bm Mon Mar 2 07:39:29 2026
@@ -1,7 +1,7 @@
-$NetBSD: patch-bm,v 1.2 2024/01/15 04:43:22 jnemeth Exp $
+$NetBSD: patch-bm,v 1.3 2026/03/02 07:39:29 jnemeth Exp $
---- sendmail/blacklist_client.h.orig 2018-01-02 20:16:44 UTC
-+++ sendmail/blacklist_client.h
+--- sendmail/blocklist_client.h.orig 2018-01-02 20:16:44 UTC
++++ sendmail/blocklist_client.h
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2016 The FreeBSD Foundation
@@ -33,30 +33,30 @@ $NetBSD: patch-bm,v 1.2 2024/01/15 04:43
+
+/* $FreeBSD$ */
+
-+#ifndef BLACKLIST_CLIENT_H
-+#define BLACKLIST_CLIENT_H
++#ifndef BLOCKLIST_CLIENT_H
++#define BLOCKLIST_CLIENT_H
+
-+#ifndef BLACKLIST_API_ENUM
++#ifndef BLOCKLIST_API_ENUM
+enum {
-+ BLACKLIST_AUTH_OK = 0,
-+ BLACKLIST_AUTH_FAIL,
-+ BLACKLIST_ABUSIVE_BEHAVIOR,
-+ BLACKLIST_BAD_USER
++ BLOCKLIST_AUTH_OK = 0,
++ BLOCKLIST_AUTH_FAIL,
++ BLOCKLIST_ABUSIVE_BEHAVIOR,
++ BLOCKLIST_BAD_USER
+};
+#endif
+
-+#ifdef USE_BLACKLIST
-+void blacklist_init(void);
-+void blacklist_notify(int, int, const char *);
++#ifdef USE_BLOCKLIST
++void blocklist_init(void);
++void blocklist_notify(int, int, const char *);
+
-+#define BLACKLIST_INIT() blacklist_init()
-+#define BLACKLIST_NOTIFY(x, y, msg) blacklist_notify(x, y, msg)
++#define BLOCKLIST_INIT() blocklist_init()
++#define BLOCKLIST_NOTIFY(x, y, msg) blocklist_notify(x, y, msg)
+
+#else
+
-+#define BLACKLIST_INIT()
-+#define BLACKLIST_NOTIFY(x, y, msg)
++#define BLOCKLIST_INIT()
++#define BLOCKLIST_NOTIFY(x, y, msg)
+
+#endif
+
-+#endif /* BLACKLIST_CLIENT_H */
++#endif /* BLOCKLIST_CLIENT_H */
Index: pkgsrc/mail/sendmail/patches/patch-bn
diff -u pkgsrc/mail/sendmail/patches/patch-bn:1.2 pkgsrc/mail/sendmail/patches/patch-bn:1.3
--- pkgsrc/mail/sendmail/patches/patch-bn:1.2 Mon Jan 15 04:43:22 2024
+++ pkgsrc/mail/sendmail/patches/patch-bn Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-bn,v 1.2 2024/01/15 04:43:22 jnemeth Exp $
+$NetBSD: patch-bn,v 1.3 2026/03/02 07:39:29 jnemeth Exp $
--- sendmail/sendmail.8.orig 2023-02-09 18:24:38.000000000 +0000
+++ sendmail/sendmail.8
@@ -6,9 +6,9 @@ $NetBSD: patch-bn,v 1.2 2024/01/15 04:43
failed messages will be returned to the sender.
The default is five days.
.TP
-+.RI UseBlacklist
++.RI UseBlocklist
+If set, send authentication failure and success notifications to the
-+.BR blacklistd (8)
++.BR blocklistd (8)
+daemon.
+.TP
.RI UserDatabaseSpec= userdatabase
Index: pkgsrc/mail/sendmail/patches/patch-bp
diff -u pkgsrc/mail/sendmail/patches/patch-bp:1.1 pkgsrc/mail/sendmail/patches/patch-bp:1.2
--- pkgsrc/mail/sendmail/patches/patch-bp:1.1 Mon Jul 15 05:30:33 2019
+++ pkgsrc/mail/sendmail/patches/patch-bp Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-bp,v 1.1 2019/07/15 05:30:33 jnemeth Exp $
+$NetBSD: patch-bp,v 1.2 2026/03/02 07:39:29 jnemeth Exp $
--- cf/README.orig 2015-06-17 16:51:58.000000000 +0000
+++ cf/README
@@ -6,9 +6,9 @@ $NetBSD: patch-bp,v 1.1 2019/07/15 05:30
confMILTER_MACROS_DATA Milter.macros.data
Macros to transmit to milters
after DATA command is received.
-+confUSE_BLACKLIST UseBlacklist [False] Whether to send authentication
++confUSE_BLOCKLIST UseBlocklist [False] Whether to send authentication
+ failure and success information to
-+ blacklistd.
++ blocklistd.
See also the description of OSTYPE for some parameters that can be
Index: pkgsrc/mail/sendmail/patches/patch-bq
diff -u pkgsrc/mail/sendmail/patches/patch-bq:1.1 pkgsrc/mail/sendmail/patches/patch-bq:1.2
--- pkgsrc/mail/sendmail/patches/patch-bq:1.1 Mon Jul 15 05:30:33 2019
+++ pkgsrc/mail/sendmail/patches/patch-bq Mon Mar 2 07:39:29 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.1 2019/07/15 05:30:33 jnemeth Exp $
+$NetBSD: patch-bq,v 1.2 2026/03/02 07:39:29 jnemeth Exp $
--- cf/m4/cfhead.m4.orig 2015-02-28 00:20:38.000000000 +0000
+++ cf/m4/cfhead.m4
@@ -6,7 +6,7 @@ $NetBSD: patch-bq,v 1.1 2019/07/15 05:30
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')
++define(`confUSE_BLOCKLIST', `False')
divert(0)dnl
Index: pkgsrc/mail/sendmail/patches/patch-br
diff -u pkgsrc/mail/sendmail/patches/patch-br:1.1 pkgsrc/mail/sendmail/patches/patch-br:1.2
--- pkgsrc/mail/sendmail/patches/patch-br:1.1 Mon Jul 15 05:30:33 2019
+++ pkgsrc/mail/sendmail/patches/patch-br Mon Mar 2 07:39:30 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-br,v 1.1 2019/07/15 05:30:33 jnemeth Exp $
+$NetBSD: patch-br,v 1.2 2026/03/02 07:39:30 jnemeth Exp $
--- cf/m4/proto.m4.orig 2015-05-22 13:42:27.000000000 +0000
+++ cf/m4/proto.m4
@@ -6,8 +6,8 @@ $NetBSD: patch-br,v 1.1 2019/07/15 05:30
# Name to use for EHLO (defaults to $j)
_OPTION(HeloName, `confHELO_NAME')
-+# blacklistd
-+_OPTION(UseBlacklist, `confUSE_BLACKLIST', `False')
++# blocklistd
++_OPTION(UseBlocklist, `confUSE_BLOCKLIST', `False')
+
ifdef(`_NEED_SMTPOPMODES_', `dnl
# SMTP operation modes
Added files:
Index: pkgsrc/mail/sendmail/files/site.config.m4-blocklistd
diff -u /dev/null pkgsrc/mail/sendmail/files/site.config.m4-blocklistd:1.1
--- /dev/null Mon Mar 2 07:39:30 2026
+++ pkgsrc/mail/sendmail/files/site.config.m4-blocklistd Mon Mar 2 07:39:29 2026
@@ -0,0 +1,5 @@
+# $Id: site.config.m4-blocklistd,v 1.1 2026/03/02 07:39:29 jnemeth Exp $
+
+APPENDDEF(`conf_sendmail_ENVDEF', `-DUSE_BLOCKLIST')
+APPENDDEF(`conf_sendmail_LIBS', `-lblocklist')
+
Home |
Main Index |
Thread Index |
Old Index