From ae6cbf95474ed842297f4f50be06e22525d6d88b Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Tue, 30 Jun 2009 14:36:16 +0000
Subject: [PATCH] - rename getline to avoid conflict with glibc (#505977) - add
 -Wno-comments to CFLAGS - remove package name from summary

---
 procmail-3.22-getline.patch | 56 +++++++++++++++++++++++++++++++++++++
 procmail.spec               | 13 +++++++--
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 procmail-3.22-getline.patch

diff --git a/procmail-3.22-getline.patch b/procmail-3.22-getline.patch
new file mode 100644
index 0000000..fb9a4ec
--- /dev/null
+++ b/procmail-3.22-getline.patch
@@ -0,0 +1,56 @@
+diff -up procmail-3.22/src/fields.c.getline procmail-3.22/src/fields.c
+--- procmail-3.22/src/fields.c.getline	2001-09-11 06:57:08.000000000 +0200
++++ procmail-3.22/src/fields.c	2009-06-30 16:10:36.000000000 +0200
+@@ -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();
++  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 -up procmail-3.22/src/formail.c.getline procmail-3.22/src/formail.c
+--- procmail-3.22/src/formail.c.getline	2009-06-30 16:00:40.000000000 +0200
++++ procmail-3.22/src/formail.c	2009-06-30 16:10:49.000000000 +0200
+@@ -819,7 +819,7 @@ splitit:       { if(!lnl)   /* did the p
+       { 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 -up procmail-3.22/src/formisc.c.getline procmail-3.22/src/formisc.c
+--- procmail-3.22/src/formisc.c.getline	2001-06-29 04:20:45.000000000 +0200
++++ procmail-3.22/src/formisc.c	2009-06-30 16:12:20.000000000 +0200
+@@ -115,7 +115,7 @@ void loadchar(c)const int c;		      /* a
+   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 -up procmail-3.22/src/formisc.h.getline procmail-3.22/src/formisc.h
+--- procmail-3.22/src/formisc.h.getline	1999-04-19 08:42:15.000000000 +0200
++++ procmail-3.22/src/formisc.h	2009-06-30 16:10:02.000000000 +0200
+@@ -17,4 +17,4 @@ void
+ char*
+  skipwords P((char*start));
+ int
+- getline P((void));
++ get_line P((void));
diff --git a/procmail.spec b/procmail.spec
index 1db9238..1953540 100644
--- a/procmail.spec
+++ b/procmail.spec
@@ -1,7 +1,7 @@
-Summary: The procmail mail processing program
+Summary: Mail processing program
 Name: procmail
 Version: 3.22
-Release: 23%{?dist}
+Release: 24%{?dist}
 License: GPLv2+ or Artistic
 Group: Applications/Internet
 Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz
@@ -12,6 +12,7 @@ Patch1: procmail-3.15.1-man.patch
 Patch2: procmail_3.22-8.debian.patch
 Patch4: procmail-3.22-truncate.patch
 Patch5: procmail-3.22-ipv6.patch
+Patch6: procmail-3.22-getline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -29,12 +30,13 @@ forward certain incoming mail automatically to someone.
 %patch2 -p1
 %patch4 -p1 -b .truncate
 %patch5 -p1 -b .ipv6
+%patch6 -p1 -b .getline
 
 find examples -type f | xargs chmod 644
 
 %build
 make RPM_OPT_FLAGS="$(getconf LFS_CFLAGS)" autoconf.h
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)"
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-comments $(getconf LFS_CFLAGS)"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -64,6 +66,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man[15]/*
 
 %changelog
+* Tue Jun 30 2009 Miroslav Lichvar <mlichvar@redhat.com> 3.22-24
+- rename getline to avoid conflict with glibc (#505977)
+- add -Wno-comments to CFLAGS
+- remove package name from summary
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.22-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild