[pkgsrc/trunk]: pkgsrc/chat/ircII apply the fix from my repo for PR 53456: "c...

[mrg <mrg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f3a5cdd136c
branches:  trunk
changeset: 383002:0f3a5cdd136c
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Thu Jul 19 22:22:21 2018 +0000

description:
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:

 chat/ircII/Makefile                     |   3 ++-
 chat/ircII/distinfo                     |   3 ++-
 chat/ircII/patches/patch-source_names.c |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diffs (56 lines):

diff -r f5baf764506d -r 0f3a5cdd136c chat/ircII/Makefile
--- a/chat/ircII/Makefile       Thu Jul 19 20:17:48 2018 +0000
+++ b/chat/ircII/Makefile       Thu Jul 19 22:22:21 2018 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.eterna.com.au/ircii/
diff -r f5baf764506d -r 0f3a5cdd136c chat/ircII/distinfo
--- a/chat/ircII/distinfo       Thu Jul 19 20:17:48 2018 +0000
+++ b/chat/ircII/distinfo       Thu Jul 19 22:22:21 2018 +0000
@@ -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 @@
 Size (ircii-20170704.tar.bz2) = 596535 bytes
 SHA1 (patch-ac) = 9f6f3b27670b63ff00b55c5431ec1da5219369ff
 SHA1 (patch-include_irc.h) = 257e7879461d88d9e8e05205e96cdec702e9e458
+SHA1 (patch-source_names.c) = 53b22dcf43f274bb4a67c6ee016260e76c090756
diff -r f5baf764506d -r 0f3a5cdd136c chat/ircII/patches/patch-source_names.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ircII/patches/patch-source_names.c   Thu Jul 19 22:22:21 2018 +0000
@@ -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);
+       }