sync patches
This commit is contained in:
naddy
parent
4098c29234
commit
61c44b5760
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2002/06/30 18:23:31 brad Exp $
|
||||
--- configure.orig Mon Jan 8 01:24:22 2001
|
||||
+++ configure Thu Feb 28 18:06:38 2002
|
||||
@@ -12004,11 +12004,11 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o
|
||||
$OpenBSD: patch-configure,v 1.5 2009/03/24 21:43:09 naddy Exp $
|
||||
--- configure.orig Mon Jan 8 07:24:22 2001
|
||||
+++ configure Tue Mar 24 22:41:56 2009
|
||||
@@ -12004,11 +12004,11 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32
|
||||
mandir="\$(IRCLIB)"
|
||||
else
|
||||
INSTALL_IRC="\${bindir}/\$(_VERSION_)\$(EXEEXT)"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-source_ctcp_c,v 1.1 2003/03/27 15:46:11 brad Exp $
|
||||
--- source/ctcp.c.orig Mon Jan 8 01:24:22 2001
|
||||
+++ source/ctcp.c Wed Mar 26 23:00:45 2003
|
||||
@@ -1478,6 +1478,10 @@ extern void send_ctcp (int type, char *t
|
||||
$OpenBSD: patch-source_ctcp_c,v 1.2 2009/03/24 21:43:09 naddy Exp $
|
||||
--- source/ctcp.c.orig Mon Jan 8 07:24:22 2001
|
||||
+++ source/ctcp.c Tue Mar 24 22:41:56 2009
|
||||
@@ -1478,6 +1478,10 @@ extern void send_ctcp (int type, char *to, int datatag
|
||||
*putbuf2;
|
||||
int len;
|
||||
len = IRCD_BUFFER_SIZE - (12 + strlen(to));
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-source_misc_c,v 1.2 2004/01/04 23:46:49 espie Exp $
|
||||
--- source/misc.c.orig 2001-01-08 07:24:22.000000000 +0100
|
||||
+++ source/misc.c 2004-01-05 00:37:21.000000000 +0100
|
||||
$OpenBSD: patch-source_misc_c,v 1.3 2009/03/24 21:43:10 naddy Exp $
|
||||
--- source/misc.c.orig Mon Jan 8 07:24:22 2001
|
||||
+++ source/misc.c Tue Mar 24 22:41:56 2009
|
||||
@@ -3108,42 +3108,47 @@ char *cluster (char *hostname)
|
||||
static char result[IRCD_BUFFER_SIZE/4 + 1];
|
||||
char temphost[BIG_BUFFER_SIZE + 1];
|
||||
@ -23,11 +23,6 @@ $OpenBSD: patch-source_misc_c,v 1.2 2004/01/04 23:46:49 espie Exp $
|
||||
- {
|
||||
- result[8] = '*';
|
||||
- result[9] = '\0';
|
||||
- }
|
||||
- strcat(result, "@");
|
||||
- if (!(hostname = strchr(hostname, '@')))
|
||||
- return NULL;
|
||||
- hostname++;
|
||||
+
|
||||
+ atsign = strchr(hostname, '@');
|
||||
+ if (atsign) {
|
||||
@ -45,7 +40,11 @@ $OpenBSD: patch-source_misc_c,v 1.2 2004/01/04 23:46:49 espie Exp $
|
||||
+ result[9] = '@';
|
||||
+ result[10] = '\0';
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
- strcat(result, "@");
|
||||
- if (!(hostname = strchr(hostname, '@')))
|
||||
- return NULL;
|
||||
- hostname++;
|
||||
+ hostname = atsign + 1;
|
||||
+ } else {
|
||||
+ *result = 0;
|
||||
@ -84,7 +83,7 @@ $OpenBSD: patch-source_misc_c,v 1.2 2004/01/04 23:46:49 espie Exp $
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3175,17 +3180,18 @@ char *cluster (char *hostname)
|
||||
@@ -3175,16 +3180,17 @@ char *cluster (char *hostname)
|
||||
else
|
||||
return (char *) NULL;
|
||||
}
|
||||
@ -100,10 +99,9 @@ $OpenBSD: patch-source_misc_c,v 1.2 2004/01/04 23:46:49 espie Exp $
|
||||
}
|
||||
return result;
|
||||
}
|
||||
-
|
||||
-
|
||||
-
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
struct _sock_manager
|
||||
{
|
||||
int init;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-source_names_c,v 1.2 2003/05/14 00:52:36 brad Exp $
|
||||
--- source/names.c.orig Tue May 13 18:30:05 2003
|
||||
+++ source/names.c Tue May 13 18:29:59 2003
|
||||
$OpenBSD: patch-source_names_c,v 1.3 2009/03/24 21:43:10 naddy Exp $
|
||||
--- source/names.c.orig Mon Jan 8 07:24:22 2001
|
||||
+++ source/names.c Tue Mar 24 22:41:56 2009
|
||||
@@ -568,7 +568,7 @@ NickList *tnl = NULL;
|
||||
|
||||
*nmodes = 0;
|
||||
@ -20,7 +20,7 @@ $OpenBSD: patch-source_names_c,v 1.2 2003/05/14 00:52:36 brad Exp $
|
||||
{
|
||||
if (tucm->o_ed)
|
||||
{
|
||||
@@ -995,8 +996,9 @@ static int decifer_mode(char *from, char
|
||||
@@ -995,8 +996,9 @@ static int decifer_mode(char *from, char *mode_str, Ch
|
||||
malloc_strcpy(key, next_arg(rest, &rest));
|
||||
else
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-source_notice_c,v 1.1 2003/03/27 15:46:11 brad Exp $
|
||||
--- source/notice.c.orig Mon Jan 8 01:24:22 2001
|
||||
+++ source/notice.c Wed Mar 26 23:00:45 2003
|
||||
@@ -421,7 +421,7 @@ irc.BitchX.com *** Notice -- Nick collis
|
||||
$OpenBSD: patch-source_notice_c,v 1.2 2009/03/24 21:43:10 naddy Exp $
|
||||
--- source/notice.c.orig Mon Jan 8 07:24:22 2001
|
||||
+++ source/notice.c Tue Mar 24 22:41:56 2009
|
||||
@@ -421,7 +421,7 @@ irc.BitchX.com *** Notice -- Nick collision on nickser
|
||||
int conn = !strncmp(line+7, "connect", 7) ? 1 : 0;
|
||||
int dalnet = 0, ircnet = 0;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-source_numbers_c,v 1.2 2003/03/27 15:46:11 brad Exp $
|
||||
--- source/numbers.c.orig Mon Jan 8 01:24:22 2001
|
||||
+++ source/numbers.c Wed Mar 26 23:42:38 2003
|
||||
@@ -350,26 +350,29 @@ static void cannot_join_channel(char *fr
|
||||
$OpenBSD: patch-source_numbers_c,v 1.3 2009/03/24 21:43:10 naddy Exp $
|
||||
--- source/numbers.c.orig Mon Jan 8 07:24:22 2001
|
||||
+++ source/numbers.c Tue Mar 24 22:41:56 2009
|
||||
@@ -350,26 +350,29 @@ static void cannot_join_channel(char *from, char **Arg
|
||||
|
||||
set_display_target(chan, LOG_CURRENT);
|
||||
PasteArgs(ArgList, 0);
|
||||
@ -38,7 +38,7 @@ $OpenBSD: patch-source_numbers_c,v 1.2 2003/03/27 15:46:11 brad Exp $
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
@@ -381,7 +384,6 @@ static void cannot_join_channel(char *fr
|
||||
@@ -381,7 +384,6 @@ static void cannot_join_channel(char *from, char **Arg
|
||||
reset_display_target();
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-source_numbers_c,v 1.2 2003/03/27 15:46:11 brad Exp $
|
||||
int handle_server_stats(char *from, char **ArgList, int comm)
|
||||
{
|
||||
static int norm = 0,
|
||||
@@ -1454,7 +1456,7 @@ void numbered_command(char *from, int co
|
||||
@@ -1454,7 +1456,7 @@ void numbered_command(char *from, int comm, char **Arg
|
||||
|
||||
if (!ArgList[1] || !*ArgList[1])
|
||||
break;
|
||||
@ -55,7 +55,7 @@ $OpenBSD: patch-source_numbers_c,v 1.2 2003/03/27 15:46:11 brad Exp $
|
||||
strcpy(this_sucks, ctime(&tme));
|
||||
this_sucks[strlen(this_sucks)-1] = '\0';
|
||||
|
||||
@@ -1465,16 +1467,16 @@ void numbered_command(char *from, int co
|
||||
@@ -1465,16 +1467,16 @@ void numbered_command(char *from, int comm, char **Arg
|
||||
else
|
||||
{
|
||||
char cts[80], pts[80], ots[80];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-source_server_c,v 1.2 2009/03/24 21:43:10 naddy Exp $
|
||||
--- source/server.c.orig Mon Jan 8 07:24:22 2001
|
||||
+++ source/server.c Tue Mar 24 22:41:56 2009
|
||||
@@ -144,7 +144,7 @@ void close_server (int cs_index, char *message)
|
||||
if (x_debug & DEBUG_OUTBOUND)
|
||||
yell("Closing server %d because [%s]",
|
||||
cs_index, message ? message : empty_string);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user