Update to sendmail-8.12.6

Large number of bug fixes and feature enhancements, especially Milter
(Mail Filter) support and by default installation of sendmail does not use
set-user-ID root anymore.

19 files changed, 164 insertions, 126 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 15d69d90288..b4e7bcc1640 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,98 +1,54 @@
-# $NetBSD: Makefile,v 1.52 2002/08/21 07:47:05 seb Exp $
-
-DISTNAME=	sendmail.8.11.6
-PKGNAME=	sendmail-8.11.6
-PKGREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
-		ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
-
-USE_WIDEPATCH?=	YES
-.if ${USE_WIDEPATCH} == "YES"
-PATCH_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
-PATCHFILES=	sendmail8.11.6+3.4W.patch.gz
-PATCH_DIST_ARGS=-d ${WRKSRC}/sendmail -E ${PATCH_DIST_STRIP}
-.if !(defined(PATCH_DEBUG) || defined(PKG_VERBOSE))
-PATCH_DIST_ARGS+=--forward --quiet
-.endif
-PATCH_DIST_STRIP=	-p1
-.endif
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.sendmail.org/
-COMMENT=	The well known Mail Transport Agent
+# $NetBSD: Makefile,v 1.53 2002/09/23 12:56:57 markd Exp $
 
-LICENSE=	no-profit
+.include "../../mail/sendmail/Makefile.common"
 
-MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
-		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
-		BUILDLINK_DIR="${BUILDLINK_DIR}"
-WRKSRC=		${WRKDIR}/${PKGNAME:C/nb[0-9]+$//}
-SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
+PKGNAME=	sendmail-${DIST_VERS}
+COMMENT=	The well known Mail Transport Agent
 
-BUILD_DEFS+=    USE_WIDEPATCH USE_INET6 USE_TCPWRAPPERS USE_LDAP USE_DB2 \
-		USE_SASL USE_STARTTLS
 MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-DESCR_SRC=	${WRKDIR}/.DESCR_SRC
-
-.include "../../mk/bsd.prefs.mk"
-# Make sure that ${BUILDLINK_DIR} is defined even no "buildlink.mk" gets
-# included below.
-.include "../../mk/bsd.buildlink.mk"
 
 .if ${OPSYS} == "SunOS"
 USE_DB2?=	YES
 .else
 USE_DB2?=	NO
 .endif
-.if ${USE_DB2} == YES
-.include "../../databases/db/buildlink.mk"
+.if defined(USE_DB4) && ${USE_DB4} == YES
+.include "../../databases/db4/buildlink2.mk"
+.elif ${USE_DB2} == YES
+.include "../../databases/db/buildlink2.mk"
 .endif
 
 .if defined(USE_LDAP) && ${USE_LDAP} == YES
-.include "../../databases/openldap/buildlink.mk"
+.include "../../databases/openldap/buildlink2.mk"
 .endif
 
 .if defined(USE_SASL) && ${USE_SASL} == YES
-.include "../../security/cyrus-sasl/buildlink.mk"
+.include "../../security/cyrus-sasl/buildlink2.mk"
 .endif
 
 .if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
 .endif
 
 USE_TCPWRAPPERS?=	YES
 .if ${USE_TCPWRAPPERS} == YES
-.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
 .endif
 
-post-patch:
-	${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
-	${CHMOD} +w ${SITECONFIG}
-	${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
-	${ECHO} '---' >>${DESCR_SRC}
-	${ECHO} -n 'compiled features:' >>${DESCR_SRC}
-.if ${USE_WIDEPATCH} == YES
-	${ECHO} -n ' WIDE' >>${DESCR_SRC}
-.endif
-.if defined(USE_INET6) && ${USE_INET6} == YES
-	${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
-	${ECHO} -n ' INET6' >>${DESCR_SRC}
-.endif
+post-patch: make-sendmail-siteconfig
 .if ${USE_TCPWRAPPERS} == YES
 	${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
 	${ECHO} -n ' TCPWRAPPERS' >>${DESCR_SRC}
 .endif
-.if ${OPSYS} == "SunOS"
-	${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
-.endif
 .if defined(USE_LDAP) && ${USE_LDAP} == YES
 	${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
 	${ECHO} -n ' LDAP' >>${DESCR_SRC}
 .endif
-.if ${USE_DB2} == YES
+.if defined(USE_DB4) && ${USE_DB4} == YES
+	${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
+	${ECHO} -n ' DB4' >>${DESCR_SRC}
+.elif ${USE_DB2} == YES
 	${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
 	${ECHO} -n ' DB2' >>${DESCR_SRC}
 .endif
@@ -133,6 +89,10 @@ post-install:
 	${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
 .endif
 
+PKG_GROUPS=	smmsp
+PKG_USERS=	smmsp:smmsp:Sendmail\\ Message\\ Submission\\ Program
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # has to be below include for bsd.pkg.mk, else substition fails
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
new file mode 100644
index 00000000000..e5bef7704ec
--- /dev/null
+++ b/mail/sendmail/Makefile.common
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile.common,v 1.1 2002/09/23 12:56:57 markd Exp $
+#
+# Makefile fragment shared with libmilter
+#
+
+DISTNAME=	sendmail.${DIST_VERS}
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
+		ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
+		ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.sendmail.org/
+
+LICENSE=	no-profit
+
+DISTINFO_FILE?=	${.CURDIR}/../../mail/sendmail/distinfo
+FILESDIR?=	${.CURDIR}/../../mail/sendmail/files
+PATCHDIR?=	${.CURDIR}/../../mail/sendmail/patches
+
+DIST_VERS=	8.12.6
+
+MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
+		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
+		BUILDLINK_DIR="${BUILDLINK_DIR}"
+WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}/
+SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
+
+BUILD_DEFS+=    USE_INET6 USE_TCPWRAPPERS USE_LDAP USE_DB2 \
+		USE_SASL USE_STARTTLS USE_MILTER USE_DB4
+DESCR_SRC=	${WRKDIR}/.DESCR_SRC
+
+USE_BUILDLINK2=	YES
+
+.include "../../mk/bsd.prefs.mk"
+
+make-sendmail-siteconfig:
+	${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
+	${CHMOD} +w ${SITECONFIG}
+	${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
+	${ECHO} '---' >>${DESCR_SRC}
+	${ECHO} -n 'compiled features:' >>${DESCR_SRC}
+.if defined(USE_INET6) && ${USE_INET6} == YES
+	${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
+.if ${OPSYS} != "SunOS"
+	${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
+.endif
+	${ECHO} -n ' INET6' >>${DESCR_SRC}
+.endif
+.if ${OPSYS} == "SunOS"
+	${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
+.endif
+.if defined(USE_MILTER) && ${USE_MILTER} == YES
+	${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
+	${ECHO} -n ' MILTER' >>${DESCR_SRC}
+.endif
diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST
index cfd64a90c5d..831f7623e9c 100644
--- a/mail/sendmail/PLIST
+++ b/mail/sendmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:48 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/23 12:56:58 markd Exp $
 bin/newaliases
 bin/mailq
 bin/hoststat
@@ -16,6 +16,7 @@ man/cat8/smrsh.0
 man/cat8/mailstats.0
 man/cat8/praliases.0
 man/cat8/sendmail.0
+sbin/editmap
 sbin/mailstats
 sbin/makemap
 sbin/praliases
@@ -23,6 +24,7 @@ share/misc/helpfile
 share/sendmail/README
 share/sendmail/cf/Build
 share/sendmail/cf/Makefile
+share/sendmail/cf/README
 share/sendmail/cf/chez.cs.mc
 share/sendmail/cf/clientproto.mc
 share/sendmail/cf/cs-hpux10.mc
@@ -38,11 +40,16 @@ share/sendmail/cf/generic-hpux10.cf
 share/sendmail/cf/generic-hpux10.mc
 share/sendmail/cf/generic-hpux9.cf
 share/sendmail/cf/generic-hpux9.mc
+share/sendmail/cf/generic-linux.cf
+share/sendmail/cf/generic-linux.mc
+share/sendmail/cf/generic-mpeix.cf
+share/sendmail/cf/generic-mpeix.mc
+share/sendmail/cf/generic-nextstep3.3.cf
 share/sendmail/cf/generic-nextstep3.3.mc
 share/sendmail/cf/generic-osf1.cf
 share/sendmail/cf/generic-osf1.mc
-share/sendmail/cf/generic-solaris2.cf
-share/sendmail/cf/generic-solaris2.mc
+share/sendmail/cf/generic-solaris.cf
+share/sendmail/cf/generic-solaris.mc
 share/sendmail/cf/generic-sunos4.1.cf
 share/sendmail/cf/generic-sunos4.1.mc
 share/sendmail/cf/generic-ultrix4.cf
@@ -55,6 +62,8 @@ share/sendmail/cf/mailspool.cs.mc
 share/sendmail/cf/python.cs.mc
 share/sendmail/cf/s2k-osf1.mc
 share/sendmail/cf/s2k-ultrix4.mc
+share/sendmail/cf/submit.cf
+share/sendmail/cf/submit.mc
 share/sendmail/cf/tcpproto.mc
 share/sendmail/cf/ucbarpa.mc
 share/sendmail/cf/ucbvax.mc
@@ -71,30 +80,38 @@ share/sendmail/feature/accept_unresolvable_domains.m4
 share/sendmail/feature/access_db.m4
 share/sendmail/feature/allmasquerade.m4
 share/sendmail/feature/always_add_domain.m4
+share/sendmail/feature/authinfo.m4
 share/sendmail/feature/bestmx_is_local.m4
 share/sendmail/feature/bitdomain.m4
 share/sendmail/feature/blacklist_recipients.m4
+share/sendmail/feature/compat_check.m4
 share/sendmail/feature/delay_checks.m4
 share/sendmail/feature/dnsbl.m4
 share/sendmail/feature/domaintable.m4
+share/sendmail/feature/enhdnsbl.m4
 share/sendmail/feature/generics_entire_domain.m4
 share/sendmail/feature/genericstable.m4
 share/sendmail/feature/ldap_routing.m4
 share/sendmail/feature/limited_masquerade.m4
 share/sendmail/feature/local_lmtp.m4
+share/sendmail/feature/local_no_masquerade.m4
 share/sendmail/feature/local_procmail.m4
+share/sendmail/feature/lookupdotdomain.m4
 share/sendmail/feature/loose_relay_check.m4
 share/sendmail/feature/mailertable.m4
 share/sendmail/feature/masquerade_entire_domain.m4
 share/sendmail/feature/masquerade_envelope.m4
+share/sendmail/feature/msp.m4
 share/sendmail/feature/no_default_msa.m4
 share/sendmail/feature/nocanonify.m4
 share/sendmail/feature/nodns.m4
 share/sendmail/feature/notsticky.m4
 share/sendmail/feature/nouucp.m4
 share/sendmail/feature/nullclient.m4
+share/sendmail/feature/preserve_local_plus_detail.m4
+share/sendmail/feature/preserve_luser_host.m4
 share/sendmail/feature/promiscuous_relay.m4
-share/sendmail/feature/rbl.m4
+share/sendmail/feature/queuegroup.m4
 share/sendmail/feature/redirect.m4
 share/sendmail/feature/relay_based_on_MX.m4
 share/sendmail/feature/relay_entire_domain.m4
@@ -114,6 +131,7 @@ share/sendmail/m4/cfhead.m4
 share/sendmail/m4/proto.m4
 share/sendmail/m4/version.m4
 share/sendmail/mailer/cyrus.m4
+share/sendmail/mailer/cyrusv2.m4
 share/sendmail/mailer/fax.m4
 share/sendmail/mailer/local.m4
 share/sendmail/mailer/mail11.m4
@@ -124,13 +142,12 @@ share/sendmail/mailer/qpage.m4
 share/sendmail/mailer/smtp.m4
 share/sendmail/mailer/usenet.m4
 share/sendmail/mailer/uucp.m4
-share/sendmail/ostype/aix2.m4
+share/sendmail/ostype/a-ux.m4
 share/sendmail/ostype/aix3.m4
 share/sendmail/ostype/aix4.m4
 share/sendmail/ostype/aix5.m4
 share/sendmail/ostype/altos.m4
 share/sendmail/ostype/amdahl-uts.m4
-share/sendmail/ostype/aux.m4
 share/sendmail/ostype/bsd4.3.m4
 share/sendmail/ostype/bsd4.4.m4
 share/sendmail/ostype/bsdi.m4
@@ -141,6 +158,7 @@ share/sendmail/ostype/dgux.m4
 share/sendmail/ostype/domainos.m4
 share/sendmail/ostype/dynix3.2.m4
 share/sendmail/ostype/freebsd4.m4
+share/sendmail/ostype/freebsd5.m4
 share/sendmail/ostype/gnu.m4
 share/sendmail/ostype/hpux10.m4
 share/sendmail/ostype/hpux11.m4
@@ -152,6 +170,7 @@ share/sendmail/ostype/isc4.1.m4
 share/sendmail/ostype/linux.m4
 share/sendmail/ostype/maxion.m4
 share/sendmail/ostype/mklinux.m4
+share/sendmail/ostype/mpeix.m4
 share/sendmail/ostype/nextstep.m4
 share/sendmail/ostype/openbsd.m4
 share/sendmail/ostype/osf1.m4
@@ -173,6 +192,7 @@ share/sendmail/ostype/ultrix4.m4
 share/sendmail/ostype/unixware7.m4
 share/sendmail/ostype/unknown.m4
 share/sendmail/ostype/uxpds.m4
+share/sendmail/sendmail.schema
 share/sendmail/sh/makeinfo.sh
 share/sendmail/siteconfig/uucp.cogsci.m4
 share/sendmail/siteconfig/uucp.old.arpa.m4
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index e955398437e..9a49a1a8e3f 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.7 2001/09/09 16:41:40 taca Exp $
+$NetBSD: distinfo,v 1.8 2002/09/23 12:56:58 markd Exp $
 
-SHA1 (sendmail.8.11.6.tar.gz) = 8f24fc7824f6d99f1be08a9eec6fe18d56cab1be
-Size (sendmail.8.11.6.tar.gz) = 1374835 bytes
-SHA1 (sendmail8.11.6+3.4W.patch.gz) = bd1caae3cc99a41001045abb6b771e51b2d411a8
-Size (sendmail8.11.6+3.4W.patch.gz) = 29720 bytes
-SHA1 (patch-aa) = 9458931dc99f8775574b26ed8ca5f530600d7506
-SHA1 (patch-ab) = 40d3643d4f82c9761cc4e5abfee90ccd9c65536b
-SHA1 (patch-ac) = bfb83dbd4209879f58b95f0328d68bb8e56ac119
-SHA1 (patch-ad) = 93408922c222d5fe6a14cdd8a00060230a9195b9
-SHA1 (patch-ae) = 5e3efecc7ac7ffed40278b3c29dd1152990f3b33
-SHA1 (patch-af) = db9e5d94b1b1f4cd7e5c9f25b36772e90e2987fe
+SHA1 (sendmail.8.12.6.tar.gz) = 17680259264ba7fd42739ce77cab68dd9e099df9
+Size (sendmail.8.12.6.tar.gz) = 1867436 bytes
+SHA1 (patch-aa) = 8a4563ece8ba8cee01081d49e486393f26ee1484
+SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
+SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
+SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
+SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
+SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4
index d0073176d88..ca03132c564 100644
--- a/mail/sendmail/files/site.config.m4
+++ b/mail/sendmail/files/site.config.m4
@@ -1,4 +1,4 @@
-# $NetBSD: site.config.m4,v 1.2 2002/06/23 11:46:04 tron Exp $
+# $NetBSD: site.config.m4,v 1.3 2002/09/23 12:56:58 markd Exp $
 
 # pathnames specific to pkgsrc
 #
@@ -8,5 +8,5 @@ define(`confSBINDIR', `${PREFIX}/sbin')
 define(`confUBINDIR', `${PREFIX}/bin')
 define(`confHFDIR', `${PREFIX}/share/misc')
 define(`confMANROOT', `${PREFIX}/man/cat')
-APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include')
-APPENDDEF(`confLIBS', `-L${BUILDLINK_DIR}/lib')
+APPENDDEF(`confENVDEF', `-I${PREFIX}/include')
+APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
diff --git a/mail/sendmail/files/site.config.m4-db2 b/mail/sendmail/files/site.config.m4-db2
index f1abc5b472a..9f13bfc1e3d 100644
--- a/mail/sendmail/files/site.config.m4-db2
+++ b/mail/sendmail/files/site.config.m4-db2
@@ -1,3 +1,3 @@
 # enable db2
-APPENDDEF(`confENVDEF', `-I${BUILDLINK_DIR}/include/db2')
+APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db2')
 APPENDDEF(`confLIBS', `-ldb2')
diff --git a/mail/sendmail/files/site.config.m4-db4 b/mail/sendmail/files/site.config.m4-db4
new file mode 100644
index 00000000000..9c331e0d2ef
--- /dev/null
+++ b/mail/sendmail/files/site.config.m4-db4
@@ -0,0 +1,3 @@
+# enable db4
+APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db4')
+APPENDDEF(`confLIBS', `-ldb4')
diff --git a/mail/sendmail/files/site.config.m4-milter b/mail/sendmail/files/site.config.m4-milter
new file mode 100644
index 00000000000..032cfd8d70e
--- /dev/null
+++ b/mail/sendmail/files/site.config.m4-milter
@@ -0,0 +1,2 @@
+# enable milter
+APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
diff --git a/mail/sendmail/files/site.config.m4-sasl b/mail/sendmail/files/site.config.m4-sasl
index f47aa37f657..2aaeaf6a835 100644
--- a/mail/sendmail/files/site.config.m4-sasl
+++ b/mail/sendmail/files/site.config.m4-sasl
@@ -1,5 +1,5 @@
-# $NetBSD: site.config.m4-sasl,v 1.1 2002/06/23 12:15:03 tron Exp $
+# $NetBSD: site.config.m4-sasl,v 1.2 2002/09/23 12:56:59 markd Exp $
 
 # enable SASL
-APPENDDEF(`confENVDEF', `-DSASL -D_FFR_UNSAFE_SASL')
+APPENDDEF(`confENVDEF', `-DSASL')
 APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
diff --git a/mail/sendmail/files/site.config.m4-solaris b/mail/sendmail/files/site.config.m4-solaris
index 461a09f9b69..5cf44ee9bc0 100644
--- a/mail/sendmail/files/site.config.m4-solaris
+++ b/mail/sendmail/files/site.config.m4-solaris
@@ -1,4 +1,4 @@
-# $NetBSD: site.config.m4-solaris,v 1.1 2001/10/19 08:51:32 veego Exp $
+# $NetBSD: site.config.m4-solaris,v 1.2 2002/09/23 12:56:59 markd Exp $
 
 # man pathnames specific for Solaris
 #
diff --git a/mail/sendmail/files/site.config.m4-starttls b/mail/sendmail/files/site.config.m4-starttls
index d475ce82440..236eb8ae627 100644
--- a/mail/sendmail/files/site.config.m4-starttls
+++ b/mail/sendmail/files/site.config.m4-starttls
@@ -1,3 +1,3 @@
 # enable STARTTLS
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -D_FFR_TLS_TOREK')
+APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
 APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail/files/site.config.m4-v6 b/mail/sendmail/files/site.config.m4-v6
index e249d65be54..c41e607f7f9 100644
--- a/mail/sendmail/files/site.config.m4-v6
+++ b/mail/sendmail/files/site.config.m4-v6
@@ -1,3 +1,2 @@
 # enable IPv6 
 APPENDDEF(`confENVDEF', `-DNETINET6')
-APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE')
diff --git a/mail/sendmail/files/site.config.m4-v6-not-solaris b/mail/sendmail/files/site.config.m4-v6-not-solaris
new file mode 100644
index 00000000000..2209c48b442
--- /dev/null
+++ b/mail/sendmail/files/site.config.m4-v6-not-solaris
@@ -0,0 +1 @@
+APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE')
diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
index 8c08fd76006..f741eda8fa3 100644
--- a/mail/sendmail/patches/patch-aa
+++ b/mail/sendmail/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.14 2001/04/15 01:18:07 itojun Exp $
+$NetBSD: patch-aa,v 1.15 2002/09/23 12:57:00 markd Exp $
 
---- devtools/OS/NetBSD-orig	Fri Apr 28 07:46:10 2000
-+++ devtools/OS/NetBSD	Wed Jul 26 13:05:56 2000
-@@ -3,13 +3,15 @@
+--- devtools/OS/NetBSD.orig	Fri Mar 22 11:59:25 2002
++++ devtools/OS/NetBSD	Mon Sep 16 15:01:23 2002
+@@ -6,13 +6,15 @@
+ define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
  define(`confENVDEF', ` -DNETISO')
  define(`confDEPEND_TYPE', `CC-M')
- define(`confSTDIO_TYPE', `torek')
 -define(`confSBINGRP', `wheel')
 -define(`confUBINOWN', `root')
 -define(`confUBINGRP', `wheel')
 -define(`confMANOWN', `root')
 -define(`confMANGRP', `wheel')
-+define(`confSBINOWN', `${BSD_BINOWN}')
++define(`confSBINGRP', `${BSD_BINOWN}')
 +define(`confSBINGRP', `${BSD_BINGRP}')
 +define(`confUBINOWN', `${BSD_BINOWN}')
 +define(`confUBINGRP', `${BSD_BINGRP}')
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
index 53fe81aa26c..0dda084aaad 100644
--- a/mail/sendmail/patches/patch-ab
+++ b/mail/sendmail/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.11 2001/04/15 01:18:07 itojun Exp $
+$NetBSD: patch-ab,v 1.12 2002/09/23 12:57:00 markd Exp $
 
---- devtools/OS/SunOS.5.6	Tue Jun  6 02:03:29 2000
-+++ devtools/OS/SunOS.5.6	Wed Jul 26 13:07:21 2000
-@@ -6,6 +6,7 @@
- define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+--- devtools/OS/SunOS.5.6.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.6	Mon Sep 16 15:05:30 2002
+@@ -11,6 +11,7 @@
  define(`confENVDEF', `-DSOLARIS=20600')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
  define(`confLIBS', `-lsocket -lnsl -lkstat')
 +define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
  define(`confMTLDOPTS', `-lpthread')
  define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ac b/mail/sendmail/patches/patch-ac
index bf773d799db..851b005737a 100644
--- a/mail/sendmail/patches/patch-ac
+++ b/mail/sendmail/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.5 2001/04/15 01:18:07 itojun Exp $
+$NetBSD: patch-ac,v 1.6 2002/09/23 12:57:00 markd Exp $
 
---- devtools/OS/SunOS.5.7	Tue Jun  6 02:03:29 2000
-+++ devtools/OS/SunOS.5.7	Wed Jul 26 13:07:08 2000
-@@ -6,6 +6,7 @@
- define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+--- devtools/OS/SunOS.5.7.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.7	Mon Sep 16 15:07:08 2002
+@@ -11,6 +11,7 @@
  define(`confENVDEF', `-DSOLARIS=20700')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
  define(`confLIBS', `-lsocket -lnsl')
 +define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
  define(`confMTLDOPTS', `-lpthread')
  define(`confMBINDIR', `/usr/lib')
- define(`confEBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad
index 1622af7a7d4..da81a3aab04 100644
--- a/mail/sendmail/patches/patch-ad
+++ b/mail/sendmail/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.6 2001/04/15 01:18:07 itojun Exp $
+$NetBSD: patch-ad,v 1.7 2002/09/23 12:57:01 markd Exp $
 
---- devtools/OS/SunOS.5.8.orig	Tue Oct 10 19:21:59 2000
-+++ devtools/OS/SunOS.5.8	Tue Oct 10 19:23:59 2000
-@@ -4,4 +4,6 @@
- define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
-+define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+--- devtools/OS/SunOS.5.8.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.8	Mon Sep 16 15:09:28 2002
+@@ -10,6 +10,7 @@
  define(`confENVDEF', `-DSOLARIS=20800 -DNETINET6')
--define(`confLIBS', `-lsocket -lnsl -lldap')
-+define(`confLIBS', `-lsocket -lnsl')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl')
 +define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
  define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-ae b/mail/sendmail/patches/patch-ae
index 19cd52da724..7a607669353 100644
--- a/mail/sendmail/patches/patch-ae
+++ b/mail/sendmail/patches/patch-ae
@@ -1,13 +1,12 @@
-$NetBSD: patch-ae,v 1.4 2001/04/15 01:18:07 itojun Exp $
+$NetBSD: patch-ae,v 1.5 2002/09/23 12:57:01 markd Exp $
 
---- devtools/OS/SunOS.5.9.orig	Tue Oct 10 19:25:30 2000
-+++ devtools/OS/SunOS.5.9	Tue Oct 10 19:26:27 2000
-@@ -3,5 +3,6 @@
- define(`confBEFORE', `sysexits.h')
--define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX -DLDAPMAP')
-+define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+--- devtools/OS/SunOS.5.9.orig	Fri Mar 22 11:59:26 2002
++++ devtools/OS/SunOS.5.9	Mon Sep 16 15:11:10 2002
+@@ -10,6 +10,7 @@
  define(`confENVDEF', `-DSOLARIS=20900 -DNETINET6')
--define(`confLIBS', `-lsocket -lnsl -lldap')
-+define(`confLIBS', `-lsocket -lnsl')
+ define(`confSM_OS_HEADER', `sm_os_sunos')
+ define(`confLIBS', `-lsocket -lnsl')
 +define(`confLDOPTS', `${LDFLAGS}')
+ define(`confMTCCOPTS', `-D_REENTRANT')
  define(`confMTLDOPTS', `-lpthread')
+ define(`confMBINDIR', `/usr/lib')
diff --git a/mail/sendmail/patches/patch-af b/mail/sendmail/patches/patch-af
index 27202a7dd79..ac36c279cc4 100644
--- a/mail/sendmail/patches/patch-af
+++ b/mail/sendmail/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2001/04/15 01:18:07 itojun Exp $
+$NetBSD: patch-af,v 1.10 2002/09/23 12:57:01 markd Exp $
 
---- sendmail/conf.c.orig	Wed Feb 28 05:48:21 2001
-+++ sendmail/conf.c	Wed Feb 28 12:48:30 2001
-@@ -4546,7 +4546,8 @@
+--- sendmail/conf.c.orig	Sat Aug 17 02:56:01 2002
++++ sendmail/conf.c	Mon Sep 16 15:13:22 2002
+@@ -4352,7 +4352,8 @@
  
  #if NETINET6
  	if (type == AF_INET6 &&