-diff -burN eggdrop1.6.17.orig/configure eggdrop1.6.17/configure
---- eggdrop1.6.17.orig/configure 2004-10-18 00:15:56.795954240 +0200
-+++ eggdrop1.6.17/configure 2004-10-18 00:23:38.287796816 +0200
-@@ -315,7 +315,7 @@
+diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure
+--- eggdrop1.6.19/configure 2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/configure 2008-09-22 09:29:38.000000000 +0200
+@@ -315,7 +315,8 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS'
++
ac_subst_files=''
# Initialize some variables set by options.
-@@ -10113,8 +10113,8 @@
+@@ -10129,8 +10130,8 @@ _ACEOF
fi
-@@ -10812,7 +10812,7 @@
+@@ -10828,7 +10829,7 @@ s,@TCLINCFN@,$TCLINCFN,;t t
s,@TCL_REQS@,$TCL_REQS,;t t
s,@TCL_LIBS@,$TCL_LIBS,;t t
s,@EGGVERSION@,$EGGVERSION,;t t
s,@MOD_UPDIR@,$MOD_UPDIR,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-diff -burN eggdrop1.6.17.orig/doc/html/compiling.html eggdrop1.6.17/doc/html/compiling.html
---- eggdrop1.6.17.orig/doc/html/compiling.html 2004-10-18 00:15:56.620980840 +0200
-+++ eggdrop1.6.17/doc/html/compiling.html 2004-10-18 00:24:19.855477568 +0200
+diff -burNp eggdrop1.6.19/doc/html/compiling.html eggdrop1.6.19.new/doc/html/compiling.html
+--- eggdrop1.6.19/doc/html/compiling.html 2008-02-16 22:40:58.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/compiling.html 2008-09-22 09:32:52.000000000 +0200
@@ -147,7 +147,7 @@
<blockquote>
</pre>
</blockquote>
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ make install DEST=<directory>
<blockquote>
<pre>
</pre>
</blockquote>
</ol>
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ sh5 ./configure --with-tclinc='<f
<blockquote>
<pre>
</pre>
</blockquote>
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ gmake install DEST='directory'
<blockquote>
<pre>
</pre>
</blockquote></li>
</ol>
-@@ -389,14 +389,14 @@
+@@ -389,14 +389,14 @@ tar -zxf eggdrop1.6.19.tar.gz
<li>Compile the bot using 'make eggdrop'.<br><br></li>
</pre>
</blockquote>
-diff -burN eggdrop1.6.17.orig/doc/html/faqs.html eggdrop1.6.17/doc/html/faqs.html
---- eggdrop1.6.17.orig/doc/html/faqs.html 2004-10-18 00:15:56.612982056 +0200
-+++ eggdrop1.6.17/doc/html/faqs.html 2004-10-18 00:24:19.882473464 +0200
+diff -burNp eggdrop1.6.19/doc/html/faqs.html eggdrop1.6.19.new/doc/html/faqs.html
+--- eggdrop1.6.19/doc/html/faqs.html 2008-02-16 22:40:58.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/faqs.html 2008-09-22 09:36:32.000000000 +0200
@@ -254,7 +254,7 @@
<li>
and install your bot.</p>
</li>
-diff -burN eggdrop1.6.17.orig/doc/html/install.html eggdrop1.6.17/doc/html/install.html
---- eggdrop1.6.17.orig/doc/html/install.html 2004-10-18 00:15:56.623980384 +0200
-+++ eggdrop1.6.17/doc/html/install.html 2004-10-18 00:24:19.894471640 +0200
+diff -burNp eggdrop1.6.19/doc/html/install.html eggdrop1.6.19.new/doc/html/install.html
+--- eggdrop1.6.19/doc/html/install.html 2008-02-16 22:40:58.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/install.html 2008-09-22 09:39:15.000000000 +0200
@@ -100,13 +100,13 @@
<p>If you want to install to a different directory, use:</p>
</blockquote>
<p>Note that you must use full path for every file to be correctly
-diff -burN eggdrop1.6.17.orig/doc/html/readme.html eggdrop1.6.17/doc/html/readme.html
---- eggdrop1.6.17.orig/doc/html/readme.html 2004-10-18 00:15:56.632979016 +0200
-+++ eggdrop1.6.17/doc/html/readme.html 2004-10-18 00:24:19.979458720 +0200
+diff -burNp eggdrop1.6.19/doc/html/readme.html eggdrop1.6.19.new/doc/html/readme.html
+--- eggdrop1.6.19/doc/html/readme.html 2008-02-16 22:40:59.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/readme.html 2008-09-22 09:39:49.000000000 +0200
@@ -261,7 +261,7 @@
<blockquote>
<p>If you followed <a href="install.html">Compilation and
this will be pretty easy. Just upload the new eggdrop1.6.x.tar.gz file
to your home dir on your shell, gunzip and untar it, and type 'cd
~/eggdrop1.6.x'. Next, type './configure', 'make
-diff -burN eggdrop1.6.17.orig/doc/html/starting.html eggdrop1.6.17/doc/html/starting.html
---- eggdrop1.6.17.orig/doc/html/starting.html 2004-10-18 00:15:56.613981904 +0200
-+++ eggdrop1.6.17/doc/html/starting.html 2004-10-18 00:24:19.983458112 +0200
+diff -burNp eggdrop1.6.19/doc/html/starting.html eggdrop1.6.19.new/doc/html/starting.html
+--- eggdrop1.6.19/doc/html/starting.html 2008-02-16 22:40:59.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/starting.html 2008-09-22 09:42:21.000000000 +0200
@@ -97,7 +97,7 @@
Eggdrop, you just have to do:</p>
</blockquote>
<p>and it will copy all the necessary files.</p>
-diff -burN eggdrop1.6.17.orig/doc/Makefile.in eggdrop1.6.17/doc/Makefile.in
---- eggdrop1.6.17.orig/doc/Makefile.in 2004-10-18 00:15:56.638978104 +0200
-+++ eggdrop1.6.17/doc/Makefile.in 2004-10-18 00:23:49.173141992 +0200
-@@ -34,39 +34,39 @@
+diff -burNp eggdrop1.6.19/doc/Makefile.in eggdrop1.6.19.new/doc/Makefile.in
+--- eggdrop1.6.19/doc/Makefile.in 2004-08-08 20:17:00.000000000 +0200
++++ eggdrop1.6.19.new/doc/Makefile.in 2008-09-22 09:45:18.000000000 +0200
+@@ -34,39 +34,39 @@ clean:
@rm -f *~
install:
+ $(INSTALL_DATA) $$i $(DESTDIR)/doc/html/; \
done; \
fi
-diff -burN eggdrop1.6.17.orig/eggdrop.conf eggdrop1.6.17/eggdrop.conf
---- eggdrop1.6.17.orig/eggdrop.conf 2004-10-18 00:15:56.808952264 +0200
-+++ eggdrop1.6.17/eggdrop.conf 2004-10-18 00:26:48.348903136 +0200
+diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19.new/eggdrop.conf
+--- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100
++++ eggdrop1.6.19.new/eggdrop.conf 2008-09-22 09:52:43.000000000 +0200
@@ -1,4 +1,4 @@
-#! /path/to/executable/eggdrop
+#! /usr/bin/eggdrop
# ^- This should contain a fully qualified path to your Eggdrop executable.
#
# $Id$
-@@ -185,22 +185,22 @@
+@@ -185,22 +185,22 @@ set sort-users 0
# Specify here where Eggdrop should look for help files. Don't modify this
# setting unless you know what you're doing!
# This specifies what permissions the user, channel, and notes files should
# be set to. The octal values are the same as for the chmod system command.
-@@ -420,7 +420,7 @@
+@@ -419,7 +419,7 @@ die "Please make sure you edit your conf
# If you run the bot from the compilation directory, you will want to set
# this to "". If you use 'make install' (like all good kiddies do ;), this
# is a fine default. Otherwise, use your head :)
+set mod-path "/usr/lib/eggdrop/modules/"
- #### DNS MODULE ####
-@@ -1327,17 +1327,17 @@
+ #### BLOWFISH MODULE ####
+@@ -1334,19 +1334,19 @@ loadmodule uptime
# directory. All scripts should be put there, although you can place them where
# you like as long as you can supply a fully qualified path to them.
#
-# source scripts/script.tcl
-+# source /usr/share/eggdrop/scripts/script.tcl
++# /usr/share/eggdrop/scripts/script.tcl
-source scripts/alltools.tcl
-source scripts/action.fix.tcl
+source /usr/share/eggdrop/scripts/alltools.tcl
+source /usr/share/eggdrop/scripts/action.fix.tcl
- # Use this script for Tcl and Eggdrop downwards compatibility.
+ # Use this script for Tcl and Eggdrop backwards compatibility.
# NOTE: This can also cause problems with some newer scripts.
--source scripts/compat.tcl
+-#source scripts/compat.tcl
+source /usr/share/eggdrop/scripts/compat.tcl
# This script provides many useful informational functions, like setting
-source scripts/userinfo.tcl
+source /usr/share/eggdrop/scripts/userinfo.tcl
loadhelp userinfo.help
-diff -burN eggdrop1.6.17.orig/INSTALL eggdrop1.6.17/INSTALL
---- eggdrop1.6.17.orig/INSTALL 2004-10-18 00:15:56.820950440 +0200
-+++ eggdrop1.6.17/INSTALL 2004-10-18 00:21:41.065617296 +0200
-@@ -66,11 +66,11 @@
+
+ # A few IRC networks (EFnet and Undernet) have added some simple checks to
+diff -burNp eggdrop1.6.19/INSTALL eggdrop1.6.19.new/INSTALL
+--- eggdrop1.6.19/INSTALL 2008-02-16 22:40:54.000000000 +0100
++++ eggdrop1.6.19.new/INSTALL 2008-09-22 09:53:40.000000000 +0200
+@@ -66,11 +66,11 @@ Last revised: July 24, 2004
If you want to install to a different directory, use:
Note that you must use full path for every file to be correctly
installed.
-diff -burN eggdrop1.6.17.orig/Makefile.in eggdrop1.6.17/Makefile.in
---- eggdrop1.6.17.orig/Makefile.in 2004-10-18 00:15:56.809952112 +0200
-+++ eggdrop1.6.17/Makefile.in 2004-10-18 00:22:54.704422496 +0200
-@@ -11,7 +11,7 @@
+diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in
+--- eggdrop1.6.19/Makefile.in 2004-08-28 08:43:21.000000000 +0200
++++ eggdrop1.6.19.new/Makefile.in 2008-09-22 09:56:26.000000000 +0200
+@@ -11,7 +11,7 @@ VPATH = @srcdir@
@SET_MAKE@
prefix = @prefix@
EGGEXEC = @EGGEXEC@
EGGVERSION = @EGGVERSION@
-@@ -120,7 +120,7 @@
+@@ -119,7 +119,7 @@ MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC
MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
all: @DEFAULT_MAKE@
-@@ -309,109 +309,109 @@
+@@ -308,109 +308,109 @@ install-start:
echo ""; \
exit 1; \
fi
done; \
fi
@cd src/mod/ && $(MAKE_INSTALL) install-help
-@@ -419,25 +419,25 @@
+@@ -418,25 +418,25 @@ install-help:
install-language:
@echo "Copying language files."
@if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \
@cd doc/ && $(MAKE_INSTALL) install
install-scripts:
-@@ -450,7 +450,7 @@
+@@ -449,7 +449,7 @@ install-end:
@echo "You MUST ensure that you edit/verify your configuration file."
@echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop."
@echo ""
@echo ""
#safety hash
-diff -burN eggdrop1.6.17.orig/scripts/Makefile.in eggdrop1.6.17/scripts/Makefile.in
---- eggdrop1.6.17.orig/scripts/Makefile.in 2004-10-18 00:15:56.805952720 +0200
-+++ eggdrop1.6.17/scripts/Makefile.in 2004-10-18 00:27:06.471148136 +0200
-@@ -31,44 +31,44 @@
+diff -burNp eggdrop1.6.19/scripts/Makefile.in eggdrop1.6.19.new/scripts/Makefile.in
+--- eggdrop1.6.19/scripts/Makefile.in 2008-02-16 07:00:17.000000000 +0100
++++ eggdrop1.6.19.new/scripts/Makefile.in 2008-09-22 09:58:28.000000000 +0200
+@@ -32,44 +32,44 @@ clean:
@rm -f *~
install:
done; \
fi; \
fi
-diff -burN eggdrop1.6.17.orig/src/eggdrop.h eggdrop1.6.17/src/eggdrop.h
---- eggdrop1.6.17.orig/src/eggdrop.h 2004-10-18 00:15:56.762959256 +0200
-+++ eggdrop1.6.17/src/eggdrop.h 2004-10-18 00:27:26.368123336 +0200
+diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h
+--- eggdrop1.6.19/src/eggdrop.h 2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/eggdrop.h 2008-09-22 10:00:48.000000000 +0200
@@ -75,7 +75,7 @@
#define BASELANG "english" /* language which always gets loaded before
all other languages. You do not want to
change this. */
-diff -burN eggdrop1.6.17.orig/src/mod/Makefile.in eggdrop1.6.17/src/mod/Makefile.in
---- eggdrop1.6.17.orig/src/mod/Makefile.in 2004-10-18 00:15:56.711967008 +0200
-+++ eggdrop1.6.17/src/mod/Makefile.in 2004-10-18 00:27:34.444895480 +0200
-@@ -121,50 +121,50 @@
+diff -burNp eggdrop1.6.19/src/mod/Makefile.in eggdrop1.6.19.new/src/mod/Makefile.in
+--- eggdrop1.6.19/src/mod/Makefile.in 2004-08-28 08:43:22.000000000 +0200
++++ eggdrop1.6.19.new/src/mod/Makefile.in 2008-09-22 10:02:45.000000000 +0200
+@@ -123,50 +123,50 @@ install: install-help install-language
install-help:
@echo "Copying module help files."
-diff -urN eggdrop1.6.15/scripts/autobotchk eggdrop1.6.15-autobotchk/scripts/autobotchk
---- eggdrop1.6.15/scripts/autobotchk Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-autobotchk/scripts/autobotchk Tue May 6 15:38:37 2003
-@@ -99,7 +99,7 @@
+diff -burNp eggdrop1.6.19/scripts/autobotchk eggdrop1.6.19.new/scripts/autobotchk
+--- eggdrop1.6.19/scripts/autobotchk 2003-04-15 19:41:57.000000000 +0200
++++ eggdrop1.6.19.new/scripts/autobotchk 2008-09-22 12:38:36.447797899 +0200
+@@ -99,7 +99,7 @@ set delay 10
set email 1
# If you renamed your eggdrop binary, you should change this variable
while {[set opt [newsplit argv]] != ""} {
switch -- $opt {
-@@ -143,16 +143,6 @@
+@@ -143,16 +143,6 @@ if {[string match "*/scripts" $dir]} {
set dir [string trimright $dir /]
---- src/tcl.c.org 2008-03-09 12:56:37.212570719 +0100
-+++ src/tcl.c 2008-03-09 12:56:59.183621062 +0100
-@@ -292,7 +292,7 @@
+diff -burNp eggdrop1.6.19/src/tcl.c eggdrop1.6.19-new/src/tcl.c
+--- eggdrop1.6.19/src/tcl.c 2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19-new/src/tcl.c 2008-09-22 16:45:55.460597054 +0200
+@@ -282,7 +282,7 @@ static char *tcl_eggstr(ClientData cdata
if (!obj)
return NULL;
len = 0;
if (!bytes)
return NULL;
s = malloc(len + 1);
-@@ -350,7 +350,7 @@
+@@ -339,7 +339,7 @@ static int utf_converter(ClientData cdat
utftot += sizeof(char *) * objc;
objc -= 5;
for (i = 0; i < objc; i++) {
-diff -urN eggdrop1.6.15/eggdrop.conf eggdrop1.6.15-config_encryption/eggdrop.conf
---- eggdrop1.6.15/eggdrop.conf Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-config_encryption/eggdrop.conf Tue May 6 15:44:42 2003
-@@ -1273,15 +1273,18 @@
- #loadmodule seen
+diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19-new/eggdrop.conf
+--- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100
++++ eggdrop1.6.19-new/eggdrop.conf 2008-09-23 11:32:44.879761861 +0200
+@@ -422,14 +422,19 @@ die "Please make sure you edit your conf
+ set mod-path "modules/"
-#### BLOWFISH MODULE ####
# Please note that when you change your encryption method later (i.e.
# using other modules like a md5 module), you can't use your current
# userfile anymore. Eggdrop will not start without an encryption module.
-+# Choose only one of the following
- #loadmodule blowfish
--
+-loadmodule blowfish
++# WARNING! rijndael temporarily disabled, do not use it.
++# # Choose only one of the following:
++#loadmodule blowfish
+#loadmodule idea
+#loadmodule twofish
-+#loadmodule rijndael
++#loadmodule rijndael (do not use it, needs fixing)
- #### ASSOC MODULE ####
+ #### DNS MODULE ####
-diff -burN eggdrop1.6.17.orig/aclocal.m4 eggdrop1.6.17/aclocal.m4
---- eggdrop1.6.17.orig/aclocal.m4 2004-11-01 14:40:44.093457768 +0100
-+++ eggdrop1.6.17/aclocal.m4 2004-11-01 14:41:51.767169800 +0100
-@@ -37,6 +37,64 @@
+diff -burNp eggdrop1.6.19/aclocal.m4 eggdrop1.6.19.new/aclocal.m4
+--- eggdrop1.6.19/aclocal.m4 2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/aclocal.m4 2008-09-22 14:03:38.304371902 +0200
+@@ -36,6 +36,63 @@ AC_DEFUN([EGG_MSG_CONFIGURE_START],
+ AC_MSG_RESULT
])
-
+dnl EGG_SSL_CRAP()
+dnl
+AC_DEFUN(EGG_SSL_CRAP, [dnl
+#end of ssl checks - hoe (.16 by poci)
+])dnl
+
-+
+
dnl EGG_MSG_CONFIGURE_END()
dnl
- AC_DEFUN([EGG_MSG_CONFIGURE_END],
-diff -burN eggdrop1.6.17.orig/config.h.in eggdrop1.6.17/config.h.in
---- eggdrop1.6.17.orig/config.h.in 2004-11-01 14:40:44.110455184 +0100
-+++ eggdrop1.6.17/config.h.in 2004-11-01 14:41:51.769169496 +0100
-@@ -30,6 +30,9 @@
+diff -burNp eggdrop1.6.19/config.h.in eggdrop1.6.19.new/config.h.in
+--- eggdrop1.6.19/config.h.in 2006-11-20 12:38:25.000000000 +0100
++++ eggdrop1.6.19.new/config.h.in 2008-09-22 14:07:26.990831137 +0200
+@@ -33,6 +33,9 @@
/* Define to 1 if you have the `clock' function. */
#undef HAVE_CLOCK
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
-diff -burN eggdrop1.6.17.orig/configure eggdrop1.6.17/configure
---- eggdrop1.6.17.orig/configure 2004-11-01 14:40:44.098457008 +0100
-+++ eggdrop1.6.17/configure 2004-11-01 14:43:30.021232912 +0100
-@@ -315,7 +315,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS SSL_LIBS SSL_INCLUDE EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -856,6 +856,7 @@
+diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure
+--- eggdrop1.6.19/configure 2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/configure 2008-09-22 14:22:28.610498567 +0200
+@@ -856,6 +857,7 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-tcllib=PATH full path to Tcl library
--with-tclinc=PATH full path to Tcl header
Some influential environment variables:
CC C compiler command
-@@ -10100,6 +10101,374 @@
-
+@@ -10113,8 +10115,372 @@ EOF
+ ac_config_commands="$ac_config_commands replace-if-changed"
+#ssl checks - hoe
+echo "$as_me:$LINENO: checking whether to include SSL support" >&5
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
-+
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+
+
+fi;
-+
+
+#end of ssl checks - hoe (.16 by poci)
-+
-+
- # Substitute Makefile variables.
-@@ -10811,6 +11180,8 @@
+ # Substitute Makefile variables.
+@@ -10827,6 +11193,8 @@ s,@TCLINC@,$TCLINC,;t t
s,@TCLINCFN@,$TCLINCFN,;t t
s,@TCL_REQS@,$TCL_REQS,;t t
s,@TCL_LIBS@,$TCL_LIBS,;t t
+s,@SSL_LIBS@,$SSL_LIBS,;t t
+s,@SSL_INCLUDE@,$SSL_INCLUDE,;t t
s,@EGGVERSION@,$EGGVERSION,;t t
- s,@DESTDIR@,$DESTDIR,;t t
+ s,@DEST@,$DEST,;t t
s,@MOD_UPDIR@,$MOD_UPDIR,;t t
-diff -burN eggdrop1.6.17.orig/configure.ac eggdrop1.6.17/configure.ac
---- eggdrop1.6.17.orig/configure.ac 2004-11-01 14:40:44.109455336 +0100
-+++ eggdrop1.6.17/configure.ac 2004-11-01 14:41:51.866154752 +0100
-@@ -148,6 +148,8 @@
+diff -burNp eggdrop1.6.19/configure.ac eggdrop1.6.19.new/configure.ac
+--- eggdrop1.6.19/configure.ac 2008-02-18 23:25:33.000000000 +0100
++++ eggdrop1.6.19.new/configure.ac 2008-09-22 14:23:32.432890637 +0200
+@@ -150,6 +150,7 @@ EGG_TCL_CHECK_THREADS
EGG_TCL_LIB_REQS
EGG_TCL_LUSH
+EGG_SSL_CRAP
-+
# Substitute Makefile variables.
EGG_SUBST_EGGVERSION
-diff -burN eggdrop1.6.17.orig/disabled_modules eggdrop1.6.17/disabled_modules
---- eggdrop1.6.17.orig/disabled_modules 2004-11-01 14:40:44.110455184 +0100
-+++ eggdrop1.6.17/disabled_modules 1970-01-01 01:00:00.000000000 +0100
+diff -burNp eggdrop1.6.19/disabled_modules eggdrop1.6.19.new/disabled_modules
+--- eggdrop1.6.19/disabled_modules 2002-06-04 07:11:10.000000000 +0200
++++ eggdrop1.6.19.new/disabled_modules 2008-09-22 14:25:14.439395696 +0200
@@ -1,12 +0,0 @@
-# disabled_modules -- File which lists all Eggdrop modules that are
-# disabled by default.
-# Woobie only serves as an example for module programming. No need to
-# compile it for normal bots ...
-woobie
-diff -burN eggdrop1.6.17.orig/Makefile eggdrop1.6.17/Makefile
---- eggdrop1.6.17.orig/Makefile 2004-11-01 14:40:44.093457768 +0100
-+++ eggdrop1.6.17/Makefile 1970-01-01 01:00:00.000000000 +0100
+diff -burNp eggdrop1.6.19/Makefile eggdrop1.6.19.new/Makefile
+--- eggdrop1.6.19/Makefile 2008-04-19 06:21:34.000000000 +0200
++++ eggdrop1.6.19.new/Makefile 2008-09-22 14:25:56.388522764 +0200
@@ -1,8 +0,0 @@
-all:
- @echo ""
- @echo " % ./configure"
- @echo ""
-
-diff -burN eggdrop1.6.17.orig/Makefile.in eggdrop1.6.17/Makefile.in
---- eggdrop1.6.17.orig/Makefile.in 2004-11-01 14:40:44.109455336 +0100
-+++ eggdrop1.6.17/Makefile.in 2004-11-01 14:41:51.766169952 +0100
-@@ -57,6 +57,8 @@
+diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in
+--- eggdrop1.6.19/Makefile.in 2004-08-28 08:43:21.000000000 +0200
++++ eggdrop1.6.19.new/Makefile.in 2008-09-22 14:29:11.247383482 +0200
+@@ -57,6 +57,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
RANLIB = @RANLIB@
MOD_EXT = @MOD_EXT@
XREQS = @TCL_REQS@
TCLLIB = @TCLLIB@
TCLLIBFN = @TCLLIBFN@
-@@ -89,7 +91,8 @@
+@@ -89,7 +91,8 @@ egg_install_msg = echo "" && \
MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \
'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \
-@@ -99,12 +102,13 @@
+@@ -99,12 +102,13 @@ MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC
'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \
'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \
MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
-@@ -113,7 +117,8 @@
+@@ -113,7 +117,8 @@ MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)'
MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DSTATIC $(CFLGS)' \
'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'XSSL_LIBS=$(XSSL_LIBS)' 'EGGEXEC=$(EGGEXEC)' \
+'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
- MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
- 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)'
-diff -burN eggdrop1.6.17.orig/src/dcc.c eggdrop1.6.17/src/dcc.c
---- eggdrop1.6.17.orig/src/dcc.c 2004-11-01 14:40:44.050464304 +0100
-+++ eggdrop1.6.17/src/dcc.c 2004-11-01 14:41:51.870154144 +0100
+ MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)'
+
+diff -burNp eggdrop1.6.19/src/dcc.c eggdrop1.6.19.new/src/dcc.c
+--- eggdrop1.6.19/src/dcc.c 2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/dcc.c 2008-09-22 14:30:37.252784308 +0200
@@ -32,7 +32,11 @@
#include "tandem.h"
extern struct userrec *userlist;
extern struct chanset_t *chanset;
-diff -burN eggdrop1.6.17.orig/src/dccutil.c eggdrop1.6.17/src/dccutil.c
---- eggdrop1.6.17.orig/src/dccutil.c 2004-11-01 14:40:44.053463848 +0100
-+++ eggdrop1.6.17/src/dccutil.c 2004-11-01 14:41:51.872153840 +0100
+diff -burNp eggdrop1.6.19/src/dccutil.c eggdrop1.6.19.new/src/dccutil.c
+--- eggdrop1.6.19/src/dccutil.c 2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/dccutil.c 2008-09-22 14:31:42.540452895 +0200
@@ -33,6 +33,7 @@
#include "chan.h"
#include "modules.h"
extern struct dcc_t *dcc;
extern int dcc_total, max_dcc, dcc_flood_thr, backgrd, copy_to_tmp, MAXSOCKS;
-diff -burN eggdrop1.6.17.orig/src/eggdrop.h eggdrop1.6.17/src/eggdrop.h
---- eggdrop1.6.17.orig/src/eggdrop.h 2004-11-01 14:40:44.068461568 +0100
-+++ eggdrop1.6.17/src/eggdrop.h 2004-11-01 14:41:51.873153688 +0100
-@@ -616,17 +616,6 @@
+diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h
+--- eggdrop1.6.19/src/eggdrop.h 2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/eggdrop.h 2008-09-22 14:33:40.008829213 +0200
+@@ -616,18 +616,6 @@ enum {
#define HELP_TEXT 2
#define HELP_IRC 16
- unsigned long outbuflen; /* Outbuf could be binary data */
- unsigned long inbuflen; /* Inbuf could be binary data */
-} sock_list;
-
+-
enum {
EGG_OPTION_SET = 1, /* Set option(s). */
-diff -burN eggdrop1.6.17.orig/src/main.c eggdrop1.6.17/src/main.c
---- eggdrop1.6.17.orig/src/main.c 2004-11-01 14:40:44.069461416 +0100
-+++ eggdrop1.6.17/src/main.c 2004-11-01 14:41:51.875153384 +0100
-@@ -161,6 +161,9 @@
+ EGG_OPTION_UNSET = 2 /* Unset option(s). */
+diff -burNp eggdrop1.6.19/src/main.c eggdrop1.6.19.new/src/main.c
+--- eggdrop1.6.19/src/main.c 2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/main.c 2008-09-22 14:35:26.008450672 +0200
+@@ -161,6 +161,9 @@ int cx_line[16];
int cx_ptr = 0;
#endif
void fatal(const char *s, int recoverable)
{
-@@ -171,6 +174,9 @@
+@@ -171,6 +174,9 @@ void fatal(const char *s, int recoverabl
for (i = 0; i < dcc_total; i++)
if (dcc[i].sock >= 0)
killsock(dcc[i].sock);
unlink(pid_file);
if (!recoverable) {
bg_send_quit(BG_ABORT);
-diff -burN eggdrop1.6.17.orig/src/Makefile.in eggdrop1.6.17/src/Makefile.in
---- eggdrop1.6.17.orig/src/Makefile.in 2004-11-01 14:40:44.067461720 +0100
-+++ eggdrop1.6.17/src/Makefile.in 2004-11-01 14:41:51.868154448 +0100
-@@ -11,6 +11,8 @@
+diff -burNp eggdrop1.6.19/src/Makefile.in eggdrop1.6.19.new/src/Makefile.in
+--- eggdrop1.6.19/src/Makefile.in 2006-11-20 12:38:25.000000000 +0100
++++ eggdrop1.6.19.new/src/Makefile.in 2008-09-22 14:38:37.400421493 +0200
+@@ -11,6 +11,8 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
CC = @CC@
LD = @CC@
-@@ -37,7 +39,7 @@
+@@ -37,7 +39,7 @@ doofus:
@echo "Linking eggdrop $(EGGBUILD)."
@echo ""
@touch mod/mod.xlibs
$(STRIP) ../$(EGGEXEC)
@echo ""
@echo "Successful compile: $(EGGEXEC)"
-diff -burN eggdrop1.6.17.orig/src/md5/md5c.c eggdrop1.6.17/src/md5/md5c.c
---- eggdrop1.6.17.orig/src/md5/md5c.c 2004-11-01 14:40:43.906486192 +0100
-+++ eggdrop1.6.17/src/md5/md5c.c 2004-11-01 14:41:51.920146544 +0100
+diff -burNp eggdrop1.6.19/src/md5/md5c.c eggdrop1.6.19.new/src/md5/md5c.c
+--- eggdrop1.6.19/src/md5/md5c.c 2004-04-10 09:49:23.000000000 +0200
++++ eggdrop1.6.19.new/src/md5/md5c.c 2008-09-22 14:40:36.140399142 +0200
@@ -17,9 +17,23 @@
#include <string.h>
/*
* The basic MD5 functions.
*
-diff -burN eggdrop1.6.17.orig/src/md5/md5.h eggdrop1.6.17/src/md5/md5.h
---- eggdrop1.6.17.orig/src/md5/md5.h 2004-11-01 14:40:43.905486344 +0100
-+++ eggdrop1.6.17/src/md5/md5.h 2004-11-01 14:41:51.876153232 +0100
-@@ -5,6 +5,9 @@
+diff -burNp eggdrop1.6.19/src/md5/md5.h eggdrop1.6.19.new/src/md5/md5.h
+--- eggdrop1.6.19/src/md5/md5.h 2003-03-06 04:35:59.000000000 +0100
++++ eggdrop1.6.19.new/src/md5/md5.h 2008-09-22 14:44:22.801432410 +0200
+@@ -5,6 +5,8 @@
* Written by Solar Designer <solar@openwall.com> in 2001, and placed in
* the public domain. See md5c.c for more information.
*/
+#include "../config.h"
+#ifndef EGG_SSL_EXT
-+
#ifndef _MD5_H
#define _MD5_H
-@@ -24,3 +27,4 @@
+@@ -24,3 +26,4 @@ extern void MD5_Update(MD5_CTX *ctx, voi
extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
#endif
+#endif
-diff -burN eggdrop1.6.17.orig/src/mod/irc.mod/chan.c eggdrop1.6.17/src/mod/irc.mod/chan.c
---- eggdrop1.6.17.orig/src/mod/irc.mod/chan.c 2004-11-01 14:40:44.040465824 +0100
-+++ eggdrop1.6.17/src/mod/irc.mod/chan.c 2004-11-01 14:41:51.953141528 +0100
-@@ -952,10 +952,10 @@
+diff -burNp eggdrop1.6.19/src/mod/irc.mod/chan.c eggdrop1.6.19.new/src/mod/irc.mod/chan.c
+--- eggdrop1.6.19/src/mod/irc.mod/chan.c 2008-02-16 22:41:09.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/irc.mod/chan.c 2008-09-22 14:46:27.143879710 +0200
+@@ -965,10 +965,10 @@ static int got324(char *from, char *msg)
q = strchr(p, ' ');
if (q != NULL) {
*q = 0;
*p = 0;
}
}
-diff -burN eggdrop1.6.17.orig/src/mod/irc.mod/irc.c eggdrop1.6.17/src/mod/irc.mod/irc.c
---- eggdrop1.6.17.orig/src/mod/irc.mod/irc.c 2004-11-01 14:40:44.037466280 +0100
-+++ eggdrop1.6.17/src/mod/irc.mod/irc.c 2004-11-01 14:41:51.987136360 +0100
-@@ -256,7 +256,7 @@
+diff -burNp eggdrop1.6.19/src/mod/irc.mod/irc.c eggdrop1.6.19.new/src/mod/irc.mod/irc.c
+--- eggdrop1.6.19/src/mod/irc.mod/irc.c 2008-02-16 22:41:09.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/irc.mod/irc.c 2008-09-22 14:47:35.182249518 +0200
+@@ -256,7 +256,7 @@ static void maybe_revenge(struct chanset
/* Set the key.
*/
{
nfree(chan->channel.key);
if (k == NULL) {
-diff -burN eggdrop1.6.17.orig/src/mod/irc.mod/irc.h eggdrop1.6.17/src/mod/irc.mod/irc.h
---- eggdrop1.6.17.orig/src/mod/irc.mod/irc.h 2004-11-01 14:40:44.039465976 +0100
-+++ eggdrop1.6.17/src/mod/irc.mod/irc.h 2004-11-01 14:41:51.988136208 +0100
-@@ -69,7 +69,7 @@
+diff -burNp eggdrop1.6.19/src/mod/irc.mod/irc.h eggdrop1.6.19.new/src/mod/irc.mod/irc.h
+--- eggdrop1.6.19/src/mod/irc.mod/irc.h 2008-02-16 22:41:09.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/irc.mod/irc.h 2008-09-22 14:53:47.281677127 +0200
+@@ -69,7 +69,7 @@ static void set_delay(struct chanset_t *
static void reset_chan_info(struct chanset_t *);
static void recheck_channel(struct chanset_t *, int);
static void maybe_revenge(struct chanset_t *, char *, char *, int);
static int detect_chan_flood(char *, char *, char *, struct chanset_t *, int,
char *);
-diff -burN eggdrop1.6.17.orig/src/mod/irc.mod/mode.c eggdrop1.6.17/src/mod/irc.mod/mode.c
---- eggdrop1.6.17.orig/src/mod/irc.mod/mode.c 2004-11-01 14:40:44.041465672 +0100
-+++ eggdrop1.6.17/src/mod/irc.mod/mode.c 2004-11-01 14:41:51.991135752 +0100
-@@ -1128,7 +1128,7 @@
+diff -burNp eggdrop1.6.19/src/mod/irc.mod/mode.c eggdrop1.6.19.new/src/mod/irc.mod/mode.c
+--- eggdrop1.6.19/src/mod/irc.mod/mode.c 2008-02-16 22:41:09.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/irc.mod/mode.c 2008-09-22 14:57:12.177766159 +0200
+@@ -1128,7 +1128,7 @@ static int gotmode(char *from, char *ori
+ break;
}
- check_tcl_mode(nick, from, u, chan->dname, ms2, op);
if (ms2[0] == '+') {
- set_key(chan, op);
+ set_keyegg(chan, op);
if (channel_active(chan))
got_key(chan, nick, from, op);
} else {
-@@ -1139,7 +1139,7 @@
+@@ -1139,7 +1139,7 @@ static int gotmode(char *from, char *ori
!chan_master(user) && !match_my_nick(nick))
add_mode(chan, '+', 'k', chan->key_prot);
}
- set_key(chan, NULL);
-+ set_keyegg(chan, NULL);
++ set_keyegg(chan, NULL);
}
+ check_tcl_mode(nick, from, u, chan->dname, ms2, op);
break;
- case 'o':
-diff -burN eggdrop1.6.17.orig/src/mod/module.h eggdrop1.6.17/src/mod/module.h
---- eggdrop1.6.17.orig/src/mod/module.h 2004-11-01 14:40:43.926483152 +0100
-+++ eggdrop1.6.17/src/mod/module.h 2004-11-01 14:41:51.995135144 +0100
+diff -burNp eggdrop1.6.19/src/mod/module.h eggdrop1.6.19.new/src/mod/module.h
+--- eggdrop1.6.19/src/mod/module.h 2008-02-16 22:41:06.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/module.h 2008-09-22 15:00:36.262853551 +0200
@@ -471,13 +471,23 @@
/* IPv6 leftovers: 286 */
/* IPv6 leftovers: 287 */
/* hostmasking */
#define maskhost(a,b) _maskhost((a),(b),1)
-diff -burN eggdrop1.6.17.orig/src/mod/server.mod/servmsg.c eggdrop1.6.17/src/mod/server.mod/servmsg.c
---- eggdrop1.6.17.orig/src/mod/server.mod/servmsg.c 2004-11-01 14:40:43.987473880 +0100
-+++ eggdrop1.6.17/src/mod/server.mod/servmsg.c 2004-11-01 14:41:52.036128912 +0100
-@@ -1239,6 +1239,14 @@
+diff -burNp eggdrop1.6.19/src/mod/server.mod/servmsg.c eggdrop1.6.19.new/src/mod/server.mod/servmsg.c
+--- eggdrop1.6.19/src/mod/server.mod/servmsg.c 2008-02-16 22:41:10.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/server.mod/servmsg.c 2008-09-22 15:16:40.818273894 +0200
+@@ -1293,6 +1293,14 @@ static void server_resolve_success(int s
fatal("NO SERVERS WILL ACCEPT MY CONNECTION.", 0);
} else {
dcc[servidx].sock = serv;
/* Queue standard login */
dcc[servidx].timeval = now;
SERVER_SOCKET.timeout_val = &server_timeout;
-diff -burN eggdrop1.6.17.orig/src/modules.c eggdrop1.6.17/src/modules.c
---- eggdrop1.6.17.orig/src/modules.c 2004-11-01 14:40:44.071461112 +0100
-+++ eggdrop1.6.17/src/modules.c 2004-11-01 14:41:52.041128152 +0100
+diff -burNp eggdrop1.6.19/src/modules.c eggdrop1.6.19.new/src/modules.c
+--- eggdrop1.6.19/src/modules.c 2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19.new/src/modules.c 2008-09-22 15:30:23.753434245 +0200
@@ -29,9 +29,17 @@
#include "main.h"
#include "modules.h"
#ifndef STATIC
# ifdef MOD_USE_SHL
# include <dl.h>
-@@ -94,6 +102,10 @@
+@@ -94,6 +102,10 @@ extern int parties, noshare, dcc_total,
password_timeout, force_expire, protect_readonly, reserved_port_min,
reserved_port_max, copy_to_tmp, quiet_reject;
extern party_t *party;
extern time_t now, online_since;
extern tand_t *tandbot;
-@@ -128,6 +140,10 @@
+@@ -128,6 +140,9 @@ void check_static(char *name, char *(*fu
}
#endif /* STATIC */
+#ifdef EGG_SSL_EXT
+int net_switch_to_ssl(int);
+#endif
-+
/* The null functions */
void null_func()
-@@ -564,7 +580,13 @@
+@@ -564,7 +579,13 @@ Function global_table[] = {
(Function) 0, /* IPv6 leftovers: 286 */
(Function) 0, /* IPv6 leftovers: 287 */
/* 288 - 291 */
(Function) strip_mirc_codes,
(Function) check_ansi,
(Function) oatoi,
-diff -burN eggdrop1.6.17.orig/src/net.c eggdrop1.6.17/src/net.c
---- eggdrop1.6.17.orig/src/net.c 2004-11-01 14:40:44.052464000 +0100
-+++ eggdrop1.6.17/src/net.c 2004-11-01 14:41:52.044127696 +0100
-@@ -34,6 +34,18 @@
+diff -burNp eggdrop1.6.19/src/net.c eggdrop1.6.19.new/src/net.c
+--- eggdrop1.6.19/src/net.c 2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19.new/src/net.c 2008-09-22 16:10:28.739840200 +0200
+@@ -52,6 +52,18 @@
# endif
#endif
extern struct dcc_t *dcc;
extern int backgrd, use_stderr, resolve_timeout, dcc_total;
extern unsigned long otraffic_irc_today, otraffic_bn_today, otraffic_dcc_today,
-@@ -46,7 +58,11 @@
- int firewallport = 1080; /* Default port of socks 4/5 firewalls. */
+@@ -65,6 +77,12 @@ int firewallport = 1080; /* Default
char botuser[21] = "eggdrop"; /* Username of the user running the bot. */
int dcc_sanitycheck = 0; /* Do some sanity checking on dcc connections. */
--
+
+#ifdef EGG_SSL_EXT
+SSL_CTX *ssl_ctx=NULL;
+char *tls_rand_file = NULL;
+int use_ssl = 0; /* kyotou */
+#endif
++
sock_list *socklist = NULL; /* Enough to be safe. */
int MAXSOCKS = 0;
- jmp_buf alarmret; /* Env buffer for alarm() returns. */
-@@ -70,6 +86,46 @@
+ sigjmp_buf alarmret; /* Env buffer for alarm() returns. */
+@@ -88,6 +106,46 @@ IP my_atoul(char *s)
return ret;
}
/* Initialize the socklist
*/
void init_net()
-@@ -78,8 +134,34 @@
+@@ -96,9 +154,35 @@ void init_net()
for (i = 0; i < MAXSOCKS; i++) {
socklist[i].flags = SOCK_UNUSED;
+#ifdef EGG_SSL_EXT
+ socklist[i].ssl=NULL;
+#endif
-+ }
+ }
+#ifdef EGG_SSL_EXT
+ /* good place to init ssl stuff */
+ SSL_load_error_strings();
+ if (seed_PRNG())
+ fatal("Wasn't able to properly seed the PRNG!",0);
+#endif
-+}
-+
+ }
+
+#ifdef EGG_SSL_EXT
+/* cleanup mess when quiting */
+int clean_net() {
+ if (ssl_ctx) {
+ SSL_CTX_free(ssl_ctx);
+ ssl_ctx = NULL;
- }
++ }
+ if (tls_rand_file)
+ RAND_write_file(tls_rand_file);
+ return 0;
- }
++ }
+#endif
-
++
int expmem_net()
{
-@@ -289,6 +371,13 @@
+ int i, tot = 0;
+@@ -231,6 +315,13 @@ int sockoptions(int sock, int operation,
- for (i = 0; i < MAXSOCKS; i++) {
+ for (i = 0; i < MAXSOCKS; i++)
if ((socklist[i].sock == sock) && !(socklist[i].flags & SOCK_UNUSED)) {
+#ifdef EGG_SSL_EXT
+ if (socklist[i].ssl) {
+ SSL_free(socklist[i].ssl);
+ socklist[i].ssl=NULL;
+ }
-+#endif
- close(socklist[i].sock);
- if (socklist[i].inbuf != NULL) {
- nfree(socklist[i].inbuf);
-@@ -428,6 +517,63 @@
++#endif
+ if (operation == EGG_OPTION_SET)
+ socklist[i].flags |= sock_options;
+ else if (operation == EGG_OPTION_UNSET)
+@@ -366,6 +457,64 @@ static int proxy_connect(int sock, char
return sock;
}
+}
+#endif
+
- /* Ordinary non-binary connection attempt */
- int open_telnet(char *server, int port)
- {
-@@ -639,6 +785,9 @@
++
+ /* Starts a connection attempt to a socket
+ *
+ * If given a normal hostname, this will be resolved to the corresponding
+@@ -627,6 +776,9 @@ static int sockread(char *s, int *len)
for (i = 0; i < MAXSOCKS; i++) {
if ((!(socklist[i].flags & SOCK_UNUSED)) &&
((FD_ISSET(socklist[i].sock, &fd)) ||
((socklist[i].sock == STDOUT) && (!backgrd) &&
(FD_ISSET(STDIN, &fd))))) {
if (socklist[i].flags & (SOCK_LISTEN | SOCK_CONNECT)) {
-@@ -663,7 +812,31 @@
+@@ -651,7 +803,31 @@ static int sockread(char *s, int *len)
if ((socklist[i].sock == STDOUT) && !backgrd)
x = read(STDIN, s, grab);
else
x = read(socklist[i].sock, s, grab);
+ }
+#else
-+ x = read(socklist[i].sock, s, grab);
++ x = read(socklist[i].sock, s, grab);
+#endif
if (x <= 0) { /* eof */
if (errno != EAGAIN) { /* EAGAIN happens when the operation would
* block on a non-blocking socket, if the
-@@ -956,6 +1129,26 @@
+@@ -944,6 +1120,26 @@ void tputs(register int z, char *s, unsi
socklist[i].outbuflen += len;
return;
}
/* Try. */
x = write(z, s, len);
if (x == -1)
-@@ -1022,6 +1215,27 @@
+@@ -1010,6 +1206,27 @@ void dequeue_sockets()
(socklist[i].outbuf != NULL) && (FD_ISSET(socklist[i].sock, &wfds))) {
/* Trick tputs into doing the work */
errno = 0;
x = write(socklist[i].sock, socklist[i].outbuf, socklist[i].outbuflen);
if ((x < 0) && (errno != EAGAIN)
#ifdef EBADSLT
-diff -burN eggdrop1.6.17.orig/src/net.h eggdrop1.6.17/src/net.h
---- eggdrop1.6.17.orig/src/net.h 1970-01-01 01:00:00.000000000 +0100
-+++ eggdrop1.6.17/src/net.h 2004-11-01 14:41:52.045127544 +0100
+diff -burNp eggdrop1.6.19/src/net.h eggdrop1.6.19.new/src/net.h
+--- eggdrop1.6.19/src/net.h 1970-01-01 01:00:00.000000000 +0100
++++ eggdrop1.6.19.new/src/net.h 2008-09-22 16:12:38.979826983 +0200
@@ -0,0 +1,30 @@
+#ifndef _EGG_NET_H
+#define _EGG_NET_H
+} sock_list;
+
+#endif /* _EGG_NET_H */
-diff -burN eggdrop1.6.17.orig/src/patch.h eggdrop1.6.17/src/patch.h
---- eggdrop1.6.17.orig/src/patch.h 2004-11-01 14:40:44.074460656 +0100
-+++ eggdrop1.6.17/src/patch.h 2004-11-01 14:42:19.178002720 +0100
-@@ -46,7 +46,9 @@
+diff -burNp eggdrop1.6.19/src/patch.h eggdrop1.6.19.new/src/patch.h
+--- eggdrop1.6.19/src/patch.h 2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/src/patch.h 2008-09-22 16:13:41.491758122 +0200
+@@ -36,7 +36,9 @@
*
*
*/
/*
*
*
-diff -burN eggdrop1.6.17.orig/src/tcl.c eggdrop1.6.17/src/tcl.c
---- eggdrop1.6.17.orig/src/tcl.c 2004-11-01 14:40:44.052464000 +0100
-+++ eggdrop1.6.17/src/tcl.c 2004-11-01 14:41:52.049126936 +0100
-@@ -45,6 +45,10 @@
+diff -burNp eggdrop1.6.19/src/tcl.c eggdrop1.6.19.new/src/tcl.c
+--- eggdrop1.6.19/src/tcl.c 2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19.new/src/tcl.c 2008-09-22 16:16:08.499821489 +0200
+@@ -45,6 +45,10 @@ typedef struct {
extern time_t online_since;
-+#ifdef EGG_SSL_EXT\r
-+extern int use_ssl; /* kyotou */\r
++#ifdef EGG_SSL_EXT
++extern int use_ssl; /* kyotou */
+#endif
+
extern char origbotname[], botuser[], motdfile[], admin[], userfile[],
firewall[], helpdir[], notify_new[], hostname[], myip[], moddir[],
tempdir[], owner[], network[], botnetnick[], bannerfile[],
-@@ -524,6 +528,9 @@
+@@ -522,6 +526,9 @@ static tcl_ints def_tcl_ints[] = {
{"enable-simul", &enable_simul, 0}, /* compat */
{"debug-output", &debug_output, 0}, /* compat */
{"use-console-r", &use_console_r, 0}, /* compat */
-+#ifdef EGG_SSL_EXT\r
-+ {"use-ssl", &use_ssl, 0}, /* kyotou */\r
++#ifdef EGG_SSL_EXT
++ {"use-ssl", &use_ssl, 0}, /* kyotou */
+#endif
{NULL, NULL, 0}
};
-diff -burN eggdrop1.6.17.orig/src/tclmisc.c eggdrop1.6.17/src/tclmisc.c
---- eggdrop1.6.17.orig/src/tclmisc.c 2004-11-01 14:40:44.070461264 +0100
-+++ eggdrop1.6.17/src/tclmisc.c 2004-11-01 14:41:52.089120856 +0100
-@@ -26,7 +26,13 @@
+diff -burNp eggdrop1.6.19/src/tclmisc.c eggdrop1.6.19.new/src/tclmisc.c
+--- eggdrop1.6.19/src/tclmisc.c 2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19.new/src/tclmisc.c 2008-09-22 16:17:34.872716077 +0200
+@@ -26,7 +26,12 @@
#include "main.h"
#include "modules.h"
#include "tandem.h"
-#include "md5/md5.h"
-+\r
-+#ifndef EGG_SSL_EXT\r
-+ #include "md5/md5.h"\r
-+#else\r
-+#include "openssl/md5.h"\r
-+#endif\r
+
++#ifndef EGG_SSL_EXT
++ #include "md5/md5.h"
++#else
++#include "openssl/md5.h"
++#endif
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
-diff -burN eggdrop1.6.17.orig/src/chan.h eggdrop1.6.17/src/chan.h
---- eggdrop1.6.17.orig/src/chan.h 2004-11-01 12:48:53.752584640 +0100
-+++ eggdrop1.6.17/src/chan.h 2004-11-01 13:38:31.701867536 +0100
-@@ -190,6 +190,7 @@
+diff -burNp eggdrop1.6.19/src/chan.h eggdrop1.6.19.new/src/chan.h
+--- eggdrop1.6.19/src/chan.h 2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/chan.h 2008-09-22 11:27:30.636306556 +0200
+@@ -191,6 +191,7 @@ struct chanset_t {
int mode_mns_prot; /* modes to reject */
int limit_prot; /* desired limit */
char key_prot[121]; /* desired password */
char pls[21]; /* positive mode changes */
char mns[21]; /* negative mode changes */
char *key; /* new key to set */
-diff -burN eggdrop1.6.17.orig/src/chanprog.c eggdrop1.6.17/src/chanprog.c
---- eggdrop1.6.17.orig/src/chanprog.c 2004-11-01 12:48:53.766582512 +0100
-+++ eggdrop1.6.17/src/chanprog.c 2004-11-01 13:38:31.704867080 +0100
-@@ -690,3 +690,23 @@
+diff -burNp eggdrop1.6.19/src/chanprog.c eggdrop1.6.19.new/src/chanprog.c
+--- eggdrop1.6.19/src/chanprog.c 2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/chanprog.c 2008-09-22 11:30:50.744325464 +0200
+@@ -690,3 +690,24 @@ int isowner(char *name)
return 0;
}
+
+/* If we have a protected topic and the bot is opped, halfoped,
+ * or the channel is -t, change the topic. (Sup 11May2001)
-+ */
++*/
+void check_topic(struct chanset_t *chan)
+{
+ memberlist *m = NULL;
+ dprintf(DP_SERVER, "TOPIC %s :%s\n", chan->name, chan->topic_prot);
+ }
+}
-diff -burN eggdrop1.6.17.orig/src/mod/channels.mod/channels.c eggdrop1.6.17/src/mod/channels.mod/channels.c
---- eggdrop1.6.17.orig/src/mod/channels.mod/channels.c 2004-11-01 12:48:53.673596648 +0100
-+++ eggdrop1.6.17/src/mod/channels.mod/channels.c 2004-11-01 13:39:57.089886584 +0100
-@@ -380,6 +380,7 @@
++
+diff -burNp eggdrop1.6.19/src/mod/channels.mod/channels.c eggdrop1.6.19.new/src/mod/channels.mod/channels.c
+--- eggdrop1.6.19/src/mod/channels.mod/channels.c 2008-02-16 22:41:06.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/channels.mod/channels.c 2008-09-22 11:34:55.161533902 +0200
+@@ -385,6 +385,7 @@ static void write_channels()
FILE *f;
char s[121], w[1024], w2[1024], name[163];
char need1[242], need2[242], need3[242], need4[242], need5[242];
struct chanset_t *chan;
struct udef_struct *ul;
-@@ -400,6 +401,7 @@
+@@ -405,6 +406,7 @@ static void write_channels()
convert_element(chan->dname, name);
get_mode_protect(chan, w);
convert_element(w, w2);
convert_element(chan->need_op, need1);
convert_element(chan->need_invite, need2);
convert_element(chan->need_key, need3);
-@@ -407,7 +409,7 @@
+@@ -412,7 +414,7 @@ static void write_channels()
convert_element(chan->need_limit, need5);
/* Do not indent me (adds extra spaces to chan file). */
fprintf(f,
need-op %s need-invite %s need-key %s need-unban %s need-limit %s \
flood-chan %d:%d flood-ctcp %d:%d flood-join %d:%d flood-kick %d:%d \
flood-deop %d:%d flood-nick %d:%d aop-delay %d:%d ban-time %d exempt-time %d \
-@@ -417,7 +419,7 @@
+@@ -422,7 +424,7 @@ invite-time %d %cenforcebans %cdynamicba
%cseen %cinactive %cdynamicexempts %cuserexempts %cdynamicinvites \
%cuserinvites %cnodesynch ",
channel_static(chan) ? "set" : "add", name, channel_static(chan) ?
- " " : " { ", w2, chan->idle_kick, chan->stopnethack_mode,
-+ " " : " { ", w2, topic, chan->idle_kick, chan->stopnethack_mode,
++ " " : " { ", w2, topic, chan->idle_kick, chan->stopnethack_mode,
chan->revenge_mode, need1, need2, need3, need4, need5,
chan->flood_pub_thr, chan->flood_pub_time,
chan->flood_ctcp_thr, chan->flood_ctcp_time,
-diff -burN eggdrop1.6.17.orig/src/mod/channels.mod/cmdschan.c eggdrop1.6.17/src/mod/channels.mod/cmdschan.c
---- eggdrop1.6.17.orig/src/mod/channels.mod/cmdschan.c 2004-11-01 12:48:53.670597104 +0100
-+++ eggdrop1.6.17/src/mod/channels.mod/cmdschan.c 2004-11-01 13:38:31.711866016 +0100
-@@ -1269,6 +1269,7 @@
+diff -burNp eggdrop1.6.19/src/mod/channels.mod/cmdschan.c eggdrop1.6.19.new/src/mod/channels.mod/cmdschan.c
+--- eggdrop1.6.19/src/mod/channels.mod/cmdschan.c 2008-02-16 22:41:07.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/channels.mod/cmdschan.c 2008-09-22 11:37:38.571477034 +0200
+@@ -1269,6 +1269,7 @@ static void cmd_chaninfo(struct userrec
channel_static(chan) ? "static" : "dynamic", chan->dname);
get_mode_protect(chan, work);
dprintf(idx, "Protect modes (chanmode): %s\n", work[0] ? work : "None");
if (chan->idle_kick)
dprintf(idx, "Idle Kick after (idle-kick): %d\n", chan->idle_kick);
else
-diff -burN eggdrop1.6.17.orig/src/mod/channels.mod/help/chaninfo.help eggdrop1.6.17/src/mod/channels.mod/help/chaninfo.help
---- eggdrop1.6.17.orig/src/mod/channels.mod/help/chaninfo.help 2004-11-01 12:48:53.669597256 +0100
-+++ eggdrop1.6.17/src/mod/channels.mod/help/chaninfo.help 2004-11-01 13:38:31.713865712 +0100
+diff -burNp eggdrop1.6.19/src/mod/channels.mod/help/chaninfo.help eggdrop1.6.19.new/src/mod/channels.mod/help/chaninfo.help
+--- eggdrop1.6.19/src/mod/channels.mod/help/chaninfo.help 2003-02-02 05:20:44.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/channels.mod/help/chaninfo.help 2008-09-22 11:42:29.504962817 +0200
@@ -4,6 +4,7 @@
It shows any of the following:
%bchanmode%b These modes are enforced on the channel. Both + and -
modes can be enforced.
-+ %btopic%b which topic is enforced on the channel
++ %btopic%b which topic is enforced on the channel
%bidle-kick%b Kick idle users that are not +f or above on the channel
after how many minutes (set this to 0 to disable).
%{+n}
-diff -burN eggdrop1.6.17.orig/src/mod/channels.mod/tclchan.c eggdrop1.6.17/src/mod/channels.mod/tclchan.c
---- eggdrop1.6.17.orig/src/mod/channels.mod/tclchan.c 2004-11-01 12:48:53.671596952 +0100
-+++ eggdrop1.6.17/src/mod/channels.mod/tclchan.c 2004-11-01 13:38:31.716865256 +0100
-@@ -1223,6 +1223,15 @@
+diff -burNp eggdrop1.6.19/src/mod/channels.mod/tclchan.c eggdrop1.6.19.new/src/mod/channels.mod/tclchan.c
+--- eggdrop1.6.19/src/mod/channels.mod/tclchan.c 2008-02-16 22:41:07.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/channels.mod/tclchan.c 2008-09-22 11:46:12.888320583 +0200
+@@ -1223,6 +1223,15 @@ static int tcl_channel_modify(Tcl_Interp
return TCL_ERROR;
}
chan->invite_time = atoi(item[i]);
} else if (!strcmp(item[i], "+enforcebans"))
chan->status |= CHAN_ENFORCEBANS;
else if (!strcmp(item[i], "-enforcebans"))
-diff -burN eggdrop1.6.17.orig/src/mod/irc.mod/chan.c eggdrop1.6.17/src/mod/irc.mod/chan.c
---- eggdrop1.6.17.orig/src/mod/irc.mod/chan.c 2004-11-01 12:48:53.738586768 +0100
-+++ eggdrop1.6.17/src/mod/irc.mod/chan.c 2004-11-01 13:38:31.721864496 +0100
-@@ -1500,12 +1500,14 @@
+diff -burNp eggdrop1.6.19/src/mod/irc.mod/chan.c eggdrop1.6.19.new/src/mod/irc.mod/chan.c
+--- eggdrop1.6.19/src/mod/irc.mod/chan.c 2008-02-16 22:41:09.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/irc.mod/chan.c 2008-09-22 11:51:07.921436628 +0200
+@@ -1513,12 +1513,14 @@ static int gottopic(char *from, char *ms
memberlist *m;
struct chanset_t *chan;
struct userrec *u;
if (chan) {
putlog(LOG_JOIN, chan->dname, "Topic changed on %s by %s!%s: %s",
chan->dname, nick, from, msg);
-@@ -1514,6 +1516,8 @@
+@@ -1527,6 +1529,8 @@ static int gottopic(char *from, char *ms
m->last = now;
set_topic(chan, msg);
check_tcl_topc(nick, from, u, chan->dname, msg);
}
return 0;
}
-@@ -1532,6 +1536,7 @@
+@@ -1545,6 +1549,7 @@ static int got331(char *from, char *msg)
if (chan) {
set_topic(chan, NULL);
check_tcl_topc("*", "*", NULL, chan->dname, "");
}
return 0;
}
-@@ -1551,6 +1556,7 @@
+@@ -1564,6 +1569,7 @@ static int got332(char *from, char *msg)
fixcolon(msg);
set_topic(chan, msg);
check_tcl_topc("*", "*", NULL, chan->dname, msg);
}
return 0;
}
-diff -burN eggdrop1.6.17.orig/src/mod/irc.mod/cmdsirc.c eggdrop1.6.17/src/mod/irc.mod/cmdsirc.c
---- eggdrop1.6.17.orig/src/mod/irc.mod/cmdsirc.c 2004-11-01 12:48:53.740586464 +0100
-+++ eggdrop1.6.17/src/mod/irc.mod/cmdsirc.c 2004-11-01 13:38:31.724864040 +0100
-@@ -900,6 +900,7 @@
+diff -burNp eggdrop1.6.19/src/mod/irc.mod/cmdsirc.c eggdrop1.6.19.new/src/mod/irc.mod/cmdsirc.c
+--- eggdrop1.6.19/src/mod/irc.mod/cmdsirc.c 2008-02-16 22:41:09.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/irc.mod/cmdsirc.c 2008-09-22 11:55:02.514726004 +0200
+@@ -898,6 +898,7 @@ static void cmd_channel(struct userrec *
static void cmd_topic(struct userrec *u, int idx, char *par)
{
struct chanset_t *chan;
if (par[0] && (strchr(CHANMETA, par[0]) != NULL)) {
char *chname = newsplit(&par);
-@@ -925,6 +926,13 @@
+@@ -923,6 +924,13 @@ static void cmd_topic(struct userrec *u,
dprintf(idx, "I'm not a channel op or halfop on %s and the channel is "
"+t.\n", chan->dname);
else {
+ if (chan->topic_prot[0]) {
+ get_user_flagrec(u, &fr, chan->dname);
+ if (!glob_master(fr) && !chan_master(fr)) {
-+ dprintf(idx, "The topic of %s is protected.\n", chan->dname);
-+ return;
++ dprintf(idx, "The topic of %s is protected.\n", chan->dname);
++ return;
+ }
+ }
dprintf(DP_SERVER, "TOPIC %s :%s\n", chan->name, par);
dprintf(idx, "Changing topic...\n");
putlog(LOG_CMDS, "*", "#%s# (%s) topic %s", dcc[idx].nick,
-diff -burN eggdrop1.6.17.orig/src/mod/irc.mod/mode.c eggdrop1.6.17/src/mod/irc.mod/mode.c
---- eggdrop1.6.17.orig/src/mod/irc.mod/mode.c 2004-11-01 12:48:53.739586616 +0100
-+++ eggdrop1.6.17/src/mod/irc.mod/mode.c 2004-11-01 13:38:31.727863584 +0100
-@@ -460,8 +460,10 @@
+diff -burNp eggdrop1.6.19/src/mod/irc.mod/mode.c eggdrop1.6.19.new/src/mod/irc.mod/mode.c
+--- eggdrop1.6.19/src/mod/irc.mod/mode.c 2008-02-16 22:41:09.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/irc.mod/mode.c 2008-09-22 12:00:05.134685721 +0200
+@@ -460,8 +460,10 @@ static void got_op(struct chanset_t *cha
}
}
m->flags |= WASOP;
}
static void got_halfop(struct chanset_t *chan, char *nick, char *from,
-@@ -549,8 +551,10 @@
+@@ -549,8 +551,10 @@ static void got_halfop(struct chanset_t
}
}
m->flags |= WASHALFOP;
}
static void got_deop(struct chanset_t *chan, char *nick, char *from,
-@@ -1241,6 +1245,8 @@
+@@ -1246,6 +1250,8 @@ static int gotmode(char *from, char *ori
(chan->mode_mns_prot & todo)))
add_mode(chan, ms2[0] == '+' ? '-' : '+', *chg, "");
}
-+ if ((ms2[0] == '-') && ((*chg == 't') || (*chg == 'h')))
++ if ((ms2[0] == '-') && ((*chg == 't') || (*chg == 'h')))
+ check_topic(chan);
}
chg++;
}
-diff -burN eggdrop1.6.17.orig/src/mod/module.h eggdrop1.6.17/src/mod/module.h
---- eggdrop1.6.17.orig/src/mod/module.h 2004-11-01 12:48:53.681595432 +0100
-+++ eggdrop1.6.17/src/mod/module.h 2004-11-01 13:38:31.729863280 +0100
+diff -burNp eggdrop1.6.19/src/mod/module.h eggdrop1.6.19.new/src/mod/module.h
+--- eggdrop1.6.19/src/mod/module.h 2008-02-16 22:41:06.000000000 +0100
++++ eggdrop1.6.19.new/src/mod/module.h 2008-09-22 12:01:11.964804368 +0200
@@ -361,7 +361,7 @@
#define rem_tcl_coups ((void (*) (tcl_coups *))global[210])
#define botname ((char *)(global[211]))
#define check_tcl_chjn ((void (*) (const char *,const char *,int,char,int,const char *))global[213])
#define sanitycheck_dcc ((int (*)(char *, char *, char *, char *))global[214])
#define isowner ((int (*)(char *))global[215])
-diff -burN eggdrop1.6.17.orig/src/modules.c eggdrop1.6.17/src/modules.c
---- eggdrop1.6.17.orig/src/modules.c 2004-11-01 12:48:53.762583120 +0100
-+++ eggdrop1.6.17/src/modules.c 2004-11-01 13:38:31.732862824 +0100
-@@ -461,7 +461,7 @@
+diff -burNp eggdrop1.6.19/src/modules.c eggdrop1.6.19.new/src/modules.c
+--- eggdrop1.6.19/src/modules.c 2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19.new/src/modules.c 2008-09-22 12:09:57.119525901 +0200
+@@ -461,7 +461,7 @@ Function global_table[] = {
(Function) rem_tcl_coups,
(Function) botname,
/* 212 - 215 */
(Function) check_tcl_chjn,
(Function) sanitycheck_dcc,
(Function) isowner,
-diff -burN eggdrop1.6.17.orig/src/patch.h eggdrop1.6.17/src/patch.h
---- eggdrop1.6.17.orig/src/patch.h 2004-11-01 12:48:53.765582664 +0100
-+++ eggdrop1.6.17/src/patch.h 2004-11-01 13:38:31.734862520 +0100
+diff -burNp eggdrop1.6.19/src/patch.h eggdrop1.6.19.new/src/patch.h
+--- eggdrop1.6.19/src/patch.h 2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/src/patch.h 2008-09-22 12:11:00.141439071 +0200
@@ -36,7 +36,7 @@
*
*
/*
*
*
-diff -burN eggdrop1.6.17.orig/src/proto.h eggdrop1.6.17/src/proto.h
---- eggdrop1.6.17.orig/src/proto.h 2004-11-01 12:48:53.769582056 +0100
-+++ eggdrop1.6.17/src/proto.h 2004-11-01 13:38:31.735862368 +0100
-@@ -116,6 +116,7 @@
+diff -burNp eggdrop1.6.19/src/proto.h eggdrop1.6.19.new/src/proto.h
+--- eggdrop1.6.19/src/proto.h 2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19.new/src/proto.h 2008-09-22 12:12:19.684612158 +0200
+@@ -114,6 +114,7 @@ void check_timers();
void set_chanlist(const char *host, struct userrec *rec);
void clear_chanlist(void);
void clear_chanlist_member(const char *nick);
projects / packages / eggdrop.git / commitdiff