aboutsummaryrefslogtreecommitdiffstats
path: root/net-im/gaim
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-01-02 03:06:35 +0800
committermarcus <marcus@FreeBSD.org>2003-01-02 03:06:35 +0800
commit8596dc1b6d01b73d2e95cc5927b531f1725129ed (patch)
tree99eebf0a6c630ec4cb5d51f4bf9b45ac1da37524 /net-im/gaim
parentf399e40af6f746cabcabe757279fd71e24de77d1 (diff)
downloadfreebsd-ports-gnome-8596dc1b6d01b73d2e95cc5927b531f1725129ed.tar.gz
freebsd-ports-gnome-8596dc1b6d01b73d2e95cc5927b531f1725129ed.tar.zst
freebsd-ports-gnome-8596dc1b6d01b73d2e95cc5927b531f1725129ed.zip
Update to 0.59.7.
Diffstat (limited to 'net-im/gaim')
-rw-r--r--net-im/gaim/Makefile3
-rw-r--r--net-im/gaim/distinfo2
-rw-r--r--net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c49
3 files changed, 2 insertions, 52 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 2f440eb81180..e69eafd7a77d 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gaim
-PORTVERSION= 0.59.6
-PORTREVISION= 1
+PORTVERSION= 0.59.7
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index d232a4b104e9..0a802f60487b 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f
+MD5 (gaim-0.59.7.tar.bz2) = 65155b1da1fd5262671a9f21eeaf5e54
diff --git a/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c b/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c
deleted file mode 100644
index f538f5c4ba62..000000000000
--- a/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c
+++ /dev/null
@@ -1,49 +0,0 @@
-This patch fixes a segfault that can occur when a Yahoo user receives new
-mail. This patch is from gaim CVS, and will be integrated in the next
-release.
-
---- src/protocols/yahoo/yahoo.c 2002/11/12 00:50:21 1.43.2.7
-+++ src/protocols/yahoo/yahoo.c 2002/11/23 18:50:47 1.43.2.8
-@@ -259,19 +259,20 @@
- pair->key = strtol(key, NULL, 10);
- accept = x; /* if x is 0 there was no key, so don't accept it */
-
-- if (accept)
-+ if (len - pos + 1 <= 0) {
-+ /* Truncated. Garbage or something. */
-+ accept = 0;
-+ }
-+
-+ if (accept) {
- value = g_malloc(len - pos + 1);
-- x = 0;
-- while (pos + 1 < len) {
-- if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
-- break;
-- if (accept)
-+ x = 0;
-+ while (pos + 1 < len) {
-+ if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
-+ break;
- value[x++] = data[pos++];
-- }
-- if (accept)
-+ }
- value[x] = 0;
-- pos += 2;
-- if (accept) {
- pair->value = g_strdup(value);
- g_free(value);
- pkt->hash = g_slist_append(pkt->hash, pair);
-@@ -279,6 +280,11 @@
- } else {
- g_free(pair);
- }
-+ pos += 2;
-+
-+ /* Skip over garbage we've noticed in the mail notifications */
-+ if (data[0] == '9' && data[pos] == 0x01)
-+ pos++;
- }
- }
-