diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/gaim/Makefile | 3 | ||||
| -rw-r--r-- | net/gaim/distinfo | 4 | ||||
| -rw-r--r-- | net/gaim/files/patch-msn | 45 | ||||
| -rw-r--r-- | net/gaim/files/patch-src_protocols_oscar_oscar.c | 32 | ||||
| -rw-r--r-- | net/gaim/pkg-plist | 5 |
5 files changed, 8 insertions, 81 deletions
diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 1dd76e2958eb..6829d75ad221 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -5,8 +5,7 @@ # PORTNAME= gaim -PORTVERSION= 0.81 -PORTREVISION= 1 +PORTVERSION= 0.82.1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net/gaim/distinfo b/net/gaim/distinfo index 5657480a7108..7f261e07146f 100644 --- a/net/gaim/distinfo +++ b/net/gaim/distinfo @@ -1,2 +1,2 @@ -MD5 (gaim-0.81.tar.bz2) = ee3460363f51ad24db1c5697d1da3c1b -SIZE (gaim-0.81.tar.bz2) = 4588215 +MD5 (gaim-0.82.1.tar.bz2) = 94484a0328dbe8073c8a97c572ce959b +SIZE (gaim-0.82.1.tar.bz2) = 4604261 diff --git a/net/gaim/files/patch-msn b/net/gaim/files/patch-msn deleted file mode 100644 index 58f47d5324f1..000000000000 --- a/net/gaim/files/patch-msn +++ /dev/null @@ -1,45 +0,0 @@ ---- src/protocols/msn/slp.c.orig 2004-08-09 11:21:34.000000000 +0200 -+++ src/protocols/msn/slp.c 2004-08-09 11:21:42.000000000 +0200 -@@ -640,13 +640,17 @@ - /* It's not valid. Kill this off. */ - char temp[32]; - const char *c; -+ size_t offset; - -+ memset(temp, 0, sizeof(temp)); - /* Eww */ - if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) || - (c = strchr(status, '\0'))) - { -- strncpy(temp, status, c - status); -- temp[c - status] = '\0'; -+ offset = c - status; -+ if (offset >= sizeof(temp)) -+ offset = sizeof(temp) - 1; -+ strncpy(temp, status, offset); - } - - gaim_debug_error("msn", "Received non-OK result: %s\n", temp); ---- src/protocols/msn/object.c.orig 2004-06-06 05:42:54.000000000 +0200 -+++ src/protocols/msn/object.c 2004-08-09 11:30:43.000000000 +0200 -@@ -35,11 +35,17 @@ - if ((tag = strstr(str, id "=\"")) != NULL) \ - { \ - char buf[16]; \ -+ size_t offset; \ - tag += strlen(id "=\""); \ - c = strchr(tag, '"'); \ -- strncpy(buf, tag, c - tag); \ -- buf[c - tag] = '\0'; \ -- obj->field = atoi(buf); \ -+ if (c != NULL) { \ -+ memset(buf, 0, sizeof(buf)); \ -+ offset = c - tag; \ -+ if (offset >= sizeof(buf)) \ -+ offset = sizeof(buf) - 1; \ -+ strncpy(buf, tag, offset); \ -+ obj->field = atoi(buf); \ -+ } \ - } - - static GList *local_objs; diff --git a/net/gaim/files/patch-src_protocols_oscar_oscar.c b/net/gaim/files/patch-src_protocols_oscar_oscar.c index db3e22bbbcf8..43a291b29617 100644 --- a/net/gaim/files/patch-src_protocols_oscar_oscar.c +++ b/net/gaim/files/patch-src_protocols_oscar_oscar.c @@ -1,6 +1,6 @@ ---- src/protocols/oscar/oscar.c.orig Sun Aug 8 01:32:27 2004 -+++ src/protocols/oscar/oscar.c Sun Aug 8 01:40:47 2004 -@@ -3136,7 +3136,7 @@ +--- src/protocols/oscar/oscar.c.orig Wed Aug 25 21:29:00 2004 ++++ src/protocols/oscar/oscar.c Thu Aug 26 21:55:32 2004 +@@ -3247,7 +3247,7 @@ * Note: There *may* be some clients which send messages as HTML formatted - * they need to be special-cased somehow. */ @@ -9,29 +9,3 @@ /* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */ gchar *tmp2 = gaim_escape_html(tmp); g_free(tmp); -@@ -3473,6 +3473,9 @@ - gchar **msg1, **msg2; - GError *err = NULL; - int i, numtoks; -+#ifdef HAVE_TM_GMTOFF -+ struct tm tm; -+#endif - - if (!args->type || !args->msg || !args->uin) - return 1; -@@ -3507,8 +3510,15 @@ - - if (t) { /* This is an offline message */ - /* The timestamp is UTC-ish, so we need to get the offset */ -+#ifdef HAVE_TM_GMTOFF -+ localtime_r(&t, &tm); -+ t += tm.tm_gmtoff; -+#else -+#ifdef HAVE_TIMEZONE - tzset(); - t -= timezone; -+#endif -+#endif - serv_got_im(gc, uin, tmp, 0, t); - } else { /* This is a message from MacICQ/Miranda */ - serv_got_im(gc, uin, tmp, 0, time(NULL)); diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist index 274cd2412f71..95ea4a008531 100644 --- a/net/gaim/pkg-plist +++ b/net/gaim/pkg-plist @@ -22,11 +22,12 @@ include/gaim/gtkcellrendererprogress.h include/gaim/gtkconn.h include/gaim/gtkconv.h include/gaim/gtkdebug.h +include/gaim/gtkdialogs.h include/gaim/gtkeventloop.h include/gaim/gtkft.h +include/gaim/gtkgaim.h include/gaim/gtkimhtml.h include/gaim/gtkimhtmltoolbar.h -include/gaim/gtkinternal.h include/gaim/gtklog.h include/gaim/gtknotify.h include/gaim/gtkplugin.h @@ -43,7 +44,6 @@ include/gaim/imgstore.h include/gaim/internal.h include/gaim/log.h include/gaim/md5.h -include/gaim/multi.h include/gaim/network.h include/gaim/notify.h include/gaim/plugin.h @@ -65,7 +65,6 @@ include/gaim/sslconn.h include/gaim/status.h include/gaim/stock.h include/gaim/stringref.h -include/gaim/ui.h include/gaim/util.h include/gaim/value.h include/gaim/xmlnode.h |