diff options
| author | lukem <lukem@pkgsrc.org> | 2003-02-18 02:29:14 +0000 |
|---|---|---|
| committer | lukem <lukem@pkgsrc.org> | 2003-02-18 02:29:14 +0000 |
| commit | 7dcb67b6883e174de39c0a97b488d4a2de7a3706 (patch) | |
| tree | e95d3b6e68502e4054ef0081d197faaf745bc608 /chat/ircII | |
| parent | 96617558acd8810c6f73162efa63e90e29a02fbd (diff) | |
| download | pkgsrc-7dcb67b6883e174de39c0a97b488d4a2de7a3706.tar.gz | |
patch from mrg@ to fix coredump when a connection to a server fails
Diffstat (limited to 'chat/ircII')
| -rw-r--r-- | chat/ircII/Makefile | 3 | ||||
| -rw-r--r-- | chat/ircII/distinfo | 3 | ||||
| -rw-r--r-- | chat/ircII/patches/patch-ad | 63 |
3 files changed, 67 insertions, 2 deletions
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index a1d70ceff06..442b7ba37f0 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2002/11/15 12:14:18 mrg Exp $ +# $NetBSD: Makefile,v 1.21 2003/02/18 02:29:14 lukem Exp $ DISTNAME= ircii-${VERS} PKGNAME= ircII-${VERS} +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= ftp://ircii.warped.com/pub/ircII/ \ ftp://ircftp.au.eterna.com.au/pub/ircII/ diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo index ae96c477926..2f558917842 100644 --- a/chat/ircII/distinfo +++ b/chat/ircII/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2002/11/15 12:14:18 mrg Exp $ +$NetBSD: distinfo,v 1.17 2003/02/18 02:29:15 lukem Exp $ SHA1 (ircii-20021103.tar.bz2) = 222d0ba4fcdb48e86739c2ec639115d86975d85e Size (ircii-20021103.tar.bz2) = 554379 bytes SHA1 (patch-aa) = aff3a8c5ff05797b8617be2b4b57920913ae9ca2 SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151 +SHA1 (patch-ad) = 57d918857e2be0687af335d7231a07d2b1d76e35 diff --git a/chat/ircII/patches/patch-ad b/chat/ircII/patches/patch-ad new file mode 100644 index 00000000000..ea8016ffbf2 --- /dev/null +++ b/chat/ircII/patches/patch-ad @@ -0,0 +1,63 @@ +$NetBSD: patch-ad,v 1.5 2003/02/18 02:29:15 lukem Exp $ + +--- source/server.c.orig 2002-09-07 02:04:38.000000000 +1000 ++++ source/server.c +@@ -58,7 +58,9 @@ int connect_to_unix _((int, u_char *)); + #include "icb.h" + #include "server.h" + ++#if 0 + static void server_list_garbage_collect _((void)); ++#endif + static void add_to_server_buffer _((int, u_char *)); + static void login_to_server _((int)); + static int connect_to_server_direct _((u_char *, int, u_char *, int)); +@@ -95,6 +97,7 @@ extern int dgets_errno; + + #define DEFAULT_SERVER_VERSION Server2_8 + ++#if 0 + /* + * clean out the SERVER_FAKE entries + */ +@@ -109,6 +112,7 @@ server_list_garbage_collect() + else + i++; + } ++#endif + + /* + * close_server: Given an index into the server list, this closes the +@@ -684,7 +688,7 @@ remove_from_server_list(i) + if (i < from_server) + --from_server; + while ((tmp = traverse_all_windows(&flag)) != NULL) +- if (tmp->server > i) ++ if (tmp->server > i && tmp->server > 0) + tmp->server--; + + bcopy((char *) &server_list[i + 1], (char *) &server_list[i], (number_of_servers - i - 1) * sizeof(Server)); +@@ -1171,7 +1175,9 @@ connect_to_server(server_name, port, nic + server_index = connect_to_server_process(server_name, port, nick, server_index); + else + server_index = connect_to_server_direct(server_name, port, nick, server_index); ++#if 0 + server_list_garbage_collect(); ++#endif + if (server_index) + { + server_list[server_index].attempting_to_connect = 0; +@@ -1423,9 +1429,11 @@ display_server_list() + say("Server list:"); + for (i = 0; i < number_of_servers; i++) + { +- u_char *icb_msg = server_list[i].version == ServerICB ? (u_char *) " (ICB connection)" : empty_string; +- u_char *group_msg, lbuf[BIG_BUFFER_SIZE]; ++ u_char *icb_msg, *group_msg, lbuf[BIG_BUFFER_SIZE]; + ++ if (server_list[i].flags & SERVER_FAKE) ++ continue; ++ icb_msg = server_list[i].version == ServerICB ? (u_char *) " (ICB connection)" : empty_string; + if (server_list[i].server_group) + { + snprintf(CP(lbuf), sizeof lbuf, " [group: %s]", |