- Update to 3.0.6

- Add distfile mirror.
- Also includes a bugfix for ctrlproxy failing to recognize
  'learn-nickserv' option.  The bug has been submitted to upstream and
  it'll be included in next release.

Submitted by:		Ashish Shukla <wahjava at gmail.com> via mail
Approved by:		maintainer

3 files changed, 14 insertions, 30 deletions

diff --git a/irc/ctrlproxy/files/patch-lib__client.c b/irc/ctrlproxy/files/patch-lib__client.c
deleted file mode 100644
index 282091e2a2d3..000000000000
--- a/irc/ctrlproxy/files/patch-lib__client.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/client.c.orig	2007-12-07 20:46:47.000000000 +0530
-+++ lib/client.c	2007-12-23 22:08:20.000000000 +0530
-@@ -277,8 +277,10 @@
- 	
- 	c->incoming = NULL;
- 
--	g_iconv_close(c->outgoing_iconv);
--	g_iconv_close(c->incoming_iconv);
-+	if (c->outgoing_iconv != (GIConv)-1)
-+		g_iconv_close(c->outgoing_iconv);
-+	if (c->incoming_iconv != (GIConv)-1)
-+		g_iconv_close(c->incoming_iconv);
- 
- 	if (c->exit_on_close) 
- 		exit(0);
diff --git a/irc/ctrlproxy/files/patch-lib__network.c b/irc/ctrlproxy/files/patch-lib__network.c
deleted file mode 100644
index 5126cc91c4b5..000000000000
--- a/irc/ctrlproxy/files/patch-lib__network.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/network.c.orig	2007-12-07 20:46:47.000000000 +0530
-+++ lib/network.c	2007-12-23 22:45:38.000000000 +0530
-@@ -1261,8 +1261,10 @@
- 	ssl_free_client_credentials(s->ssl_credentials);
- #endif
- 
--	g_iconv_close(s->connection.incoming_iconv);
--	g_iconv_close(s->connection.outgoing_iconv);
-+	if (s->connection.incoming_iconv != (GIConv)-1)
-+		g_iconv_close(s->connection.incoming_iconv);
-+	if (s->connection.outgoing_iconv != (GIConv)-1)
-+		g_iconv_close(s->connection.outgoing_iconv);
- 
- 	g_free(s);
- }
diff --git a/irc/ctrlproxy/files/patch-src_settings.c b/irc/ctrlproxy/files/patch-src_settings.c
new file mode 100644
index 000000000000..f67394ca5d87
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-src_settings.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/settings.c.orig
++++ src/settings.c
+@@ -1055,7 +1055,7 @@
+ 	}
+ 
+     if (g_key_file_has_key(kf, "global", "learn-nickserv", NULL))
+-		cfg->learn_nickserv = g_key_file_get_boolean(kf, "global", "learn-nicksev", NULL);
++		cfg->learn_nickserv = g_key_file_get_boolean(kf, "global", "learn-nickserv", NULL);
+     else 
+ 	    cfg->learn_nickserv = TRUE;
+