--- procmail-3.22.orig/examples/advanced

+++ procmail-3.22/examples/advanced

@@ -251,14 +251,14 @@

    --------------------------------------------------------

 There are many different reasons why more and more sites decide not to

-store mail in /usr/spool/mail or /usr/mail anymore.

+store mail in /var/spool/mail or /var/mail anymore.

 Some of the obvious advantages when storing mail in the recipient's home

 directory are:

 	- Mail is automatically subject to the user's quota limitations.

 	- Often there is more room on the home partition(s) than on that

-	  one /usr/mail partition.

+	  one /var/mail partition.

-The quota limitations also apply to /usr/spool/mail or /usr/mail if procmail

+The quota limitations also apply to /var/spool/mail or /var/mail if procmail

 does the delivery.  These quota limitations often do not work with the

 regular /bin/mail since that usually writes the mailbox with root permissions

 (eluding the quota restrictions).

@@ -276,7 +276,7 @@

 	defined SYSTEM_MBOX to be.  Some braindamaged mail programs

 	do not pick up the MAIL environment variable, these either

 	have to be patched/recompiled or you have to create symbolic

-	links in /usr/mail to every person's new mailbox.

+	links in /var/mail to every person's new mailbox.

 				---

--- procmail-3.22.orig/man/procmail.man

+++ procmail-3.22/man/procmail.man

@@ -166,7 +166,8 @@

 accept an unlimited number of arguments.@ETCRCS_desc@

 For some advanced usage of this option you should look in the

 .B EXAMPLES

-section below.@[email protected] ARGUMENTS

+section below.@LMTPOPTdesc@

+.SH ARGUMENTS

 Any arguments containing an '=' are considered to be environment variable

 assignments, they will

 .I all

@@ -723,6 +724,15 @@

 .fi

 .ad

 .PP

+Some mailers (notably exim) do not currently accept the above syntax.

+In such case use this instead:

+.PP

+.na

+.nf

+|/usr/bin/procmail

+.fi

+.ad

+.PP

 Procmail can also be invoked to postprocess an already filled system

 mailbox.  This can be useful if you don't want to or can't use a

 $HOME/@DOT_FORWARD@ file (in which case the following script could

@@ -754,7 +764,7 @@

 .SS "A sample small @PROCMAILRC@:"

 .na

 .nf

-PATH=/bin:/usr/bin:@BINDIR@

+PATH=/usr/local/bin:/usr/bin:/bin

 MAILDIR=$HOME/Mail      #you'd better make sure it exists

 DEFAULT=$MAILDIR/mbox   #completely optional

 LOGFILE=$MAILDIR/from   #recommended

--- procmail-3.22.orig/man/procmailrc.man

+++ procmail-3.22/man/procmailrc.man

@@ -779,7 +779,7 @@

 .PP

 Some non-optimal and non-obvious regexps set MATCH to an incorrect

 value.  The regexp can be made to work by removing one or more unneeded

-'*', '+', or '?' operator on the left-hand side of the \e/ token.

+\&'*', '+', or '?' operator on the left-hand side of the \e/ token.

 .SH MISCELLANEOUS

 If the regular expression contains `\fB@TO_key@\fP' it will be substituted by

 .na

--- procmail-3.22.orig/src/comsat.c

+++ procmail-3.22/src/comsat.c

@@ -92,7 +92,7 @@

    }

   if(newvalid)						  /* so far, so good */

    { int s;

-     if(!*chp)						       /* no service */

+     if(!chad||!*chp)					       /* no service */

 	chp=BIFF_serviceport;				/* new balls please! */

      s=strtol(chp,&chad,10);

      if(chp!=chad)			       /* the service is not numeric */

@@ -120,7 +120,7 @@

 { int s;const char*p;

   if(!csvalid||!buf)		  /* is comat on and set to a valid address? */

      return;

-  if(!*cslgname||strlen(cslgname)+2>linebuf)	       /* is $LOGNAME bogus? */

+  if(!cslgname||!*cslgname||strlen(cslgname)+2>linebuf)/* is $LOGNAME bogus? */

      return;

   if(!(p=folder?folder:cslastf))		     /* do we have a folder? */

      return;

--- procmail-3.22.orig/src/formail.c

+++ procmail-3.22/src/formail.c

@@ -758,9 +758,9 @@

 	lputssn(buf,buffilled),ctlength-=buffilled,buffilled=lnl=0;

      ;{ int tbl=buflast,lwr='\n';

 	while(--ctlength>=0&&tbl!=EOF)	       /* skip Content-Length: bytes */

-	   lnl=lwr==tbl&&lwr=='\n',putcs(lwr=tbl),tbl=getchar();

+	   lnl=lwr==tbl&&lwr=='\n',lputcs(lwr=tbl),tbl=getchar();

 	if((buflast=tbl)=='\n'&&lwr!=tbl)	/* just before a line break? */

-	   putcs('\n'),buflast=getchar();		/* wrap up loose end */

+	   lputcs('\n'),buflast=getchar();		/* wrap up loose end */

       }

      if(!quiet&&ctlength>0)

       { charNUM(num,ctlength);

--- procmail-3.22.orig/src/memblk.c

+++ procmail-3.22/src/memblk.c

@@ -51,11 +51,11 @@

 {

 #ifdef USE_MMAP

   if(mb->fd>=0)

-   { long len=mb->len+1;

-     if(munmap(mb->p,len))

-	mmapfailed(len);		      /* don't want to continue here */

-     if((mb->p=mmap(0,len,PROT_READ,MAP_PRIVATE,mb->fd,(off_t)0))==MAP_FAILED)

-	mmapfailed(len);

+   { long mlen=mb->len+1;

+     if(munmap(mb->p,mlen))

+	mmapfailed(mlen);		      /* don't want to continue here */

+     if((mb->p=mmap(0,mlen,PROT_READ,MAP_PRIVATE,mb->fd,(off_t)0))==MAP_FAILED)

+	mmapfailed(mlen);

      close(mb->fd);

      mb->fd=ropen(devnull,O_RDWR,0);		/* XXX Perhaps -1 is better? */

    }

@@ -77,8 +77,8 @@

      strcpy(filename,MMAP_DIR);

      if(unique(filename,strchr(filename,'\0'),MMAP_FILE_LEN,MMAP_PERM,0,0)&&

 	(mb->fd=ropen(filename,O_RDWR,MMAP_PERM),unlink(filename),mb->fd>=0))

-      { mb->filelen=len;

-	if(lseek(mb->fd,mb->filelen-1,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))

+      { mb->filelen=len+1;

+	if(lseek(mb->fd,len,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))

 dropf:	 { close(mb->fd);mb->fd= -1;

 	   if(verbose)nlog("Unable to extend or use tempfile");

 	 }

@@ -98,9 +98,9 @@

       }

    }

   if(mb->fd>=0)

-   { if(len>mb->filelen)				  /* need to extend? */

-      { mb->filelen=len;

-	if(lseek(mb->fd,mb->filelen-1,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))

+   { if(len>=mb->filelen)				  /* need to extend? */

+      { mb->filelen=len+1;

+	if(lseek(mb->fd,len,SEEK_SET)<0||1!=rwrite(mb->fd,empty,1))

 	 { char*p=malloc(len+1);	   /* can't extend, switch to malloc */

 	   tmemmove(p,mb->p,mb->len);

 	   munmap(mb->p,mb->len+1);

@@ -124,9 +124,9 @@

    }

   else

      mb->p=realloc(mb->p,len+1);

-  mb->len=len+1;

-  mb->p[len]='\0';

+  mb->len=len;

 ret1:

+  mb->p[len]='\0';

   return 1;

 }

--- procmail-3.22.orig/src/autoconf

+++ procmail-3.22/src/autoconf

@@ -1470,15 +1470,14 @@

  grep 'Mlocal.*procmail' >$DEVNULL ||

  echo '#define CF_no_procmail_yet' >>$ACONF

-cat /usr/lib/sendmail.cf /etc/sendmail.cf /etc/mail/sendmail.cf 2>$DEVNULL |

- grep '^V' >$DEVNULL ||

- echo '#define buggy_SENDMAIL' >>$ACONF

+# cat /usr/lib/sendmail.cf /etc/sendmail.cf /etc/mail/sendmail.cf 2>$DEVNULL |

+#  grep '^V' >$DEVNULL ||

+#  echo '#define buggy_SENDMAIL' >>$ACONF

 lpath='/bin'

 bins="/bin"

-for newd in /usr/bin /usr/ucb /usr/5bin $BINDIR /local/bin /usr/local/bin \

- /global/bin /usr/bin/X11 /usr/X*/bin

+for newd in /usr/bin $BINDIR /usr/bin/X11 /usr/X*/bin

 do

   if test -d $newd

   then

--- procmail-3.22.orig/src/procmail.c

+++ procmail-3.22/src/procmail.c

@@ -652,8 +652,7 @@

 	      nrcond= -1;

 	   if(tolock)		 /* clear temporary buffer for lockfile name */

 	      free(tolock);

-	   for(i=maxindex(flags);i;i--)			  /* clear the flags */

-	      flags[i]=0;

+	   bbzero(flags,sizeof(flags));		  /* clear the flags */

 	   for(tolock=0,locknext=0;;)

 	    { chp=skpspace(chp);

 	      switch(i= *chp++)

--- procmail-3.22.orig/src/pipes.c

+++ procmail-3.22/src/pipes.c

@@ -145,7 +145,9 @@

   if(Stdout)

    { *(eq=strchr(Stdout,'\0')-1)='\0';			     /* chop the '=' */

      if(!(backblock=getenv(Stdout)))			/* no current value? */

-	PRDB=PWRB= -1;

+      { PRDB=PWRB= -1;

+	backlen=0;

+      }

      else

       { backlen=strlen(backblock);

 	goto pip;

@@ -155,9 +157,7 @@

 pip: rpipe(pbackfd);

   rpipe(pinfd);						 /* main pipes setup */

   if(!(pidchild=sfork()))			/* create a sending procmail */

-   { if(Stdout&&backblock)

-	backlen=strlen(backblock);

-     else

+   { if(!Stdout)

 	backblock=source,backlen=len;

      childsetup();rclose(PRDI);rclose(PRDB);

      rpipe(poutfd);rclose(STDOUT);

@@ -194,7 +194,7 @@

      makeblock(&temp,Stdfilled);

      tmemmove(temp.p,Stdout,Stdfilled);

      readdyn(&temp,&Stdfilled,Stdfilled+backlen+1);

-     Stdout=realloc(Stdout,&Stdfilled+1);

+     Stdout=realloc(Stdout,Stdfilled+1);

      tmemmove(Stdout,temp.p,Stdfilled+1);

      freeblock(&temp);

      retStdout(Stdout,pwait&&pipw,!backblock);

--- procmail-3.22.orig/src/memblk.h

+++ procmail-3.22/src/memblk.h

@@ -1,6 +1,6 @@

 typedef struct memblk {

     char*p;						  /* where it starts */

-    long len;					 /* currently allocated size */

+    long len;			 /* current size, not including trailing NUL */

 #ifdef USE_MMAP

     off_t filelen;				     /* how long is the file */

     int fd;					   /* file which is mmap()ed */

--- procmail-3.22.orig/src/manconf.c

+++ procmail-3.22/src/manconf.c

@@ -233,7 +233,7 @@

  \2-@PRESERVOPT@\1and\1.BR \2-@FROMWHOPT@ .\1");

   pc("LMTPOPT",LMTPOPT);

 #else

-  ps("LMTPOPTdesc","");ps("LMTPusage","");

+  ps("LMTPOPTdesc","");ps("LMTPusage","\1");

 #endif

   pname("INIT_UMASK",0);printf("0%lo/g\n",(unsigned long)INIT_UMASK);lines--;

   pn("DEFlinebuf",DEFlinebuf);

--- procmail-3.22.orig/src/recommend.c

+++ procmail-3.22/src/recommend.c

@@ -47,7 +47,7 @@

      printf("chmod %lo %s\n",(unsigned long)(sgid|PERMIS),argv[2]);

   else if(chmdir==1)

      goto nogchmod;

-  if(chmdir)

+  if(0)

      printf("chmod %c+w %s/.\n",chmdir==1?'g':'a',mailspooldir);

 nogchmod:

   return EXIT_SUCCESS;

--- procmail-3.22.orig/src/foldinfo.h

+++ procmail-3.22/src/foldinfo.h

@@ -10,7 +10,7 @@

 #define ft_lock(type)	   ((type)>ft_MAILDIR)		   /* kernel lock fd */

 #define ft_atime(type)	   ((type)==ft_FILE)	      /* force atime < mtime */

-#define ft_dotlock(type)   ((type)==ft_FILE)		 /* dotlock $DEFAULT */

+#define ft_dotlock(type)   ((type)>ft_MAILDIR)		 /* dotlock $DEFAULT */

 #define ft_delim(type)	   ((type)==ft_FILE)		   /* add MMDF delim */

 #define ft_checkcloser(type) ((type)>ft_MH)

 #define ft_forceblank(type) ((type)!=ft_MAILDIR)  /* force blank line at end */

--- procmail-3.22.orig/src/mailfold.c

+++ procmail-3.22/src/mailfold.c

@@ -378,7 +378,8 @@

 	dfilled=mailread=0;

      else if(rhead)				/* only read in a new header */

       { memblk new;

-	dfilled=mailread=0;makeblock(&new,0);readdyn(&new,&dfilled,0);

+	dfilled=mailread=0;makeblock(&new,0);

+	readdyn(&new,&dfilled,thebody-themail.p);

 	if(tobesent>dfilled&&isprivate)		     /* put it in place here */

 	 { tmemmove(themail.p+dfilled,thebody,filled-=tobesent);

 	   tmemmove(themail.p,new.p,dfilled);

--- procmail-3.22.orig/FAQ

+++ procmail-3.22/FAQ

@@ -57,8 +57,8 @@

 		Forward to |/usr/bin/procmail

 	or if that doesn't work, try:

 		Pipe to /usr/bin/procmail

-	as the only line in your mail spool file (e.g. /usr/mail/$LOGNAME), as

-	well as doing a "chmod 06660 /usr/mail/$LOGNAME".  For more information

+	as the only line in your mail spool file (e.g. /var/mail/$LOGNAME), as

+	well as doing a "chmod 06660 /var/mail/$LOGNAME".  For more information

 	on such systems, do a "man mail".

 	If all of this doesn't work, procmail can be called on a periodical

@@ -210,14 +210,14 @@

 	procmail with both the fcntl() and lockf() locking method

 	disabled (see config.h).

-17. I sometimes get these `Lock failure on "/usr/mail/$LOGNAME.lock"' errors

+17. I sometimes get these `Lock failure on "/var/mail/$LOGNAME.lock"' errors

     from procmail.  What do I do about it?

 	The problem here is that as long as procmail has not read a

 	$HOME/.procmailrc file, it can hang on to the sgid mail permission

-	(which it needs in order to create a lockfile in /usr/mail).

+	(which it needs in order to create a lockfile in /var/mail).

 	I.e. if procmail delivers mail to a user without a $HOME/.procmailrc

-	file, procmail *can* (and does) use the /usr/mail/$LOGNAME.lock file.

+	file, procmail *can* (and does) use the /var/mail/$LOGNAME.lock file.

 	If, however, it finds a $HOME/.procmailrc file, procmail has to let go

 	of the sgid mail permission because otherwise any ordinary user could

@@ -226,7 +226,7 @@

 	There are several solutions to this problem:

 	- Some systems support the sticky bit on directories (when set only

 	  allows the owner of a file in that directory to rename or remove

-	  it).	This enables you to make /usr/spool/mail drwxrwxrwt.  It is

+	  it).	This enables you to make /var/mail drwxrwxrwt.  It is

 	  thus effectively world writable, but all the mailboxes in it are

 	  protected because only the mailbox owner can remove or rename it.

 	- If your system did not exhibit the !@#$%^&* POSIX semantics for

@@ -245,9 +245,9 @@

 			:0

 			$DEFAULT

-	- You could, instead of using /usr/mail/$LOGNAME, use a file below

+	- You could, instead of using /var/mail/$LOGNAME, use a file below

 	  your home directory as your default mailbox.

-	- Or, you could still use /usr/mail/$LOGNAME as the mailbox, but

+	- Or, you could still use /var/mail/$LOGNAME as the mailbox, but

 	  simply instruct procmail to use a different lockfile.	 This can

 	  be achieved by putting following recipe at the bottom of

 	  your .procmailrc file:

--- procmail-3.22.orig/Makefile

+++ procmail-3.22/Makefile

@@ -79,7 +79,7 @@

 #			-lresolv	# not really needed, is it?

 # Informal list of directories where we look for the libraries in SEARCHLIBS

-LIBPATHS=/lib /usr/lib /usr/local/lib

+LIBPATHS=/lib /usr/lib

 GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \

  -Wpointer-arith -Wconversion -Waggregate-return \

--- procmail-3.22.orig/debian/changelog

+++ procmail-3.22/debian/changelog

@@ -0,0 +1,294 @@

+procmail (3.22-8) unstable; urgency=low

+

+  * Fixed strange formail -l behaviour when there is a Content-Length: header.

+    Thanks a lot to Henning Makholm for the patch (Closes: #217853).

+

+ -- Santiago Vila <[email protected]>  Mon,  3 Nov 2003 20:01:24 +0100

+

+procmail (3.22-7) unstable; urgency=low

+

+  * Fixed bad nroff syntax in procmailrc(5), closes: #147173.

+  * Added missing newline in procmail(1), closes: #180477.

+

+ -- Santiago Vila <[email protected]>  Mon, 10 Mar 2003 00:09:20 +0100

+

+procmail (3.22-6) unstable; urgency=low

+

+  * Standards-Version: 3.5.8.

+

+ -- Santiago Vila <[email protected]>  Thu, 26 Dec 2002 18:27:08 +0100

+

+procmail (3.22-5) stable; urgency=medium

+

+  * Patched pipes.c to fix a memory allocation bug (Closes: #171514).

+

+ -- Santiago Vila <[email protected]>  Thu, 26 Dec 2002 18:09:38 +0100

+

+procmail (3.22-4) unstable; urgency=low

+

+  * Fixed a typo in procmail(1). Patch by the author (Closes: #142983).

+

+ -- Santiago Vila <[email protected]>  Tue, 16 Apr 2002 19:16:20 +0200

+

+procmail (3.22-3) unstable; urgency=medium

+

+  * Fixed off-by-one bug in procmail.c which made the raw flag not to be

+    cleared properly. Thanks to Gregory Stark (Closes: #134341).

+

+ -- Santiago Vila <[email protected]>  Sun, 17 Feb 2002 16:43:02 +0100

+

+procmail (3.22-2) unstable; urgency=medium

+

+  * Modified mailfold.c to fix a segfault problem. Patch by the author.

+  * The system-wide mail directory is /var/mail as per policy.

+

+ -- Santiago Vila <[email protected]>  Thu, 29 Nov 2001 09:39:04 +0100

+

+procmail (3.22-1) unstable; urgency=low

+

+  * New upstream release, which uses the `standard' format for Maildir

+    filenames and retries on name collision. It also contains some

+    bug fixes from the 3.23pre snapshot dated 2001-09-13.

+  * Removed `sendmail' from the Recommends field, since we already

+    have `exim' (the default Debian MTA) and `mail-transport-agent'.

+  * Removed suidmanager support. Conflicts: suidmanager (<< 0.50).

+  * Added support for DEB_BUILD_OPTIONS in the source package.

+  * README.Maildir: Do not use locking on the example recipe,

+    since it's wrong to do so in this case.

+

+ -- Santiago Vila <[email protected]>  Wed, 21 Nov 2001 09:40:20 +0100

+

+procmail (3.15.2-1) stable; urgency=high

+

+  * New upstream release, with improved security and robustness involving

+    signal handlers. Author recommends upgrading to this version on

+    any system where it is installed setuid or setgid.

+  * This release fixes also Bug #108417: procmail -p -m resets PATH.

+

+ -- Santiago Vila <[email protected]>  Thu, 30 Aug 2001 20:05:06 +0200

+

+procmail (3.15.1-4) unstable; urgency=low

+

+  * Don't add an extra newline when delivering to a Maildir folder.

+    Please note that the MTA may still add a newline on their own.

+    Exim users should check the `suffix' variable, for example.

+    Patch by the author. Closes: #78623.

+

+ -- Santiago Vila <[email protected]>  Sat, 14 Apr 2001 17:18:29 +0200

+

+procmail (3.15.1-3) unstable; urgency=low

+

+  * Clarified formail -X behaviour, patch by the author (Closes: #77388).

+  * Updated QuickStart.

+

+ -- Santiago Vila <[email protected]>  Sun, 25 Mar 2001 10:45:56 +0200

+

+procmail (3.15.1-2) unstable; urgency=low

+

+  * Fixed lockfile -l endless loop (Closes: #82006). Patch by the author.

+

+ -- Santiago Vila <[email protected]>  Sun, 28 Jan 2001 19:44:49 +0100

+

+procmail (3.15.1-1) unstable; urgency=low

+

+  * New upstream release. A race to create the mailspool would bounce one of

+    the messages due to an internal error.

+

+ -- Santiago Vila <[email protected]>  Mon,  8 Jan 2001 20:09:34 +0100

+

+procmail (3.15-3) unstable; urgency=low

+

+  * Fixed formatting error in procmailrc(5). Patch by the author.

+    (Closes: #80437).

+

+ -- Santiago Vila <[email protected]>  Sun, 31 Dec 2000 17:20:47 +0100

+

+procmail (3.15-2) unstable; urgency=low

+

+  * formail -l is now documented. Patch by the author (Closes: #72275).

+

+ -- Santiago Vila <[email protected]>  Fri,  1 Dec 2000 19:54:22 +0100

+

+procmail (3.15-1) unstable; urgency=low

+

+  * New upstream release. Maildir support is now built-in.

+  * Really change default PATH to "$HOME/bin:/usr/local/bin:/usr/bin:/bin".

+  * Modified the note in QuickStart about refiltering an old mail folder.

+  * Use SEARCHLIBS="" in debian/rules clean target to speed it up.

+  * Modified ft_dotlock in src/foldinfo.h to be in compliance with

+    locking policy, following a hint by the author.

+  * Removed (versioned) dependency on debianutils, since mailstat

+    does not use temporary files anymore.

+  * Made the .forward example in procmail(1) not to depend on the build

+    environment by modifying src/autoconf so that buggy_SENDMAIL is

+    never defined.

+

+ -- Santiago Vila <[email protected]>  Mon, 28 Aug 2000 12:51:05 +0200

+

+procmail (3.13.1-4) stable; urgency=high

+

+  * Fixed weird formail -rk behavior (patch from the author, backported

+    from procmail-3.15). Thanks to Ben Collins for the report.

+  * s/smail/exim/ in `Recommends:' field.

+

+ -- Santiago Vila <[email protected]>  Tue, 22 Aug 2000 13:04:50 +0200

+

+procmail (3.13.1-3) unstable; urgency=medium

+

+  * Standards-Version: 3.1.1

+  * Updated location of licenses in copyright file.

+  * LOCKINGTEST=100 again, to use fcntl() and dot-locking, as required by

+    latest policy.

+

+ -- Santiago Vila <[email protected]>  Wed,  1 Dec 1999 12:37:35 +0100

+

+procmail (3.13.1-2) unstable; urgency=low

+

+  * Modified procmail(1) and QuickStart to reflect the fact that exim does

+    not accept the exec keyword in .forward files (Bugs #33460 and #37771).

+  * Modified formail to recognize exim's Envelope-To: header (Bug#40718).

+    Patch by Philip Guenther.

+  * Standards-Version: 3.0.0.

+

+ -- Santiago Vila <[email protected]>  Mon, 19 Jul 1999 20:09:25 +0200

+

+procmail (3.13.1-1) stable unstable; urgency=high

+

+  * New upstream release, 3.13 missed a couple possible overflows.

+  * Applied `procmail-locking.patch' from Bruce Guenter, since

+    no directory delivery mechanism requires locking (Bug #35210).

+

+ -- Santiago Vila <[email protected]>  Thu,  8 Apr 1999 13:56:33 +0200

+

+procmail (3.13-1) stable unstable; urgency=high

+

+  * New upstream release. procmail 3.12 breaks smartlist (Bug #35115).

+

+ -- Santiago Vila <[email protected]>  Fri,  2 Apr 1999 14:24:24 +0200

+

+procmail (3.12-1) frozen unstable; urgency=high

+

+  * New upstream release. Fixes some security bugs.

+  * #define GROUP_PER_USER in config.h to allow writeable rcfiles when

+    the group is the user's default group.