From 357ab3c9253ef7488fbca7405ee100f0ae76ccfc Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Sat, 16 May 2009 11:00:48 +0200
Subject: [PATCH] procmail: fix for 'conflicting types' error

---
 procmail/.md5sum                |  1 +
 procmail/Pkgfile                |  6 ++--
 procmail/procmail-getline.patch | 56 +++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 procmail/procmail-getline.patch

diff --git a/procmail/.md5sum b/procmail/.md5sum
index 775683c5d..29a635685 100644
--- a/procmail/.md5sum
+++ b/procmail/.md5sum
@@ -1 +1,2 @@
 1678ea99b973eb77eda4ecf6acae53f1  procmail-3.22.tar.gz
+4644c7cd572dbd63d56ffc632b092860  procmail-getline.patch
diff --git a/procmail/Pkgfile b/procmail/Pkgfile
index 182d7b261..7bc1713bc 100644
--- a/procmail/Pkgfile
+++ b/procmail/Pkgfile
@@ -4,11 +4,13 @@
 
 name=procmail
 version=3.22
-release=2
-source=(ftp://ftp.procmail.net/pub/procmail/$name-$version.tar.gz)
+release=3
+source=(ftp://ftp.procmail.net/pub/procmail/$name-$version.tar.gz
+        $name-getline.patch)
 
 build() {
     cd $name-$version
+    patch -p1 -i $SRC/$name-getline.patch
     make CFLAGS0="$CFLAGS" LOCKINGTEST=/tmp all
     make BASENAME=$PKG/usr install
     make BASENAME=$PKG/usr install-suid
diff --git a/procmail/procmail-getline.patch b/procmail/procmail-getline.patch
new file mode 100644
index 000000000..a62ed8abd
--- /dev/null
+++ b/procmail/procmail-getline.patch
@@ -0,0 +1,56 @@
+diff -Nru procmail-3.22.orig/src/fields.c procmail-3.22/src/fields.c
+--- procmail-3.22.orig/src/fields.c	2009-05-15 21:59:51.768416278 +0200
++++ procmail-3.22/src/fields.c	2009-05-15 22:00:58.128416259 +0200
+@@ -110,16 +110,16 @@
+ 		    /* try and append one valid field to rdheader from stdin */
+ int readhead P((void))
+ { int idlen;
+-  getline();
++  get_line();
+   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=='>';get_line());	    /* gather continued >From_ lines */
+    }
+   else
+-     for(;;getline())		      /* get the rest of the continued field */
++     for(;;get_line())		      /* get the rest of the continued field */
+       { switch(buflast)			     /* will this line be continued? */
+ 	 { case ' ':case '\t':				  /* yep, it sure is */
+ 	      continue;
+diff -Nru procmail-3.22.orig/src/formail.c procmail-3.22/src/formail.c
+--- procmail-3.22.orig/src/formail.c	2009-05-15 21:59:51.768416278 +0200
++++ procmail-3.22/src/formail.c	2009-05-15 22:01:23.778416754 +0200
+@@ -819,7 +819,7 @@
+       { if(split)		       /* gobble up the next start separator */
+ 	 { buffilled=0;
+ #ifdef sMAILBOX_SEPARATOR
+-	   getline();buffilled=0;		 /* but only if it's defined */
++	   get_line();buffilled=0;		 /* but only if it's defined */
+ #endif
+ 	   if(buflast!=EOF)					   /* if any */
+ 	      goto splitit;
+diff -Nru procmail-3.22.orig/src/formisc.c procmail-3.22/src/formisc.c
+--- procmail-3.22.orig/src/formisc.c	2009-05-15 21:59:51.768416278 +0200
++++ procmail-3.22/src/formisc.c	2009-05-15 22:02:00.538416155 +0200
+@@ -115,7 +115,7 @@
+   buf[buffilled++]=c;
+ }
+ 
+-int getline P((void))			   /* read a newline-terminated line */
++int get_line 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 */
+diff -Nru procmail-3.22.orig/src/formisc.h procmail-3.22/src/formisc.h
+--- procmail-3.22.orig/src/formisc.h	2009-05-15 21:59:51.768416278 +0200
++++ procmail-3.22/src/formisc.h	2009-05-15 22:02:12.028416164 +0200
+@@ -17,4 +17,4 @@
+ char*
+  skipwords P((char*start));
+ int
+- getline P((void));
++ get_line P((void));