5 files changed, 80 insertions, 1 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 9e624f8af8a2..b52e6118ad3d 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	BitchX
 PORTVERSION=	1.0c19
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES+=	irc gnome
 MASTER_SITES=	ftp://ftp.bitchx.com/pub/BitchX/source/ \
 		ftp://ftp.bitchx.org/pub/BitchX/source/ \
diff --git a/irc/bitchx/files/patch-dcc-force-port b/irc/bitchx/files/patch-dcc-force-port
new file mode 100644
index 000000000000..030a5684685a
--- /dev/null
+++ b/irc/bitchx/files/patch-dcc-force-port
@@ -0,0 +1,35 @@
+--- include/vars.h.old	Sun Nov  4 17:18:23 2001
++++ include/vars.h	Sun Nov  4 17:20:30 2001
+@@ -89,6 +89,7 @@
+ 	DCC_BLOCK_SIZE_VAR,
+ 	DCC_DLDIR_VAR , 
+ 	DCC_FAST_VAR, 
++	DCC_FORCE_PORT_VAR,
+ 	DCC_GET_LIMIT_VAR,
+ 	DCC_MAX_AUTOGET_SIZE_VAR ,
+ 	DCC_QUEUE_LIMIT_VAR,
+
+--- source/vars.c.old	Sun Nov  4 17:16:10 2001
++++ source/vars.c	Sun Nov  4 17:15:55 2001
+@@ -189,6 +189,7 @@
+ 	{ "DCC_BLOCK_SIZE",0,		INT_TYPE_VAR,	DEFAULT_DCC_BLOCK_SIZE, NULL, NULL, 0, VIF_BITCHX },
+ 	{ "DCC_DLDIR",0,		STR_TYPE_VAR,	0, NULL, NULL, 0, VIF_BITCHX },
+ 	{ "DCC_FAST",0,			BOOL_TYPE_VAR,	DEFAULT_DCC_FAST, NULL, NULL, 0, VIF_BITCHX },
++	{ "DCC_FORCE_PORT",0,		INT_TYPE_VAR,	0, NULL, NULL, 0, VIF_BITCHX },
+ 	{ "DCC_GET_LIMIT",0,		INT_TYPE_VAR,	DEFAULT_DCC_GET_LIMIT, NULL, NULL, 0, VIF_BITCHX },
+ 	{ "DCC_MAX_AUTOGET_SIZE",0,	INT_TYPE_VAR,	DEFAULT_MAX_AUTOGET_SIZE, NULL, NULL, 0, VIF_BITCHX },
+ 	{ "DCC_QUEUE_LIMIT",0,		INT_TYPE_VAR,	DEFAULT_DCC_QUEUE_LIMIT, NULL, NULL, 0, VIF_BITCHX },
+
+--- source/dcc.c.old	Sun Nov  4 17:16:25 2001
++++ source/dcc.c	Sun Nov  4 17:18:00 2001
+@@ -620,7 +620,9 @@
+ 
+ 		if (get_int_var(RANDOM_LOCAL_PORTS_VAR))
+ 			portnum = random_number(65535 - 1024) + 1024;
+-
++		if (get_int_var(DCC_FORCE_PORT_VAR))
++			portnum = get_int_var(DCC_FORCE_PORT_VAR);
++		
+ #ifdef DCC_CNCT_PEND
+ 		flags |= DCC_CNCT_PEND;
+ #endif
diff --git a/irc/bitchx/files/patch-funny.c b/irc/bitchx/files/patch-funny.c
new file mode 100644
index 000000000000..fa7eb1217ad0
--- /dev/null
+++ b/irc/bitchx/files/patch-funny.c
@@ -0,0 +1,14 @@
+--- source/funny.c	2003-02-20 16:37:07.000000000 +0000
++++ source/funny.c	2003-02-20 16:39:13.000000000 +0000
+@@ -261,6 +261,11 @@
+ 	channel = Args[1];
+ 	line = Args[2];
+ 
++	if (channel == NULL || line == NULL) { 
++		bitchsay("Invalid number of arguments for %s", __FUNCTION__); 
++		return; 
++	} 
++
+ 	ptr = line;
+ 	while (*ptr)
+ 	{
diff --git a/irc/bitchx/files/patch-names.c b/irc/bitchx/files/patch-names.c
new file mode 100644
index 000000000000..00171c2cde8b
--- /dev/null
+++ b/irc/bitchx/files/patch-names.c
@@ -0,0 +1,18 @@
+Index: source/names.c
+===================================================================
+RCS file: /cvs/bitchx/BitchX/source/names.c,v
+retrieving revision 1.8
+diff -u -3 -p -r1.8 names.c
+--- source/names.c	25 Mar 2003 04:32:14 -0000	1.8
++++ source/names.c	8 May 2003 20:26:11 -0000
+@@ -1004,8 +1004,9 @@ static	int decifer_mode(char *from, char
+ 				malloc_strcpy(key, next_arg(rest, &rest));
+ 			else
+ 			{
+-				if (rest && *key && !my_strnicmp(rest, *key, strlen(*key)))
++				if (rest && *key && (!my_strnicmp(rest, *key, strlen(*key)) || rest[0] == '*'))
+ 					next_arg(rest, &rest);
++
+ 				new_free(key);
+ 			}
+ 			(*channel)->i_mode = -1;
diff --git a/irc/bitchx/files/patch-source_server_c b/irc/bitchx/files/patch-source_server_c
new file mode 100644
index 000000000000..5910cca38940
--- /dev/null
+++ b/irc/bitchx/files/patch-source_server_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-source_server_c,v 1.1 2003/04/16 09:04:24 avsm Exp $
+--- source/server.c.orig	Mon Apr 14 23:56:28 2003
++++ source/server.c	Mon Apr 14 23:56:59 2003
+@@ -144,7 +144,7 @@ void	close_server (int cs_index, char *m
+ 			if (x_debug & DEBUG_OUTBOUND)
+ 				yell("Closing server %d because [%s]",
+ 					   cs_index, message ? message : empty_string);
+-			snprintf(buffer, BIG_BUFFER_SIZE, "QUIT :%s\n", message);
++			snprintf(buffer, sizeof buffer, "QUIT :%s\n", message);
+ #ifdef HAVE_SSL
+ 			if (get_server_ssl(cs_index))
+ 				SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer));