Prefer PATH_MAX over MAXPATHLEN.

Use a better boundary check, which doesn't depend on PATH_MAX >> NAME_MAX.
Both changes are from DragonFly and have been reported upstream.

Install only man pages, not the catpages. The installation was
inconsistent before.

Bump revision. OK from tv@.

5 files changed, 73 insertions, 16 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 1d38c7db2b7..40c76fad996 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.88 2006/06/06 22:03:36 adrianp Exp $
+# $NetBSD: Makefile,v 1.89 2006/06/07 14:48:28 joerg Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
 PKGNAME=	sendmail-${DIST_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	The well known Mail Transport Agent
 
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST
index a5f3e912f4b..6c116a31a47 100644
--- a/mail/sendmail/PLIST
+++ b/mail/sendmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/06/06 22:03:36 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/06/07 14:48:28 joerg Exp $
 bin/hoststat
 bin/mailq
 bin/newaliases
@@ -8,16 +8,16 @@ lib/libsm.a
 lib/libsmutil.a
 libexec/sendmail/sendmail
 libexec/sendmail/smrsh
-man/cat1/mailq.0
-man/cat1/newaliases.0
-man/cat1/vacation.0
-man/cat5/aliases.0
-man/cat8/editmap.0
-man/cat8/mailstats.0
-man/cat8/makemap.0
-man/cat8/praliases.0
-man/cat8/sendmail.0
-man/cat8/smrsh.0
+man/man1/mailq.1
+man/man1/newaliases.1
+man/man1/vacation.1
+man/man5/aliases.5
+man/man8/editmap.8
+man/man8/mailstats.8
+man/man8/makemap.8
+man/man8/praliases.8
+man/man8/sendmail.8
+man/man8/smrsh.8
 sbin/editmap
 sbin/mailstats
 sbin/makemap
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index f0467a1e147..4a8aec23812 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2006/05/12 22:23:09 adrianp Exp $
+$NetBSD: distinfo,v 1.29 2006/06/07 14:48:28 joerg Exp $
 
 SHA1 (sendmail.8.13.6.tar.gz) = 6c35f4780bd9fc5f8982977ad699752e2ccb26d0
 RMD160 (sendmail.8.13.6.tar.gz) = cbb0649b5dec8e4b4850c76ad4a132a15335df3b
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
 SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
 SHA1 (patch-ag) = 672c3e8a0c897f2c721d45393d85d4ea819d55a6
 SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028
+SHA1 (patch-ai) = 8ade5888074ad9a328f87d66836c04eacf7785d5
diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4
index ca03132c564..305a6ca90bc 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.3 2002/09/23 12:56:58 markd Exp $
+# $NetBSD: site.config.m4,v 1.4 2006/06/07 14:48:28 joerg Exp $
 
 # pathnames specific to pkgsrc
 #
@@ -7,6 +7,9 @@ define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
 define(`confSBINDIR', `${PREFIX}/sbin')
 define(`confUBINDIR', `${PREFIX}/bin')
 define(`confHFDIR', `${PREFIX}/share/misc')
-define(`confMANROOT', `${PREFIX}/man/cat')
+define(`confINSTALL_RAWMAN', 'yes')
+define(`confDONT_INSTALL_CATMAN', 'yes')
+define(`confMANROOT', `${PREFIX}/${PKGMANDIR}/man')
+define(`confMANROOTMAN', `${PREFIX}/${PKGMANDIR}/man')
 APPENDDEF(`confENVDEF', `-I${PREFIX}/include')
 APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
diff --git a/mail/sendmail/patches/patch-ai b/mail/sendmail/patches/patch-ai
new file mode 100644
index 00000000000..ddb69d3a0a3
--- /dev/null
+++ b/mail/sendmail/patches/patch-ai
@@ -0,0 +1,53 @@
+$NetBSD: patch-ai,v 1.6 2006/06/07 14:48:28 joerg Exp $
+
+--- sendmail/mci.c.orig	2005-07-12 22:27:44.000000000 +0000
++++ sendmail/mci.c
+@@ -20,6 +20,7 @@ SM_RCSID("@(#)$Id: mci.c,v 8.216 2005/07
+ #endif /* NETINET || NETINET6 */
+ 
+ #include <dirent.h>
++#include <limits.h>
+ 
+ static int	mci_generate_persistent_path __P((const char *, char *,
+ 						  int, bool));
+@@ -717,7 +718,11 @@ mci_lock_host_statfile(mci)
+ {
+ 	int save_errno = errno;
+ 	int retVal = EX_OK;
++#if defined(PATH_MAX)
++	char fname[PATH_MAX];
++#else
+ 	char fname[MAXPATHLEN];
++#endif
+ 
+ 	if (HostStatDir == NULL || mci->mci_host == NULL)
+ 		return EX_OK;
+@@ -1135,7 +1140,7 @@ mci_traverse_persistent(action, pathname
+ 					pathname, sm_errstring(errno));
+ 			return -1;
+ 		}
+-		len = sizeof(newpath) - MAXNAMLEN - 3;
++		len = sizeof(newpath) - 2; /* enough space for '/' and NUL */
+ 		if (sm_strlcpy(newpath, pathname, len) >= len)
+ 		{
+ 			if (tTd(56, 2))
+@@ -1145,6 +1150,7 @@ mci_traverse_persistent(action, pathname
+ 		}
+ 		newptr = newpath + strlen(newpath);
+ 		*newptr++ = '/';
++		len = sizeof(newpath) - (newptr - newpath);
+ 
+ 		/*
+ 		**  repeat until no file has been removed
+@@ -1161,9 +1167,8 @@ mci_traverse_persistent(action, pathname
+ 				if (e->d_name[0] == '.')
+ 					continue;
+ 
+-				(void) sm_strlcpy(newptr, e->d_name,
+-					       sizeof newpath -
+-					       (newptr - newpath));
++				if (sm_strlcpy(newptr, e->d_name, len) >= len)
++					continue;
+ 
+ 				if (StopRequest)
+ 					stop_sendmail();