Update to 0.59.7.

9 files changed, 6 insertions, 156 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++;
- 	}
- }
- 
diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile
index 2f440eb81180..e69eafd7a77d 100644
--- a/net/gaim-snapshot/Makefile
+++ b/net/gaim-snapshot/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/gaim-snapshot/distinfo b/net/gaim-snapshot/distinfo
index d232a4b104e9..0a802f60487b 100644
--- a/net/gaim-snapshot/distinfo
+++ b/net/gaim-snapshot/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f
+MD5 (gaim-0.59.7.tar.bz2) = 65155b1da1fd5262671a9f21eeaf5e54
diff --git a/net/gaim-snapshot/files/patch-src_protocols_yahoo_yahoo.c b/net/gaim-snapshot/files/patch-src_protocols_yahoo_yahoo.c
deleted file mode 100644
index f538f5c4ba62..000000000000
--- a/net/gaim-snapshot/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++;
- 	}
- }
- 
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 2f440eb81180..e69eafd7a77d 100644
--- a/net/gaim/Makefile
+++ b/net/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/gaim/distinfo b/net/gaim/distinfo
index d232a4b104e9..0a802f60487b 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.59.6.tar.bz2) = 5057a1a52361fd0384b93f41e573300f
+MD5 (gaim-0.59.7.tar.bz2) = 65155b1da1fd5262671a9f21eeaf5e54
diff --git a/net/gaim/files/patch-src_protocols_yahoo_yahoo.c b/net/gaim/files/patch-src_protocols_yahoo_yahoo.c
deleted file mode 100644
index f538f5c4ba62..000000000000
--- a/net/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++;
- 	}
- }
-