diff options
| author | mrg <mrg@pkgsrc.org> | 2018-07-19 22:22:21 +0000 |
|---|---|---|
| committer | mrg <mrg@pkgsrc.org> | 2018-07-19 22:22:21 +0000 |
| commit | fde4432cf92eea2873af8f2d4805f43fdafdc17f (patch) | |
| tree | 2a1cfc7ffac8ade4f9452fc267bfc953b90e17f2 /chat | |
| parent | 34903062d34881b25f671f322130e33ba37e3a2b (diff) | |
| download | pkgsrc-fde4432cf92eea2873af8f2d4805f43fdafdc17f.tar.gz | |
apply the fix from my repo for PR 53456: "chat/ircII crashes on joining
to a channel with +k, with wrong channel key", which also fixes
reconnecting in some cases for me. now chan->window is never stale or
uninitialised.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/ircII/Makefile | 3 | ||||
| -rw-r--r-- | chat/ircII/distinfo | 3 | ||||
| -rw-r--r-- | chat/ircII/patches/patch-source_names.c | 22 |
3 files changed, 26 insertions, 2 deletions
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index a0387832b2f..2b38fb5b8a9 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.78 2017/07/06 14:51:00 mrg Exp $ +# $NetBSD: Makefile,v 1.79 2018/07/19 22:22:21 mrg Exp $ DISTNAME= ircii-${VERS} PKGNAME= ircII-${VERS} CATEGORIES= chat MASTER_SITES= http://ircii.warped.com/ EXTRACT_SUFX= .tar.bz2 +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.eterna.com.au/ircii/ diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo index 55b37a2db2e..26f9eaf663f 100644 --- a/chat/ircII/distinfo +++ b/chat/ircII/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2017/07/22 15:13:41 maya Exp $ +$NetBSD: distinfo,v 1.47 2018/07/19 22:22:21 mrg Exp $ SHA1 (ircii-20170704.tar.bz2) = 88f55a59af48d7ed131895d68354fe7f566e3180 RMD160 (ircii-20170704.tar.bz2) = b857a49c6d843748b0bcbccf9e3aec16d7be974b @@ -6,3 +6,4 @@ SHA512 (ircii-20170704.tar.bz2) = a0cdc5603fab040fa2f7d2b3d7a564e9eeac4b402329cb Size (ircii-20170704.tar.bz2) = 596535 bytes SHA1 (patch-ac) = 9f6f3b27670b63ff00b55c5431ec1da5219369ff SHA1 (patch-include_irc.h) = 257e7879461d88d9e8e05205e96cdec702e9e458 +SHA1 (patch-source_names.c) = 53b22dcf43f274bb4a67c6ee016260e76c090756 diff --git a/chat/ircII/patches/patch-source_names.c b/chat/ircII/patches/patch-source_names.c new file mode 100644 index 00000000000..5e1b7e68e50 --- /dev/null +++ b/chat/ircII/patches/patch-source_names.c @@ -0,0 +1,22 @@ +$NetBSD: patch-source_names.c,v 1.1 2018/07/19 22:22:21 mrg Exp $ + +fix a problem with reconnecting to the wrong window and also +join channels with the wrong key. + +Index: source/names.c +=================================================================== +RCS file: /home/cvs/ircii/source/names.c,v +retrieving revision 1.143 +retrieving revision 1.144 +diff -p -u -u -r1.143 -r1.144 +--- source/names.c 4 Jul 2017 08:08:23 -0000 1.143 ++++ source/names.c 6 Sep 2017 04:47:48 -0000 1.144 +@@ -202,6 +202,8 @@ add_channel(u_char *channel, u_char *key + new->limit = 0; + do_add = 1; + full_list = server_get_chan_list(server); ++ if ((new->window = is_bound(channel, server)) == NULL) ++ new->window = curr_scr_win; + add_to_list((List **)(void *)&full_list, (List *) new); + server_set_chan_list(server, full_list); + } |