[ScrollZ/el5] Add patch to fix manpage install dir

Dan Mashal vicodan at fedoraproject.org
Wed Apr 10 05:10:26 UTC 2013


commit 81b3958e18b5e179199100eaeb82d69ef27dadf7
Author: dan <dan.mashal at fedoraproject.org>
Date:   Tue Apr 9 22:09:54 2013 -0700

    Add patch to fix manpage install dir

 ScrollZ.spec         |    9 +-
 commits_rollup.patch | 1334 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1341 insertions(+), 2 deletions(-)
---
diff --git a/ScrollZ.spec b/ScrollZ.spec
index 0f7f39f..c1b5ab7 100644
--- a/ScrollZ.spec
+++ b/ScrollZ.spec
@@ -8,12 +8,15 @@ URL: http://www.scrollz.com
 Source0: http://www.scrollz.com/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}  -n)
 BuildRequires: ncurses-devel openssl-devel glib2-devel 
+#Latest commits from github include various  bugfixes including manpage being installed to the proper directory amongst others
+Patch0: commits_rollup.patch
 
 %description
 ScrollZ is advanced IRC client based on ircII code. It adds features normally found in ircII scripts like Toolz, PhoEniX, GargOyle or Lice.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-ssl --enable-ipv6
@@ -27,12 +30,14 @@ make install DESTDIR=%{buildroot}
 %files
 %defattr(-, root, root, 0755)
 %doc README COPYRIGHT
+%{_mandir}/man1/*
 %{_bindir}/scrollz*
 %{_datadir}/scrollz
-#to be fixed in next release.. nobody will miss it
-%exclude /usr/man/*
 
 %changelog
+* Tue Apr 09 2013 Dan Mashal <dan.mashal at fedoraproject.org> 2.2.2-4
+- Add upstream patch to fix various bugs and manpage install directory
+
 * Tue Oct 30 2012 Dan Mashal <dan.mashal at fedoraproject.org> 2.2.2-3
 - Add group section for el5 and bump release version
 
diff --git a/commits_rollup.patch b/commits_rollup.patch
new file mode 100644
index 0000000..9429087
--- /dev/null
+++ b/commits_rollup.patch
@@ -0,0 +1,1334 @@
+diff -uNrp b/ChangeLog.ScrollZ a/ChangeLog.ScrollZ
+--- b/ChangeLog.ScrollZ	2012-04-12 08:41:23.000000000 -0700
++++ a/ChangeLog.ScrollZ	2013-04-09 21:57:29.237550104 -0700
+@@ -8,6 +8,29 @@ Meaning of flags:
+ 
+ ------------------------------------------------------------------------------
+ 
++ScrollZ
++
++    ! crash when displaying very large aliases (reported by -jff-)
++    ! +password in ENCRMSG is not treated as a FiSH key if FiSH is
++      not available (reported by -jff-)
++    ! slashes (on Unix) and backslashes (on Windows) in channel names
++      are converted to underscores in per channel logging
++    + SET DEFAULT_PROTOCOL to specify default IP protocol for
++      server connections (patch by SteelyDan)
++    ! parallel make install (patch by Nathan Phillip Brink)
++    ! respect CPP flags in Makefile (patch by Nathan Phillip Brink)
++    ! dependencies in Makefile, fixes build on Debian sid
++      (reported by juha)
++    ! example for REGEXPREP (thanks SteelyDan)
++    ! MODE #channel I/e/b for IPv6 addresses (reported by Jugernaut)
++    ~ set AI_ADDRCONFIG flag for IP lookups when IPv6 support is
++      enabled (suggested by SteelyDan)
++    ! update target directory for manual page to modern /usr/share/man
++      (reported by dan408)
++    + parsing of numeric 378 for freenode (requested by SteelyDan)
++
++------------------------------------------------------------------------------
++
+ ScrollZ v2.2.2, 15.4.2012
+ 
+     ! auto completion bug introduced by a rather stupid fix in v2.2.1
+diff -uNrp b/.gitignore a/.gitignore
+--- b/.gitignore	2011-12-28 05:52:23.000000000 -0800
++++ a/.gitignore	2013-04-09 21:57:29.230549947 -0700
+@@ -8,3 +8,8 @@ scrollz.1
+ source/*.o
+ source/scrollz
+ source/sig.inc
++source/TAGS
++source/cscope.out
++source/depend.mk
++source/tags
++source/wterm.c
+diff -uNrp b/help/alias/functions a/help/alias/functions
+--- b/help/alias/functions	2011-04-29 01:21:18.000000000 -0700
++++ a/help/alias/functions	2013-04-09 21:57:29.244550260 -0700
+@@ -145,7 +145,7 @@ ScrollZ Functions
+   REGEXPREP(PATTERN STRING) Performs search & replace using POSIX.2 regular
+                         expressions supporting up to 10 back references in $# style,
+                         example:
+-                        REGEXP("/a (.*) c (.*)/$$1 $$2/" a b c d) would return
++                        REGEXPREP("/a (.*) c (.*)/$$1 $$2/" a b c d) would return
+                         b d
+   RENAME(OLD NEW)       Renames file OLD to NEW.
+   RIGHT(COUNT STRING)   Returns the COUNT rightmost bytes from the STRING.
+diff -uNrp b/help/chanlog a/help/chanlog
+--- b/help/chanlog	2011-04-29 01:21:18.000000000 -0700
++++ a/help/chanlog	2013-04-09 21:57:29.249550372 -0700
+@@ -9,7 +9,8 @@ Usage: CHANLOG on channels|off
+   Toggles per channel logging on/off
+ 
+   Channel name is converted to lowercase because IRC inherently
+-  is case insensitive.
++  is case insensitive. Slashes (on Unix) and backslashes (on Windows)
++  in channel names are converted to underscores.
+ 
+ See also:
+   CHANLOGDIR
+diff -uNrp b/help/set/default_protocol a/help/set/default_protocol
+--- b/help/set/default_protocol	1969-12-31 16:00:00.000000000 -0800
++++ a/help/set/default_protocol	2013-04-09 21:57:29.266550753 -0700
+@@ -0,0 +1,10 @@
++!
++! Copyright (c) 1994-2012 Flier
++!
++! All rights reserved.  See the HELP SCROLLZ COPYRIGHT file for more
++! information.
++!
++Usage: SET DEFAULT_PROTOCOL <protocol>
++  Set default IP protocol for new connections to servers.
++  Values 4, v4, ipv4 or inet specify IPv4 protocol. Values 6, v6,
++  ipv6 or inet6 specify IPv6 protocol. Default is unspecified.
+diff -uNrp b/include/vars.h a/include/vars.h
+--- b/include/vars.h	2011-04-29 05:04:26.000000000 -0700
++++ a/include/vars.h	2013-04-09 21:57:29.280551066 -0700
+@@ -115,6 +115,9 @@ enum {
+ /****************************************************************************/
+ 	DEBUG_VAR,
+ 	DECRYPT_PROGRAM_VAR,
++/**************************** PATCHED by Flier ******************************/
++        DEFAULT_PROTOCOL_VAR,
++/****************************************************************************/
+ 	DISPLAY_VAR,
+ /**************************** PATCHED by Flier ******************************/
+ 	DISPLAY_ANSI_VAR,
+diff -uNrp b/include/whois.h a/include/whois.h
+--- b/include/whois.h	2011-04-29 01:21:18.000000000 -0700
++++ a/include/whois.h	2013-04-09 21:57:29.280551066 -0700
+@@ -56,6 +56,7 @@
+         void	whois_identified _((char *, char **));
+         void	whois_actually _((char *, char **));
+         void    whois_secure _((char *, char **));
++        void	whois_connecting _((char *, char **));
+ /****************************************************************************/
+ 	void	whois_lastcom _((char *, char **));
+ 	void	whois_nickname _((WhoisStuff *, char *, char *));
+diff -uNrp b/Makefile.in a/Makefile.in
+--- b/Makefile.in	2011-04-29 01:21:18.000000000 -0700
++++ a/Makefile.in	2013-04-09 21:57:29.237550104 -0700
+@@ -51,7 +51,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+ sharedir = @prefix@/share
+-mandir = @prefix@/man/man1
++mandir = @prefix@/share/man/man1
+ 
+ DESTDIR =
+ 
+@@ -68,7 +68,7 @@ IRCSHARE = ${sharedir}/scrollz
+ IRCDOC = ${IRCSHARE}/doc
+ 
+ CC = @CC@
+-DEFS = @DEFS@
++DEFS = @DEFS@ @CPPFLAGS@
+ LIBS = @LIBS@
+ 
+ # Set this to -g if you want to be able to debug the client, otherwise
+@@ -179,7 +179,7 @@ installirc: scrollz installdirs
+ 	@(cd $(DESTDIR)/$(bindir) ; $(LN) scrollz-$(VERSION) scrollz)
+ 	@cp doc/ScrollZ.doc $(DESTDIR)/$(IRCDOC)
+ 
+-installman: scrollz.1
++installman: installdirs scrollz.1
+ 	$(INSTALL) scrollz.1 $(DESTDIR)/$(mandir)
+ 
+ installserv: installio
+@@ -197,7 +197,7 @@ installdirs:
+ 		$(DESTDIR)/$(INSTALL_SCRIPT) \
+ 		$(DESTDIR)/$(HELP_DIR) $(DESTDIR)/$(IRCDOC) $(DESTDIR)/$(mandir)
+ 
+-installhelp:
++installhelp: installdirs
+ 	$(INSTALL_HELP_CMD)
+ 	find $(DESTDIR)/$(HELP_DIR) -type d -print | xargs chmod a+rx
+ 	find $(DESTDIR)/$(HELP_DIR) -type f -print | xargs chmod a+r
+diff -uNrp b/README a/README
+--- b/README	2011-04-29 01:21:18.000000000 -0700
++++ a/README	2013-04-09 21:57:29.238550126 -0700
+@@ -1,16 +1,25 @@
+-$Id: README,v 1.1 1998-09-10 17:31:12 f Exp $
++$Id: README.ScrollZ,v 1.16 2009-09-03 16:26:55 f Exp $
+ 
+-please read the NEWS file to find out what is new in this
+-version of ircii, and the INSTALL file to find out how to
+-compile and install this version of ircii.
+-
+-this is a proper release of ircii.  it has bugs (ircii always
+-has bugs).  feel free to send me context diffs to fix them,
+-or at least a sequence of actions to show the bug.  run the
+-`ircbug' script to submit bug reports.  if `ircbug' can not
+-be run, please send reports to ircii-bugs at ircii.eterna.com.au.
++This is the readme file for ScrollZ IRC client.
++ScrollZ is copyright (C) 1995-2005 by Flier (flier at scrollz.org).
++Please read the COPYRIGHT file for licensing information.
+ 
+-the INSTALL file also has some additional notes on portability
+-issues.
++For list of changes please see the ChangeLog.ScrollZ file.
+ 
+-mrg (mrg at eterna.com.au)
++For the installation instructions please read the INSTALL.ScrollZ
++file in doc directory. ScrollZ tutorial can be found in doc
++directory as ScrollZ.doc (new users should read it).
++
++Some tools for customising the client (colour setup) can be found
++in tools directory.
++
++I would like to thank the following individuals: f0x for scrollz.com,
++acidflash for patches and support, ogre for bugtracker, Anton and
++colrebel for arranging and maintaining the FTP site/mirrors, Ahnberg for
++the FTP mirror and the mailing list, largo and rob for the web page design,
++tel and Tero for the web space and web forum, Sheik for cdcc.c, whowas.c
++and edit2.c.lame, and Saud for the FTP mirror. Also thanks to Sharky and
++Darkie for permission to use the code from their BitchX SSL port - it
++was modified as ircII code differs a lot from the EPIC code these days.
++
++-flier
+diff -uNrp b/README.ircII a/README.ircII
+--- b/README.ircII	1969-12-31 16:00:00.000000000 -0800
++++ a/README.ircII	2013-04-09 21:57:29.238550126 -0700
+@@ -0,0 +1,16 @@
++$Id: README,v 1.1 1998-09-10 17:31:12 f Exp $
++
++please read the NEWS file to find out what is new in this
++version of ircii, and the INSTALL file to find out how to
++compile and install this version of ircii.
++
++this is a proper release of ircii.  it has bugs (ircii always
++has bugs).  feel free to send me context diffs to fix them,
++or at least a sequence of actions to show the bug.  run the
++`ircbug' script to submit bug reports.  if `ircbug' can not
++be run, please send reports to ircii-bugs at ircii.eterna.com.au.
++
++the INSTALL file also has some additional notes on portability
++issues.
++
++mrg (mrg at eterna.com.au)
+diff -uNrp b/README.ScrollZ a/README.ScrollZ
+--- b/README.ScrollZ	2011-04-29 01:21:18.000000000 -0700
++++ a/README.ScrollZ	1969-12-31 16:00:00.000000000 -0800
+@@ -1,25 +0,0 @@
+-$Id: README.ScrollZ,v 1.16 2009-09-03 16:26:55 f Exp $
+-
+-This is the readme file for ScrollZ IRC client.
+-ScrollZ is copyright (C) 1995-2005 by Flier (flier at scrollz.org).
+-Please read the COPYRIGHT file for licensing information.
+-
+-For list of changes please see the ChangeLog.ScrollZ file.
+-
+-For the installation instructions please read the INSTALL.ScrollZ
+-file in doc directory. ScrollZ tutorial can be found in doc
+-directory as ScrollZ.doc (new users should read it).
+-
+-Some tools for customising the client (colour setup) can be found
+-in tools directory.
+-
+-I would like to thank the following individuals: f0x for scrollz.com,
+-acidflash for patches and support, ogre for bugtracker, Anton and
+-colrebel for arranging and maintaining the FTP site/mirrors, Ahnberg for
+-the FTP mirror and the mailing list, largo and rob for the web page design,
+-tel and Tero for the web space and web forum, Sheik for cdcc.c, whowas.c
+-and edit2.c.lame, and Saud for the FTP mirror. Also thanks to Sharky and
+-Darkie for permission to use the code from their BitchX SSL port - it
+-was modified as ircII code differs a lot from the EPIC code these days.
+-
+--flier
+diff -uNrp b/scrollz.1.in a/scrollz.1.in
+--- b/scrollz.1.in	2011-04-29 01:21:18.000000000 -0700
++++ a/scrollz.1.in	2013-04-09 21:57:29.280551066 -0700
+@@ -5,6 +5,8 @@
+ ScrollZ \- An advanced ircII-based IRC client
+ .SH SYNOPSIS
+ .B scrollz
++.RB [ \-4 ]
++.RB [ \-6 ]
+ .RB [ \-c
+ .IR chan ]
+ .RB [ \-p
+@@ -54,6 +56,12 @@ operators and user friendly features suc
+ and channels.
+ .SH OPTIONS
+ .TP
++.BI \-4
++Use IPv4 protocol when connecting to a server.
++.TP
++.BI \-6
++Use IPv6 protocol when connecting to a server.
++.TP
+ .BI \-c " channel"
+ Joins channel on startup
+ .TP
+diff -uNrp b/source/edit6.c a/source/edit6.c
+--- b/source/edit6.c	2012-04-12 08:40:08.000000000 -0700
++++ a/source/edit6.c	2013-04-09 21:57:29.287551223 -0700
+@@ -2393,10 +2393,12 @@ char *key;
+     }
+     tmp = (struct encrstr *) list_lookup((List **) &encrlist, user, !USE_WILDCARDS, !REMOVE_FROM_LIST);
+     if (tmp) {
++#ifdef HAVE_GMP
+         if (*key == '+') {
+             tmp->type = 2;
+             key++;
+         }
++#endif
+         malloc_strcpy(&(tmp->key), key);
+     }
+     else {
+@@ -2405,10 +2407,12 @@ char *key;
+         tmp->user = (char *) 0;
+         tmp->key = (char *) 0;
+         tmp->type = 0;
++#ifdef HAVE_GMP
+         if (*key == '+') {
+             tmp->type = 2;
+             key++;
+         }
++#endif
+         malloc_strcpy(&(tmp->user), user);
+         malloc_strcpy(&(tmp->key), key);
+         add_to_list((List **) &encrlist, (List *) tmp);
+@@ -3255,8 +3259,8 @@ char *subargs;
+         else PrintSetting("Channel logging prefix", "OFF", empty_string, empty_string);
+     }
+     else if (!strcmp(command, "CHANLOGPOST")) {
+-        if (ChanLogPostfix) PrintSetting("Channel logging postix", ChanLogPostfix, empty_string, empty_string);
+-        else PrintSetting("Channel logging postix", "OFF", empty_string, empty_string);
++        if (ChanLogPostfix) PrintSetting("Channel logging postfix", ChanLogPostfix, empty_string, empty_string);
++        else PrintSetting("Channel logging postfix", "OFF", empty_string, empty_string);
+     }
+ }
+ 
+@@ -3267,11 +3271,20 @@ ChannelList *chan;
+     char *filename = NULL;
+     char *filepath = NULL;
+     char *channame = NULL;
++    char *p;
+ 
+     if (!chan) return;
+     if (ChanLogPrefix) malloc_strcpy(&filename, ChanLogPrefix);
+     malloc_strcpy(&channame, chan->channel);
+     lower(channame);
++    /* To get a legal filename, convert any slash in a channel name to a backslash */
++    for (p = channame; *p; p++) {
++#ifdef SZ32
++        if (*p == '\\') *p = '_';
++#else
++        if (*p == '/') *p = '_';
++#endif
++    }
+     malloc_strcat(&filename, channame);
+     new_free(&channame);
+     if (ChanLogPostfix) malloc_strcat(&filename, ChanLogPostfix);
+diff -uNrp b/source/ircaux.c a/source/ircaux.c
+--- b/source/ircaux.c	2011-04-29 01:21:18.000000000 -0700
++++ a/source/ircaux.c	2013-04-09 21:57:29.289551267 -0700
+@@ -52,6 +52,7 @@
+ #include "output.h"
+ #include "ircterm.h"
+ #include "newio.h"
++#include "vars.h"
+ 
+ /**************************** PATCHED by Flier ******************************/
+ int DCCLowPort;
+@@ -597,6 +598,9 @@ connect_by_number(service,host,nonblocki
+ 	char	strhost[1025], strservice[32];
+ 	struct	sockaddr_storage server;
+ 	struct	addrinfo hints, *res, *res0;
++/**************************** PATCHED by Flier ******************************/
++        char	*p;
++/****************************************************************************/
+ 
+ 	strncpy(strhost, host, sizeof(strhost) - 1);
+ 	strhost[sizeof(strhost) - 1] = 0;
+@@ -666,6 +670,7 @@ connect_by_number(service,host,nonblocki
+ 	/* If strhost is empty then probably DCC connection was requested.
+ 	 * In this case we must use AF_INET */
+ 	errno = 0;
++        hints.ai_flags = AI_ADDRCONFIG;
+ 	if (strlen(strhost) == 0)
+ 	{
+ 		hints.ai_family = AF_INET;
+@@ -673,7 +678,18 @@ connect_by_number(service,host,nonblocki
+ 	}
+ 	else
+ 	{
+-		hints.ai_family = AF_UNSPEC;
++/**************************** PATCHED by Flier ******************************/
++		/*hints.ai_family = AF_UNSPEC;*/
++            p = get_string_var(DEFAULT_PROTOCOL_VAR);
++            if (p && (!strcmp(p, "4") || !my_stricmp(p, "v4") || !my_stricmp(p, "ipv4") || !my_stricmp(p, "inet")))
++                hints.ai_family = AF_INET;
++            else {
++                if (p && (!strcmp(p, "6") || !my_stricmp(p, "v6") || !my_stricmp(p, "ipv6") || !my_stricmp(p, "inet6")))
++                    hints.ai_family = AF_INET6;
++                else
++                    hints.ai_family = AF_UNSPEC;
++            }
++/****************************************************************************/
+ 		err = getaddrinfo(strhost, strservice, &hints, &res0);
+ 	}
+ 	if (err != 0)
+@@ -855,7 +871,7 @@ bind_local_addr(localhost, localport, fd
+ 	memset(&hintsx, 0, sizeof(hintsx));
+ 	hintsx.ai_family = family;
+ 	hintsx.ai_socktype = SOCK_STREAM;
+-	hintsx.ai_flags = AI_PASSIVE;
++	hintsx.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+ 	err = getaddrinfo(localhost, localport, &hintsx, &res0x);
+ 
+ 	if (err != 0)
+diff -uNrp b/source/irc.c a/source/irc.c
+--- b/source/irc.c	2012-04-12 08:41:54.000000000 -0700
++++ a/source/irc.c	2013-04-09 21:57:29.289551267 -0700
+@@ -1011,6 +1011,12 @@ parse_args(argv, argc)
+ 					connect_at_startup = 0;
+ 					break;
+ /**************************** PATCHED by Flier ******************************/
++                                case '4':
++                                        set_string_var(DEFAULT_PROTOCOL_VAR, "4");
++                                        break;
++                                case '6':
++					set_string_var(DEFAULT_PROTOCOL_VAR, "6");
++					break;
+                                 /* what the hell is this */
+ 				/*case '-':
+ 					if (argv[ac])
+diff -uNrp b/source/Makefile.in a/source/Makefile.in
+--- b/source/Makefile.in	2011-04-29 01:21:18.000000000 -0700
++++ a/source/Makefile.in	2013-04-09 21:57:29.281551088 -0700
+@@ -11,7 +11,7 @@ CFLAGS	= @CFLAGS@
+ LDFLAGS	= @LDFLAGS@
+ LEX	= @LEX@
+ LEXLIB	= @LEXLIB@
+-DEFS	= @DEFS@
++DEFS	= @DEFS@ @CPPFLAGS@
+ LN	= @LN@
+ RM	= @RM@
+ 
+@@ -130,47 +130,49 @@ wterm.o:
+ 
+ # this is the "depend.mk" file created above.
+ # --- ALL BELOW IS AUTOMATICALLY GENERATED ---
+-alias.o: alias.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/alias.h ../include/dcc.h ../include/status.h \
+-      ../include/edit.h ../include/history.h ../include/vars.h \
+-      ../include/ircaux.h ../include/server.h ../include/names.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/menu.h ../include/screen.h ../include/input.h \
+-      ../include/output.h ../include/parse.h ../include/notify.h \
+-      ../include/ignore.h ../include/exec.h ../include/ircterm.h \
+-      /usr/include/sys/stat.h ../include/myvars.h
++alias.o: alias.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/alias.h \
++      ../include/dcc.h ../include/status.h ../include/edit.h \
++      ../include/history.h ../include/vars.h ../include/ircaux.h \
++      ../include/server.h ../include/names.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/irc.h ../include/myssl.h \
++      ../include/screen.h ../include/window.h ../include/input.h \
++      ../include/names.h ../include/output.h ../include/parse.h \
++      ../include/notify.h ../include/ignore.h ../include/exec.h \
++      ../include/ircterm.h ../include/myvars.h
+ blowfish.o: blowfish.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/ircaux.h ../include/blowfish.h
+-cdcc.o: cdcc.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/list.h ../include/server.h ../include/names.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/vars.h \
+-      ../include/ircaux.h ../include/input.h ../include/screen.h \
+-      ../include/output.h ../include/scandir.h ../include/dcc.h \
+-      ../include/parse.h ../include/hook.h ../include/cdcc.h \
+-      ../include/myvars.h
++cdcc.o: cdcc.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/list.h \
++      ../include/server.h ../include/names.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/irc.h ../include/myssl.h ../include/vars.h \
++      ../include/ircaux.h ../include/input.h ../include/window.h \
++      ../include/screen.h ../include/output.h ../include/edit.h \
++      ../include/scandir.h ../include/dcc.h ../include/parse.h \
++      ../include/hook.h ../include/cdcc.h ../include/myvars.h
+ celerity.o: celerity.c ../include/defs.h ../include/celerity.h
+-crypt.o: crypt.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/crypt.h ../include/vars.h ../include/ircaux.h \
+-      ../include/list.h ../include/ctcp.h ../include/output.h \
+-      ../include/newio.h cast.c ../include/cast_sbox.h sed.c
+-ctcp.o: ctcp.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircaux.h ../include/hook.h ../include/crypt.h \
+-      ../include/ctcp.h ../include/vars.h ../include/server.h \
+-      ../include/names.h ../include/window.h ../include/hold.h \
+-      ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/status.h ../include/ignore.h ../include/output.h \
+-      ../include/dcc.h ../include/parse.h ../include/whois.h \
++crypt.o: crypt.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/crypt.h \
++      ../include/vars.h ../include/ircaux.h ../include/list.h \
++      ../include/ctcp.h ../include/output.h ../include/newio.h \
++      ../include/myssl.h cast.c ../include/cast_sbox.h sed.c
++ctcp.o: ctcp.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/hook.h ../include/crypt.h ../include/ctcp.h ../include/vars.h \
++      ../include/server.h ../include/names.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/irc.h ../include/myssl.h \
++      ../include/status.h ../include/lastlog.h ../include/ignore.h \
++      ../include/output.h ../include/window.h ../include/dcc.h \
++      ../include/names.h ../include/parse.h ../include/whois.h \
+       ../include/myvars.h ../include/flood.h ../include/screen.h \
+       ../include/ircterm.h
+ dcc.o: dcc.c ../include/irc.h ../include/defs.h ../include/celerity.h \
+@@ -178,153 +180,166 @@ dcc.o: dcc.c ../include/irc.h ../include
+       ../include/struct.h ../include/mystructs.h ../include/server.h \
+       ../include/names.h ../include/window.h ../include/hold.h \
+       ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/ircaux.h ../include/whois.h ../include/ctcp.h \
+-      ../include/dcc.h ../include/hook.h ../include/vars.h \
++      ../include/irc.h ../include/myssl.h ../include/ircaux.h \
++      ../include/whois.h ../include/lastlog.h ../include/ctcp.h \
++      ../include/dcc.h ../include/hook.h ../include/vars.h ../include/window.h \
+       ../include/output.h ../include/newio.h ../include/crypt.h \
+       ../include/myvars.h
+-debug.o: debug.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h
+-edit.o: edit.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/parse.h ../include/ircterm.h ../include/server.h \
+-      ../include/names.h ../include/window.h ../include/hold.h \
+-      ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/crypt.h ../include/vars.h ../include/ircaux.h \
++debug.o: debug.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h
++edit.o: edit.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/parse.h \
++      ../include/ircterm.h ../include/server.h ../include/names.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/irc.h ../include/myssl.h \
++      ../include/edit.h ../include/crypt.h ../include/vars.h \
++      ../include/ircaux.h ../include/lastlog.h ../include/window.h \
+       ../include/screen.h ../include/whois.h ../include/hook.h \
+       ../include/input.h ../include/ignore.h ../include/keys.h \
+-      ../include/alias.h ../include/history.h ../include/funny.h \
+-      ../include/ctcp.h ../include/dcc.h ../include/translat.h \
+-      ../include/output.h ../include/exec.h ../include/notify.h \
+-      ../include/numbers.h ../include/status.h ../include/if.h \
+-      ../include/help.h ../include/stack.h ../include/queue.h \
+-      ../include/myvars.h
+-edit2.o: edit2.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/crypt.h ../include/vars.h ../include/ircaux.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/whois.h \
+-      ../include/hook.h ../include/input.h ../include/ignore.h \
+-      ../include/keys.h ../include/names.h ../include/alias.h \
+-      ../include/history.h ../include/funny.h ../include/ctcp.h \
+-      ../include/dcc.h ../include/translat.h ../include/output.h \
++      ../include/names.h ../include/alias.h ../include/history.h \
++      ../include/funny.h ../include/ctcp.h ../include/dcc.h \
++      ../include/translat.h ../include/output.h ../include/exec.h \
+       ../include/notify.h ../include/numbers.h ../include/status.h \
+-      ../include/screen.h ../include/server.h ../include/list.h \
+-      ../include/parse.h ../include/myvars.h ../include/whowas.h
+-edit3.o: edit3.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/crypt.h ../include/vars.h ../include/ircaux.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/whois.h \
+-      ../include/hook.h ../include/input.h ../include/ignore.h \
+-      ../include/keys.h ../include/names.h ../include/alias.h \
+-      ../include/history.h ../include/list.h ../include/funny.h \
++      ../include/if.h ../include/help.h ../include/stack.h ../include/hook.h \
++      ../include/alias.h ../include/queue.h ../include/struct.h \
++      ../include/myvars.h
++edit2.o: edit2.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/crypt.h \
++      ../include/vars.h ../include/ircaux.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/whois.h ../include/hook.h \
++      ../include/input.h ../include/ignore.h ../include/keys.h \
++      ../include/names.h ../include/window.h ../include/irc.h \
++      ../include/alias.h ../include/history.h ../include/funny.h \
+       ../include/ctcp.h ../include/dcc.h ../include/translat.h \
+       ../include/output.h ../include/notify.h ../include/numbers.h \
+       ../include/status.h ../include/screen.h ../include/server.h \
+-      ../include/exec.h ../include/parse.h ../include/myvars.h \
+-      ../include/whowas.h
+-edit4.o: edit4.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/crypt.h ../include/vars.h ../include/ircaux.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/whois.h \
+-      ../include/hook.h ../include/input.h ../include/ignore.h \
+-      ../include/keys.h ../include/names.h ../include/alias.h \
+-      ../include/history.h ../include/funny.h ../include/ctcp.h \
+-      ../include/dcc.h ../include/translat.h ../include/output.h \
+-      ../include/notify.h ../include/numbers.h ../include/status.h \
+-      ../include/screen.h ../include/server.h ../include/ircterm.h \
+-      ../include/list.h ../include/parse.h ../include/myvars.h \
+-      ../include/whowas.h ../include/scandir.h
+-edit5.o: edit5.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/crypt.h ../include/vars.h ../include/ircaux.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/whois.h \
+-      ../include/hook.h ../include/input.h ../include/ignore.h \
+-      ../include/keys.h ../include/list.h ../include/names.h \
++      ../include/names.h ../include/myssl.h ../include/edit.h \
++      ../include/list.h ../include/struct.h ../include/parse.h \
++      ../include/myvars.h ../include/whowas.h
++edit3.o: edit3.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/crypt.h \
++      ../include/vars.h ../include/ircaux.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/whois.h ../include/hook.h \
++      ../include/input.h ../include/ignore.h ../include/keys.h \
++      ../include/names.h ../include/window.h ../include/irc.h \
++      ../include/alias.h ../include/history.h ../include/list.h \
++      ../include/funny.h ../include/ctcp.h ../include/dcc.h \
++      ../include/translat.h ../include/output.h ../include/notify.h \
++      ../include/numbers.h ../include/status.h ../include/screen.h \
++      ../include/server.h ../include/names.h ../include/myssl.h \
++      ../include/edit.h ../include/exec.h ../include/struct.h \
++      ../include/parse.h ../include/myvars.h ../include/whowas.h
++edit4.o: edit4.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/crypt.h \
++      ../include/vars.h ../include/ircaux.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/whois.h ../include/hook.h \
++      ../include/input.h ../include/ignore.h ../include/keys.h \
++      ../include/names.h ../include/window.h ../include/irc.h \
+       ../include/alias.h ../include/history.h ../include/funny.h \
+       ../include/ctcp.h ../include/dcc.h ../include/translat.h \
+       ../include/output.h ../include/notify.h ../include/numbers.h \
+       ../include/status.h ../include/screen.h ../include/server.h \
+-      ../include/ircterm.h ../include/parse.h ../include/myvars.h \
+-      ../include/whowas.h
+-edit6.o: edit6.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/crypt.h ../include/vars.h ../include/ircaux.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/whois.h \
+-      ../include/hook.h ../include/input.h ../include/ignore.h \
+-      ../include/keys.h ../include/list.h ../include/names.h \
+-      ../include/alias.h ../include/history.h ../include/funny.h \
+-      ../include/exec.h ../include/ctcp.h ../include/dcc.h \
++      ../include/names.h ../include/myssl.h ../include/edit.h \
++      ../include/ircterm.h ../include/list.h ../include/struct.h \
++      ../include/parse.h ../include/myvars.h ../include/whowas.h \
++      ../include/scandir.h
++edit5.o: edit5.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/crypt.h \
++      ../include/vars.h ../include/ircaux.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/whois.h ../include/hook.h \
++      ../include/input.h ../include/ignore.h ../include/keys.h \
++      ../include/list.h ../include/names.h ../include/window.h \
++      ../include/irc.h ../include/alias.h ../include/history.h \
++      ../include/funny.h ../include/ctcp.h ../include/dcc.h \
+       ../include/translat.h ../include/output.h ../include/notify.h \
+       ../include/numbers.h ../include/status.h ../include/screen.h \
+-      ../include/server.h ../include/parse.h ../include/myvars.h \
+-      ../include/whowas.h
+-exec.o: exec.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/exec.h ../include/vars.h ../include/ircaux.h \
+-      ../include/edit.h ../include/window.h ../include/hold.h \
+-      ../include/lastlog.h ../include/menu.h ../include/screen.h \
+-      ../include/hook.h ../include/input.h ../include/list.h \
+-      ../include/server.h ../include/names.h ../include/output.h \
++      ../include/server.h ../include/names.h ../include/myssl.h \
++      ../include/edit.h ../include/ircterm.h ../include/struct.h \
++      ../include/parse.h ../include/myvars.h ../include/whowas.h
++edit6.o: edit6.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/crypt.h \
++      ../include/vars.h ../include/ircaux.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/whois.h ../include/hook.h \
++      ../include/input.h ../include/ignore.h ../include/keys.h \
++      ../include/list.h ../include/names.h ../include/window.h \
++      ../include/irc.h ../include/alias.h ../include/history.h \
++      ../include/funny.h ../include/exec.h ../include/ctcp.h ../include/dcc.h \
++      ../include/translat.h ../include/output.h ../include/notify.h \
++      ../include/numbers.h ../include/status.h ../include/screen.h \
++      ../include/server.h ../include/names.h ../include/myssl.h \
++      ../include/edit.h ../include/struct.h ../include/parse.h \
++      ../include/myvars.h ../include/whowas.h
++exec.o: exec.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/exec.h \
++      ../include/vars.h ../include/ircaux.h ../include/edit.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/screen.h \
++      ../include/window.h ../include/hook.h ../include/input.h \
++      ../include/list.h ../include/server.h ../include/names.h \
++      ../include/irc.h ../include/myssl.h ../include/output.h \
+       ../include/parse.h ../include/dcc.h ../include/newio.h \
+       ../include/alias.h sig.inc
+-files.o: files.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircaux.h
+-flood.o: flood.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/hook.h ../include/ircaux.h ../include/ignore.h \
+-      ../include/flood.h ../include/vars.h ../include/output.h \
+-      ../include/myvars.h
+-funny.o: funny.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircaux.h ../include/hook.h ../include/vars.h \
+-      ../include/funny.h ../include/names.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/server.h ../include/ircterm.h \
++files.o: files.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/mystructs.h
++flood.o: flood.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/hook.h \
++      ../include/ircaux.h ../include/ignore.h ../include/flood.h \
++      ../include/vars.h ../include/output.h ../include/myvars.h
++funny.o: funny.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/hook.h ../include/vars.h ../include/funny.h \
++      ../include/names.h ../include/window.h ../include/hold.h \
++      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/irc.h ../include/server.h ../include/names.h \
++      ../include/myssl.h ../include/lastlog.h ../include/ircterm.h \
+       ../include/output.h ../include/numbers.h ../include/parse.h \
+       ../include/screen.h ../include/myvars.h
+-help.o: help.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircterm.h ../include/server.h ../include/names.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/vars.h \
+-      ../include/ircaux.h ../include/input.h ../include/screen.h \
+-      ../include/output.h ../include/help.h ../include/scandir.h
++help.o: help.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircterm.h \
++      ../include/server.h ../include/names.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/irc.h ../include/myssl.h ../include/vars.h \
++      ../include/ircaux.h ../include/input.h ../include/window.h \
++      ../include/screen.h ../include/output.h ../include/help.h \
++      ../include/scandir.h
+ history.o: history.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/ircaux.h ../include/vars.h ../include/history.h \
+-      ../include/output.h ../include/input.h
+-hold.o: hold.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircaux.h ../include/window.h ../include/hold.h \
++      ../include/output.h ../include/input.h ../include/debug.h
++hold.o: hold.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/screen.h \
++      ../include/window.h ../include/vars.h ../include/input.h
++hook.o: hook.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/hook.h \
++      ../include/vars.h ../include/ircaux.h ../include/alias.h \
++      ../include/list.h ../include/window.h ../include/hold.h \
+       ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/screen.h ../include/vars.h ../include/input.h
+-hook.o: hook.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/hook.h ../include/vars.h ../include/ircaux.h \
+-      ../include/alias.h ../include/list.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/server.h ../include/names.h \
+-      ../include/output.h ../include/buffer.h
++      ../include/server.h ../include/names.h ../include/window.h \
++      ../include/irc.h ../include/myssl.h ../include/output.h \
++      ../include/edit.h ../include/buffer.h
+ if.o: if.c ../include/irc.h ../include/defs.h ../include/celerity.h \
+       ../include/config.h ../include/irc_std.h ../include/debug.h \
+       ../include/struct.h ../include/mystructs.h ../include/alias.h \
+@@ -337,94 +352,105 @@ ignore.o: ignore.c ../include/irc.h ../i
+       ../include/ignore.h ../include/ircaux.h ../include/list.h \
+       ../include/vars.h ../include/output.h ../include/parse.h \
+       ../include/myvars.h
+-input.o: input.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/input.h ../include/ircterm.h ../include/alias.h \
+-      ../include/vars.h ../include/ircaux.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/screen.h ../include/exec.h \
+-      ../include/output.h ../include/myvars.h
++input.o: input.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/input.h \
++      ../include/ircterm.h ../include/alias.h ../include/vars.h \
++      ../include/ircaux.h ../include/window.h ../include/hold.h \
++      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/screen.h ../include/window.h ../include/exec.h \
++      ../include/output.h ../include/translat.h ../include/debug.h \
++      ../include/myvars.h
+ irc.o: irc.c ../include/irc.h ../include/defs.h ../include/celerity.h \
+       ../include/config.h ../include/irc_std.h ../include/debug.h \
+       ../include/struct.h ../include/mystructs.h ../include/status.h \
+       ../include/dcc.h ../include/names.h ../include/window.h \
+       ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/vars.h ../include/input.h \
++      ../include/menu.h ../include/irc.h ../include/vars.h ../include/input.h \
+       ../include/alias.h ../include/output.h ../include/ircterm.h \
+       ../include/exec.h ../include/screen.h ../include/log.h \
+-      ../include/server.h ../include/hook.h ../include/keys.h \
+-      ../include/ircaux.h ../include/history.h ../include/notify.h \
+-      ../include/mail.h ../include/newio.h ../include/ctcp.h \
+-      ../include/parse.h ../include/myvars.h ../include/cdcc.h
++      ../include/server.h ../include/names.h ../include/myssl.h \
++      ../include/hook.h ../include/keys.h ../include/ircaux.h \
++      ../include/edit.h ../include/window.h ../include/history.h \
++      ../include/notify.h ../include/mail.h ../include/debug.h \
++      ../include/newio.h ../include/ctcp.h ../include/parse.h \
++      ../include/myvars.h ../include/cdcc.h
+ ircaux.o: ircaux.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/ircaux.h ../include/output.h ../include/ircterm.h \
+-      ../include/newio.h
++      ../include/newio.h ../include/myssl.h
+ ircsig.o: ircsig.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h
+-keys.o: keys.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/output.h ../include/keys.h ../include/names.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/ircaux.h \
+-      ../include/vars.h ../include/translat.h ../include/ircterm.h \
+-      ../include/input.h ../include/screen.h ../include/myvars.h
++keys.o: keys.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/output.h \
++      ../include/keys.h ../include/names.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/irc.h ../include/ircaux.h \
++      ../include/window.h ../include/edit.h ../include/vars.h \
++      ../include/translat.h ../include/ircterm.h ../include/input.h \
++      ../include/screen.h ../include/menu.h ../include/myvars.h
+ lastlog.o: lastlog.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/lastlog.h ../include/window.h ../include/hold.h \
+-      ../include/edit.h ../include/menu.h ../include/screen.h \
+-      ../include/vars.h ../include/ircaux.h ../include/output.h
+-list.o: list.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/list.h ../include/ircaux.h
++      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/screen.h ../include/window.h ../include/vars.h \
++      ../include/ircaux.h ../include/output.h
++list.o: list.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/list.h \
++      ../include/ircaux.h
+ log.o: log.c ../include/irc.h ../include/defs.h ../include/celerity.h \
+       ../include/config.h ../include/irc_std.h ../include/debug.h \
+       ../include/struct.h ../include/mystructs.h ../include/log.h \
+       ../include/vars.h ../include/output.h ../include/ircaux.h \
+       ../include/myvars.h
+-mail.o: mail.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/newio.h ../include/myvars.h ../include/parse.h \
+-      ../include/ircaux.h ../include/screen.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/vars.h ../include/ircterm.h \
+-      ../include/mail.h ../include/hook.h ../include/output.h
+-menu.o: menu.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/menu.h ../include/list.h ../include/ircaux.h \
+-      ../include/ircterm.h ../include/window.h ../include/hold.h \
+-      ../include/lastlog.h ../include/edit.h ../include/screen.h \
+-      ../include/input.h ../include/vars.h ../include/output.h
+-names.o: names.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircaux.h ../include/names.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/screen.h ../include/server.h \
+-      ../include/list.h ../include/output.h ../include/notify.h \
+-      ../include/vars.h ../include/myvars.h ../include/whowas.h
+-newio.o: newio.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircaux.h ../include/newio.h
++mail.o: mail.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/newio.h \
++      ../include/myssl.h ../include/myvars.h ../include/mystructs.h \
++      ../include/parse.h ../include/ircaux.h ../include/screen.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/vars.h \
++      ../include/ircterm.h ../include/mail.h ../include/lastlog.h \
++      ../include/hook.h ../include/output.h ../include/window.h
++menu.o: menu.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/menu.h \
++      ../include/list.h ../include/ircaux.h ../include/ircterm.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/screen.h \
++      ../include/window.h ../include/input.h ../include/vars.h \
++      ../include/output.h
++names.o: names.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/names.h ../include/window.h ../include/hold.h \
++      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/irc.h ../include/window.h ../include/screen.h \
++      ../include/server.h ../include/names.h ../include/myssl.h \
++      ../include/lastlog.h ../include/list.h ../include/output.h \
++      ../include/notify.h ../include/vars.h ../include/myvars.h \
++      ../include/whowas.h
++newio.o: newio.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/newio.h ../include/myssl.h ../include/irc_std.h
+ notice.o: notice.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/whois.h ../include/ctcp.h ../include/window.h \
+       ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/flood.h ../include/vars.h \
+-      ../include/ircaux.h ../include/hook.h ../include/ignore.h \
+-      ../include/server.h ../include/names.h ../include/funny.h \
+-      ../include/output.h ../include/parse.h ../include/notify.h \
+-      ../include/status.h ../include/myvars.h
++      ../include/menu.h ../include/lastlog.h ../include/flood.h \
++      ../include/vars.h ../include/ircaux.h ../include/hook.h \
++      ../include/ignore.h ../include/server.h ../include/names.h \
++      ../include/window.h ../include/irc.h ../include/myssl.h \
++      ../include/funny.h ../include/output.h ../include/names.h \
++      ../include/parse.h ../include/notify.h ../include/status.h \
++      ../include/myvars.h
+ notify.o: notify.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+@@ -432,49 +458,55 @@ notify.o: notify.c ../include/irc.h ../i
+       ../include/whois.h ../include/hook.h ../include/server.h \
+       ../include/names.h ../include/window.h ../include/hold.h \
+       ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/output.h ../include/vars.h ../include/myvars.h
++      ../include/irc.h ../include/myssl.h ../include/output.h \
++      ../include/vars.h ../include/myvars.h
+ numbers.o: numbers.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/input.h ../include/edit.h ../include/ircaux.h \
+       ../include/vars.h ../include/lastlog.h ../include/hook.h \
+       ../include/server.h ../include/names.h ../include/window.h \
+-      ../include/hold.h ../include/menu.h ../include/whois.h \
+-      ../include/numbers.h ../include/screen.h ../include/output.h \
+-      ../include/funny.h ../include/parse.h ../include/ignore.h \
+-      ../include/status.h ../include/myvars.h
+-operv.o: operv.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircaux.h ../include/window.h ../include/hold.h \
+-      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/irc.h ../include/myssl.h ../include/whois.h \
++      ../include/numbers.h ../include/window.h ../include/screen.h \
++      ../include/output.h ../include/names.h ../include/funny.h \
++      ../include/parse.h ../include/ignore.h ../include/status.h \
++      ../include/myvars.h
++operv.o: operv.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/edit.h \
+       ../include/output.h ../include/server.h ../include/names.h \
++      ../include/window.h ../include/irc.h ../include/myssl.h \
+       ../include/screen.h ../include/status.h ../include/myvars.h
+ output.o: output.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/output.h ../include/vars.h ../include/input.h \
+       ../include/ircterm.h ../include/ircaux.h ../include/lastlog.h \
+-      ../include/window.h ../include/hold.h ../include/edit.h \
+-      ../include/menu.h ../include/screen.h ../include/hook.h \
+-      ../include/ctcp.h ../include/log.h ../include/alias.h \
+-      ../include/buffer.h ../include/status.h ../include/myvars.h
+-parse.o: parse.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/server.h ../include/names.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/vars.h ../include/ctcp.h \
+-      ../include/hook.h ../include/ignore.h ../include/whois.h \
+-      ../include/ircaux.h ../include/funny.h ../include/crypt.h \
+-      ../include/ircterm.h ../include/flood.h ../include/screen.h \
+-      ../include/output.h ../include/numbers.h ../include/parse.h \
+-      ../include/notify.h ../include/list.h ../include/status.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/screen.h \
++      ../include/window.h ../include/hook.h ../include/ctcp.h ../include/log.h \
++      ../include/alias.h ../include/buffer.h ../include/status.h \
+       ../include/myvars.h
+-queue.o: queue.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/alias.h ../include/ircaux.h ../include/output.h \
++parse.o: parse.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/server.h \
++      ../include/names.h ../include/window.h ../include/hold.h \
++      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/irc.h ../include/myssl.h ../include/names.h ../include/vars.h \
++      ../include/ctcp.h ../include/hook.h ../include/edit.h \
++      ../include/ignore.h ../include/whois.h ../include/lastlog.h \
++      ../include/ircaux.h ../include/funny.h ../include/crypt.h \
++      ../include/ircterm.h ../include/flood.h ../include/window.h \
++      ../include/screen.h ../include/output.h ../include/numbers.h \
++      ../include/parse.h ../include/notify.h ../include/list.h \
++      ../include/status.h ../include/myvars.h
++queue.o: queue.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/alias.h \
++      ../include/ircaux.h ../include/debug.h ../include/output.h \
+       ../include/edit.h ../include/if.h ../include/queue.h
+ reg.o: reg.c ../include/irc.h ../include/defs.h ../include/celerity.h \
+       ../include/config.h ../include/irc_std.h ../include/debug.h \
+@@ -488,27 +520,30 @@ screen.o: screen.c ../include/irc.h ../i
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/screen.h ../include/window.h ../include/hold.h \
+       ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/output.h ../include/vars.h ../include/server.h \
+-      ../include/names.h ../include/list.h ../include/ircterm.h \
+-      ../include/ircaux.h ../include/input.h ../include/log.h \
+-      ../include/hook.h ../include/dcc.h ../include/translat.h \
+-      ../include/exec.h ../include/newio.h ../include/parse.h \
+-      ../include/myvars.h
++      ../include/menu.h ../include/window.h ../include/output.h \
++      ../include/vars.h ../include/server.h ../include/names.h \
++      ../include/irc.h ../include/myssl.h ../include/list.h \
++      ../include/ircterm.h ../include/names.h ../include/ircaux.h \
++      ../include/input.h ../include/log.h ../include/hook.h ../include/dcc.h \
++      ../include/translat.h ../include/exec.h ../include/newio.h \
++      ../include/parse.h ../include/edit.h ../include/myvars.h
+ server.o: server.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/server.h ../include/names.h ../include/window.h \
+       ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/screen.h ../include/ircaux.h \
+-      ../include/whois.h ../include/exec.h ../include/output.h \
+-      ../include/parse.h ../include/list.h ../include/newio.h \
+-      ../include/vars.h ../include/hook.h ../include/myvars.h
+-stack.o: stack.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/stack.h ../include/hook.h ../include/alias.h \
+-      ../include/window.h ../include/hold.h ../include/lastlog.h \
+-      ../include/edit.h ../include/menu.h ../include/ircaux.h \
++      ../include/menu.h ../include/irc.h ../include/myssl.h \
++      ../include/screen.h ../include/ircaux.h ../include/whois.h \
++      ../include/lastlog.h ../include/exec.h ../include/window.h \
++      ../include/output.h ../include/names.h ../include/parse.h \
++      ../include/list.h ../include/newio.h ../include/vars.h ../include/hook.h \
++      ../include/myvars.h
++stack.o: stack.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/stack.h \
++      ../include/hook.h ../include/alias.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/hook.h ../include/ircaux.h \
+       ../include/output.h ../include/list.h
+ status.o: status.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+@@ -516,71 +551,88 @@ status.o: status.c ../include/irc.h ../i
+       ../include/ircterm.h ../include/status.h ../include/server.h \
+       ../include/names.h ../include/window.h ../include/hold.h \
+       ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/vars.h ../include/hook.h ../include/input.h \
++      ../include/irc.h ../include/myssl.h ../include/vars.h ../include/hook.h \
++      ../include/input.h ../include/edit.h ../include/window.h \
+       ../include/screen.h ../include/mail.h ../include/output.h \
+-      ../include/ircaux.h ../include/translat.h ../include/ctcp.h \
+-      ../include/myvars.h
+-term.o: term.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircterm.h ../include/translat.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/screen.h ../include/vars.h
++      ../include/names.h ../include/ircaux.h ../include/translat.h \
++      ../include/debug.h ../include/ctcp.h ../include/myvars.h
++term.o: term.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircterm.h \
++      ../include/translat.h ../include/window.h ../include/hold.h \
++      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/screen.h ../include/window.h ../include/vars.h
+ translat.o: translat.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/vars.h ../include/translat.h ../include/ircaux.h \
+       ../include/window.h ../include/hold.h ../include/lastlog.h \
+       ../include/edit.h ../include/menu.h ../include/screen.h \
+-      ../include/output.h digraph.inc
+-vars.o: vars.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/status.h ../include/window.h ../include/hold.h \
+-      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/window.h ../include/output.h digraph.inc
++vars.o: vars.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/status.h \
++      ../include/window.h ../include/hold.h ../include/lastlog.h \
++      ../include/edit.h ../include/menu.h ../include/lastlog.h \
+       ../include/log.h ../include/crypt.h ../include/history.h \
+       ../include/notify.h ../include/vars.h ../include/input.h \
+-      ../include/ircaux.h ../include/whois.h ../include/translat.h \
+-      ../include/ircterm.h ../include/output.h ../include/server.h \
+-      ../include/names.h ../include/alias.h ../include/myvars.h
+-whois.o: whois.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/whois.h ../include/hook.h ../include/lastlog.h \
+-      ../include/vars.h ../include/server.h ../include/names.h \
+-      ../include/window.h ../include/hold.h ../include/edit.h \
+-      ../include/menu.h ../include/ignore.h ../include/ircaux.h \
+-      ../include/notify.h ../include/numbers.h ../include/output.h \
+-      ../include/parse.h ../include/ctcp.h ../include/myvars.h
++      ../include/ircaux.h ../include/whois.h ../include/ircterm.h \
++      ../include/translat.h ../include/output.h ../include/server.h \
++      ../include/names.h ../include/window.h ../include/irc.h \
++      ../include/myssl.h ../include/alias.h ../include/myvars.h
++whois.o: whois.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/whois.h \
++      ../include/hook.h ../include/lastlog.h ../include/vars.h \
++      ../include/server.h ../include/names.h ../include/window.h \
++      ../include/hold.h ../include/lastlog.h ../include/edit.h \
++      ../include/menu.h ../include/irc.h ../include/myssl.h \
++      ../include/ignore.h ../include/ircaux.h ../include/notify.h \
++      ../include/numbers.h ../include/window.h ../include/edit.h \
++      ../include/output.h ../include/parse.h ../include/ctcp.h \
++      ../include/myvars.h
+ whowas.o: whowas.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/vars.h ../include/ircaux.h ../include/window.h \
+       ../include/hold.h ../include/lastlog.h ../include/edit.h \
+       ../include/menu.h ../include/whois.h ../include/hook.h \
+-      ../include/input.h ../include/names.h ../include/alias.h \
+-      ../include/output.h ../include/numbers.h ../include/status.h \
+-      ../include/screen.h ../include/list.h ../include/whowas.h \
+-      ../include/myvars.h
++      ../include/input.h ../include/names.h ../include/window.h \
++      ../include/irc.h ../include/alias.h ../include/output.h \
++      ../include/numbers.h ../include/status.h ../include/screen.h \
++      ../include/edit.h ../include/config.h ../include/list.h \
++      ../include/whowas.h ../include/names.h ../include/myvars.h
+ window.o: window.c ../include/irc.h ../include/defs.h \
+       ../include/celerity.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/screen.h ../include/window.h ../include/hold.h \
+       ../include/lastlog.h ../include/edit.h ../include/menu.h \
+-      ../include/vars.h ../include/server.h ../include/names.h \
+-      ../include/list.h ../include/ircterm.h ../include/ircaux.h \
+-      ../include/input.h ../include/status.h ../include/output.h \
+-      ../include/log.h ../include/hook.h ../include/dcc.h \
+-      ../include/translat.h ../include/parse.h ../include/myvars.h
++      ../include/menu.h ../include/window.h ../include/vars.h \
++      ../include/server.h ../include/names.h ../include/irc.h \
++      ../include/myssl.h ../include/list.h ../include/ircterm.h \
++      ../include/names.h ../include/ircaux.h ../include/input.h \
++      ../include/status.h ../include/output.h ../include/log.h \
++      ../include/hook.h ../include/dcc.h ../include/translat.h \
++      ../include/parse.h ../include/myvars.h
++dh1080.o: dh1080.c ../include/irc.h ../include/defs.h \
++      ../include/celerity.h ../include/config.h ../include/irc_std.h \
++      ../include/debug.h ../include/struct.h ../include/mystructs.h
++fish.o: fish.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircaux.h \
++      ../include/list.h ../include/vars.h
++sha-256.o: sha-256.c ../include/irc.h ../include/defs.h \
++      ../include/celerity.h ../include/config.h ../include/irc_std.h \
++      ../include/debug.h ../include/struct.h ../include/mystructs.h
+ ircio.o: ircio.c ../include/defs.h ../include/celerity.h \
+-      ../include/irc_std.h ../include/newio.h
+-wserv.o: wserv.c ../include/defs.h ../include/celerity.h \
+-      ../include/irc.h ../include/config.h ../include/irc_std.h \
++      ../include/irc_std.h ../include/newio.h ../include/myssl.h
++wserv.o: wserv.c ../include/defs.h ../include/celerity.h ../include/irc.h \
++      ../include/defs.h ../include/config.h ../include/irc_std.h \
+       ../include/debug.h ../include/struct.h ../include/mystructs.h \
+       ../include/ircterm.h
+-wterm.o: wterm.c ../include/irc.h ../include/defs.h \
+-      ../include/celerity.h ../include/config.h ../include/irc_std.h \
+-      ../include/debug.h ../include/struct.h ../include/mystructs.h \
+-      ../include/ircterm.h ../include/translat.h ../include/window.h \
+-      ../include/hold.h ../include/lastlog.h ../include/edit.h \
+-      ../include/menu.h ../include/screen.h ../include/vars.h
++wterm.o: wterm.c ../include/irc.h ../include/defs.h ../include/celerity.h \
++      ../include/config.h ../include/irc_std.h ../include/debug.h \
++      ../include/struct.h ../include/mystructs.h ../include/ircterm.h \
++      ../include/translat.h ../include/window.h ../include/hold.h \
++      ../include/lastlog.h ../include/edit.h ../include/menu.h \
++      ../include/screen.h ../include/window.h ../include/vars.h
+diff -uNrp b/source/numbers.c a/source/numbers.c
+--- b/source/numbers.c	2011-05-02 01:46:50.000000000 -0700
++++ a/source/numbers.c	2013-04-09 21:57:29.292551334 -0700
+@@ -1228,6 +1228,9 @@ numbered_command(from, comm, ArgList)
+ 	case 338:
+                 whois_actually(from, ArgList);
+                 break;
++	case 378: /* freenode */
++                whois_connecting(from, ArgList);
++                break;
+ /****************************************************************************/
+ 
+ 	case 321:		/* #define RPL_LISTSTART        321 */
+@@ -1693,6 +1696,13 @@ numbered_command(from, comm, ArgList)
+                                 CdccTimeWarning();
+                         }
+                         break;
++		case 346:
++		case 348:
++		case 367:
++                        PasteArgs(ArgList, 0);
++                        if (do_hook(current_numeric, "%s %s", from, *ArgList))
++                            put_it("%s", ArgList[0]);
++			break;
+ /****************************************************************************/
+ 
+ 		case 351:		/* #define RPL_VERSION          351 */
+diff -uNrp b/source/screen.c a/source/screen.c
+--- b/source/screen.c	2011-04-29 01:21:18.000000000 -0700
++++ a/source/screen.c	2013-04-09 21:57:29.294551379 -0700
+@@ -1800,6 +1800,11 @@ split_up_line(str)
+ 			else
+ 				malloc_strcpy(&temp, &(lbuf[start]));
+ 			malloc_strcpy(&output[line++], temp);
++/**************************** PATCHED by Flier ******************************/
++                        /* do not overflow the buffer */
++                        if (line >= MAXIMUM_SPLITS)
++                            break;
++/****************************************************************************/
+ 			lbuf[word_break] = c;
+ 			lbuf[word_break+1] = c1;
+ 			start = word_break;
+diff -uNrp b/source/vars.c a/source/vars.c
+--- b/source/vars.c	2011-04-29 05:04:26.000000000 -0700
++++ a/source/vars.c	2013-04-09 21:57:29.295551401 -0700
+@@ -165,6 +165,9 @@ IrcVariable irc_variable[] =
+ /****************************************************************************/
+ 	{ "DEBUG",			INT_TYPE_VAR,	0, NULL, NULL, 0, 0 },
+ 	{ "DECRYPT_PROGRAM",		STR_TYPE_VAR,	0, NULL, NULL, 0, VF_NODAEMON },
++/**************************** PATCHED by Flier ******************************/
++        { "DEFAULT_PROTOCOL",		STR_TYPE_VAR,	0, NULL, NULL, 0, 0 },
++/****************************************************************************/
+ 	{ "DISPLAY",			BOOL_TYPE_VAR,	DEFAULT_DISPLAY, NULL, NULL, 0, 0 },
+ /**************************** PATCHED by Flier ******************************/
+ 	{ "DISPLAY_ANSI",		BOOL_TYPE_VAR,	DEFAULT_DISPLAY_ANSI, NULL, RedrawAll, 0, 0 },
+diff -uNrp b/source/whois.c a/source/whois.c
+--- b/source/whois.c	2011-04-29 04:57:14.000000000 -0700
++++ a/source/whois.c	2013-04-09 21:57:29.296551424 -0700
+@@ -772,6 +772,56 @@ char **ArgList;
+         }
+     }
+ }
++
++void whois_connecting(from, ArgList)
++char *from;
++char **ArgList;
++{
++    if (!ignore_whois_crap) {
++        char *str;
++        char *host = NULL;
++        char *ip = NULL;
++        char tmpbuf[mybufsize];
++
++        str = ArgList[1];
++        strmcpy(tmpbuf, str, sizeof(tmpbuf));
++        if ((str = strstr(tmpbuf, " connecting from "))) {
++            str++;
++            str = index(str, ' ');
++            if (str) {
++                str++;
++                host = index(str, ' ');
++                if (host) {
++                    host++;
++                    ip = index(host, ' ');
++                    if (ip) *ip++ = '\0';
++                }
++            }
++        }
++        if (host && ip) {
++            if (do_hook(current_numeric, "%s %s %s", from, host, ip)) {
++#ifdef WANTANSI
++#ifdef GENX
++                put_it("%s³%sconnecting%s³ %s%s %s%s",
++                       numeric_banner(), CmdsColors[COLWHOIS].color5, Colors[COLOFF],
++                       CmdsColors[COLWHOIS].color2, host, ip, Colors[COLOFF]);
++#elif defined(CELECOSM)
++                put_it("%s%sconnecting%s:   %s%s %s%s",
++                       numeric_banner(), CmdsColors[COLWHOIS].color5, Colors[COLOFF],
++                       CmdsColors[COLWHOIS].color2, host, ip, Colors[COLOFF]);
++#else  /* CELECOSM */
++                put_it("%s%sConnecting%s: %s%s %s%s",
++                       numeric_banner(), CmdsColors[COLWHOIS].color5, Colors[COLOFF],
++                       CmdsColors[COLWHOIS].color2, host, ip, Colors[COLOFF]);
++#endif /* GENX */
++#else  /* WANTANSI */
++                put_it("%sConnecting:   %s %s",
++                      numeric_banner(), host, ip);
++#endif /* WANTANSI */
++            }
++        }
++    }
++}
+ /****************************************************************************/
+ 
+ void


More information about the scm-commits mailing list