sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-03 03:46:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 1.5.0. See http://gaim.sourceforge.net/ChangeLog for the list of

Browse source 
changes.

Submitted by:	Matthew Luckie <mjl@luckie.org.nz>
This commit is contained in:
Joe Marcus Clarke 2005-08-28 07:09:11 +00:00
parent a1ec789f81
commit 0fe32b3273
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=141012
8 changed files with 8 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net-im/gaim/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= gaim
PORTVERSION= 1.4.0
PORTREVISION= 1
PORTVERSION= 1.5.0
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

4
net-im/gaim/distinfo
View file

@ -1,2 +1,2 @@
MD5 (gaim-1.4.0.tar.bz2) = d7717cb771e556012ecd5b7f3bdb02ba
SIZE (gaim-1.4.0.tar.bz2) = 5979303
MD5 (gaim-1.5.0.tar.bz2) = 9205321ac11fad271c90f2f0d7c5e7ce
SIZE (gaim-1.5.0.tar.bz2) = 6123237

123
net-im/gaim/files/patch-security
View file

@ -1,123 +0,0 @@
Index: src/util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.325.2.25
diff -u -d -p -u -d -p -r1.325.2.25 util.c
--- src/util.c 31 Jul 2005 15:21:01 -0000 1.325.2.25
+++ src/util.c 8 Aug 2005 02:48:15 -0000
@@ -2141,8 +2141,7 @@ gchar *
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];
@@ -2150,12 +2149,12 @@ gaim_str_sub_away_formatters(const char
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) {
@@ -2164,39 +2163,35 @@ gaim_str_sub_away_formatters(const char
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 *
Index: src/protocols/oscar/oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.663.2.30
diff -u -d -p -r1.663.2.30 oscar.c
--- src/protocols/oscar/oscar.c 9 Jul 2005 21:48:21 -0000 1.663.2.30
+++ src/protocols/oscar/oscar.c 15 Jul 2005 04:02:59 -0000
@@ -3534,7 +3534,18 @@ static int incomingim_chan2(aim_session_
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);
/* Ignore <ICQ_COOL_FT> XML that is sent along with ICQ sendfile requests */
--- src/protocols/gg/libgg.c.orig Wed Aug 10 23:23:20 2005
+++ src/protocols/gg/libgg.c Wed Aug 10 23:24:16 2005
@@ -1099,7 +1099,11 @@ static int gg_watch_fd_connected(struct
e->event.status60.descr = buf;
if (len > 4 && p[h->length - 5] == 0)
- e->event.status60.time = *((int*) (p + h->length - 4));
+ {
+ uint32_t t;
+ memcpy(&t, p + h->length - 4, sizeof(uint32_t));
+ e->event.status60.time = t;
+ }
}
break;

1
net-im/gaim/pkg-plist
View file

@ -412,6 +412,7 @@ share/locale/sv/LC_MESSAGES/gaim.mo
share/locale/tr/LC_MESSAGES/gaim.mo
share/locale/uk/LC_MESSAGES/gaim.mo
share/locale/vi/LC_MESSAGES/gaim.mo
share/locale/xh/LC_MESSAGES/gaim.mo
share/locale/zh_CN/LC_MESSAGES/gaim.mo
share/locale/zh_TW/LC_MESSAGES/gaim.mo
@unexec /bin/rmdir %D/share/locale/my_MM/LC_MESSAGES 2>/dev/null || /usr/bin/true

3
net/gaim/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= gaim
PORTVERSION= 1.4.0
PORTREVISION= 1
PORTVERSION= 1.5.0
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

4
net/gaim/distinfo
View file

@ -1,2 +1,2 @@
MD5 (gaim-1.4.0.tar.bz2) = d7717cb771e556012ecd5b7f3bdb02ba
SIZE (gaim-1.4.0.tar.bz2) = 5979303
MD5 (gaim-1.5.0.tar.bz2) = 9205321ac11fad271c90f2f0d7c5e7ce
SIZE (gaim-1.5.0.tar.bz2) = 6123237

123
net/gaim/files/patch-security
View file

@ -1,123 +0,0 @@
Index: src/util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.325.2.25
diff -u -d -p -u -d -p -r1.325.2.25 util.c
--- src/util.c 31 Jul 2005 15:21:01 -0000 1.325.2.25
+++ src/util.c 8 Aug 2005 02:48:15 -0000
@@ -2141,8 +2141,7 @@ gchar *
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];
@@ -2150,12 +2149,12 @@ gaim_str_sub_away_formatters(const char
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) {
@@ -2164,39 +2163,35 @@ gaim_str_sub_away_formatters(const char
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 *
Index: src/protocols/oscar/oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.663.2.30
diff -u -d -p -r1.663.2.30 oscar.c
--- src/protocols/oscar/oscar.c 9 Jul 2005 21:48:21 -0000 1.663.2.30
+++ src/protocols/oscar/oscar.c 15 Jul 2005 04:02:59 -0000
@@ -3534,7 +3534,18 @@ static int incomingim_chan2(aim_session_
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);
/* Ignore <ICQ_COOL_FT> XML that is sent along with ICQ sendfile requests */
--- src/protocols/gg/libgg.c.orig Wed Aug 10 23:23:20 2005
+++ src/protocols/gg/libgg.c Wed Aug 10 23:24:16 2005
@@ -1099,7 +1099,11 @@ static int gg_watch_fd_connected(struct
e->event.status60.descr = buf;
if (len > 4 && p[h->length - 5] == 0)
- e->event.status60.time = *((int*) (p + h->length - 4));
+ {
+ uint32_t t;
+ memcpy(&t, p + h->length - 4, sizeof(uint32_t));
+ e->event.status60.time = t;
+ }
}
break;

1
net/gaim/pkg-plist
View file

@ -412,6 +412,7 @@ share/locale/sv/LC_MESSAGES/gaim.mo
share/locale/tr/LC_MESSAGES/gaim.mo
share/locale/uk/LC_MESSAGES/gaim.mo
share/locale/vi/LC_MESSAGES/gaim.mo
share/locale/xh/LC_MESSAGES/gaim.mo
share/locale/zh_CN/LC_MESSAGES/gaim.mo
share/locale/zh_TW/LC_MESSAGES/gaim.mo
@unexec /bin/rmdir %D/share/locale/my_MM/LC_MESSAGES 2>/dev/null || /usr/bin/true