Package: procmail
Version: 3.22-16
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu karmic ubuntu-patch
*** /tmp/tmpw9Pexp
In Ubuntu, we've applied the attached patch to achieve the following:
* rename function 'getline' to 'procmail_getline' to avoid namespace
clash with modern POSIX. Fixes FTBFS.
We thought you might be interested in doing the same. In fact, gcc-4.4
is not (yet) the default compiler version in debian, but this might
still change before freezing squeeze.
-- System Information:
Debian Release: squeeze/sid
APT prefers karmic-updates
APT policy: (500, 'karmic-updates'), (500, 'karmic')
Architecture: i386 (i686)
Kernel: Linux 2.6.31-11-generic (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u procmail-3.22/src/formail.c procmail-3.22/src/formail.c
--- procmail-3.22/src/formail.c
+++ procmail-3.22/src/formail.c
@@ -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 */
+ procmail_getline();buffilled=0; /* but only if it's defined */
#endif
if(buflast!=EOF) /* if any */
goto splitit;
diff -u procmail-3.22/src/formisc.c procmail-3.22/src/formisc.c
--- procmail-3.22/src/formisc.c
+++ procmail-3.22/src/formisc.c
@@ -115,7 +115,7 @@
buf[buffilled++]=c;
}
-int getline P((void)) /* read a newline-terminated line */
+int procmail_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 */
only in patch2:
unchanged:
--- procmail-3.22.orig/src/fields.c
+++ procmail-3.22/src/fields.c
@@ -110,16 +110,16 @@
/* try and append one valid field to rdheader from stdin */
int readhead P((void))
{ int idlen;
- getline();
+ procmail_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=='';procmail_getline()); /* gather continued From_ lines */
}
else
- for(;;getline()) /* get the rest of the continued field */
+ for(;;procmail_getline()) /* get the rest of the continued field */
{ switch(buflast) /* will this line be continued? */
{ case ' ':case '\t': /* yep, it sure is */
continue;
only in patch2:
unchanged:
--- procmail-3.22.orig/src/formisc.h
+++ procmail-3.22/src/formisc.h
@@ -17,4 +17,4 @@
char*
skipwords P((char*start));
int
- getline P((void));
+ procmail_getline P((void));