packages: procmail/procmail.spec, procmail/private_getline.patch (NEW) - ad...

[sls]

Author: sls                          Date: Sun Jan 10 22:23:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add private_getline.patch

---- Files affected:
packages/procmail:
   procmail.spec (1.59 -> 1.60) , private_getline.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/procmail/procmail.spec
diff -u packages/procmail/procmail.spec:1.59 packages/procmail/procmail.spec:1.60
--- packages/procmail/procmail.spec:1.59	Wed May 28 21:03:03 2008
+++ packages/procmail/procmail.spec	Sun Jan 10 23:23:04 2010
@@ -24,6 +24,7 @@
 Patch0:		%{name}-lockf.patch
 Patch1:		%{name}-misc.patch
 Patch2:		%{name}-FHS.patch
+Patch3:		private_getline.patch
 URL:		http://www.procmail.org/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -91,6 +92,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 echo "" | %{__make} \
@@ -138,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2010/01/10 22:23:04  sls
+- add private_getline.patch
+
 Revision 1.59  2008/05/28 19:03:03  glen
 - release 15
 

================================================================
Index: packages/procmail/private_getline.patch
diff -u /dev/null packages/procmail/private_getline.patch:1.1
--- /dev/null	Sun Jan 10 23:23:10 2010
+++ packages/procmail/private_getline.patch	Sun Jan 10 23:23:04 2010
@@ -0,0 +1,41 @@
+--- procmail-3.22/src/formisc.h.orig	2010-01-10 22:53:39.726707771 +0100
++++ procmail-3.22/src/formisc.h	2010-01-10 22:54:57.934199882 +0100
+@@ -17,4 +17,4 @@ void
+ char*
+  skipwords P((char*start));
+ int
+- getline P((void));
++ pm_getline P((void));
+--- procmail-3.22/src/fields.c.orig	2010-01-10 22:55:07.463366037 +0100
++++ procmail-3.22/src/fields.c	2010-01-10 22:55:28.953363478 +0100
+@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
+ 		    /* try and append one valid field to rdheader from stdin */
+ int readhead P((void))
+ { int idlen;
+-  getline();
++  pm_getline();
+   if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
+      return 0;
+   if(idlen==STRLEN(FROM)&&eqFrom_(buf))			/* it's a From_ line */
+    { if(rdheader)
+ 	return 0;			       /* the From_ line was a fake! */
+-     for(;buflast=='>';getline());	    /* gather continued >From_ lines */
++     for(;buflast=='>';pm_getline());	    /* gather continued >From_ lines */
+    }
+   else
+-     for(;;getline())		      /* get the rest of the continued field */
++     for(;;pm_getline())		      /* get the rest of the continued field */
+       { switch(buflast)			     /* will this line be continued? */
+ 	 { case ' ':case '\t':				  /* yep, it sure is */
+ 	      continue;
+--- procmail-3.22/src/formisc.c.orig	2010-01-10 22:55:37.473363034 +0100
++++ procmail-3.22/src/formisc.c	2010-01-10 22:55:45.763361970 +0100
+@@ -115,7 +115,7 @@ void loadchar(c)const int c;		      /* a
+   buf[buffilled++]=c;
+ }
+ 
+-int getline P((void))			   /* read a newline-terminated line */
++int pm_getline P((void))			   /* read a newline-terminated line */
+ { if(buflast==EOF)			 /* at the end of our Latin already? */
+    { loadchar('\n');					  /* fake empty line */
+      return EOF;					  /* spread the word */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/procmail/procmail.spec?r1=1.59&r2=1.60&f=u