[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#548616: marked as done (fails to build with gcc-4.4)

Your message dated Sun, 20 Dec 2009 17:38:39 +0000
with message-id <E1NMPjr-0000lA-01@ries.debian.org>
and subject line Bug#548616: fixed in licq 1.3.6-3
has caused the Debian Bug report #548616,
regarding fails to build with gcc-4.4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
548616: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548616
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: licq
Version: 1.3.6-2
Severity: normal
Tags: patch

Hi,

during Ubuntu's rebuild test, licq failed to build with gcc-4.4 [1].
The reason is that the c++ string functions have changed signatures.

Attached is a small patch to fix this problem. The hunks referring
to plugins/msn are still a little bit ugly, as actually a const argument
gets modified (which was also the case before), and the fix in the patch
is to use the const_cast hammer :/.

Cheers,
   Stefan.

[1]:
<http://launchpadlibrarian.net/31885185/buildlog_ubuntu-karmic-amd64.licq_1.3.6-2_FAILEDTOBUILD.txt.gz>

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-1-amd64 (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 -Nur -x '*.orig' -x '*~' licq-1.3.6/plugins/msn/src/msn-sb.cpp licq-1.3.6.new/plugins/msn/src/msn-sb.cpp
--- licq-1.3.6/plugins/msn/src/msn-sb.cpp	2008-08-17 15:34:41.000000000 +0200
+++ licq-1.3.6.new/plugins/msn/src/msn-sb.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -441,7 +441,7 @@
   const char *szParam = strServer.c_str();
   char szServer[16];
   char *szPort;
-  if ((szPort = strchr(szParam, ':')))
+  if ((szPort = const_cast<char *>(strchr(szParam, ':'))))
   {
     strncpy(szServer, szParam, szPort - szParam);
     szServer[szPort - szParam] = '\0';
@@ -504,7 +504,7 @@
   const char *szParam = strServer.c_str();
   char szServer[16];
   char *szPort;
-  if ((szPort = strchr(szParam, ':')))
+  if ((szPort = const_cast<char *>(strchr(szParam, ':'))))
   {
     strncpy(szServer, szParam, szPort - szParam);
     szServer[szPort - szParam] = '\0';
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/plugins/msn/src/msn-srv.cpp licq-1.3.6.new/plugins/msn/src/msn-srv.cpp
--- licq-1.3.6/plugins/msn/src/msn-srv.cpp	2008-08-11 18:06:38.000000000 +0200
+++ licq-1.3.6.new/plugins/msn/src/msn-srv.cpp	2009-09-27 15:47:42.000000000 +0200
@@ -76,7 +76,7 @@
         const char *szParam = strServer.c_str();
         char szNewServer[16];
         char *szPort;
-        if ((szPort = strchr(szParam, ':')))
+        if ((szPort = const_cast<char *>(strchr(szParam, ':'))))
         {
           strncpy(szNewServer, szParam, szPort - szParam);
           szNewServer[szPort - szParam] = '\0';
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/plugins/msn/src/msn-ssl.cpp licq-1.3.6.new/plugins/msn/src/msn-ssl.cpp
--- licq-1.3.6/plugins/msn/src/msn-ssl.cpp	2008-09-07 16:03:53.000000000 +0200
+++ licq-1.3.6.new/plugins/msn/src/msn-ssl.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -68,7 +68,7 @@
   if (strFirstLine == "HTTP/1.1 200 OK")
   {
     m_pSSLPacket->ParseHeaders();
-    char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
+    const char *fromPP = strstr(m_pSSLPacket->GetValue("Authentication-Info").c_str(), "from-PP=");
     char *tag;
 
     if (fromPP == 0)
@@ -76,7 +76,7 @@
     else
     {
       fromPP+= 9; // skip to the tag
-      char *endTag = strchr(fromPP, '\'');
+      const char *endTag = strchr(fromPP, '\'');
       tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need
     }
 
@@ -146,7 +146,7 @@
 
   m_pNexusBuff->ParseHeaders();
   
-  char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
+  const char *szLogin = strstr(m_pNexusBuff->GetValue("PassportURLs").c_str(), "DALogin=");
   szLogin += 8; // skip to the tag
   //char *szEndURL = strchr(szLogin, '/');
   //char *szServer = strndup(szLogin, szEndURL - szLogin); // this is all we need
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/src/file.cpp licq-1.3.6.new/src/file.cpp
--- licq-1.3.6/src/file.cpp	2008-09-13 15:58:45.000000000 +0200
+++ licq-1.3.6.new/src/file.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -552,7 +552,7 @@
                                 bool bTrim, int _nMax)
 {
   //static char s_szData[MAX_LINE_LEN];
-  char *szPostEquals;
+  const char *szPostEquals;
   char szData[MAX_LINE_LEN];
   int nMax = (_nMax > 0 ? _nMax : MAX_LINE_LEN);
 
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/src/icqd-filetransfer.cpp licq-1.3.6.new/src/icqd-filetransfer.cpp
--- licq-1.3.6/src/icqd-filetransfer.cpp	2008-07-25 22:34:44.000000000 +0200
+++ licq-1.3.6.new/src/icqd-filetransfer.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -102,7 +102,7 @@
   m_bValid = true;
   m_nError = 0;
 
-  char *pcNoPath = NULL;
+  const char *pcNoPath = NULL;
   struct stat buf;
 
   // Remove any path from the filename
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/src/icqpacket.cpp licq-1.3.6.new/src/icqpacket.cpp
--- licq-1.3.6/src/icqpacket.cpp	2008-08-23 18:04:35.000000000 +0200
+++ licq-1.3.6.new/src/icqpacket.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -5874,7 +5874,7 @@
   }
 
   // Remove path from filename (if it exists)
-  char *pcEndOfPath = strrchr(_szFilename, '/');
+  const char *pcEndOfPath = strrchr(_szFilename, '/');
   if (pcEndOfPath != NULL)
      m_szFilename = strdup(pcEndOfPath + 1);
   else
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/src/licq.cpp licq-1.3.6.new/src/licq.cpp
--- licq-1.3.6/src/licq.cpp	2008-06-11 20:34:35.000000000 +0200
+++ licq-1.3.6.new/src/licq.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -183,14 +183,14 @@
 /*-----Helper functions for CLicq::UpgradeLicq-----------------------------*/
 int SelectUserUtility(const struct dirent *d)
 {
-  char *pcDot = strrchr(d->d_name, '.');
+  const char *pcDot = strrchr(d->d_name, '.');
   if (pcDot == NULL) return (0);
   return (strcmp(pcDot, ".uin") == 0);
 }
 
 int SelectHistoryUtility(const struct dirent *d)
 {
-  char *pcDot = strchr(d->d_name, '.');
+  const char *pcDot = strchr(d->d_name, '.');
   if (pcDot == NULL) return (0);
   return (strcmp(pcDot, ".history") == 0 ||
           strcmp(pcDot, ".history.removed") == 0);
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/src/rtf.cc licq-1.3.6.new/src/rtf.cc
--- licq-1.3.6/src/rtf.cc	2007-06-20 23:41:54.000000000 +0200
+++ licq-1.3.6.new/src/rtf.cc	2009-09-27 15:47:12.000000000 +0200
@@ -2141,7 +2141,7 @@
         return;
     }
     if (m_bFontName){
-        char *pp = strchr(str, ';');
+        const char *pp = strchr(str, ';');
         unsigned size = strlen(pp);
         if (pp){
             size = (pp - str);
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/src/translate.cpp licq-1.3.6.new/src/translate.cpp
--- licq-1.3.6/src/translate.cpp	2008-07-02 16:02:49.000000000 +0200
+++ licq-1.3.6.new/src/translate.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -76,7 +76,7 @@
 bool CTranslator::setTranslationMap(const char* mapFileName)
 {
   // Map name is the file name with no path
-  char* sep = strrchr(mapFileName, '/');
+  const char* sep = strrchr(mapFileName, '/');
   const char* mapName = (sep == NULL ? mapFileName : sep + 1);
 
   if (strcmp(mapName, "LATIN_1") == 0)
diff -Nur -x '*.orig' -x '*~' licq-1.3.6/src/utility.cpp licq-1.3.6.new/src/utility.cpp
--- licq-1.3.6/src/utility.cpp	2008-07-25 22:34:44.000000000 +0200
+++ licq-1.3.6.new/src/utility.cpp	2009-09-27 15:47:12.000000000 +0200
@@ -46,7 +46,7 @@
 //=====CUtilityManager==========================================================
 int SelectUtility(const struct dirent *d)
 {
-  char *pcDot = strrchr(d->d_name, '.');
+  const char *pcDot = strrchr(d->d_name, '.');
   if (pcDot == NULL) return (0);
   return (strcmp(pcDot, ".utility") == 0);
 }

--- End Message ---
--- Begin Message --- 
Source: licq
Source-Version: 1.3.6-3

We believe that the bug you reported is fixed in the latest version of
licq, which is due to be installed in the Debian FTP archive:

licq-dev_1.3.6-3_all.deb
  to main/l/licq/licq-dev_1.3.6-3_all.deb
licq-plugin-autoreply_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-autoreply_1.3.6-3_i386.deb
licq-plugin-console_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-console_1.3.6-3_i386.deb
licq-plugin-forwarder_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-forwarder_1.3.6-3_i386.deb
licq-plugin-kde_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-kde_1.3.6-3_i386.deb
licq-plugin-msn_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-msn_1.3.6-3_i386.deb
licq-plugin-osd_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-osd_1.3.6-3_i386.deb
licq-plugin-qt_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-qt_1.3.6-3_i386.deb
licq-plugin-rms_1.3.6-3_i386.deb
  to main/l/licq/licq-plugin-rms_1.3.6-3_i386.deb
licq_1.3.6-3.diff.gz
  to main/l/licq/licq_1.3.6-3.diff.gz
licq_1.3.6-3.dsc
  to main/l/licq/licq_1.3.6-3.dsc
licq_1.3.6-3_i386.deb
  to main/l/licq/licq_1.3.6-3_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 548616@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
gregor herrmann <gregoa@debian.org> (supplier of updated licq package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sun, 20 Dec 2009 17:46:19 +0100
Source: licq
Binary: licq licq-dev licq-plugin-autoreply licq-plugin-console licq-plugin-forwarder licq-plugin-kde licq-plugin-msn licq-plugin-osd licq-plugin-qt licq-plugin-rms
Architecture: source all i386
Version: 1.3.6-3
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: gregor herrmann <gregoa@debian.org>
Description: 
 licq       - ICQ client (base files)
 licq-dev   - Licq development and header files
 licq-plugin-autoreply - autoreply plug-in for Licq
 licq-plugin-console - console user interface plug-in for Licq
 licq-plugin-forwarder - forwarder plug-in for Licq
 licq-plugin-kde - graphical user interface plug-in for Licq using Qt and KDE
 licq-plugin-msn - MSN plug-in for Licq
 licq-plugin-osd - on-screen display plug-in for Licq
 licq-plugin-qt - graphical user interface plug-in for Licq using Qt
 licq-plugin-rms - remote management server plug-in for telnet Licq access
Closes: 548616
Changes: 
 licq (1.3.6-3) unstable; urgency=low
 .
   * QA upload.
   * Fix "fails to build with gcc-4.4", apply patch fix-const.patch from Ubuntu
     (closes: #548616).
Checksums-Sha1: 
 dc2b1e9058a1d00e2e4d6fd8757fd9edb913568a 1986 licq_1.3.6-3.dsc
 dd792adca2ac7ca201c783bce17ff631da255ea0 26971 licq_1.3.6-3.diff.gz
 c8e01f33fb32eff34a195a757f50702ac0f9823d 98280 licq-dev_1.3.6-3_all.deb
 f82908910410a5b9a32c259b646bc3d11f648f66 783474 licq_1.3.6-3_i386.deb
 30e8075ca9f8394747f10af9f38be17de5694388 40358 licq-plugin-autoreply_1.3.6-3_i386.deb
 21fe879cad292f99c5a71d74d29d9f785c867323 88260 licq-plugin-console_1.3.6-3_i386.deb
 d445b23202d1faf02bc0202900a53c4076f9e350 41192 licq-plugin-forwarder_1.3.6-3_i386.deb
 ed02d54039ab58e250ac325b7932763eb4bdef12 1886132 licq-plugin-kde_1.3.6-3_i386.deb
 0549c014bfe62303391ec7d5ba8da961e7fb1e62 88364 licq-plugin-msn_1.3.6-3_i386.deb
 12e86338989f0c4b3c4e2079dd2f05062337caf0 58778 licq-plugin-osd_1.3.6-3_i386.deb
 699c366b40274b8a9a32f844450630ab882f797e 1853222 licq-plugin-qt_1.3.6-3_i386.deb
 55303d4f1245c334600e127a3946390a41ab0ba3 49112 licq-plugin-rms_1.3.6-3_i386.deb
Checksums-Sha256: 
 1d47a7a870f53b749f42fcd6c4c06e18d501d313fa173063b11727b753d7535c 1986 licq_1.3.6-3.dsc
 ec07199be18869b78c88832a1addf02f931a0eab102c82f503436257478eafdf 26971 licq_1.3.6-3.diff.gz
 caa49fee24ed6868ae36c122ae0fca6364b9e15d45de5a872b838de5fac345ef 98280 licq-dev_1.3.6-3_all.deb
 ed7d9c13ae476ae17c6db2f532d8d1a64980166b39cafb3f29899db4fea6d3b0 783474 licq_1.3.6-3_i386.deb
 f5063f7c3c84895074a6943c2e541185a157f9c2b9db2785be0fa217be59c715 40358 licq-plugin-autoreply_1.3.6-3_i386.deb
 7bd7feaedd2f33c4d406224e812d6c6a75c57fa0e7eed46e7f7b9ddd2e3f2f6d 88260 licq-plugin-console_1.3.6-3_i386.deb
 0511456ee1348993ba7a7f6dc8459e7d4bdbeb71bbf811e4b344d44d7386ac65 41192 licq-plugin-forwarder_1.3.6-3_i386.deb
 53ce896fcbc9d4b91a3a0daa106a31382c7c828b1997e0c9981cbafa5cc8b3e7 1886132 licq-plugin-kde_1.3.6-3_i386.deb
 ed3b1dc48957fad8b7d694e48088be967f987595796cd77ebe77eb0e67838cbb 88364 licq-plugin-msn_1.3.6-3_i386.deb
 6551df42cdc6f11b54bdc93bdbbd330f913a750dc6592f9834d63321f0e2ba87 58778 licq-plugin-osd_1.3.6-3_i386.deb
 6195839098b1443d1716d8e55779408db75545037631bd5040697d996802a92f 1853222 licq-plugin-qt_1.3.6-3_i386.deb
 c62c73e4f1f9a963f2e7d8e5e1be74de6aa8845e5ca7e34d92edf76845167ef4 49112 licq-plugin-rms_1.3.6-3_i386.deb
Files: 
 a3c96ea61cb0868ebbfd5621ab3f9664 1986 net optional licq_1.3.6-3.dsc
 9bc537a4f83b370f92646a3dd460e4c8 26971 net optional licq_1.3.6-3.diff.gz
 d019a38f83da397b934d40a07d400733 98280 libdevel optional licq-dev_1.3.6-3_all.deb
 ce94f7b4ce257870b10447f616f807b5 783474 net optional licq_1.3.6-3_i386.deb
 6d80fdabdf0d23c17c068c4d825c9a33 40358 net optional licq-plugin-autoreply_1.3.6-3_i386.deb
 603d72a7c4fae2e4998e6a1f6aa04c6e 88260 net optional licq-plugin-console_1.3.6-3_i386.deb
 68bae0d1eeb50a52bf398a64d74ca0fe 41192 net optional licq-plugin-forwarder_1.3.6-3_i386.deb
 7e77bf5ed5a618b202e6e9f0e79daba4 1886132 net optional licq-plugin-kde_1.3.6-3_i386.deb
 8d408c9353041e36cc4d04373b9a5b64 88364 net optional licq-plugin-msn_1.3.6-3_i386.deb
 2d0f6f04f28c43aa98beaf2cf89e6011 58778 net optional licq-plugin-osd_1.3.6-3_i386.deb
 f31d92feb25d1d7f38f9a93f777b3d66 1853222 net optional licq-plugin-qt_1.3.6-3_i386.deb
 7dc36a11a22b0637c8b013f42e8a0774 49112 net optional licq-plugin-rms_1.3.6-3_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQIcBAEBCAAGBQJLLlvqAAoJELs6aAGGSaoGoB4P/jJsg+EG1EWdIaqRA1ffng5D
+Izh/xSscjU62J7GYPo2VyDzhFQo7WWWViO4JkGI6/lK1aKYa5n9cKXFWIyiAIZy
ZE2cNLZNNW+rt0ln10DsirN0aAlKWKSiGjPj5rz+FGBgSeSxA+53tKIEtVufv/LY
EUaUiTsy9JpVELXkZmDkI454/qouH3PDQ77JYS9CfUPWXml/YLZvsHEXp4bHMQzH
cIvOeSGHQZAcQQHlV+1Tf48+6txqeFUI10678VHdc2lMZyOvTKt4xOTj+MZIRLUv
YAzvFMElKIh+PgW5AaRbwGxlImblGhnmXzLXWLap2zamMYCROAX9ggbg8ILIRIhj
lkvOLppfw5OnhgyvrODwWJN6mU4DJ9qRusJG6Zw+0z9EMfBI428DJwAfwAA9EErs
qtuF4sPkI6ZWHhGCXl0oog8JLBlx9a7u+ZAYwDU6r27YMoV+o3E9evVEu3SIS91S
fKERtftCImJvh8GqOq1OxSIAUdE6Eh90zt65ZLb52DUG3ANvQ0fy0sJ/Redi20zz
jPprSP0z8hkX7vY8n+MoHlOR/MkgIBkJgLskQrG+aLwirnsHI479KfAN/f8PfKBt
n5Eu+gpmdeGWlo0IIeGDFF9HVQcdDnVLfZta8/gQbXfWW/itffHqAQseUtnAAuzg
m6JgEZuZ7FGBVj3uCKdE
=j4wM
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: