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

3 files changed, 46 insertions, 35 deletions

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