diff -pruN 2.1-6/debian/changelog 2.1-7/debian/changelog
--- 2.1-6/debian/changelog	2009-12-10 19:47:23.000000000 +0000
+++ 2.1-7/debian/changelog	2009-12-07 06:39:43.000000000 +0000
@@ -1,3 +1,13 @@
+postman (2.1-7) unstable; urgency=high
+
+  * QA upload.
+  * Fix FTBFS with eglibc (>= 2.10) and its getline() function, thanks to
+    Ruben Molina for the patch (Closes: #552862):
+     + debian/patches/12_fix_eglibc_getline_conflict.dpatch
+  * Set urgency to “high” since it also affects testing.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 06 Dec 2009 20:23:55 +0100
+
 postman (2.1-6) unstable; urgency=low
 
   * QA upload.
diff -pruN 2.1-6/debian/patches/00list 2.1-7/debian/patches/00list
--- 2.1-6/debian/patches/00list	2009-12-10 19:47:23.000000000 +0000
+++ 2.1-7/debian/patches/00list	2009-12-07 06:39:43.000000000 +0000
@@ -9,3 +9,4 @@
 09_gcc4.1_fix
 10_kfreebsd_fix
 11_ldap_deprecated.dpatch
+12_fix_eglibc_getline_conflict.dpatch
diff -pruN 2.1-6/debian/patches/12_fix_eglibc_getline_conflict.dpatch 2.1-7/debian/patches/12_fix_eglibc_getline_conflict.dpatch
--- 2.1-6/debian/patches/12_fix_eglibc_getline_conflict.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ 2.1-7/debian/patches/12_fix_eglibc_getline_conflict.dpatch	2009-12-07 06:39:43.000000000 +0000
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_fix_eglibc_getline_conflict.dpatch by Cyril Brulebois <kibi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix conflict with eglibc's getline() function in eglibc (>= 2.10).
+
+@DPATCH@
+diff -urNad postman-2.1~/cgi-lib.c postman-2.1/cgi-lib.c
+--- postman-2.1~/cgi-lib.c	2005-03-21 10:20:17.000000000 +0100
++++ postman-2.1/cgi-lib.c	2009-12-06 20:45:18.000000000 +0100
+@@ -235,7 +235,7 @@
+ 
+ /* stolen from k&r and seriously modified to do what I want */
+ 
+-int getline(char s[], int lim)
++int mygetline(char s[], int lim)
+ {
+   int c = 0, i=0, num;
+ 
+@@ -282,9 +282,9 @@
+   list_create(entries);
+   window = entries->head;
+   //ignore first boundary; this isn't so robust; improve it later
+-  getline(buffer,BUFSIZ);
++  mygetline(buffer,BUFSIZ);
+   //now start parsing
+-  while ((bytesread=getline(buffer,BUFSIZ)) != 0) 
++  while ((bytesread=mygetline(buffer,BUFSIZ)) != 0) 
+     {
+     start = 1;
+     // this assumes that buffer contains no binary characters. if the buffer contains the first valid header, then this
+@@ -358,7 +358,7 @@
+     else isfile = 0;
+     
+     //ignore rest of headers and first blank line
+-    while (getline(buffer, BUFSIZ) > 1) 
++    while (mygetline(buffer, BUFSIZ) > 1) 
+       {
+       //DOS style blank line?
+       if ((buffer[0] == '\r') && (buffer[1] == '\n')) break;
+@@ -367,7 +367,7 @@
+     j = 0;
+     while (!done) 
+       {
+-      bytesread = getline(buffer,BUFSIZ);
++      bytesread = mygetline(buffer,BUFSIZ);
+       buffer[bytesread] = '\0';
+       if (bytesread && strstr(buffer,boundary) == NULL) 
+         {