From 45c54ca8d0e49dbdfefd56c208a48d6c7c36f5d5 Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 12 Aug 2005 17:52:16 +0000 Subject: Update to 1.5.0 from maintainer, Matthew Luckie, via PR #30974. "this release of gaim has a few security fixes which mirror the effects of patch-ae patch-af patch-ag" ChangeLog says: version 1.5.0 (8/11/2005): * Ability to set IRC quit message (Lalo Martins) * OSCAR file transfers now work for 2 users behind the same NAT (Jonathan Clark) * Yahoo! buddy requests to add you to their buddy list now prompt for authorization * Added a /clear command for conversations/chats * Fixed ICQ encoding for messages with offline ICQ users (Ilya Konstantinov, SF Bug #1179452) * Default Yahoo! chat roomlist locale to 'us' --- chat/gaim/Makefile | 5 ++- chat/gaim/PLIST | 3 +- chat/gaim/distinfo | 11 +++---- chat/gaim/patches/patch-ae | 20 ------------ chat/gaim/patches/patch-af | 78 ---------------------------------------------- chat/gaim/patches/patch-ag | 26 ---------------- 6 files changed, 8 insertions(+), 135 deletions(-) delete mode 100644 chat/gaim/patches/patch-ae delete mode 100644 chat/gaim/patches/patch-af delete mode 100644 chat/gaim/patches/patch-ag (limited to 'chat') diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index 4c0457e2d68..a2281f4b3c5 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.95 2005/08/10 20:56:13 jlam Exp $ +# $NetBSD: Makefile,v 1.96 2005/08/12 17:52:16 reed Exp $ -DISTNAME= gaim-1.4.0 -PKGREVISION= 2 +DISTNAME= gaim-1.5.0 CATEGORIES= chat x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} EXTRACT_SUFX= .tar.bz2 diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST index 3e85bafe359..d3b14d176be 100644 --- a/chat/gaim/PLIST +++ b/chat/gaim/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.41 2005/07/08 09:39:47 grant Exp $ +@comment $NetBSD: PLIST,v 1.42 2005/08/12 17:52:16 reed Exp $ bin/gaim bin/gaim-remote include/gaim/account.h @@ -145,6 +145,7 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gaim.mo +${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo share/pixmaps/gaim.png diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo index 9a4649d18e0..060c24a3cf1 100644 --- a/chat/gaim/distinfo +++ b/chat/gaim/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.68 2005/08/10 16:13:34 salo Exp $ +$NetBSD: distinfo,v 1.69 2005/08/12 17:52:17 reed Exp $ -SHA1 (gaim-1.4.0.tar.bz2) = 49955722104216e6e41757657abaa94388c42249 -RMD160 (gaim-1.4.0.tar.bz2) = d12354df0828451d32124750340b759180289591 -Size (gaim-1.4.0.tar.bz2) = 5979303 bytes +SHA1 (gaim-1.5.0.tar.bz2) = a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 +RMD160 (gaim-1.5.0.tar.bz2) = 13f74e2d2ed69a775a5884b807c365177455ae0e +Size (gaim-1.5.0.tar.bz2) = 6123237 bytes SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067 SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359 -SHA1 (patch-ae) = 6c8a5960918ea77a766cdb4f3c2d805a61235771 -SHA1 (patch-af) = 63f14c28109a3515bffbed1ece14ae56f0652d13 -SHA1 (patch-ag) = 145aaa3e990eaada33186a5b13196e613b5aac91 diff --git a/chat/gaim/patches/patch-ae b/chat/gaim/patches/patch-ae deleted file mode 100644 index c6ad1d130db..00000000000 --- a/chat/gaim/patches/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2005/08/05 14:33:53 salo Exp $ - -Fix for CAN-2005-2370, from Gaim CVS. - ---- src/protocols/gg/libgg.c.orig 2005-03-02 12:53:57.000000000 +0100 -+++ src/protocols/gg/libgg.c 2005-08-05 15:38:42.000000000 +0200 -@@ -1098,8 +1098,11 @@ - - e->event.status60.descr = buf; - -- if (len > 4 && p[h->length - 5] == 0) -- e->event.status60.time = *((int*) (p + h->length - 4)); -+ if (len > 4 && p[h->length - 5] == 0) { -+ uint32_t t; -+ memcpy(&t, p + h->length - 4, sizeof(uint32_t)); -+ e->event.status60.time = t; -+ } - } - - break; diff --git a/chat/gaim/patches/patch-af b/chat/gaim/patches/patch-af deleted file mode 100644 index 7e0dd28621e..00000000000 --- a/chat/gaim/patches/patch-af +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-af,v 1.1 2005/08/10 16:13:34 salo Exp $ - -Fix for CAN-2005-2103, from RedHat. - ---- src/util.c.orig 2005-06-09 06:00:36.000000000 +0200 -+++ src/util.c 2005-08-10 16:35:33.000000000 +0200 -@@ -2129,8 +2129,7 @@ - gaim_str_sub_away_formatters(const char *str, const char *name) - { - char *c; -- gchar *cpy; -- int cnt = 0; -+ GString *cpy; - time_t t; - struct tm *tme; - char tmp[20]; -@@ -2138,12 +2137,12 @@ - g_return_val_if_fail(str != NULL, NULL); - g_return_val_if_fail(name != NULL, NULL); - -- cpy = g_malloc(BUF_LONG); -+ /* Create an empty GString that is hopefully big enough for most messages */ -+ cpy = g_string_sized_new(1024); - - t = time(NULL); - tme = localtime(&t); - -- cpy[0] = '\0'; - c = (char *)str; - while (*c) { - switch (*c) { -@@ -2152,39 +2151,35 @@ - switch (*(c + 1)) { - case 'n': - /* append name */ -- strcpy(cpy + cnt, name); -- cnt += strlen(name); -+ g_string_append(cpy, name); - c++; - break; - case 'd': - /* append date */ - strftime(tmp, 20, "%m/%d/%Y", tme); -- strcpy(cpy + cnt, tmp); -- cnt += strlen(tmp); -+ g_string_append(cpy, tmp); - c++; - break; - case 't': - /* append time */ - strftime(tmp, 20, "%I:%M:%S %p", tme); -- strcpy(cpy + cnt, tmp); -- cnt += strlen(tmp); -+ g_string_append(cpy, tmp); - c++; - break; - default: -- cpy[cnt++] = *c; -+ g_string_append_c(cpy, *c); - } - } else { -- cpy[cnt++] = *c; -+ g_string_append_c(cpy, *c); - } - break; - default: -- cpy[cnt++] = *c; -+ g_string_append_c(cpy, *c); - } - c++; - } -- cpy[cnt] = '\0'; - -- return cpy; -+ return g_string_free(cpy, FALSE); - } - - gchar * diff --git a/chat/gaim/patches/patch-ag b/chat/gaim/patches/patch-ag deleted file mode 100644 index 64ed2fdbdef..00000000000 --- a/chat/gaim/patches/patch-ag +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2005/08/10 16:13:34 salo Exp $ - -Fix for CAN-2005-2102, from RedHat. - ---- src/protocols/oscar/oscar.c.orig 2005-07-02 18:13:14.000000000 +0200 -+++ src/protocols/oscar/oscar.c 2005-08-10 16:37:02.000000000 +0200 -@@ -3455,7 +3455,18 @@ - xfer = gaim_xfer_new(gc->account, GAIM_XFER_RECEIVE, userinfo->sn); - xfer->remote_ip = g_strdup(args->verifiedip); - xfer->remote_port = args->port; -- gaim_xfer_set_filename(xfer, args->info.sendfile.filename); -+ -+ if (g_utf8_validate(args->info.sendfile.filename, -1, -+ NULL)) { -+ gaim_xfer_set_filename(xfer, -+ args->info.sendfile.filename); -+ } else { -+ gchar * utf8_filename = gaim_utf8_salvage( -+ args->info.sendfile.filename); -+ gaim_xfer_set_filename(xfer, utf8_filename); -+ g_free(utf8_filename); -+ } -+ - gaim_xfer_set_size(xfer, args->info.sendfile.totsize); - gaim_xfer_set_message(xfer, message); - -- cgit v1.2.3