commit 47a15cc155e7ddbd96b731929b72d06ecead8688
Author: Kimmo Suominen <kimmo@suominen.com>
Date:   Sun Dec 24 12:28:37 2023 +0200

    Postfix 3.8.4 patch for netbsd-9
    
    Patch doc/3RDPARTY and revert some Postfix changes from HEAD.

diff --git a/doc/3RDPARTY b/doc/3RDPARTY
index b2ef7dd38c9e..d95fcda8bfd8 100644
--- a/doc/3RDPARTY
+++ b/doc/3RDPARTY
@@ -1210,12 +1210,12 @@ and more. Vern's ping is gone. We are too different from everyone else
 now to do a new import.
 
 Package:	Postfix
-Version:	3.1.4
-Current Vers:	3.1.13/3.2.10/3.3.5/3.4.6
+Version:	3.8.4
+Current Vers:	3.8.4
 Maintainer:	Wietse Venema <wietse@porcupine.org>
 Archive Site:
 Home Page:	http://www.postfix.org/
-Date: 		2019-07-03
+Date: 		2023-12-23
 Mailing List:	postfix-users@postfix.org
 Responsible:	christos
 License:	IBM Public License. See also src/external/ibm-public/postfix/dist.
diff --git a/external/ibm-public/postfix/Makefile.inc b/external/ibm-public/postfix/Makefile.inc
index f62beff5716f..2a4952f558e7 100644
--- a/external/ibm-public/postfix/Makefile.inc
+++ b/external/ibm-public/postfix/Makefile.inc
@@ -63,8 +63,12 @@ CPPFLAGS+=	-DHAS_LDAP
 
 # Automatically link in libldap for a program.
 . if defined(PROG)
-LDADD+=		${LIBLDAP_LDADD}
-DPADD+=		${LIBLDAP_DPADD}
+LDADD+=		-lldap -llber
+DPADD+=		${LIBLDAP} ${LIBLBER}
+.  if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
+DPADD+=		${LIBSSL} ${LIBCRYPTO}
+LDADD+=		-lssl -lcrypto
+.  endif
 . endif
 .endif # USE_LDAP != no
 
diff --git a/external/ibm-public/postfix/dist/src/smtpd/pfilter.c b/external/ibm-public/postfix/dist/src/smtpd/pfilter.c
index cf05190de5c8..6d36cceb34c7 100644
--- a/external/ibm-public/postfix/dist/src/smtpd/pfilter.c
+++ b/external/ibm-public/postfix/dist/src/smtpd/pfilter.c
@@ -1,19 +1,19 @@
 #include "pfilter.h"
 #include <stdio.h>	/* for NULL */
-#include <blocklist.h>
+#include <blacklist.h>
 
-static struct blocklist *blstate;
+static struct blacklist *blstate;
 
 void
 pfilter_notify(int a, int fd)
 {
 	if (blstate == NULL)
-		blstate = blocklist_open();
+		blstate = blacklist_open();
 	if (blstate == NULL)
 		return;
-	(void)blocklist_r(blstate, a, fd, "smtpd");
+	(void)blacklist_r(blstate, a, fd, "smtpd");
 	if (a == 0) {
-		blocklist_close(blstate);
+		blacklist_close(blstate);
 		blstate = NULL;
 	}
 }
diff --git a/external/ibm-public/postfix/libexec/smtpd/Makefile b/external/ibm-public/postfix/libexec/smtpd/Makefile
index 24c7d9e00a15..7c05c9d5514f 100644
--- a/external/ibm-public/postfix/libexec/smtpd/Makefile
+++ b/external/ibm-public/postfix/libexec/smtpd/Makefile
@@ -31,8 +31,8 @@ smtpd_xforward.c
 DPADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
 LDADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
 
-DPADD+=	${LIBBLOCKLIST}
-LDADD+=	-lblocklist
+DPADD+=	${LIBBLACKLIST}
+LDADD+=	-lblacklist
 
 DPADD+=	${LIBPTLS} ${LIBSSL} ${LIBCRYPTO}
 LDADD+=	${LIBPTLS} -lssl -lcrypto