diff -pruN 2.1-6/debian/changelog 2.1-6ubuntu1/debian/changelog --- 2.1-6/debian/changelog 2009-10-21 16:25:26.000000000 +0100 +++ 2.1-6ubuntu1/debian/changelog 2009-10-21 16:25:27.000000000 +0100 @@ -1,3 +1,30 @@ +postman (2.1-6ubuntu1) karmic; urgency=low + + * debian/patches/12_gcc4.4_fix.dpatch: rename 'getline' to + 'postman_getline', as getline is now a standard function and causes + build failures with gcc 4.4 due to the colliding names; and when calling + strchr() on a const char *, don't cast the result to a char *. + + -- Steve Langasek Wed, 14 Oct 2009 09:25:55 +0000 + +postman (2.1-6build3) jaunty; urgency=low + + * Rebuild for the libc-client2007b transition. + + -- Luca Falavigna Sat, 24 Jan 2009 16:02:01 +0100 + +postman (2.1-6build2) jaunty; urgency=low + + * Rebuild for the libc-client2007b transition. + + -- Luca Falavigna Mon, 22 Dec 2008 10:29:47 +0000 + +postman (2.1-6build1) jaunty; urgency=low + + * Rebuild for libc-client2007b -> libc-client2007d transition. + + -- Luca Falavigna Mon, 17 Nov 2008 09:25:48 +0100 + postman (2.1-6) unstable; urgency=low * QA upload. diff -pruN 2.1-6/debian/control 2.1-6ubuntu1/debian/control --- 2.1-6/debian/control 2009-10-21 16:25:26.000000000 +0100 +++ 2.1-6ubuntu1/debian/control 2009-10-21 16:25:27.000000000 +0100 @@ -1,7 +1,8 @@ Source: postman Section: web Priority: optional -Maintainer: Debian QA Group +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian QA Group Build-Depends: debhelper (>> 4.0.0), dpatch, libdb-dev, libc-client-dev, libldap2-dev Standards-Version: 3.7.2 diff -pruN 2.1-6/debian/patches/00list 2.1-6ubuntu1/debian/patches/00list --- 2.1-6/debian/patches/00list 2009-10-21 16:25:26.000000000 +0100 +++ 2.1-6ubuntu1/debian/patches/00list 2009-10-21 16:25:27.000000000 +0100 @@ -9,3 +9,4 @@ 09_gcc4.1_fix 10_kfreebsd_fix 11_ldap_deprecated.dpatch +12_gcc4.4_fix diff -pruN 2.1-6/debian/patches/12_gcc4.4_fix.dpatch 2.1-6ubuntu1/debian/patches/12_gcc4.4_fix.dpatch --- 2.1-6/debian/patches/12_gcc4.4_fix.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ 2.1-6ubuntu1/debian/patches/12_gcc4.4_fix.dpatch 2009-10-21 16:25:27.000000000 +0100 @@ -0,0 +1,110 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_gcc4.4_fix.dpatch by Steve Langasek +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix build failure with gcc 4.4: +## DP: - getline() is now a standard function, rename this copy +## DP: - C string functions are now const-aware in C++, so fix +## DP: various functions to not implicitly cast + +@DPATCH@ +diff -urNad postman-2.1~/CCLIENT.cc postman-2.1/CCLIENT.cc +--- postman-2.1~/CCLIENT.cc 2009-10-14 09:48:33.674376402 +0000 ++++ postman-2.1/CCLIENT.cc 2009-10-14 09:48:33.961380166 +0000 +@@ -1617,7 +1617,8 @@ + + void CCLIENT::getMailboxes (StringList *SL, StringList *SLSubscribedGroups, bool refreshIMAPFolders, bool ALLOW_NNTP) + { +- char *pc, *pc1, *pc2; ++ char *pc, *pc2; ++ const char *pc1; + TBuffer abuf, abuf2, abuf3, mbinbox; + setError (false); + if (refreshIMAPFolders == true) +diff -urNad postman-2.1~/ClientFileBrowser.cc postman-2.1/ClientFileBrowser.cc +--- postman-2.1~/ClientFileBrowser.cc 2005-03-21 09:20:15.000000000 +0000 ++++ postman-2.1/ClientFileBrowser.cc 2009-10-14 09:48:47.374753750 +0000 +@@ -161,7 +161,7 @@ + + const char *ClientFileBrowser::obtainRelDir (const char *FullDir, TBuffer reldir) + { +- char *pc; ++ const char *pc; + if (strcmp (FullDir, RestrictedPath) == 0) {xstrncpy (reldir, CMAXBUFFER, "/"); return reldir;} + pc = strstr (FullDir, RestrictedPath); + if (pc == NULL) {addLastSlash (reldir);} +diff -urNad postman-2.1~/Utils.cc postman-2.1/Utils.cc +--- postman-2.1~/Utils.cc 2009-10-14 09:48:33.105379281 +0000 ++++ postman-2.1/Utils.cc 2009-10-14 09:48:33.961380166 +0000 +@@ -50,7 +50,7 @@ + return ABuf; + } + +-char *getExtensionFromFile (const char *fn) ++const char *getExtensionFromFile (const char *fn) + { + if (fn == NULL) return ""; + if (strchr(fn, '.') == NULL) return ""; +@@ -479,7 +479,7 @@ + //DEVUELVE LA POSICION DE UN SUBSTRING EN UN STRING IMPORTANDO EL CASE + int Cstrstr (const char *linea, const char *token) + { +- char *p; ++ const char *p; + p = strstr (linea, token); + if (p == NULL) return 0; + return (p - linea + 1); +diff -urNad postman-2.1~/Utils.h postman-2.1/Utils.h +--- postman-2.1~/Utils.h 2009-10-14 09:48:33.778377934 +0000 ++++ postman-2.1/Utils.h 2009-10-14 09:48:33.961380166 +0000 +@@ -224,7 +224,7 @@ + void Randomize (); + int Rand (int max); + char *MakeTmpName (TBuffer fntmp, int maxlong); +-char *getExtensionFromFile (const char *fn); ++const char *getExtensionFromFile (const char *fn); + bool FileExists (const char *fn); + int FileSize (const char *fn); + time_t FileDate (char *fn); +diff -urNad postman-2.1~/cgi-lib.c postman-2.1/cgi-lib.c +--- postman-2.1~/cgi-lib.c 2009-10-14 09:48:33.109386753 +0000 ++++ postman-2.1/cgi-lib.c 2009-10-14 09:48:33.961380166 +0000 +@@ -235,7 +235,7 @@ + + /* stolen from k&r and seriously modified to do what I want */ + +-int getline(char s[], int lim) ++int postman_getline(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); ++ postman_getline(buffer,BUFSIZ); + //now start parsing +- while ((bytesread=getline(buffer,BUFSIZ)) != 0) ++ while ((bytesread=postman_getline(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 (postman_getline(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 = postman_getline(buffer,BUFSIZ); + buffer[bytesread] = '\0'; + if (bytesread && strstr(buffer,boundary) == NULL) + {