Changes 2.2.8:

* Many updates, security fix.

5 files changed, 25 insertions, 24 deletions

diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 7f6e8c77373..19df3e5c80c 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/09/07 12:41:12 adam Exp $
 
-DISTNAME=	gg2-2.2.6
+DISTNAME=	gg2-2.2.8
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ggadu/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://ggadu.sourceforge.net/
diff --git a/chat/gg2/distinfo b/chat/gg2/distinfo
index d6eefa70371..8c63b74b74a 100644
--- a/chat/gg2/distinfo
+++ b/chat/gg2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2005/06/14 04:49:19 rillig Exp $
+$NetBSD: distinfo,v 1.12 2005/09/07 12:41:12 adam Exp $
 
-SHA1 (gg2-2.2.6.tar.gz) = 5142607ab6de127f64c3cf54a271dfae4d434bd6
-RMD160 (gg2-2.2.6.tar.gz) = 75b6185bf560edd3207bbe9d6cd5bb3c37cc0193
-Size (gg2-2.2.6.tar.gz) = 1371439 bytes
+SHA1 (gg2-2.2.8.tar.bz2) = 80d05766be8db8fe11f561c49b283c39f06f01e9
+RMD160 (gg2-2.2.8.tar.bz2) = de32cd6faf3441218aac8add66497fd60d7ab21a
+Size (gg2-2.2.8.tar.bz2) = 1091976 bytes
 SHA1 (patch-aa) = cf6fa7e1bf79dcaf90a10c4bc20b715cca67142e
 SHA1 (patch-af) = 9e1cc4b53f069e520a165bfed00c8b6692216ce9
-SHA1 (patch-ag) = d7ddded776a5d61b57eae9a03e63269e22fe8437
-SHA1 (patch-ah) = b52abe3ed2fe478b7b55df78df299c3d7b706086
+SHA1 (patch-ag) = 9405ef6717919408345c97f09171db9316002b1a
+SHA1 (patch-ah) = bafa1c5f250cbc9a70984a93b7d0214506a375af
 SHA1 (patch-ai) = 39cd62d72007ba875dcb09156d53ab8852328eec
-SHA1 (patch-aj) = 0eeb9ec958e48d9d36f4ae078e51196f1fca158e
+SHA1 (patch-aj) = 9c3c06016793aadd862bea74f47bad712005a50c
 SHA1 (patch-ak) = 2283ca2ddfbd952a58741a1d021918337135e3b8
diff --git a/chat/gg2/patches/patch-ag b/chat/gg2/patches/patch-ag
index f5b194f923b..24bdb1bcaad 100644
--- a/chat/gg2/patches/patch-ag
+++ b/chat/gg2/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2005/05/27 13:47:05 adam Exp $
+$NetBSD: patch-ag,v 1.4 2005/09/07 12:41:12 adam Exp $
 
---- src/plugins/jabber/jabber_plugin.c.orig	2005-05-20 16:20:12.000000000 +0000
+--- src/plugins/jabber/jabber_plugin.c.orig	2005-08-12 08:21:27.000000000 +0000
 +++ src/plugins/jabber/jabber_plugin.c
-@@ -1489,9 +1489,10 @@ void start_plugin()
+@@ -1503,9 +1503,10 @@ void start_plugin()
  
  	if (ggadu_config_var_get(jabber_handler, "autoconnect"))
  	{
diff --git a/chat/gg2/patches/patch-ah b/chat/gg2/patches/patch-ah
index 73d4db3f4be..4785fd85a72 100644
--- a/chat/gg2/patches/patch-ah
+++ b/chat/gg2/patches/patch-ah
@@ -1,12 +1,13 @@
-$NetBSD: patch-ah,v 1.2 2005/04/04 08:26:29 adam Exp $
+$NetBSD: patch-ah,v 1.3 2005/09/07 12:41:12 adam Exp $
 
---- src/plugins/jabber/jabber_login.c.orig	2005-02-17 22:28:33.000000000 +0000
+--- src/plugins/jabber/jabber_login.c.orig	2005-08-12 08:21:27.000000000 +0000
 +++ src/plugins/jabber/jabber_login.c
-@@ -85,15 +85,15 @@ gpointer jabber_login_connect(gpointer s
+@@ -92,16 +92,16 @@ gpointer jabber_login_connect(gpointer s
  
  	if (!jabber_data.connection || !lm_connection_is_open(jabber_data.connection))
  	{
--		print_debug("jabber: Connecting to %s with %s", server,jid);
+-		portstr ? print_debug("jabber: Connecting to %s:%s with %s", server, portstr, jid) :
+-			print_debug("jabber: Connecting to %s with %s", server, jid);
 -		jabber_data.connection = lm_connection_new(server);
 -		lm_connection_set_keep_alive_rate(jabber_data.connection,30);
 -
@@ -15,7 +16,8 @@ $NetBSD: patch-ah,v 1.2 2005/04/04 08:26:29 adam Exp $
  		gchar *jabber_proxy_host = NULL;
  		gint jabber_proxy_port;
  
-+		print_debug("jabber: Connecting to %s with %s", server,jid);
++		portstr ? print_debug("jabber: Connecting to %s:%s with %s", server, portstr, jid) :
++			print_debug("jabber: Connecting to %s with %s", server, jid);
 +		jabber_data.connection = lm_connection_new(server);
 +		lm_connection_set_keep_alive_rate(jabber_data.connection,30);
 +
diff --git a/chat/gg2/patches/patch-aj b/chat/gg2/patches/patch-aj
index d23a7956afe..f0462a22d04 100644
--- a/chat/gg2/patches/patch-aj
+++ b/chat/gg2/patches/patch-aj
@@ -1,10 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2005/04/13 16:31:26 rillig Exp $
+$NetBSD: patch-aj,v 1.4 2005/09/07 12:41:12 adam Exp $
 
-Needed for ISO C90 compliance.
-
---- src/plugins/GUI/gui_preferences.c.orig	Wed Mar  9 15:02:37 2005
-+++ src/plugins/GUI/gui_preferences.c	Tue Apr 12 11:41:36 2005
-@@ -1315,6 +1315,7 @@ void gui_preferences(GtkWidget * widget,
+--- src/plugins/GUI/gui_preferences.c.orig	2005-08-12 08:21:26.000000000 +0000
++++ src/plugins/GUI/gui_preferences.c
+@@ -1329,6 +1329,7 @@ void gui_preferences(GtkWidget * widget,
  	{
  		GSList *combo_theme_slist;
  		GSList *combo_icons_slist;
@@ -12,7 +10,7 @@ Needed for ISO C90 compliance.
  		if (plugins_updated)
  		{
  			GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w",
-@@ -1433,7 +1434,7 @@ void gui_preferences(GtkWidget * widget,
+@@ -1448,7 +1449,7 @@ void gui_preferences(GtkWidget * widget,
  		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_skins");
  		g_return_if_fail(entry != NULL);