cvsdist 399dc0
--- procmail-3.22.orig/examples/advanced
cvsdist 399dc0
+++ procmail-3.22/examples/advanced
cvsdist 399dc0
@@ -251,14 +251,14 @@
cvsdist 399dc0
    --------------------------------------------------------
cvsdist 399dc0
 
cvsdist 399dc0
 There are many different reasons why more and more sites decide not to
cvsdist 399dc0
-store mail in /usr/spool/mail or /usr/mail anymore.
cvsdist 399dc0
+store mail in /var/spool/mail or /var/mail anymore.
cvsdist 399dc0
 Some of the obvious advantages when storing mail in the recipient's home
cvsdist 399dc0
 directory are:
cvsdist 399dc0
 	- Mail is automatically subject to the user's quota limitations.
cvsdist 399dc0
 	- Often there is more room on the home partition(s) than on that
cvsdist 399dc0
-	  one /usr/mail partition.
cvsdist 399dc0
+	  one /var/mail partition.
cvsdist 399dc0
 
cvsdist 399dc0
-The quota limitations also apply to /usr/spool/mail or /usr/mail if procmail
cvsdist 399dc0
+The quota limitations also apply to /var/spool/mail or /var/mail if procmail
cvsdist 399dc0
 does the delivery.  These quota limitations often do not work with the
cvsdist 399dc0
 regular /bin/mail since that usually writes the mailbox with root permissions
cvsdist 399dc0
 (eluding the quota restrictions).
cvsdist 399dc0
@@ -276,7 +276,7 @@
cvsdist 399dc0
 	defined SYSTEM_MBOX to be.  Some braindamaged mail programs
cvsdist 399dc0
 	do not pick up the MAIL environment variable, these either
cvsdist 399dc0
 	have to be patched/recompiled or you have to create symbolic
cvsdist 399dc0
-	links in /usr/mail to every person's new mailbox.
cvsdist 399dc0
+	links in /var/mail to every person's new mailbox.
cvsdist 399dc0
 
cvsdist 399dc0
 				---
cvsdist 399dc0
 
cvsdist 399dc0
--- procmail-3.22.orig/man/procmail.man
cvsdist 399dc0
+++ procmail-3.22/man/procmail.man
cvsdist 399dc0
@@ -166,7 +166,8 @@
cvsdist 399dc0
 accept an unlimited number of arguments.@ETCRCS_desc@
cvsdist 399dc0
 For some advanced usage of this option you should look in the
cvsdist 399dc0
 .B EXAMPLES
cvsdist 399dc0
-section below.@LMTPOPTdesc@.SH ARGUMENTS
cvsdist 399dc0
+section below.@LMTPOPTdesc@
cvsdist 399dc0
+.SH ARGUMENTS
cvsdist 399dc0
 Any arguments containing an '=' are considered to be environment variable
cvsdist 399dc0
 assignments, they will
cvsdist 399dc0
 .I all
cvsdist 399dc0
@@ -723,6 +724,15 @@
cvsdist 399dc0
 .fi
cvsdist 399dc0
 .ad
cvsdist 399dc0
 .PP
cvsdist 399dc0
+Some mailers (notably exim) do not currently accept the above syntax.
cvsdist 399dc0
+In such case use this instead:
cvsdist 399dc0
+.PP
cvsdist 399dc0
+.na
cvsdist 399dc0
+.nf
cvsdist 399dc0
+|/usr/bin/procmail
cvsdist 399dc0
+.fi
cvsdist 399dc0
+.ad
cvsdist 399dc0
+.PP
cvsdist 399dc0
 Procmail can also be invoked to postprocess an already filled system
cvsdist 399dc0
 mailbox.  This can be useful if you don't want to or can't use a
cvsdist 399dc0
 $HOME/@DOT_FORWARD@ file (in which case the following script could
cvsdist 399dc0
@@ -754,7 +764,7 @@
cvsdist 399dc0
 .SS "A sample small @PROCMAILRC@:"
cvsdist 399dc0
 .na
cvsdist 399dc0
 .nf
cvsdist 399dc0
-PATH=/bin:/usr/bin:@BINDIR@
cvsdist 399dc0
+PATH=/usr/local/bin:/usr/bin:/bin
cvsdist 399dc0
 MAILDIR=$HOME/Mail      #you'd better make sure it exists
cvsdist 399dc0
 DEFAULT=$MAILDIR/mbox   #completely optional
cvsdist 399dc0
 LOGFILE=$MAILDIR/from   #recommended
cvsdist 399dc0
--- procmail-3.22.orig/man/procmailrc.man
cvsdist 399dc0
+++ procmail-3.22/man/procmailrc.man
cvsdist 399dc0
@@ -779,7 +779,7 @@
cvsdist 399dc0
 .PP
cvsdist 399dc0
 Some non-optimal and non-obvious regexps set MATCH to an incorrect
cvsdist 399dc0
 value.  The regexp can be made to work by removing one or more unneeded
cvsdist 399dc0
-'*', '+', or '?' operator on the left-hand side of the \e/ token.
cvsdist 399dc0
+\&'*', '+', or '?' operator on the left-hand side of the \e/ token.
cvsdist 399dc0
 .SH MISCELLANEOUS
cvsdist 399dc0
 If the regular expression contains `\fB@TO_key@\fP' it will be substituted by
cvsdist 399dc0
 .na
cvsdist 399dc0
--- procmail-3.22.orig/src/comsat.c
cvsdist 399dc0
+++ procmail-3.22/src/comsat.c
cvsdist 399dc0
@@ -92,7 +92,7 @@
cvsdist 399dc0
    }
cvsdist 399dc0
   if(newvalid)						  /* so far, so good */
cvsdist 399dc0
    { int s;
cvsdist 399dc0
-     if(!*chp)						       /* no service */
cvsdist 399dc0
+     if(!chad||!*chp)					       /* no service */
cvsdist 399dc0
 	chp=BIFF_serviceport;				/* new balls please! */
cvsdist 399dc0
      s=strtol(chp,&chad,10);
cvsdist 399dc0
      if(chp!=chad)			       /* the service is not numeric */
cvsdist 399dc0
@@ -120,7 +120,7 @@
cvsdist 399dc0
 { int s;const char*p;
cvsdist 399dc0
   if(!csvalid||!buf)		  /* is comat on and set to a valid address? */
cvsdist 399dc0
      return;
cvsdist 399dc0
-  if(!*cslgname||strlen(cslgname)+2>linebuf)	       /* is $LOGNAME bogus? */
cvsdist 399dc0
+  if(!cslgname||!*cslgname||strlen(cslgname)+2>linebuf)/* is $LOGNAME bogus? */
cvsdist 399dc0
      return;
cvsdist 399dc0
   if(!(p=folder?folder:cslastf))		     /* do we have a folder? */
cvsdist 399dc0
      return;
cvsdist 399dc0
--- procmail-3.22.orig/src/formail.c
cvsdist 399dc0
+++ procmail-3.22/src/formail.c
cvsdist 399dc0
@@ -758,9 +758,9 @@
cvsdist 399dc0
 	lputssn(buf,buffilled),ctlength-=buffilled,buffilled=lnl=0;
cvsdist 399dc0
      ;{ int tbl=buflast,lwr='\n';
cvsdist 399dc0
 	while(--ctlength>=0&&tbl!=EOF)	       /* skip Content-Length: bytes */
cvsdist 399dc0
-	   lnl=lwr==tbl&&lwr=='\n',putcs(lwr=tbl),tbl=getchar();
cvsdist 399dc0
+	   lnl=lwr==tbl&&lwr=='\n',lputcs(lwr=tbl),tbl=getchar();
cvsdist 399dc0
 	if((buflast=tbl)=='\n'&&lwr!=tbl)	/* just before a line break? */
cvsdist 399dc0
-	   putcs('\n'),buflast=getchar();		/* wrap up loose end */
cvsdist 399dc0
+	   lputcs('\n'),buflast=getchar();		/* wrap up loose end */
cvsdist 399dc0
       }
cvsdist 399dc0
      if(!quiet&&ctlength>0)
cvsdist 399dc0
       { charNUM(num,ctlength);
cvsdist 399dc0
--- procmail-3.22.orig/src/memblk.c
cvsdist 399dc0
+++ procmail-3.22/src/memblk.c
cvsdist 399dc0
@@ -51,11 +51,11 @@
cvsdist 399dc0
 {
cvsdist 399dc0
 #ifdef USE_MMAP
cvsdist 399dc0
   if(mb->fd>=0)
cvsdist 399dc0
-   { long len=mb->len+1;
cvsdist 399dc0
-     if(munmap(mb->p,len))
cvsdist 399dc0
-	mmapfailed(len);		      /* don't want to continue here */
cvsdist 399dc0
-     if((mb->p=mmap(0,len,PROT_READ,MAP_PRIVATE,mb->fd,(off_t)0))==MAP_FAILED)
cvsdist 399dc0
-	mmapfailed(len);
cvsdist 399dc0
+   { long mlen=mb->len+1;
cvsdist 399dc0
+     if(munmap(mb->p,mlen))
cvsdist 399dc0
+	mmapfailed(mlen);		      /* don't want to continue here */
cvsdist 399dc0
+     if((mb->p=mmap(0,mlen,PROT_READ,MAP_PRIVATE,mb->fd,(off_t)0))==MAP_FAILED)
cvsdist 399dc0
+	mmapfailed(mlen);
cvsdist 399dc0
      close(mb->fd);
cvsdist 399dc0
      mb->fd=ropen(devnull,O_RDWR,0);		/* XXX Perhaps -1 is better? */
cvsdist 399dc0
    }
cvsdist 399dc0
@@ -77,8 +77,8 @@
cvsdist 399dc0
      strcpy(filename,MMAP_DIR);
cvsdist 399dc0
      if(unique(filename,strchr(filename,'\0'),MMAP_FILE_LEN,MMAP_PERM,0,0)&&
cvsdist 399dc0
 	(mb->fd=ropen(filename,O_RDWR,MMAP_PERM),unlink(filename),mb->fd>=0))
cvsdist 399dc0
-      { mb->filelen=len;
cvsdist 399dc0
-	if(lseek(mb->fd,mb->filelen-1,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))
cvsdist 399dc0
+      { mb->filelen=len+1;
cvsdist 399dc0
+	if(lseek(mb->fd,len,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))
cvsdist 399dc0
 dropf:	 { close(mb->fd);mb->fd= -1;
cvsdist 399dc0
 	   if(verbose)nlog("Unable to extend or use tempfile");
cvsdist 399dc0
 	 }
cvsdist 399dc0
@@ -98,9 +98,9 @@
cvsdist 399dc0
       }
cvsdist 399dc0
    }
cvsdist 399dc0
   if(mb->fd>=0)
cvsdist 399dc0
-   { if(len>mb->filelen)				  /* need to extend? */
cvsdist 399dc0
-      { mb->filelen=len;
cvsdist 399dc0
-	if(lseek(mb->fd,mb->filelen-1,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))
cvsdist 399dc0
+   { if(len>=mb->filelen)				  /* need to extend? */
cvsdist 399dc0
+      { mb->filelen=len+1;
cvsdist 399dc0
+	if(lseek(mb->fd,len,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))
cvsdist 399dc0
 	 { char*p=malloc(len+1);	   /* can't extend, switch to malloc */
cvsdist 399dc0
 	   tmemmove(p,mb->p,mb->len);
cvsdist 399dc0
 	   munmap(mb->p,mb->len+1);
cvsdist 399dc0
@@ -124,9 +124,9 @@
cvsdist 399dc0
    }
cvsdist 399dc0
   else
cvsdist 399dc0
      mb->p=realloc(mb->p,len+1);
cvsdist 399dc0
-  mb->len=len+1;
cvsdist 399dc0
-  mb->p[len]='\0';
cvsdist 399dc0
+  mb->len=len;
cvsdist 399dc0
 ret1:
cvsdist 399dc0
+  mb->p[len]='\0';
cvsdist 399dc0
   return 1;
cvsdist 399dc0
 }
cvsdist 399dc0
 
cvsdist 399dc0
--- procmail-3.22.orig/src/authenticate.c
cvsdist 399dc0
+++ procmail-3.22/src/authenticate.c
cvsdist 399dc0
@@ -39,13 +39,13 @@
cvsdist 399dc0
 #include "authenticate.h"
cvsdist 399dc0
 
cvsdist 399dc0
 #ifndef MAILSPOOLDIR
cvsdist 399dc0
-#define MAILSPOOLDIR	"/var/spool/mail/"	     /* watch the trailing / */
cvsdist 399dc0
+#define MAILSPOOLDIR	"/var/mail/"	     /* watch the trailing / */
cvsdist 399dc0
 #endif
cvsdist 399dc0
 #ifndef MAILSPOOLSUFFIX
cvsdist 399dc0
 #define MAILSPOOLSUFFIX ""	      /* suffix to force maildir or MH style */
cvsdist 399dc0
 #endif
cvsdist 399dc0
 #ifndef MAILSPOOLHASH
cvsdist 399dc0
-#define MAILSPOOLHASH	0      /* 2 would deliver to /var/spool/mail/b/a/bar */
cvsdist 399dc0
+#define MAILSPOOLHASH	0      /* 2 would deliver to /var/mail/b/a/bar */
cvsdist 399dc0
 #endif
cvsdist 399dc0
 /*#define MAILSPOOLHOME "/.mail"		      /* watch the leading / */
cvsdist 399dc0
 						  /* delivers to $HOME/.mail */
cvsdist 399dc0
--- procmail-3.22.orig/src/autoconf
cvsdist 399dc0
+++ procmail-3.22/src/autoconf
cvsdist 399dc0
@@ -89,7 +89,7 @@
cvsdist 399dc0
 #	#define NOfcntl_lock
cvsdist 399dc0
 #Ok	#define USElockf
cvsdist 399dc0
 #Ok	#define USEflock
cvsdist 399dc0
-#Ok	#define MAILSPOOLDIR "/var/spool/mail/"
cvsdist 399dc0
+#Ok	#define MAILSPOOLDIR "/var/mail/"
cvsdist 399dc0
 #Ok	#define SENDMAIL "/usr/sbin/sendmail"
cvsdist 399dc0
 #	#define buggy_SENDMAIL
cvsdist 399dc0
 #	#define DEFflagsendmail ""
cvsdist 399dc0
@@ -1416,14 +1416,14 @@
cvsdist 399dc0
 
cvsdist 399dc0
 found=no
cvsdist 399dc0
 
cvsdist 399dc0
-for a in /var/spool/mail /usr/spool/mail /var/mail /usr/mail /spool/mail
cvsdist 399dc0
+for a in /var/mail /var/spool/mail /usr/spool/mail /usr/mail /spool/mail
cvsdist 399dc0
 do
cvsdist 399dc0
   test -d $a -a $found != yes &&
cvsdist 399dc0
    echo '#define MAILSPOOLDIR "'$a'/"' >>$ACONF && found=yes
cvsdist 399dc0
 done
cvsdist 399dc0
 if test $found != yes
cvsdist 399dc0
 then
cvsdist 399dc0
- echo '#define MAILSPOOLDIR "/var/spool/mail/"' >>$ACONF
cvsdist 399dc0
+ echo '#define MAILSPOOLDIR "/var/mail/"' >>$ACONF
cvsdist 399dc0
  echo Could not find the system-mailbox directory, supplied default.
cvsdist 399dc0
 fi
cvsdist 399dc0
 
cvsdist 399dc0
@@ -1470,15 +1470,14 @@
cvsdist 399dc0
  grep 'Mlocal.*procmail' >$DEVNULL ||
cvsdist 399dc0
  echo '#define CF_no_procmail_yet' >>$ACONF
cvsdist 399dc0
 
cvsdist 399dc0
-cat /usr/lib/sendmail.cf /etc/sendmail.cf /etc/mail/sendmail.cf 2>$DEVNULL |
cvsdist 399dc0
- grep '^V' >$DEVNULL ||
cvsdist 399dc0
- echo '#define buggy_SENDMAIL' >>$ACONF
cvsdist 399dc0
+# cat /usr/lib/sendmail.cf /etc/sendmail.cf /etc/mail/sendmail.cf 2>$DEVNULL |
cvsdist 399dc0
+#  grep '^V' >$DEVNULL ||
cvsdist 399dc0
+#  echo '#define buggy_SENDMAIL' >>$ACONF
cvsdist 399dc0
 
cvsdist 399dc0
 lpath='/bin'
cvsdist 399dc0
 bins="/bin"
cvsdist 399dc0
 
cvsdist 399dc0
-for newd in /usr/bin /usr/ucb /usr/5bin $BINDIR /local/bin /usr/local/bin \
cvsdist 399dc0
- /global/bin /usr/bin/X11 /usr/X*/bin
cvsdist 399dc0
+for newd in /usr/bin $BINDIR /usr/bin/X11 /usr/X*/bin
cvsdist 399dc0
 do
cvsdist 399dc0
   if test -d $newd
cvsdist 399dc0
   then
cvsdist 399dc0
--- procmail-3.22.orig/src/procmail.c
cvsdist 399dc0
+++ procmail-3.22/src/procmail.c
cvsdist 399dc0
@@ -652,8 +652,7 @@
cvsdist 399dc0
 	      nrcond= -1;
cvsdist 399dc0
 	   if(tolock)		 /* clear temporary buffer for lockfile name */
cvsdist 399dc0
 	      free(tolock);
cvsdist 399dc0
-	   for(i=maxindex(flags);i;i--)			  /* clear the flags */
cvsdist 399dc0
-	      flags[i]=0;
cvsdist 399dc0
+	   bbzero(flags,sizeof(flags));		  /* clear the flags */
cvsdist 399dc0
 	   for(tolock=0,locknext=0;;)
cvsdist 399dc0
 	    { chp=skpspace(chp);
cvsdist 399dc0
 	      switch(i= *chp++)
cvsdist 399dc0
--- procmail-3.22.orig/src/pipes.c
cvsdist 399dc0
+++ procmail-3.22/src/pipes.c
cvsdist 399dc0
@@ -145,7 +145,9 @@
cvsdist 399dc0
   if(Stdout)
cvsdist 399dc0
    { *(eq=strchr(Stdout,'\0')-1)='\0';			     /* chop the '=' */
cvsdist 399dc0
      if(!(backblock=getenv(Stdout)))			/* no current value? */
cvsdist 399dc0
-	PRDB=PWRB= -1;
cvsdist 399dc0
+      { PRDB=PWRB= -1;
cvsdist 399dc0
+	backlen=0;
cvsdist 399dc0
+      }
cvsdist 399dc0
      else
cvsdist 399dc0
       { backlen=strlen(backblock);
cvsdist 399dc0
 	goto pip;
cvsdist 399dc0
@@ -155,9 +157,7 @@
cvsdist 399dc0
 pip: rpipe(pbackfd);
cvsdist 399dc0
   rpipe(pinfd);						 /* main pipes setup */
cvsdist 399dc0
   if(!(pidchild=sfork()))			/* create a sending procmail */
cvsdist 399dc0
-   { if(Stdout&&backblock)
cvsdist 399dc0
-	backlen=strlen(backblock);
cvsdist 399dc0
-     else
cvsdist 399dc0
+   { if(!Stdout)
cvsdist 399dc0
 	backblock=source,backlen=len;
cvsdist 399dc0
      childsetup();rclose(PRDI);rclose(PRDB);
cvsdist 399dc0
      rpipe(poutfd);rclose(STDOUT);
cvsdist 399dc0
@@ -194,7 +194,7 @@
cvsdist 399dc0
      makeblock(&temp,Stdfilled);
cvsdist 399dc0
      tmemmove(temp.p,Stdout,Stdfilled);
cvsdist 399dc0
      readdyn(&temp,&Stdfilled,Stdfilled+backlen+1);
cvsdist 399dc0
-     Stdout=realloc(Stdout,&Stdfilled+1);
cvsdist 399dc0
+     Stdout=realloc(Stdout,Stdfilled+1);
cvsdist 399dc0
      tmemmove(Stdout,temp.p,Stdfilled+1);
cvsdist 399dc0
      freeblock(&temp);
cvsdist 399dc0
      retStdout(Stdout,pwait&&pipw,!backblock);
cvsdist 399dc0
--- procmail-3.22.orig/src/memblk.h
cvsdist 399dc0
+++ procmail-3.22/src/memblk.h
cvsdist 399dc0
@@ -1,6 +1,6 @@
cvsdist 399dc0
 typedef struct memblk {
cvsdist 399dc0
     char*p;						  /* where it starts */
cvsdist 399dc0
-    long len;					 /* currently allocated size */
cvsdist 399dc0
+    long len;			 /* current size, not including trailing NUL */
cvsdist 399dc0
 #ifdef USE_MMAP
cvsdist 399dc0
     off_t filelen;				     /* how long is the file */
cvsdist 399dc0
     int fd;					   /* file which is mmap()ed */
cvsdist 399dc0
--- procmail-3.22.orig/src/manconf.c
cvsdist 399dc0
+++ procmail-3.22/src/manconf.c
cvsdist 399dc0
@@ -233,7 +233,7 @@
cvsdist 399dc0
  \2-@PRESERVOPT@\1and\1.BR \2-@FROMWHOPT@ .\1");
cvsdist 399dc0
   pc("LMTPOPT",LMTPOPT);
cvsdist 399dc0
 #else
cvsdist 399dc0
-  ps("LMTPOPTdesc","");ps("LMTPusage","");
cvsdist 399dc0
+  ps("LMTPOPTdesc","");ps("LMTPusage","\1");
cvsdist 399dc0
 #endif
cvsdist 399dc0
   pname("INIT_UMASK",0);printf("0%lo/g\n",(unsigned long)INIT_UMASK);lines--;
cvsdist 399dc0
   pn("DEFlinebuf",DEFlinebuf);
cvsdist 399dc0
--- procmail-3.22.orig/src/recommend.c
cvsdist 399dc0
+++ procmail-3.22/src/recommend.c
cvsdist 399dc0
@@ -47,7 +47,7 @@
cvsdist 399dc0
      printf("chmod %lo %s\n",(unsigned long)(sgid|PERMIS),argv[2]);
cvsdist 399dc0
   else if(chmdir==1)
cvsdist 399dc0
      goto nogchmod;
cvsdist 399dc0
-  if(chmdir)
cvsdist 399dc0
+  if(0)
cvsdist 399dc0
      printf("chmod %c+w %s/.\n",chmdir==1?'g':'a',mailspooldir);
cvsdist 399dc0
 nogchmod:
cvsdist 399dc0
   return EXIT_SUCCESS;
cvsdist 399dc0
--- procmail-3.22.orig/src/foldinfo.h
cvsdist 399dc0
+++ procmail-3.22/src/foldinfo.h
cvsdist 399dc0
@@ -10,7 +10,7 @@
cvsdist 399dc0
 
cvsdist 399dc0
 #define ft_lock(type)	   ((type)>ft_MAILDIR)		   /* kernel lock fd */
cvsdist 399dc0
 #define ft_atime(type)	   ((type)==ft_FILE)	      /* force atime < mtime */
cvsdist 399dc0
-#define ft_dotlock(type)   ((type)==ft_FILE)		 /* dotlock $DEFAULT */
cvsdist 399dc0
+#define ft_dotlock(type)   ((type)>ft_MAILDIR)		 /* dotlock $DEFAULT */
cvsdist 399dc0
 #define ft_delim(type)	   ((type)==ft_FILE)		   /* add MMDF delim */
cvsdist 399dc0
 #define ft_checkcloser(type) ((type)>ft_MH)
cvsdist 399dc0
 #define ft_forceblank(type) ((type)!=ft_MAILDIR)  /* force blank line at end */
cvsdist 399dc0
--- procmail-3.22.orig/src/mailfold.c
cvsdist 399dc0
+++ procmail-3.22/src/mailfold.c
cvsdist 399dc0
@@ -378,7 +378,8 @@
cvsdist 399dc0
 	dfilled=mailread=0;
cvsdist 399dc0
      else if(rhead)				/* only read in a new header */
cvsdist 399dc0
       { memblk new;
cvsdist 399dc0
-	dfilled=mailread=0;makeblock(&new,0);readdyn(&new,&dfilled,0);
cvsdist 399dc0
+	dfilled=mailread=0;makeblock(&new,0);
cvsdist 399dc0
+	readdyn(&new,&dfilled,thebody-themail.p);
cvsdist 399dc0
 	if(tobesent>dfilled&&isprivate)		     /* put it in place here */
cvsdist 399dc0
 	 { tmemmove(themail.p+dfilled,thebody,filled-=tobesent);
cvsdist 399dc0
 	   tmemmove(themail.p,new.p,dfilled);
cvsdist 399dc0
--- procmail-3.22.orig/FAQ
cvsdist 399dc0
+++ procmail-3.22/FAQ
cvsdist 399dc0
@@ -57,8 +57,8 @@
cvsdist 399dc0
 		Forward to |/usr/bin/procmail
cvsdist 399dc0
 	or if that doesn't work, try:
cvsdist 399dc0
 		Pipe to /usr/bin/procmail
cvsdist 399dc0
-	as the only line in your mail spool file (e.g. /usr/mail/$LOGNAME), as
cvsdist 399dc0
-	well as doing a "chmod 06660 /usr/mail/$LOGNAME".  For more information
cvsdist 399dc0
+	as the only line in your mail spool file (e.g. /var/mail/$LOGNAME), as
cvsdist 399dc0
+	well as doing a "chmod 06660 /var/mail/$LOGNAME".  For more information
cvsdist 399dc0
 	on such systems, do a "man mail".
cvsdist 399dc0
 
cvsdist 399dc0
 	If all of this doesn't work, procmail can be called on a periodical
cvsdist 399dc0
@@ -210,14 +210,14 @@
cvsdist 399dc0
 	procmail with both the fcntl() and lockf() locking method
cvsdist 399dc0
 	disabled (see config.h).
cvsdist 399dc0
 
cvsdist 399dc0
-17. I sometimes get these `Lock failure on "/usr/mail/$LOGNAME.lock"' errors
cvsdist 399dc0
+17. I sometimes get these `Lock failure on "/var/mail/$LOGNAME.lock"' errors
cvsdist 399dc0
     from procmail.  What do I do about it?
cvsdist 399dc0
 
cvsdist 399dc0
 	The problem here is that as long as procmail has not read a
cvsdist 399dc0
 	$HOME/.procmailrc file, it can hang on to the sgid mail permission
cvsdist 399dc0
-	(which it needs in order to create a lockfile in /usr/mail).
cvsdist 399dc0
+	(which it needs in order to create a lockfile in /var/mail).
cvsdist 399dc0
 	I.e. if procmail delivers mail to a user without a $HOME/.procmailrc
cvsdist 399dc0
-	file, procmail *can* (and does) use the /usr/mail/$LOGNAME.lock file.
cvsdist 399dc0
+	file, procmail *can* (and does) use the /var/mail/$LOGNAME.lock file.
cvsdist 399dc0
 
cvsdist 399dc0
 	If, however, it finds a $HOME/.procmailrc file, procmail has to let go
cvsdist 399dc0
 	of the sgid mail permission because otherwise any ordinary user could
cvsdist 399dc0
@@ -226,7 +226,7 @@
cvsdist 399dc0
 	There are several solutions to this problem:
cvsdist 399dc0
 	- Some systems support the sticky bit on directories (when set only
cvsdist 399dc0
 	  allows the owner of a file in that directory to rename or remove
cvsdist 399dc0
-	  it).	This enables you to make /usr/spool/mail drwxrwxrwt.  It is
cvsdist 399dc0
+	  it).	This enables you to make /var/mail drwxrwxrwt.  It is
cvsdist 399dc0
 	  thus effectively world writable, but all the mailboxes in it are
cvsdist 399dc0
 	  protected because only the mailbox owner can remove or rename it.
cvsdist 399dc0
 	- If your system did not exhibit the !@#$%^&* POSIX semantics for
cvsdist 399dc0
@@ -245,9 +245,9 @@
cvsdist 399dc0
 			:0
cvsdist 399dc0
 			$DEFAULT
cvsdist 399dc0
 
cvsdist 399dc0
-	- You could, instead of using /usr/mail/$LOGNAME, use a file below
cvsdist 399dc0
+	- You could, instead of using /var/mail/$LOGNAME, use a file below
cvsdist 399dc0
 	  your home directory as your default mailbox.
cvsdist 399dc0
-	- Or, you could still use /usr/mail/$LOGNAME as the mailbox, but
cvsdist 399dc0
+	- Or, you could still use /var/mail/$LOGNAME as the mailbox, but
cvsdist 399dc0
 	  simply instruct procmail to use a different lockfile.	 This can
cvsdist 399dc0
 	  be achieved by putting following recipe at the bottom of
cvsdist 399dc0
 	  your .procmailrc file:
cvsdist 399dc0
--- procmail-3.22.orig/FEATURES
cvsdist 399dc0
+++ procmail-3.22/FEATURES
cvsdist 399dc0
@@ -30,7 +30,7 @@
cvsdist 399dc0
 	  per message, the similar MH directory folders (numbered files),
cvsdist 399dc0
 	  and Maildir directory folders (a multi-directory format that requires
cvsdist 399dc0
 	  no locking)
cvsdist 399dc0
-	+ Native support for /var/spool/mail/b/a/bar type mailspools
cvsdist 399dc0
+	+ Native support for /var/mail/b/a/bar type mailspools
cvsdist 399dc0
 	+ Variable assignment and substitution is an extremely complete subset
cvsdist 399dc0
 	  of the standard /bin/sh syntax
cvsdist 399dc0
 	+ Provides a mail log file, which logs all mail arrival, shows
cvsdist 399dc0
--- procmail-3.22.orig/Makefile
cvsdist 399dc0
+++ procmail-3.22/Makefile
cvsdist 399dc0
@@ -79,7 +79,7 @@
cvsdist 399dc0
 #			-lresolv	# not really needed, is it?
cvsdist 399dc0
 
cvsdist 399dc0
 # Informal list of directories where we look for the libraries in SEARCHLIBS
cvsdist 399dc0
-LIBPATHS=/lib /usr/lib /usr/local/lib
cvsdist 399dc0
+LIBPATHS=/lib /usr/lib
cvsdist 399dc0
 
cvsdist 399dc0
 GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \
cvsdist 399dc0
  -Wpointer-arith -Wconversion -Waggregate-return \
cvsdist 399dc0
--- procmail-3.22.orig/debian/changelog
cvsdist 399dc0
+++ procmail-3.22/debian/changelog
cvsdist 399dc0
@@ -0,0 +1,294 @@
cvsdist 399dc0
+procmail (3.22-8) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Fixed strange formail -l behaviour when there is a Content-Length: header.
cvsdist 399dc0
+    Thanks a lot to Henning Makholm for the patch (Closes: #217853).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Mon,  3 Nov 2003 20:01:24 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.22-7) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Fixed bad nroff syntax in procmailrc(5), closes: #147173.
cvsdist 399dc0
+  * Added missing newline in procmail(1), closes: #180477.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Mon, 10 Mar 2003 00:09:20 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.22-6) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Standards-Version: 3.5.8.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Thu, 26 Dec 2002 18:27:08 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.22-5) stable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * Patched pipes.c to fix a memory allocation bug (Closes: #171514).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Thu, 26 Dec 2002 18:09:38 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.22-4) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Fixed a typo in procmail(1). Patch by the author (Closes: #142983).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Tue, 16 Apr 2002 19:16:20 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.22-3) unstable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * Fixed off-by-one bug in procmail.c which made the raw flag not to be
cvsdist 399dc0
+    cleared properly. Thanks to Gregory Stark (Closes: #134341).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Sun, 17 Feb 2002 16:43:02 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.22-2) unstable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * Modified mailfold.c to fix a segfault problem. Patch by the author.
cvsdist 399dc0
+  * The system-wide mail directory is /var/mail as per policy.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Thu, 29 Nov 2001 09:39:04 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.22-1) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * New upstream release, which uses the `standard' format for Maildir
cvsdist 399dc0
+    filenames and retries on name collision. It also contains some
cvsdist 399dc0
+    bug fixes from the 3.23pre snapshot dated 2001-09-13.
cvsdist 399dc0
+  * Removed `sendmail' from the Recommends field, since we already
cvsdist 399dc0
+    have `exim' (the default Debian MTA) and `mail-transport-agent'.
cvsdist 399dc0
+  * Removed suidmanager support. Conflicts: suidmanager (<< 0.50).
cvsdist 399dc0
+  * Added support for DEB_BUILD_OPTIONS in the source package.
cvsdist 399dc0
+  * README.Maildir: Do not use locking on the example recipe,
cvsdist 399dc0
+    since it's wrong to do so in this case.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Wed, 21 Nov 2001 09:40:20 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15.2-1) stable; urgency=high
cvsdist 399dc0
+
cvsdist 399dc0
+  * New upstream release, with improved security and robustness involving
cvsdist 399dc0
+    signal handlers. Author recommends upgrading to this version on
cvsdist 399dc0
+    any system where it is installed setuid or setgid.
cvsdist 399dc0
+  * This release fixes also Bug #108417: procmail -p -m resets PATH.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Thu, 30 Aug 2001 20:05:06 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15.1-4) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Don't add an extra newline when delivering to a Maildir folder.
cvsdist 399dc0
+    Please note that the MTA may still add a newline on their own.
cvsdist 399dc0
+    Exim users should check the `suffix' variable, for example.
cvsdist 399dc0
+    Patch by the author. Closes: #78623.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Sat, 14 Apr 2001 17:18:29 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15.1-3) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Clarified formail -X behaviour, patch by the author (Closes: #77388).
cvsdist 399dc0
+  * Updated QuickStart.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Sun, 25 Mar 2001 10:45:56 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15.1-2) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Fixed lockfile -l endless loop (Closes: #82006). Patch by the author.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Sun, 28 Jan 2001 19:44:49 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15.1-1) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * New upstream release. A race to create the mailspool would bounce one of
cvsdist 399dc0
+    the messages due to an internal error.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Mon,  8 Jan 2001 20:09:34 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15-3) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Fixed formatting error in procmailrc(5). Patch by the author.
cvsdist 399dc0
+    (Closes: #80437).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Sun, 31 Dec 2000 17:20:47 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15-2) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * formail -l is now documented. Patch by the author (Closes: #72275).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Fri,  1 Dec 2000 19:54:22 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.15-1) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * New upstream release. Maildir support is now built-in.
cvsdist 399dc0
+  * Really change default PATH to "$HOME/bin:/usr/local/bin:/usr/bin:/bin".
cvsdist 399dc0
+  * Modified the note in QuickStart about refiltering an old mail folder.
cvsdist 399dc0
+  * Use SEARCHLIBS="" in debian/rules clean target to speed it up.
cvsdist 399dc0
+  * Modified ft_dotlock in src/foldinfo.h to be in compliance with
cvsdist 399dc0
+    locking policy, following a hint by the author.
cvsdist 399dc0
+  * Removed (versioned) dependency on debianutils, since mailstat
cvsdist 399dc0
+    does not use temporary files anymore.
cvsdist 399dc0
+  * Made the .forward example in procmail(1) not to depend on the build
cvsdist 399dc0
+    environment by modifying src/autoconf so that buggy_SENDMAIL is
cvsdist 399dc0
+    never defined.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Mon, 28 Aug 2000 12:51:05 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.13.1-4) stable; urgency=high
cvsdist 399dc0
+
cvsdist 399dc0
+  * Fixed weird formail -rk behavior (patch from the author, backported
cvsdist 399dc0
+    from procmail-3.15). Thanks to Ben Collins for the report.
cvsdist 399dc0
+  * s/smail/exim/ in `Recommends:' field.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@debian.org>  Tue, 22 Aug 2000 13:04:50 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.13.1-3) unstable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * Standards-Version: 3.1.1
cvsdist 399dc0
+  * Updated location of licenses in copyright file.
cvsdist 399dc0
+  * LOCKINGTEST=100 again, to use fcntl() and dot-locking, as required by
cvsdist 399dc0
+    latest policy.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Wed,  1 Dec 1999 12:37:35 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.13.1-2) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Modified procmail(1) and QuickStart to reflect the fact that exim does
cvsdist 399dc0
+    not accept the exec keyword in .forward files (Bugs #33460 and #37771).
cvsdist 399dc0
+  * Modified formail to recognize exim's Envelope-To: header (Bug#40718).
cvsdist 399dc0
+    Patch by Philip Guenther.
cvsdist 399dc0
+  * Standards-Version: 3.0.0.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Mon, 19 Jul 1999 20:09:25 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.13.1-1) stable unstable; urgency=high
cvsdist 399dc0
+
cvsdist 399dc0
+  * New upstream release, 3.13 missed a couple possible overflows.
cvsdist 399dc0
+  * Applied `procmail-locking.patch' from Bruce Guenter, since
cvsdist 399dc0
+    no directory delivery mechanism requires locking (Bug #35210).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Thu,  8 Apr 1999 13:56:33 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.13-1) stable unstable; urgency=high
cvsdist 399dc0
+
cvsdist 399dc0
+  * New upstream release. procmail 3.12 breaks smartlist (Bug #35115).
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Fri,  2 Apr 1999 14:24:24 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.12-1) frozen unstable; urgency=high
cvsdist 399dc0
+
cvsdist 399dc0
+  * New upstream release. Fixes some security bugs.
cvsdist 399dc0
+  * #define GROUP_PER_USER in config.h to allow writeable rcfiles when
cvsdist 399dc0
+    the group is the user's default group.
cvsdist 399dc0
+  * Added KNOWN_BUGS to the doc directory.
cvsdist 399dc0
+  * suid procmail to avoid non-suidness window when upgrading.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Thu,  4 Mar 1999 10:28:28 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.7-7) frozen unstable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * New Maildir patches from Bruce Guenter.
cvsdist 399dc0
+    Should fix Bug #30320: procmail: maildir does not use From_ lines.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Thu, 31 Dec 1998 13:27:20 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.7-6) frozen unstable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * Patched mailfold.c to avoid the unnecessary one second wait when
cvsdist 399dc0
+    delivering to MH folders (patch by the author).
cvsdist 399dc0
+  * src/locking.c: Applied a bugfix patch from the author.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Wed, 13 May 1998 21:50:19 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.7-5) frozen unstable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * Added a patch for Maildir support. The "new" procmail should be
cvsdist 399dc0
+    completely backwards compatible with the "previous" one, in the
cvsdist 399dc0
+    sense that its behaviour should be just the same for already
cvsdist 399dc0
+    existing .procmailrc files which do not use the new syntax for
cvsdist 399dc0
+    Maildir folders.
cvsdist 399dc0
+  * Added a small README.Maildir explaining how to use this feature.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Mon,  4 May 1998 19:39:55 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.7-4) frozen unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Added a small note in QuickStart about refiltering an old mail folder.
cvsdist 399dc0
+  * mailstat(1): The log file is truncated to zero length (Bug #21022).
cvsdist 399dc0
+  * PATH=/usr/local/bin:/usr/bin:/bin for the example in procmail(1).
cvsdist 399dc0
+  * Standards-Version: 2.4.1.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Fri, 17 Apr 1998 18:00:14 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.7-3) frozen unstable; urgency=medium
cvsdist 399dc0
+
cvsdist 399dc0
+  * Patched src/recommend.c so that the mail spool directory is not
cvsdist 399dc0
+    touched. This will allow the package to be built using fakeroot.
cvsdist 399dc0
+  * Patched mailstat so that it uses tempfile.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Tue, 24 Mar 1998 21:43:08 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.7-2) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Default PATH is now "$HOME/bin:/usr/local/bin:/usr/bin:/bin".
cvsdist 399dc0
+  * Added "fetchmail" to the Recommends: line as one more option.
cvsdist 399dc0
+  * Added /usr/doc/procmail/QuickStart (experimental).
cvsdist 399dc0
+  * Compressed changelog.Debian.
cvsdist 399dc0
+  * Removed debstd dependency.
cvsdist 399dc0
+  * Pristine source.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Sat, 31 Jan 1998 20:30:06 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.7-1) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Upgraded to 3.11pre7. Sources are now GPLed, hurrah!
cvsdist 399dc0
+  * Added explicit SEARCHLIBS, to avoid unneeded dependency on libdl.
cvsdist 399dc0
+  * First libc6 release.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Wed, 18 Jun 1997 20:43:28 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.4-2) frozen unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Rebuilt using latest debmake to avoid a problem with suidmanager.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Sat, 17 May 1997 20:52:59 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10.4-1) frozen unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Upgraded to 3.11pre4. Side effect: It can be built using libc6.
cvsdist 399dc0
+  * Removed NFS_ATIME_HACK patch, since it is no longer needed.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Sat, 12 Apr 1997 19:06:46 +0200
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10-8) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Rewritten copyright file.
cvsdist 399dc0
+  * initmake unmodified (source).
cvsdist 399dc0
+  * Patched to recognize NFS_ATIME_HACK variable in .procmailrc or
cvsdist 399dc0
+    /etc/procmailrc. Default value is "yes" (i.e. wait a second).
cvsdist 399dc0
+  * Added a small note about this in /usr/doc/procmail/README.Debian.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Sun, 23 Mar 1997 12:04:34 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10-7) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Put CFLAGS settings &c in ./Makefile, not in debian/rules.
cvsdist 399dc0
+  * Removed fix-substvars script, since it's no longer needed with
cvsdist 399dc0
+    new libc5-5.4.20.
cvsdist 399dc0
+  * Man page for mailstat changed slightly.
cvsdist 399dc0
+  * Some minor debian/rules changes.
cvsdist 399dc0
+  * Added MD5 sums.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Fri, 21 Feb 1997 20:53:30 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10-6) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Use debmake.
cvsdist 399dc0
+  * suidmanager support.
cvsdist 399dc0
+  * Removed `mailstat' from examples, it's already in /usr/bin.
cvsdist 399dc0
+  * Removed also `dirname' (which was "for the deprived").
cvsdist 399dc0
+  * Added `fix-substvars' script to depend on libc5 >= 5.4.0.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Mon, 23 Dec 1996 16:34:02 +0100
cvsdist 399dc0
+
cvsdist 399dc0
+procmail (3.10-5) unstable; urgency=low
cvsdist 399dc0
+
cvsdist 399dc0
+  * Updated to Standards-Version 2.1.2.2.
cvsdist 399dc0
+  * Changed "Depends: MTA" to "Recommends: MTA".
cvsdist 399dc0
+  * Added extended package description in control file.
cvsdist 399dc0
+  * Added the symlink changelog.gz -> HISTORY.gz.
cvsdist 399dc0
+  * Added an "experimental" man page for mailstat.
cvsdist 399dc0
+  * New maintainer.
cvsdist 399dc0
+
cvsdist 399dc0
+ -- Santiago Vila <sanvila@ctv.es>  Sat, 21 Dec 1996 23:32:11 +0100
cvsdist 399dc0
--- procmail-3.22.orig/debian/control
cvsdist 399dc0
+++ procmail-3.22/debian/control
cvsdist 399dc0
@@ -0,0 +1,18 @@
cvsdist 399dc0
+Source: procmail
cvsdist 399dc0
+Section: mail
cvsdist 399dc0
+Priority: standard
cvsdist 399dc0
+Maintainer: Santiago Vila <sanvila@debian.org>
cvsdist 399dc0
+Standards-Version: 3.6.1
cvsdist 399dc0
+
cvsdist 399dc0
+Package: procmail
cvsdist 399dc0
+Architecture: any
cvsdist 399dc0
+Depends: ${shlibs:Depends}
cvsdist 399dc0
+Conflicts: suidmanager (<< 0.50)
cvsdist 399dc0
+Recommends: exim | mail-transport-agent | fetchmail
cvsdist 399dc0
+Description: Versatile e-mail processor
cvsdist 399dc0
+ Can be used to create mail-servers, mailing lists, sort your incoming
cvsdist 399dc0
+ mail into separate folders/files (real convenient when subscribing to one
cvsdist 399dc0
+ or more mailing lists or for prioritising your mail), preprocess your
cvsdist 399dc0
+ mail, start any programs upon mail arrival (e.g. to generate different
cvsdist 399dc0
+ chimes on your workstation for different types of mail) or selectively
cvsdist 399dc0
+ forward certain incoming mail automatically to someone.
cvsdist 399dc0
--- procmail-3.22.orig/debian/copyright
cvsdist 399dc0
+++ procmail-3.22/debian/copyright
cvsdist 399dc0
@@ -0,0 +1,41 @@
cvsdist 399dc0
+This is the Debian prepackaged version of the "procmail" mail-processing
cvsdist 399dc0
+program written by Stephen van den Berg.
cvsdist 399dc0
+
cvsdist 399dc0
+This package is currently maintained by Santiago Vila <sanvila@debian.org>.
cvsdist 399dc0
+The source for this release was downloaded from:
cvsdist 399dc0
+
cvsdist 399dc0
+ftp://ftp.procmail.org/pub/procmail/procmail-3.22.tar.gz
cvsdist 399dc0
+
cvsdist 399dc0
+This package was first put together by Bruce Perens <bruce@hams.com>,
cvsdist 399dc0
+who added Debian package maintenance system files, and edited config.h
cvsdist 399dc0
+to configure for Debian.
cvsdist 399dc0
+
cvsdist 399dc0
+Copyright:
cvsdist 399dc0
+
cvsdist 399dc0
+Procmail & formail mail processing package.
cvsdist 399dc0
+Copyright (c) 1990-1999, S.R. van den Berg, The Netherlands.
cvsdist 399dc0
+Copyright (c) 1999-2001, Philip Guenther, The United States of America
cvsdist 399dc0
+
cvsdist 399dc0
+This package is open source software; you can redistribute it and/or
cvsdist 399dc0
+modify it under the terms of either:
cvsdist 399dc0
+- the GNU General Public License as published by the Free Software Foundation
cvsdist 399dc0
+  and can be found in the included file called "COPYING"; either version 2,
cvsdist 399dc0
+  or (at your option) any later version, or
cvsdist 399dc0
+- the "Artistic License" which can be found in the included file called
cvsdist 399dc0
+  "Artistic".
cvsdist 399dc0
+
cvsdist 399dc0
+This package is distributed in the hope that it will be useful, but without
cvsdist 399dc0
+any warranty; without even the implied warranty of merchantability or fitness
cvsdist 399dc0
+for a particular purpose.  See either the GNU General Public License or the
cvsdist 399dc0
+Artistic License for more details.
cvsdist 399dc0
+
cvsdist 399dc0
+For those of you that choose to use the GNU General Public License,
cvsdist 399dc0
+my interpretation of the GNU General Public License is that no procmailrc
cvsdist 399dc0
+script falls under the terms of the GPL unless you explicitly put
cvsdist 399dc0
+said script under the terms of the GPL yourself.
cvsdist 399dc0
+
cvsdist 399dc0
+
cvsdist 399dc0
+On Debian systems, the complete text of the GNU General Public License
cvsdist 399dc0
+can be found in `/usr/share/common-licenses/GPL', and the complete
cvsdist 399dc0
+text of the "Artistic License" can be found in
cvsdist 399dc0
+`/usr/share/common-licenses/Artistic'.
cvsdist 399dc0
--- procmail-3.22.orig/debian/mailstat.1
cvsdist 399dc0
+++ procmail-3.22/debian/mailstat.1
cvsdist 399dc0
@@ -0,0 +1,40 @@
cvsdist 399dc0
+.TH MAILSTAT 1
cvsdist 399dc0
+.SH NAME
cvsdist 399dc0
+mailstat \- shows mail-arrival statistics
cvsdist 399dc0
+.SH SYNOPSIS
cvsdist 399dc0
+.B mailstat
cvsdist 399dc0
+[\-klmots] [logfile]
cvsdist 399dc0
+.SH DESCRIPTION
cvsdist 399dc0
+.B mailstat
cvsdist 399dc0
+parses a procmail-generated $LOGFILE and displays
cvsdist 399dc0
+a summary about the messages delivered to all folders
cvsdist 399dc0
+(total size, average size, nr of messages).
cvsdist 399dc0
+The $LOGFILE is truncated to zero length, unless the
cvsdist 399dc0
+.B -k
cvsdist 399dc0
+option is used.
cvsdist 399dc0
+Exit code 0 if mail arrived, 1 if no mail arrived.
cvsdist 399dc0
+.SH OPTIONS
cvsdist 399dc0
+.TP
cvsdist 399dc0
+.I \-k
cvsdist 399dc0
+keep logfile intact
cvsdist 399dc0
+.TP
cvsdist 399dc0
+.I \-l
cvsdist 399dc0
+long display format
cvsdist 399dc0
+.TP
cvsdist 399dc0
+.I \-m
cvsdist 399dc0
+merge any errors into one line
cvsdist 399dc0
+.TP
cvsdist 399dc0
+.I \-o
cvsdist 399dc0
+use the old logfile
cvsdist 399dc0
+.TP
cvsdist 399dc0
+.I \-t
cvsdist 399dc0
+terse display format
cvsdist 399dc0
+.TP
cvsdist 399dc0
+.I \-s
cvsdist 399dc0
+silent in case of no mail
cvsdist 399dc0
+.SH NOTES
cvsdist 399dc0
+Customise to your heart's content, this program is only provided as a
cvsdist 399dc0
+guideline.
cvsdist 399dc0
+.SH AUTHOR
cvsdist 399dc0
+This manual page was written by Santiago Vila <sanvila@debian.org>
cvsdist 399dc0
+for the Debian GNU/Linux distribution (but may be used by others).
cvsdist 399dc0
--- procmail-3.22.orig/debian/QuickStart
cvsdist 399dc0
+++ procmail-3.22/debian/QuickStart
cvsdist 399dc0
@@ -0,0 +1,97 @@
cvsdist 399dc0
+procmail QuickStart
cvsdist 399dc0
+===================
cvsdist 399dc0
+
cvsdist 399dc0
+* procmail is not an `interactive' program. It has to run automatically
cvsdist 399dc0
+when the mail arrives. Therefore the first thing to do is to tell our MTA
cvsdist 399dc0
+that we want procmail to "eat" all our mail messages. The way of doing
cvsdist 399dc0
+this depends on the MTA we are using. For example, if we are using
cvsdist 399dc0
+sendmail, it will suffice to have a .forward file like this in our home
cvsdist 399dc0
+directory:
cvsdist 399dc0
+
cvsdist 399dc0
+"|exec /usr/bin/procmail"
cvsdist 399dc0
+
cvsdist 399dc0
+(don't forget the quotes, they are needed in this case).
cvsdist 399dc0
+
cvsdist 399dc0
+If you are using exim, use this instead as your .forward file:
cvsdist 399dc0
+
cvsdist 399dc0
+|/usr/bin/procmail
cvsdist 399dc0
+
cvsdist 399dc0
+The step of creating a .forward file is not needed if the MTA already
cvsdist 399dc0
+performs the delivery using procmail. For example, Debian sendmail will
cvsdist 399dc0
+automatically use procmail for mail delivering if the sendmail.cf is
cvsdist 399dc0
+generated from a sendmail.mc file containing this line:
cvsdist 399dc0
+
cvsdist 399dc0
+FEATURE(local_procmail)dnl
cvsdist 399dc0
+
cvsdist 399dc0
+
cvsdist 399dc0
+* If we have a stand-alone system with no permanent net connection (like
cvsdist 399dc0
+PPP), and we are using fetchmail to get mail from a server, we don't
cvsdist 399dc0
+really need a MTA.  Just adding  --mda "formail -s procmail"  to the
cvsdist 399dc0
+fetchmail command line (or using the `mda' keyword) will tell it to
cvsdist 399dc0
+deliver through procmail.
cvsdist 399dc0
+
cvsdist 399dc0
+
cvsdist 399dc0
+* Next, we have to write a ~/.procmailrc file in our home directory. This
cvsdist 399dc0
+file is a set of filtering rules, based on regular expressions. The
cvsdist 399dc0
+complete syntax is explained in procmailrc(5). Let's see a real example
cvsdist 399dc0
+just to get started. Let's suppose you are subscribed to the following two
cvsdist 399dc0
+mailing lists:
cvsdist 399dc0
+
cvsdist 399dc0
+linux-kernel@vger.kernel.org
cvsdist 399dc0
+debian-user@lists.debian.org
cvsdist 399dc0
+
cvsdist 399dc0
+The first list is managed by Majordomo. Messages coming from a Majordomo
cvsdist 399dc0
+list often include a header field "Sender: " which allow easy filtering.
cvsdist 399dc0
+
cvsdist 399dc0
+The second list is managed my SmartList. Messages coming from a SmartList
cvsdist 399dc0
+list may include several headers that can be used to filter it. One of
cvsdist 399dc0
+them (in fact, the only that it is not X-whatever) is "Resent-Sender: ".
cvsdist 399dc0
+
cvsdist 399dc0
+So the following .procmailrc will first filter the mailing lists, and
cvsdist 399dc0
+any remaining message will go to the default folder:
cvsdist 399dc0
+
cvsdist 399dc0
+*--------------------------------->8------------------------------------
cvsdist 399dc0
+PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
cvsdist 399dc0
+MAILDIR=$HOME/mail             # you'd better make sure it exists
cvsdist 399dc0
+DEFAULT=$MAILDIR/mbox          # completely optional
cvsdist 399dc0
+LOGFILE=$MAILDIR/procmail.log  # recommended
cvsdist 399dc0
+
cvsdist 399dc0
+:0:
cvsdist 399dc0
+* ^Sender:.*linux-kernel-owner@vger.kernel.org
cvsdist 399dc0
+linux-kernel
cvsdist 399dc0
+
cvsdist 399dc0
+:0:
cvsdist 399dc0
+* ^Resent-Sender:.*debian-user-request@lists.debian.org
cvsdist 399dc0
+debian-user
cvsdist 399dc0
+*--------------------------------->8------------------------------------
cvsdist 399dc0
+
cvsdist 399dc0
+From this example additional rules for mailing lists may be created
cvsdist 399dc0
+easily.
cvsdist 399dc0
+
cvsdist 399dc0
+
cvsdist 399dc0
+* Once you have received lots of messages you will want to know where
cvsdist 399dc0
+did they go. That's what the LOGFILE is for. There is a tool named
cvsdist 399dc0
+mailstat which parses this file and shows a summary:
cvsdist 399dc0
+
cvsdist 399dc0
+mailstat procmail.log
cvsdist 399dc0
+
cvsdist 399dc0
+The mailstat command that this package provides does really come from the
cvsdist 399dc0
+examples directory and it is installed by default. You may have your own
cvsdist 399dc0
+modified copy in $HOME/bin, if you like.
cvsdist 399dc0
+
cvsdist 399dc0
+
cvsdist 399dc0
+If you have to refilter an old mail folder according to your current
cvsdist 399dc0
+~/.procmailrc file, you may do the following:
cvsdist 399dc0
+
cvsdist 399dc0
+cat mbox | formail -s procmail
cvsdist 399dc0
+
cvsdist 399dc0
+But of course if your mbox file is the target of a procmail recipe you should
cvsdist 399dc0
+do this instead:
cvsdist 399dc0
+
cvsdist 399dc0
+mv mbox whatever
cvsdist 399dc0
+cat whatever | formail -s procmail
cvsdist 399dc0
+
cvsdist 399dc0
+See formail(1) for details.
cvsdist 399dc0
+
cvsdist 399dc0
+
cvsdist 399dc0
+Santiago Vila <sanvila@debian.org>
cvsdist 399dc0
--- procmail-3.22.orig/debian/README.Maildir
cvsdist 399dc0
+++ procmail-3.22/debian/README.Maildir
cvsdist 399dc0
@@ -0,0 +1,12 @@
cvsdist 399dc0
+This version of procmail supports Maildir folders.
cvsdist 399dc0
+
cvsdist 399dc0
+To make procmail to deliver into a Maildir folder, just append
cvsdist 399dc0
+a slash (/) to the name of the maildir folder in your ~/.procmailrc file.
cvsdist 399dc0
+For example, the following rule:
cvsdist 399dc0
+
cvsdist 399dc0
+:0
cvsdist 399dc0
+* ^Resent-Sender.*debian-user-request@lists.debian.org
cvsdist 399dc0
+debian-user/
cvsdist 399dc0
+
cvsdist 399dc0
+will deliver all mail from the debian-user mailing list to the Maildir
cvsdist 399dc0
+folder "debian-user".
cvsdist 399dc0
--- procmail-3.22.orig/debian/rules
cvsdist 399dc0
+++ procmail-3.22/debian/rules
cvsdist 399dc0
@@ -0,0 +1,76 @@
cvsdist 399dc0
+#!/usr/bin/make -f
cvsdist 399dc0
+
cvsdist 399dc0
+package = procmail
cvsdist 399dc0
+docdir = debian/tmp/usr/share/doc/$(package)
cvsdist 399dc0
+
cvsdist 399dc0
+CC = gcc
cvsdist 399dc0
+CFLAGS0 = -g
cvsdist 399dc0
+LDFLAGS0 =
cvsdist 399dc0
+SEARCHLIBS = -lm
cvsdist 399dc0
+STRIP = true
cvsdist 399dc0
+
cvsdist 399dc0
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
cvsdist 399dc0
+  CFLAGS0 += -O2
cvsdist 399dc0
+endif
cvsdist 399dc0
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
cvsdist 399dc0
+  STRIP = strip --remove-section=.comment --remove-section=.note
cvsdist 399dc0
+endif
cvsdist 399dc0
+
cvsdist 399dc0
+build:
cvsdist 399dc0
+	$(checkdir)
cvsdist 399dc0
+	$(MAKE) CC="$(CC)" CFLAGS0="$(CFLAGS0)" LDFLAGS0="$(LDFLAGS0)" \
cvsdist 399dc0
+		SEARCHLIBS="$(SEARCHLIBS)"
cvsdist 399dc0
+	touch build
cvsdist 399dc0
+
cvsdist 399dc0
+clean:
cvsdist 399dc0
+	$(checkdir)
cvsdist 399dc0
+	rm -f build
cvsdist 399dc0
+	-$(MAKE) realclean SEARCHLIBS=""
cvsdist 399dc0
+	rm -f `find . -name "*~"`
cvsdist 399dc0
+	rm -rf debian/tmp debian/files* core debian/substvars
cvsdist 399dc0
+
cvsdist 399dc0
+binary-indep: checkroot build
cvsdist 399dc0
+	$(checkdir)
cvsdist 399dc0
+
cvsdist 399dc0
+binary-arch: checkroot build
cvsdist 399dc0
+	$(checkdir)
cvsdist 399dc0
+	rm -rf debian/tmp
cvsdist 399dc0
+	install -d debian/tmp/DEBIAN $(docdir)/examples
cvsdist 399dc0
+	cd debian/tmp && install -d usr/bin
cvsdist 399dc0
+	$(MAKE) BASENAME=`pwd`/debian/tmp/usr install.man install-suid
cvsdist 399dc0
+	$(STRIP) debian/tmp/usr/bin/procmail
cvsdist 399dc0
+	$(STRIP) debian/tmp/usr/bin/lockfile
cvsdist 399dc0
+	$(STRIP) debian/tmp/usr/bin/formail
cvsdist 399dc0
+	cp -p debian/copyright $(docdir)
cvsdist 399dc0
+	cp -p debian/changelog $(docdir)/changelog.Debian
cvsdist 399dc0
+	install -m 644 debian/mailstat.1 debian/tmp/usr/man/man1
cvsdist 399dc0
+	cp -p FEATURES HISTORY README FAQ KNOWN_BUGS \
cvsdist 399dc0
+		debian/QuickStart debian/README.Maildir $(docdir)
cvsdist 399dc0
+	cp -p examples/* $(docdir)/examples
cvsdist 399dc0
+	cd $(docdir)/examples && rm -f dirname mailstat procmail-rpm.spec
cvsdist 399dc0
+	cd $(docdir) && gzip -9 HISTORY changelog.Debian
cvsdist 399dc0
+	ln -s HISTORY.gz $(docdir)/changelog.gz
cvsdist 399dc0
+	mv debian/tmp/usr/man debian/tmp/usr/share
cvsdist 399dc0
+	gzip -r9 debian/tmp/usr/share/man
cvsdist 399dc0
+	dpkg-shlibdeps debian/tmp/usr/bin/*
cvsdist 399dc0
+	dpkg-gencontrol -isp
cvsdist 399dc0
+	cd debian/tmp && \
cvsdist 399dc0
+		md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
cvsdist 399dc0
+	chown -R root:root debian/tmp
cvsdist 399dc0
+	chmod -R go=rX debian/tmp
cvsdist 399dc0
+	chgrp mail debian/tmp/usr/bin/procmail debian/tmp/usr/bin/lockfile
cvsdist 399dc0
+	chmod 6755 debian/tmp/usr/bin/procmail
cvsdist 399dc0
+	chmod 2755 debian/tmp/usr/bin/lockfile
cvsdist 399dc0
+	dpkg --build debian/tmp ..
cvsdist 399dc0
+
cvsdist 399dc0
+define checkdir
cvsdist 399dc0
+        test -f src/$(package).c -a -f debian/rules
cvsdist 399dc0
+endef
cvsdist 399dc0
+
cvsdist 399dc0
+binary: binary-indep binary-arch
cvsdist 399dc0
+
cvsdist 399dc0
+checkroot:
cvsdist 399dc0
+	$(checkdir)
cvsdist 399dc0
+	test root = "`whoami`"
cvsdist 399dc0
+
cvsdist 399dc0
+.PHONY: binary binary-arch binary-indep clean checkroot