Update to procmail-3.15, inspired by D'Arcy J.M. Cain.

Relevant changes:
- Rewrite folder type parsing: corrects handling of MH and maildir
  style spools
- v3.14 changed '!' actions too much: revert to v3.13 behavior but
  continue to split SENDMAILFLAGS
- Contents of skipped nested blocks could affect 'E', 'e', 'a', and
  'A' flags
- Prevent peeking into buffers on "Out of memory" errors
- Unquoted $\var expansions could alter the interpretation of the
  following whitespace
- Prevent attempts to set LINEBUF to really huge values
- Optimize SWITCHRC = $_
- Use a secure PATH when processing /etc/procmailrc
- Use 2^31-1 as the maximum score even when sizeof(long)>4
Changes to formail:
- Allow -n with -D and -s again -- corruption couldn't happen after
  all
- Don't strip pre-colon whitespace until header is identified
- Properly handle NULs in the body when generating an autoreply that
  keeps the body (could coredump)
General:
- Documented that $\var expansions are never split on whitespace
- Removed ':' and '@' from list of characters that can appear in
  tempfile names
- Called nice() when shouldn't have

7 files changed, 66 insertions, 48 deletions

diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 244ffe0a8d3..2bd2c613ab7 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.16 2000/08/03 14:42:29 veego Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/26 14:26:57 wiz Exp $
 # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp
 #
 
-DISTNAME=       procmail-3.14
+DISTNAME=	procmail-3.15
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.procmail.org/pub/procmail/
 
-MAINTAINER=     packages@netbsd.org
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.procmail.org/
 
-INSTALL_TARGET= install-suid install.man
+INSTALL_TARGET=	install-suid install.man
 MAKE_ENV=	SHELL=/bin/sh
 
+MESSAGE_FILE=	${WRKDIR}/MESSAGE
+
 post-patch:
 	${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h-orig
 	${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' < ${WRKSRC}/config.h-orig \
@@ -20,6 +23,9 @@ post-patch:
 		< ${WRKSRC}/man/procmail.man-orig \
 		> ${WRKSRC}/man/procmail.man
 
+pre-install:
+	${SED} -e 's,@PREFIX@,${PREFIX},g' ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/mail/procmail/files/md5 b/mail/procmail/files/md5
index 60bcdfbfced..37496ed1fc2 100644
--- a/mail/procmail/files/md5
+++ b/mail/procmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/07/21 14:10:15 simonb Exp $
+$NetBSD: md5,v 1.6 2000/08/26 14:26:58 wiz Exp $
 
-MD5 (procmail-3.14.tar.gz) = c10ae1301aa78352348b340ab8df4f77
+MD5 (procmail-3.15.tar.gz) = 2567273648f41ae23c51cf876e0019fc
diff --git a/mail/procmail/files/patch-sum b/mail/procmail/files/patch-sum
index 07265a42bc3..871faa2e57c 100644
--- a/mail/procmail/files/patch-sum
+++ b/mail/procmail/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/26 14:26:58 wiz Exp $
 
 MD5 (patch-aa) = d93dbd801c97a11afb7ba53bd834110e
 MD5 (patch-ab) = 3627fbed7693e14e4814acc23ef43f04
-MD5 (patch-ac) = b4d3b1b8cd2d63f300c424c5ddcd8a30
-MD5 (patch-ad) = 3244290ba0c412a7e2fd789f384cebab
+MD5 (patch-ac) = 97524a373bf7c48f6cec23e9ced294c2
+MD5 (patch-ad) = 9efbec8cab16390f7b8fe825dc3df96f
+MD5 (patch-ae) = 229d5010a66e32343837472d8cb4107d
diff --git a/mail/procmail/patches/patch-ac b/mail/procmail/patches/patch-ac
index 751b71ab735..428bb7c9a82 100644
--- a/mail/procmail/patches/patch-ac
+++ b/mail/procmail/patches/patch-ac
@@ -1,23 +1,15 @@
-$NetBSD: patch-ac,v 1.3 1999/04/06 11:48:07 cjs Exp $
+$NetBSD: patch-ac,v 1.4 2000/08/26 14:26:58 wiz Exp $
 
-*** initmake~	Tue Feb 16 16:13:32 1999
---- initmake	Mon Apr  5 23:10:00 1999
-***************
-*** 382,389 ****
-  test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
-  test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
-  
-! echo "CFLAGS	= \$(CFLAGS1)$CFLAGS"			>>_Makefile
-! echo "LDFLAGS	= \$(LDFLAGS1)$LDFLAGS"			>>_Makefile
-  echo							>>_Makefile
-  
-  MANSS=""
---- 382,389 ----
-  test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
-  test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
-  
-! echo "CFLAGS	+= \$(CFLAGS1)$CFLAGS"			>>_Makefile
-! echo "LDFLAGS	+= \$(LDFLAGS1)$LDFLAGS"		>>_Makefile
-  echo							>>_Makefile
-  
-  MANSS=""
+--- initmake.orig	Sat Jan 29 07:52:13 2000
++++ initmake
+@@ -433,8 +433,8 @@
+ test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
+ test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
+ 
+-echo "CFLAGS	= \$(CFLAGS1)$CFLAGS"			>>_Makefile
+-echo "LDFLAGS	= $LDFLAGS"				>>_Makefile
++echo "CFLAGS	+= \$(CFLAGS1)$CFLAGS"			>>_Makefile
++echo "LDFLAGS	+= $LDFLAGS"				>>_Makefile
+ echo							>>_Makefile
+ 
+ MANSS=""
diff --git a/mail/procmail/patches/patch-ad b/mail/procmail/patches/patch-ad
index fc072099ebd..a19c80e8b66 100644
--- a/mail/procmail/patches/patch-ad
+++ b/mail/procmail/patches/patch-ad
@@ -1,14 +1,12 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:51 agc Exp $
+$NetBSD: patch-ad,v 1.3 2000/08/26 14:26:58 wiz Exp $
 
-*** src/recommend.c.bak	Wed Apr  2 07:15:45 1997
---- src/recommend.c	Tue Jun 17 21:48:49 1997
-***************
-*** 23,29 ****
-     { fprintf(stderr,"Please run this program via 'make recommend'\n");
-       return EX_USAGE;
-     }
--   strchr(mailspooldir,'\0')[-1]='\0';		     /* strip last character */
-    for(p=checkf;*p;p++)
-       if(!stat(*p,&stbuf)&&stbuf.st_mode&S_ISGID)
-        { if(stbuf.st_mode&S_ISGID)
---- 23,28 ----
+--- src/recommend.c.orig	Thu Nov 25 04:13:36 1999
++++ src/recommend.c
+@@ -19,7 +19,6 @@
+    { fprintf(stderr,"Please run this program via 'make recommend'\n");
+      return EX_USAGE;
+    }
+-  strchr(mailspooldir,'\0')[-1]='\0';		     /* strip last character */
+   for(p=checkf;*p;p++)
+      if(!stat(*p,&stbuf)&&stbuf.st_mode&S_ISGID)
+       { if(stbuf.st_mode&S_ISGID)
diff --git a/mail/procmail/patches/patch-ae b/mail/procmail/patches/patch-ae
new file mode 100644
index 00000000000..0e231f50430
--- /dev/null
+++ b/mail/procmail/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.4 2000/08/26 14:26:59 wiz Exp $
+
+If these lines stay, `make install; make deinstall; make install' fails.
+
+--- Makefile.1.orig	Sat Dec 21 04:28:05 1996
++++ Makefile.1
+@@ -102,14 +102,12 @@
+      then $(MANCOMPRESS) -c new/$$a.5 >$(MAN5DIR)/$$a.$(MAN5SUFFIX); \
+      else :; fi; \
+   done
+-	echo Housekeeping file >install.man
+ 
+ install.bin: $(BINS) $(BASENAME)
+ 	@-mkdir $(BINDIR) 2>$(DEVNULL); exit 0
+ 	@chmod 0755 $(BINS)
+ 	$(INSTALL) $(BINS) $(BINDIR)
+ 	@-dirname / >$(DEVNULL) || $(INSTALL) examples/dirname $(BINDIR)
+-	echo Housekeeping file >install.bin
+ 
+ install:
+ 	@$(MAKE) install.man install.bin
diff --git a/mail/procmail/pkg/MESSAGE b/mail/procmail/pkg/MESSAGE
index 6873d8da3f9..16be21a6674 100644
--- a/mail/procmail/pkg/MESSAGE
+++ b/mail/procmail/pkg/MESSAGE
@@ -1,12 +1,12 @@
-$NetBSD: MESSAGE,v 1.2 1998/08/07 11:09:52 agc Exp $
+$NetBSD: MESSAGE,v 1.3 2000/08/26 14:26:59 wiz Exp $
 
 =============================================================
 Please note the following:
 
-    - The system-wide procmailrc is expected in ${PREFIX}/etc
-      (e.g. /usr/pkg/etc/procmailrc).
+    - The system-wide procmailrc is expected in @PREFIX@/etc
+      (e.g. @PREFIX@/etc/procmailrc).
 
     - The system-wide procmailrc directory is expected in
-      ${PREFIX}/etc (e.g. /usr/pkg/etc/procmailrcs/*).
+      @PREFIX@/etc (e.g. @PREFIX@/etc/procmailrcs/*).
 
 =============================================================