diff -u gaim-1.5.0+1.5.1cvs20051015/debian/changelog gaim-1.5.0+1.5.1cvs20051015/debian/changelog --- gaim-1.5.0+1.5.1cvs20051015/debian/changelog +++ gaim-1.5.0+1.5.1cvs20051015/debian/changelog @@ -1,3 +1,12 @@ +gaim (1:1.5.0+1.5.1cvs20051015-1ubuntu10.2) dapper-updates; urgency=low + + * Apply modified upstream patch to fix connexion issue with new ICQ + protocol: debian/patches/80_fix_ICQ_new_protocol.patch (LP: #340151) + (do not call directy CLIENTINFO_*_ICQ in gaim but + CLIENTINFO_ICQ_KNOWNGOOD in oscar.c) + + -- Didier Roche Tue, 10 Mar 2009 19:10:21 +0100 + gaim (1:1.5.0+1.5.1cvs20051015-1ubuntu10.1) dapper-security; urgency=low * SECURITY UPDATE: code execution via integer overflow in the MSN protocol diff -u gaim-1.5.0+1.5.1cvs20051015/debian/control gaim-1.5.0+1.5.1cvs20051015/debian/control --- gaim-1.5.0+1.5.1cvs20051015/debian/control +++ gaim-1.5.0+1.5.1cvs20051015/debian/control @@ -1,7 +1,8 @@ Source: gaim Section: net Priority: optional -Maintainer: Robert McQueen +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Robert McQueen Uploaders: Ari Pollak Build-Depends: bzip2, cdbs, debhelper (>= 4.1.0), libgtk2.0-dev, libxss-dev, libgnutls-dev (>= 1.0.16-5), tcl8.4-dev, tk8.4-dev, libao-dev, libaudiofile-dev, libgtkspell-dev, libltdl3-dev, libstartup-notification0-dev, xutils, libzephyr-dev, libxml2-dev, libebook1.2-dev, libedata-book1.2-dev, libcamel1.2-dev, libxext-dev, liblaunchpad-integration-dev, intltool Build-Conflicts: tcl8.3-dev, tk8.3-dev only in patch2: unchanged: --- gaim-1.5.0+1.5.1cvs20051015.orig/debian/patches/80_fix_ICQ_new_protocol.patch +++ gaim-1.5.0+1.5.1cvs20051015/debian/patches/80_fix_ICQ_new_protocol.patch @@ -0,0 +1,28 @@ +diff -Nur gaim-1.5.0+1.5.1cvs20051015.orig/src/protocols/oscar/aim.h gaim-1.5.0+1.5.1cvs20051015/src/protocols/oscar/aim.h +--- gaim-1.5.0+1.5.1cvs20051015.orig/src/protocols/oscar/aim.h 2005-08-27 22:30:22.000000000 +0200 ++++ gaim-1.5.0+1.5.1cvs20051015/src/protocols/oscar/aim.h 2009-03-10 18:51:31.000000000 +0100 +@@ -261,6 +261,15 @@ + "us", "en", \ + } + ++#define CLIENTINFO_ICQBASIC_14_34_3096 { \ ++ "ICQBasic", \ ++ 0x010a, \ ++ 0x0014, 0x0034, \ ++ 0x0000, 0x0c18, \ ++ 0x0000043d, \ ++ "us", "en", \ ++} ++ + #define CLIENTINFO_NETSCAPE_7_0_1 { \ + "Netscape 2000 an approved user of AOL Instant Messenger (SM)", \ + 0x1d0d, \ +@@ -271,7 +280,7 @@ + } + + #define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036 +-#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQ_5_45_3777 ++#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3096 + + /* + * These could be arbitrary, but its easier to use the actual AIM values