[pkgsrc/pkgsrc-2008Q1]: pkgsrc/chat/centerim pullup ticket #2383 - requested ...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c9741c62e9b
branches:  pkgsrc-2008Q1
changeset: 540351:4c9741c62e9b
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Fri May 16 12:12:14 2008 +0000

description:
pullup ticket #2383 - requested by obache
centerim: update package bug & security fixes

revisions pulled up:
- pkgsrc/chat/centerim/Makefile         1.7
- pkgsrc/chat/centerim/PLIST            1.3
- pkgsrc/chat/centerim/distinfo         1.3
- pkgsrc/chat/centerim/patches/patch-aa 1.2
- pkgsrc/chat/centerim/patches/patch-ac 1.2
- pkgsrc/chat/centerim/patches/patch-an 1.2
- pkgsrc/chat/centerim/patches/patch-av 1.2
- pkgsrc/chat/centerim/patches/patch-au r0
- pkgsrc/chat/centerim/patches/patch-aw r0
- pkgsrc/chat/centerim/patches/patch-ax r0
- pkgsrc/chat/centerim/patches/patch-ay r0
- pkgsrc/chat/centerim/patches/patch-az r0
- pkgsrc/chat/centerim/patches/patch-ba r0
- pkgsrc/chat/centerim/patches/patch-bb 1.1

   Module Name: pkgsrc
   Committed By:        obache
   Date:                Tue May 13 15:15:51 UTC 2008

   Modified Files:
        pkgsrc/chat/centerim: Makefile PLIST distinfo
        pkgsrc/chat/centerim/patches: patch-aa patch-ac patch-an patch-av
   Added Files:
        pkgsrc/chat/centerim/patches: patch-bb
   Removed Files:
        pkgsrc/chat/centerim/patches: patch-au patch-aw patch-ax patch-ay
            patch-az patch-ba

   Log Message:
   Update centerim to 4.22.5.
   Based on patch provided in PR 38624.

   'cicqconv' command is renamed for 'cimconv', conflict with centericq is gone away.

   2008-04-08 New version (4.22.5) released.
   This release fixes various segfaults in the Yahoo protocol. It also introduces a
   bar which displays all open chats nicely.

   2008-03-29 New version (4.22.4) released.
   This release fixes the possible url exploit described in CVE-2008-1467. It also
   makes CenterIM ready for the Yahoo protocol change kicking in on 2nd april 2008.

   2008-03-11 New version (4.22.3) released.
   This version fixes the various ICQ contact list issues (e.g adding contacts
   should now work).

   2007-12-08 New version (4.22.2) released.
   More than 90 fixes/improvements have been added to centerim since our last
   release in June. The main fixes included are:

   * Fixed bug in msn login when the server sent a NOT message
   * Fixed bug in ICQ protocol which prevented others from seeing your presence
     (partial)
   * New version tracking/updating (Thanks to David Riebenbauer for this helpful
     feature)
   * Added an "Out for Lunch" state

diffstat:

 chat/centerim/Makefile         |    9 +-
 chat/centerim/PLIST            |    9 +-
 chat/centerim/distinfo         |   23 +--
 chat/centerim/patches/patch-aa |   28 ++---
 chat/centerim/patches/patch-ac |   10 +-
 chat/centerim/patches/patch-an |    6 +-
 chat/centerim/patches/patch-au |   27 -----
 chat/centerim/patches/patch-av |   36 +------
 chat/centerim/patches/patch-aw |   23 ----
 chat/centerim/patches/patch-ax |  194 -----------------------------------------
 chat/centerim/patches/patch-ay |   46 ---------
 chat/centerim/patches/patch-az |  108 ----------------------
 chat/centerim/patches/patch-ba |   13 --
 chat/centerim/patches/patch-bb |   13 ++
 14 files changed, 55 insertions(+), 490 deletions(-)

diffs (truncated from 688 to 300 lines):

diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/Makefile
--- a/chat/centerim/Makefile    Thu May 15 11:13:49 2008 +0000
+++ b/chat/centerim/Makefile    Fri May 16 12:12:14 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2008/01/18 05:06:22 tnn Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2008/05/16 12:12:14 rtr Exp $
 #
 
-DISTNAME=      centerim-4.22.1
-PKGREVISION=   3
+DISTNAME=      centerim-4.22.5
 CATEGORIES=    chat
 MASTER_SITES=  http://www.centerim.org/download/releases/ \
                http://transacid.de/centerim/releases/
@@ -11,8 +10,6 @@
 HOMEPAGE=      http://www.centerim.org/
 COMMENT=       Instant Messenger interface supporting many protocols
 
-CONFLICTS=     centericq-[0-9]*
-
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_PKGLOCALEDIR=      yes
@@ -23,7 +20,7 @@
 CONFIGURE_ARGS+=       --with-ssl --with-openssl=${SSLBASE:Q}
 LIBS+=                 ${LDFLAGS}
 
-REPLACE_PERL=          misc/cicqconv
+REPLACE_PERL=          misc/cimconv
 
 INCOMPAT_CURSES+=      NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
 INCOMPAT_CURSES+=      NetBSD-1.6_*-* NetBSD-1.6.[1-9]_*-* NetBSD-1.6[A-T]-*
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/PLIST
--- a/chat/centerim/PLIST       Thu May 15 11:13:49 2008 +0000
+++ b/chat/centerim/PLIST       Fri May 16 12:12:14 2008 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/30 10:50:55 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.2.6.1 2008/05/16 12:12:14 rtr Exp $
 bin/centerim
-bin/cicqconv
+bin/cimconv
 man/man1/centerim.1
-man/man1/cicqconv.1
+man/man1/cimconv.1
 share/centerim/email.wav
 share/centerim/msg.wav
 share/centerim/offline.wav
@@ -24,5 +24,6 @@
 share/locale/ru/LC_MESSAGES/centerim.mo
 share/locale/sv/LC_MESSAGES/centerim.mo
 share/locale/uk/LC_MESSAGES/centerim.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/centerim.mo
+share/locale/zh_CN/LC_MESSAGES/centerim.mo
+share/locale/zh_TW/LC_MESSAGES/centerim.mo
 @dirrm share/centerim
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/distinfo
--- a/chat/centerim/distinfo    Thu May 15 11:13:49 2008 +0000
+++ b/chat/centerim/distinfo    Fri May 16 12:12:14 2008 +0000
@@ -1,23 +1,18 @@
-$NetBSD: distinfo,v 1.2 2007/12/22 23:29:03 jdolecek Exp $
+$NetBSD: distinfo,v 1.2.4.1 2008/05/16 12:12:14 rtr Exp $
 
-SHA1 (centerim-4.22.1.tar.gz) = 221b3e505d5ea432977db7e5c0cebc85b4f928f2
-RMD160 (centerim-4.22.1.tar.gz) = 165b1acad70fa5d38b045510045b438c89776f3f
-Size (centerim-4.22.1.tar.gz) = 2606696 bytes
-SHA1 (patch-aa) = 244ccb35ceb53715af2134d27ab4c591ed62dd30
-SHA1 (patch-ac) = b32ff8df936ea66f3ff029ba322d4a94f1ebe4e6
+SHA1 (centerim-4.22.5.tar.gz) = 422c368064f47886585720c1c639515acff21ae9
+RMD160 (centerim-4.22.5.tar.gz) = 94ade501f8ba46ff24bf4b3cc283533924c3e2f4
+Size (centerim-4.22.5.tar.gz) = 2803217 bytes
+SHA1 (patch-aa) = 6fb3a3dc309b32be177f3e21a1dc5dd43ddbf7e5
+SHA1 (patch-ac) = 4ef992ed632a57e921661b1b0054beff0c0aa587
 SHA1 (patch-ad) = bfe19ca98facfbb23a87dd28a176980fb4e986de
 SHA1 (patch-al) = d0c627ffc4ec2a7d179367dd2ddbbfd5ba52a377
 SHA1 (patch-am) = 942bab1a28fd79a40ac824e58855af35fb139141
-SHA1 (patch-an) = db7ec68a563f44e0a1350b4adb659dcbac183a23
+SHA1 (patch-an) = ec94c04118e6395b7ef14c9231255f34092acb95
 SHA1 (patch-ao) = ce9585139b7390884fcbbb92bcd9d107fc5b8a8b
 SHA1 (patch-ap) = b2aa04db28b38332d00b1cdb22887e2985edea59
 SHA1 (patch-aq) = 03be56591d3c925a6ffa48a1b87eb61a582f25c6
 SHA1 (patch-ar) = c74e757e3ef6bf1f6bc9575955f5b8f73ac4b51d
 SHA1 (patch-as) = b74310eb515c425cc98528f2b0384652370cef18
-SHA1 (patch-au) = 542111ddc738cc377c037ad910cedc0772707faf
-SHA1 (patch-av) = bf032d4447349d3b4f75c43f58eca3e0342b9f9d
-SHA1 (patch-aw) = d0238209328a6da5ae9f74d37f0fc44cf964b528
-SHA1 (patch-ax) = a96edcc859b30fde6e6577a833005fab8d45eabf
-SHA1 (patch-ay) = d7511f39004f2a86bda14b265ab2c4d03214dc2d
-SHA1 (patch-az) = 4542871c64fffb311cc464bc0b25fb59ef2db3b3
-SHA1 (patch-ba) = dee59621310b246097543257991e57cfb05b3ef3
+SHA1 (patch-av) = 05758183016fb1bb297c9c3d2c0606e6a66f9901
+SHA1 (patch-bb) = 9fa08e7313967f3cc8c1e2d9d05d124f62f4dd58
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/patches/patch-aa
--- a/chat/centerim/patches/patch-aa    Thu May 15 11:13:49 2008 +0000
+++ b/chat/centerim/patches/patch-aa    Fri May 16 12:12:14 2008 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
+$NetBSD: patch-aa,v 1.1.1.1.6.1 2008/05/16 12:12:14 rtr Exp $
 
---- src/icqconf.cc.orig        2005-01-27 00:52:47.000000000 +0100
+--- src/icqconf.cc.orig        2008-04-08 17:51:09.000000000 +0000
 +++ src/icqconf.cc
 @@ -27,7 +27,11 @@
  #include <dirent.h>
  #include <fstream>
  
--#ifdef __sun__
+-#if defined(__sun__) || defined(__NetBSD__)
 +#ifdef __NetBSD__
 +/* Find out about __NetBSD_Version__ */
 +#  include <sys/param.h>
@@ -15,7 +15,7 @@
  #include <sys/statvfs.h>
  #endif
  
-@@ -644,13 +648,13 @@ void icqconf::loadsounds() {
+@@ -797,12 +801,12 @@ void icqconf::loadsounds() {
  
            switch(rs) {
                case rscard:
@@ -25,22 +25,20 @@
 -                  fo << "*\tonline\tplay " << SHARE_DIR << "/online.wav" << endl;
 -                  fo << "*\toffline\tplay " << SHARE_DIR << "/offline.wav" << endl;
 -                  fo << "*\tsms\tplay " << SHARE_DIR << "/sms.wav" << endl;
--                  break;
-+                   fo << "*\tmsg\t" AUDIO_PLAYER " " << SHARE_DIR << "/msg.wav" << endl;
-+                   fo << "*\turl\t" AUDIO_PLAYER " " << SHARE_DIR << "/url.wav" << endl;
-+                   fo << "*\temail\t" AUDIO_PLAYER " " << SHARE_DIR << "/email.wav" << endl;
-+                   fo << "*\tonline\t" AUDIO_PLAYER " " << SHARE_DIR << "/online.wav" << endl;
-+                   fo << "*\toffline\t" AUDIO_PLAYER << SHARE_DIR << "/offline.wav" << endl;
-+                   fo << "*\tsms\t" AUDIO_PLAYER " " << SHARE_DIR << "/sms.wav" << endl;
-+                 break;
++                  fo << "*\tmsg\t" AUDIO_PLAYER " " << SHARE_DIR << "/msg.wav" << endl;
++                  fo << "*\turl\t" AUDIO_PLAYER " " << SHARE_DIR << "/url.wav" << endl;
++                  fo << "*\temail\t" AUDIO_PLAYER " " << SHARE_DIR << "/email.wav" << endl;
++                  fo << "*\tonline\t" AUDIO_PLAYER " " << SHARE_DIR << "/online.wav" << endl;
++                  fo << "*\toffline\t" AUDIO_PLAYER " " << SHARE_DIR << "/offline.wav" << endl;
++                  fo << "*\tsms\t" AUDIO_PLAYER " " << SHARE_DIR << "/sms.wav" << endl;
+                   break;
  
                case rsspeaker:
-                   fo << "*\tmsg\t!spk1" << endl;
-@@ -1433,7 +1437,7 @@ string icqconf::gethttpproxypasswd() con
+@@ -1735,7 +1739,7 @@ string icqconf::gethttpproxypasswd() con
  void icqconf::checkdiskspace() {
      fenoughdiskspace = true;
  
--#ifndef __sun__
+-#if !(defined(__sun__) || defined(__NetBSD__))
 +#if !(defined(__sun) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)))
      struct statfs st;
      if(!statfs(conf.getdirname().c_str(), &st)) {
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/patches/patch-ac
--- a/chat/centerim/patches/patch-ac    Thu May 15 11:13:49 2008 +0000
+++ b/chat/centerim/patches/patch-ac    Fri May 16 12:12:14 2008 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
+$NetBSD: patch-ac,v 1.1.1.1.6.1 2008/05/16 12:12:14 rtr Exp $
 
---- libmsn/msn/util.cpp.orig   2007-06-13 15:44:04.000000000 -0700
+--- libmsn/msn/util.cpp.orig   2008-04-08 17:51:09.000000000 +0000
 +++ libmsn/msn/util.cpp
-@@ -24,6 +24,10 @@
- #include <errno.h>
+@@ -26,6 +26,10 @@
  #include <cctype>
+ #include <cstring>
  
-+ 
++
 +// Get rid of the macro for platforms not having c++-safe headers.
 +#undef toupper
 +
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/patches/patch-an
--- a/chat/centerim/patches/patch-an    Thu May 15 11:13:49 2008 +0000
+++ b/chat/centerim/patches/patch-an    Fri May 16 12:12:14 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1.1.1 2007/08/30 00:47:01 jnemeth Exp $
+$NetBSD: patch-an,v 1.1.1.1.6.1 2008/05/16 12:12:14 rtr Exp $
 
---- kkstrtext/configure.orig   2007-06-13 15:44:42.000000000 -0700
+--- kkstrtext/configure.orig   2008-04-08 17:51:39.000000000 +0000
 +++ kkstrtext/configure
-@@ -1134,11 +1134,11 @@ Try \`$0 --help' for more information." 
+@@ -1140,11 +1140,11 @@ Try \`$0 --help' for more information." 
      export $ac_envvar ;;
  
    *)
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/patches/patch-au
--- a/chat/centerim/patches/patch-au    Thu May 15 11:13:49 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-au,v 1.1.1.1 2007/08/30 00:47:02 jnemeth Exp $
-
-Part of a fix for CVE-2007-3713.
-
---- src/hooks/jabberhook.cc.orig       2007-07-19 02:34:54.000000000 +0200
-+++ src/hooks/jabberhook.cc
-@@ -36,6 +36,8 @@
- #define DEFAULT_CONFSERV "conference.jabber.org"
- #define PERIOD_KEEPALIVE 30
- 
-+#define NOTIFBUF 512
-+
- static void jidsplit(const string &jid, string &user, string &host, string &rest) {
-     int pos;
-     user = jid;
-@@ -1289,8 +1286,9 @@ void jabberhook::gotversion(const imcont
-       if(vinfo.size() > 128)
-           vinfo.erase(128);
- 
--      char buf[256];
--      sprintf(buf, _("The remote is using %s"), vinfo.c_str());
-+      char buf[NOTIFBUF];
-+      snprintf(buf, NOTIFBUF, _("The remote is using %s"), vinfo.c_str());
-+      buf[NOTIFBUF-1] = '\0';
-       em.store(imnotification(ic, buf));
-     }
- }
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/patches/patch-av
--- a/chat/centerim/patches/patch-av    Thu May 15 11:13:49 2008 +0000
+++ b/chat/centerim/patches/patch-av    Fri May 16 12:12:14 2008 +0000
@@ -1,41 +1,13 @@
-$NetBSD: patch-av,v 1.1.1.1 2007/08/30 00:47:02 jnemeth Exp $
+$NetBSD: patch-av,v 1.1.1.1.6.1 2008/05/16 12:12:14 rtr Exp $
 
---- src/hooks/abstracthook.cc.orig     2007-07-19 02:24:38.000000000 +0200
+--- src/hooks/abstracthook.cc.orig     2008-04-08 17:51:09.000000000 +0000
 +++ src/hooks/abstracthook.cc
-@@ -40,6 +40,8 @@
- 
- #include <time.h>
- 
-+#define NOTIFBUF 512
-+
- time_t timer_current = time(0);
- 
- abstracthook::abstracthook(protocolname aproto)
-@@ -339,7 +341,7 @@ bool abstracthook::regattempt(unsigned i
- 
- void abstracthook::log(logevent ev, ...) {
-     va_list ap;
--    char buf[512];
-+    char buf[NOTIFBUF];
-     static map<logevent, string> lst;
- 
-     if(lst.empty()) {
-@@ -354,7 +356,8 @@ void abstracthook::log(logevent ev, ...)
-     }
- 
-     va_start(ap, ev);
--    vsprintf(buf, lst[ev].c_str(), ap);
-+    vsnprintf(buf, NOTIFBUF, lst[ev].c_str(), ap);
-+    buf[NOTIFBUF-1] = '\0';
-     va_end(ap);
- 
-     face.log((string) "+ [" + conf.getprotocolname(proto)  + "] " + buf);
-@@ -751,7 +754,7 @@ string abstracthook::getTimezoneIDtoStri
+@@ -758,7 +758,7 @@ string abstracthook::getTimezoneIDtoStri
      if(id > 24 || id < -24) {
        return "Unspecified";
      } else {
 -      char buf[32];
 +      static char buf[32];
-       sprintf(buf, "GMT %s%d:%s", id > 0 ? "-" : "+", abs(id/2), id % 2 == 0 ? "00" : "30");
+       snprintf(buf, sizeof(buf), "GMT %s%d:%s", id > 0 ? "-" : "+", abs(id/2), id % 2 == 0 ? "00" : "30");
        return buf;
      }
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/patches/patch-aw
--- a/chat/centerim/patches/patch-aw    Thu May 15 11:13:49 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-aw,v 1.1.1.1 2007/08/30 00:47:02 jnemeth Exp $
-
---- src/hooks/aimhook.cc.orig  2007-07-19 02:24:38.000000000 +0200
-+++ src/hooks/aimhook.cc
-@@ -32,6 +32,8 @@
- #include "imlogger.h"
- #include "eventmanager.h"
- 
-+#define NOTIFBUF 512
-+
- aimhook ahook;
- 
- aimhook::aimhook()
-@@ -293,7 +295,8 @@ void aimhook::loadprofile() {
- 
-     if(access(fname.c_str(), R_OK)) {
-       char sbuf[512];
--      sprintf(sbuf, _("I do really enjoy the default AIM profile of centerim %s."), VERSION);
-+      snprintf(sbuf, 512, _("I do really enjoy the default AIM profile of centerim %s."), VERSION);
-+      sbuf[511] = '\0';
-       profile.info = sbuf;
-       saveprofile();
-     }
diff -r 177329f15c7a -r 4c9741c62e9b chat/centerim/patches/patch-ax
--- a/chat/centerim/patches/patch-ax    Thu May 15 11:13:49 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-$NetBSD: patch-ax,v 1.1.1.1 2007/08/30 00:47:02 jnemeth Exp $
-