1 diff -burNp eggdrop1.6.19/aclocal.m4 eggdrop1.6.19.new/aclocal.m4
2 --- eggdrop1.6.19/aclocal.m4 2008-04-19 06:21:20.000000000 +0200
3 +++ eggdrop1.6.19.new/aclocal.m4 2008-09-22 14:03:38.304371902 +0200
4 @@ -36,6 +36,63 @@ AC_DEFUN([EGG_MSG_CONFIGURE_START],
10 +AC_DEFUN(EGG_SSL_CRAP, [dnl
12 +AC_MSG_CHECKING(whether to include SSL support)
14 +[ --with-ssl[=PATH] Include SSL support (DIR is OpenSSL's install dir).],
18 + AC_MSG_RESULT(no) ;;
21 + AC_CHECK_LIB(ssl,SSL_accept,[AC_DEFINE(EGG_SSL_EXT)
22 + SSL_LIBS="-lssl -lcrypto"],[AC_MSG_ERROR([You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL])],-lcrypto)
25 +dnl A whole whack of possible places where this might be
26 + test -f $withval/openssl/ssl.h && SSL_INCLUDE="$withval"
27 + test -f $withval/include/openssl/ssl.h && SSL_INCLUDE="$withval/include"
29 + test -f $withval/lib/libssl.a && SSL_LIB="$withval/lib"
30 + test -f $withval/lib/ssl/libssl.a && SSL_LIB="$withval/lib/ssl"
31 + test -f $withval/lib/openssl/libssl.a && SSL_LIB="$withval/lib/openssl/ssl"
32 + test -f $withval/libssl.a && SSL_LIB="$withval"
33 + test -f $withval/ssl/libssl.a && SSL_LIB="$withval/ssl"
34 + test -f $withval/openssl/libssl.a && SSL_LIB="$withval/openssl"
36 + test -f $withval/lib/libcrypto.a && CRYPTO_LIB="$withval/lib"
37 + test -f $withval/lib/ssl/libcrypto.a && CRYPTO_LIB="$withval/lib/ssl"
38 + test -f $withval/lib/openssl/libcrypto.a && CRYPTO_LIB="$withval/lib/openssl/ssl"
39 + test -f $withval/libcrypto.a && CRYPTO_LIB="$withval"
40 + test -f $withval/ssl/libcrypto.a && CRYPTO_LIB="$withval/ssl"
41 + test -f $withval/openssl/libcrypto.a && CRYPTO_LIB="$withval/openssl"
43 + if test -n "$SSL_INCLUDE" && test -n "$SSL_LIB" && test -n "$CRYPTO_LIB"; then
44 + SSL_LIBS="-lssl -lcrypto -L$SSL_LIB -L$CRYPTO_LIB";
45 + AC_DEFINE([EGG_SSL_EXT], [], [SSL support])
49 + AC_MSG_ERROR([You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL])
53 + AC_MSG_RESULT(will try to find)
54 + AC_CHECK_LIB(ssl,SSL_accept,[AC_DEFINE(EGG_SSL_EXT)
55 + SSL_LIBS="-lssl -lcrypto"],[AC_MSG_ERROR([OpenSSL was not found. Please supply a pathname to OpenSSL])],-lcrypto)
56 + AC_CHECK_HEADERS("openssl/ssl.h",,[AC_MSG_ERROR([OpenSSL was not found. Please supply a pathname to OpenSSL])],)
58 + AC_SUBST(SSL_LIBS)dnl
59 + AC_SUBST(SSL_INCLUDE)dnl
62 +#end of ssl checks - hoe (.16 by poci)
66 dnl EGG_MSG_CONFIGURE_END()
68 diff -burNp eggdrop1.6.19/config.h.in eggdrop1.6.19.new/config.h.in
69 --- eggdrop1.6.19/config.h.in 2006-11-20 12:38:25.000000000 +0100
70 +++ eggdrop1.6.19.new/config.h.in 2008-09-22 14:07:26.990831137 +0200
72 /* Define to 1 if you have the `clock' function. */
75 +/* Defines ssl mode */
78 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
81 diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure
82 --- eggdrop1.6.19/configure 2008-04-19 06:21:20.000000000 +0200
83 +++ eggdrop1.6.19.new/configure 2008-09-22 14:22:28.610498567 +0200
84 @@ -856,6 +857,7 @@ Optional Packages:
85 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
86 --with-tcllib=PATH full path to Tcl library
87 --with-tclinc=PATH full path to Tcl header
88 + --with-ssl=PATH Include SSL support (DIR is OpenSSL's install dir).
90 Some influential environment variables:
92 @@ -10113,8 +10115,372 @@ EOF
94 ac_config_commands="$ac_config_commands replace-if-changed"
97 +echo "$as_me:$LINENO: checking whether to include SSL support" >&5
98 +echo $ECHO_N "checking whether to include SSL support... $ECHO_C" >&6
100 +# Check whether --with-ssl or --without-ssl was given.
101 +if test "${with_ssl+set}" = set; then
102 + withval="$with_ssl"
106 + echo "$as_me:$LINENO: result: no" >&5
107 +echo "${ECHO_T}no" >&6 ;;
109 + echo "$as_me:$LINENO: result: yes" >&5
110 +echo "${ECHO_T}yes" >&6
111 + echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
112 +echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
113 +if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
114 + echo $ECHO_N "(cached) $ECHO_C" >&6
116 + ac_check_lib_save_LIBS=$LIBS
117 +LIBS="-lssl -lcrypto $LIBS"
118 +cat >conftest.$ac_ext <<_ACEOF
121 +cat confdefs.h >>conftest.$ac_ext
122 +cat >>conftest.$ac_ext <<_ACEOF
123 +/* end confdefs.h. */
125 +/* Override any gcc2 internal prototype to avoid an error. */
129 +/* We use char because int might match the return type of a gcc2
130 + builtin and then its argument prototype would still apply. */
140 +rm -f conftest.$ac_objext conftest$ac_exeext
141 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
142 + (eval $ac_link) 2>conftest.er1
144 + grep -v '^ *+' conftest.er1 >conftest.err
146 + cat conftest.err >&5
147 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
148 + (exit $ac_status); } &&
149 + { ac_try='test -z "$ac_c_werror_flag"
150 + || test ! -s conftest.err'
151 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
152 + (eval $ac_try) 2>&5
154 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
155 + (exit $ac_status); }; } &&
156 + { ac_try='test -s conftest$ac_exeext'
157 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
158 + (eval $ac_try) 2>&5
160 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
161 + (exit $ac_status); }; }; then
162 + ac_cv_lib_ssl_SSL_accept=yes
164 + echo "$as_me: failed program was:" >&5
165 +sed 's/^/| /' conftest.$ac_ext >&5
167 +ac_cv_lib_ssl_SSL_accept=no
169 +rm -f conftest.err conftest.$ac_objext \
170 + conftest$ac_exeext conftest.$ac_ext
171 +LIBS=$ac_check_lib_save_LIBS
173 +echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5
174 +echo "${ECHO_T}$ac_cv_lib_ssl_SSL_accept" >&6
175 +if test $ac_cv_lib_ssl_SSL_accept = yes; then
176 + cat >>confdefs.h <<\_ACEOF
177 +#define EGG_SSL_EXT 1
180 + SSL_LIBS="-lssl -lcrypto"
182 + { { echo "$as_me:$LINENO: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
183 +echo "$as_me: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
184 + { (exit 1); exit 1; }; }
189 + test -f $withval/openssl/ssl.h && SSL_INCLUDE="$withval"
190 + test -f $withval/include/openssl/ssl.h && SSL_INCLUDE="$withval/include"
192 + test -f $withval/lib/libssl.a && SSL_LIB="$withval/lib"
193 + test -f $withval/lib/ssl/libssl.a && SSL_LIB="$withval/lib/ssl"
194 + test -f $withval/lib/openssl/libssl.a && SSL_LIB="$withval/lib/openssl/ssl"
195 + test -f $withval/libssl.a && SSL_LIB="$withval"
196 + test -f $withval/ssl/libssl.a && SSL_LIB="$withval/ssl"
197 + test -f $withval/openssl/libssl.a && SSL_LIB="$withval/openssl"
199 + test -f $withval/lib/libcrypto.a && CRYPTO_LIB="$withval/lib"
200 + test -f $withval/lib/ssl/libcrypto.a && CRYPTO_LIB="$withval/lib/ssl"
201 + test -f $withval/lib/openssl/libcrypto.a && CRYPTO_LIB="$withval/lib/openssl/ssl"
202 + test -f $withval/libcrypto.a && CRYPTO_LIB="$withval"
203 + test -f $withval/ssl/libcrypto.a && CRYPTO_LIB="$withval/ssl"
204 + test -f $withval/openssl/libcrypto.a && CRYPTO_LIB="$withval/openssl"
206 + if test -n "$SSL_INCLUDE" && test -n "$SSL_LIB" && test -n "$CRYPTO_LIB"; then
207 + SSL_LIBS="-lssl -lcrypto -L$SSL_LIB -L$CRYPTO_LIB";
208 + cat >>confdefs.h <<\_ACEOF
209 +#define EGG_SSL_EXT 1
212 + echo "$as_me:$LINENO: result: yes" >&5
213 +echo "${ECHO_T}yes" >&6
215 + echo "$as_me:$LINENO: result: no" >&5
216 +echo "${ECHO_T}no" >&6
217 + { { echo "$as_me:$LINENO: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
218 +echo "$as_me: error: You requested SSL support, but OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
219 + { (exit 1); exit 1; }; }
225 + echo "$as_me:$LINENO: result: will try to find" >&5
226 +echo "${ECHO_T}will try to find" >&6
227 + echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
228 +echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
229 +if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
230 + echo $ECHO_N "(cached) $ECHO_C" >&6
232 + ac_check_lib_save_LIBS=$LIBS
233 +LIBS="-lssl -lcrypto $LIBS"
234 +cat >conftest.$ac_ext <<_ACEOF
237 +cat confdefs.h >>conftest.$ac_ext
238 +cat >>conftest.$ac_ext <<_ACEOF
239 +/* end confdefs.h. */
241 +/* Override any gcc2 internal prototype to avoid an error. */
245 +/* We use char because int might match the return type of a gcc2
246 + builtin and then its argument prototype would still apply. */
256 +rm -f conftest.$ac_objext conftest$ac_exeext
257 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
258 + (eval $ac_link) 2>conftest.er1
260 + grep -v '^ *+' conftest.er1 >conftest.err
262 + cat conftest.err >&5
263 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
264 + (exit $ac_status); } &&
265 + { ac_try='test -z "$ac_c_werror_flag"
266 + || test ! -s conftest.err'
267 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
268 + (eval $ac_try) 2>&5
270 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
271 + (exit $ac_status); }; } &&
272 + { ac_try='test -s conftest$ac_exeext'
273 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
274 + (eval $ac_try) 2>&5
276 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
277 + (exit $ac_status); }; }; then
278 + ac_cv_lib_ssl_SSL_accept=yes
280 + echo "$as_me: failed program was:" >&5
281 +sed 's/^/| /' conftest.$ac_ext >&5
283 +ac_cv_lib_ssl_SSL_accept=no
285 +rm -f conftest.err conftest.$ac_objext \
286 + conftest$ac_exeext conftest.$ac_ext
287 +LIBS=$ac_check_lib_save_LIBS
289 +echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5
290 +echo "${ECHO_T}$ac_cv_lib_ssl_SSL_accept" >&6
291 +if test $ac_cv_lib_ssl_SSL_accept = yes; then
292 + cat >>confdefs.h <<\_ACEOF
293 +#define EGG_SSL_EXT 1
296 + SSL_LIBS="-lssl -lcrypto"
298 + { { echo "$as_me:$LINENO: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
299 +echo "$as_me: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
300 + { (exit 1); exit 1; }; }
304 +for ac_header in "openssl/ssl.h"
306 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
307 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
308 + echo "$as_me:$LINENO: checking for $ac_header" >&5
309 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
310 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
311 + echo $ECHO_N "(cached) $ECHO_C" >&6
313 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
314 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
316 + # Is the header compilable?
317 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
318 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
319 +cat >conftest.$ac_ext <<_ACEOF
322 +cat confdefs.h >>conftest.$ac_ext
323 +cat >>conftest.$ac_ext <<_ACEOF
324 +/* end confdefs.h. */
325 +$ac_includes_default
326 +#include <$ac_header>
328 +rm -f conftest.$ac_objext
329 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
330 + (eval $ac_compile) 2>conftest.er1
332 + grep -v '^ *+' conftest.er1 >conftest.err
334 + cat conftest.err >&5
335 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
336 + (exit $ac_status); } &&
337 + { ac_try='test -z "$ac_c_werror_flag"
338 + || test ! -s conftest.err'
339 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
340 + (eval $ac_try) 2>&5
342 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
343 + (exit $ac_status); }; } &&
344 + { ac_try='test -s conftest.$ac_objext'
345 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
346 + (eval $ac_try) 2>&5
348 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
349 + (exit $ac_status); }; }; then
350 + ac_header_compiler=yes
352 + echo "$as_me: failed program was:" >&5
353 +sed 's/^/| /' conftest.$ac_ext >&5
355 +ac_header_compiler=no
357 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
358 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
359 +echo "${ECHO_T}$ac_header_compiler" >&6
361 +# Is the header present?
362 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
363 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
364 +cat >conftest.$ac_ext <<_ACEOF
367 +cat confdefs.h >>conftest.$ac_ext
368 +cat >>conftest.$ac_ext <<_ACEOF
369 +/* end confdefs.h. */
370 +#include <$ac_header>
372 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
373 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
375 + grep -v '^ *+' conftest.er1 >conftest.err
377 + cat conftest.err >&5
378 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
379 + (exit $ac_status); } >/dev/null; then
380 + if test -s conftest.err; then
381 + ac_cpp_err=$ac_c_preproc_warn_flag
382 + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
389 +if test -z "$ac_cpp_err"; then
390 + ac_header_preproc=yes
392 + echo "$as_me: failed program was:" >&5
393 +sed 's/^/| /' conftest.$ac_ext >&5
395 + ac_header_preproc=no
397 +rm -f conftest.err conftest.$ac_ext
398 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
399 +echo "${ECHO_T}$ac_header_preproc" >&6
401 +# So? What about this header?
402 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
404 + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
405 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
406 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
407 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
408 + ac_header_preproc=yes
411 + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
412 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
413 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
414 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
415 + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
416 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
417 + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
418 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
419 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
420 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
421 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
422 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
425 +## -------------------------------- ##
426 +## Report this to bugs@eggheads.org ##
427 +## -------------------------------- ##
430 + sed "s/^/$as_me: WARNING: /" >&2
433 +echo "$as_me:$LINENO: checking for $ac_header" >&5
434 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
435 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
436 + echo $ECHO_N "(cached) $ECHO_C" >&6
438 + eval "$as_ac_Header=\$ac_header_preproc"
440 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
441 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
444 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
445 + cat >>confdefs.h <<_ACEOF
446 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
450 + { { echo "$as_me:$LINENO: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&5
451 +echo "$as_me: error: OpenSSL was not found. Please supply a pathname to OpenSSL" >&2;}
452 + { (exit 1); exit 1; }; }
461 +#end of ssl checks - hoe (.16 by poci)
464 # Substitute Makefile variables.
465 @@ -10827,6 +11193,8 @@ s,@TCLINC@,$TCLINC,;t t
466 s,@TCLINCFN@,$TCLINCFN,;t t
467 s,@TCL_REQS@,$TCL_REQS,;t t
468 s,@TCL_LIBS@,$TCL_LIBS,;t t
469 +s,@SSL_LIBS@,$SSL_LIBS,;t t
470 +s,@SSL_INCLUDE@,$SSL_INCLUDE,;t t
471 s,@EGGVERSION@,$EGGVERSION,;t t
473 s,@MOD_UPDIR@,$MOD_UPDIR,;t t
474 diff -burNp eggdrop1.6.19/configure.ac eggdrop1.6.19.new/configure.ac
475 --- eggdrop1.6.19/configure.ac 2008-02-18 23:25:33.000000000 +0100
476 +++ eggdrop1.6.19.new/configure.ac 2008-09-22 14:23:32.432890637 +0200
477 @@ -150,6 +150,7 @@ EGG_TCL_CHECK_THREADS
483 # Substitute Makefile variables.
485 diff -burNp eggdrop1.6.19/disabled_modules eggdrop1.6.19.new/disabled_modules
486 --- eggdrop1.6.19/disabled_modules 2002-06-04 07:11:10.000000000 +0200
487 +++ eggdrop1.6.19.new/disabled_modules 2008-09-22 14:25:14.439395696 +0200
489 -# disabled_modules -- File which lists all Eggdrop modules that are
490 -# disabled by default.
495 -# - Lines which start with a '#' character are ignored.
496 -# - Every module name needs to be on its own line
498 -# Woobie only serves as an example for module programming. No need to
499 -# compile it for normal bots ...
501 diff -burNp eggdrop1.6.19/Makefile eggdrop1.6.19.new/Makefile
502 --- eggdrop1.6.19/Makefile 2008-04-19 06:21:34.000000000 +0200
503 +++ eggdrop1.6.19.new/Makefile 2008-09-22 14:25:56.388522764 +0200
507 - @echo "Before you can compile your bot you have to configure it."
508 - @echo "Please start the configure script now:"
510 - @echo " % ./configure"
513 diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in
514 --- eggdrop1.6.19/Makefile.in 2004-08-28 08:43:21.000000000 +0200
515 +++ eggdrop1.6.19.new/Makefile.in 2008-09-22 14:29:11.247383482 +0200
516 @@ -57,6 +57,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
520 +XSSL_LIBS = @SSL_LIBS@
521 +XSSL_INCLUDE = @SSL_INCLUDE@
523 TCLLIBFN = @TCLLIBFN@
525 @@ -89,7 +91,8 @@ egg_install_msg = echo "" && \
526 MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
527 'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \
528 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
529 -'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS='
530 +'XSSL_LIBS=$(XSSL_LIBS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' \
531 +'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'EGGBUILD=' 'MODOBJS='
533 MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
534 'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \
535 @@ -99,12 +102,13 @@ MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC
536 'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \
537 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
538 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \
540 +'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'XSSL_LIBS=$(XSSL_LIBS)' 'MODOBJS=mod/*.o'
542 MAKE_DEBEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD) -g' \
543 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
544 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
545 -'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS='
546 +'XSSL_LIBS=$(XSSL_LIBS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' \
547 +'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'EGGBUILD=(debug version)' 'MODOBJS='
549 MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
550 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
551 @@ -113,7 +117,8 @@ MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)'
552 MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
553 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DSTATIC $(CFLGS)' \
554 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
555 -'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o'
556 +'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'XSSL_LIBS=$(XSSL_LIBS)' 'EGGEXEC=$(EGGEXEC)' \
557 +'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
559 MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)'
561 diff -burNp eggdrop1.6.19/src/dcc.c eggdrop1.6.19.new/src/dcc.c
562 --- eggdrop1.6.19/src/dcc.c 2008-02-16 22:41:03.000000000 +0100
563 +++ eggdrop1.6.19.new/src/dcc.c 2008-09-22 14:30:37.252784308 +0200
567 /* Includes for botnet md5 challenge/response code <cybah> */
571 +#include "openssl/md5.h"
574 extern struct userrec *userlist;
575 extern struct chanset_t *chanset;
576 diff -burNp eggdrop1.6.19/src/dccutil.c eggdrop1.6.19.new/src/dccutil.c
577 --- eggdrop1.6.19/src/dccutil.c 2008-02-16 22:41:03.000000000 +0100
578 +++ eggdrop1.6.19.new/src/dccutil.c 2008-09-22 14:31:42.540452895 +0200
585 extern struct dcc_t *dcc;
586 extern int dcc_total, max_dcc, dcc_flood_thr, backgrd, copy_to_tmp, MAXSOCKS;
587 diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h
588 --- eggdrop1.6.19/src/eggdrop.h 2008-02-16 22:41:03.000000000 +0100
589 +++ eggdrop1.6.19.new/src/eggdrop.h 2008-09-22 14:33:40.008829213 +0200
590 @@ -616,18 +616,6 @@ enum {
594 -/* This is used by the net module to keep track of sockets and what's
602 - unsigned long outbuflen; /* Outbuf could be binary data */
603 - unsigned long inbuflen; /* Inbuf could be binary data */
607 EGG_OPTION_SET = 1, /* Set option(s). */
608 EGG_OPTION_UNSET = 2 /* Unset option(s). */
609 diff -burNp eggdrop1.6.19/src/main.c eggdrop1.6.19.new/src/main.c
610 --- eggdrop1.6.19/src/main.c 2008-02-16 22:41:03.000000000 +0100
611 +++ eggdrop1.6.19.new/src/main.c 2008-09-22 14:35:26.008450672 +0200
612 @@ -161,6 +161,9 @@ int cx_line[16];
620 void fatal(const char *s, int recoverable)
622 @@ -171,6 +174,9 @@ void fatal(const char *s, int recoverabl
623 for (i = 0; i < dcc_total; i++)
624 if (dcc[i].sock >= 0)
625 killsock(dcc[i].sock);
631 bg_send_quit(BG_ABORT);
632 diff -burNp eggdrop1.6.19/src/Makefile.in eggdrop1.6.19.new/src/Makefile.in
633 --- eggdrop1.6.19/src/Makefile.in 2006-11-20 12:38:25.000000000 +0100
634 +++ eggdrop1.6.19.new/src/Makefile.in 2008-09-22 14:38:37.400421493 +0200
635 @@ -11,6 +11,8 @@ INSTALL = @INSTALL@
636 INSTALL_PROGRAM = @INSTALL_PROGRAM@
637 INSTALL_DATA = @INSTALL_DATA@
638 INSTALL_SCRIPT = @INSTALL_SCRIPT@
639 +XSSL_LIBS = @SSL_LIBS@
640 +XSSL_INCLUDE = @SSL_INCLUDE@
644 @@ -37,7 +39,7 @@ doofus:
645 @echo "Linking eggdrop $(EGGBUILD)."
648 - $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
649 + $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` $(XSSL_LIBS) $(XSSL_INCLUDE)
650 $(STRIP) ../$(EGGEXEC)
652 @echo "Successful compile: $(EGGEXEC)"
653 diff -burNp eggdrop1.6.19/src/md5/md5c.c eggdrop1.6.19.new/src/md5/md5c.c
654 --- eggdrop1.6.19/src/md5/md5c.c 2004-04-10 09:49:23.000000000 +0200
655 +++ eggdrop1.6.19.new/src/md5/md5c.c 2008-09-22 14:40:36.140399142 +0200
663 +#include "openssl/md5.h"
666 #include "compat/compat.h"
668 +typedef unsigned long MD5_u32plus;
671 + MD5_u32plus lo, hi;
672 + MD5_u32plus a, b, c, d;
673 + unsigned char buffer[64];
674 + MD5_u32plus block[16];
678 * The basic MD5 functions.
680 diff -burNp eggdrop1.6.19/src/md5/md5.h eggdrop1.6.19.new/src/md5/md5.h
681 --- eggdrop1.6.19/src/md5/md5.h 2003-03-06 04:35:59.000000000 +0100
682 +++ eggdrop1.6.19.new/src/md5/md5.h 2008-09-22 14:44:22.801432410 +0200
684 * Written by Solar Designer <solar@openwall.com> in 2001, and placed in
685 * the public domain. See md5c.c for more information.
687 +#include "../config.h"
692 @@ -24,3 +26,4 @@ extern void MD5_Update(MD5_CTX *ctx, voi
693 extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
697 diff -burNp eggdrop1.6.19/src/mod/irc.mod/chan.c eggdrop1.6.19.new/src/mod/irc.mod/chan.c
698 --- eggdrop1.6.19/src/mod/irc.mod/chan.c 2008-02-16 22:41:09.000000000 +0100
699 +++ eggdrop1.6.19.new/src/mod/irc.mod/chan.c 2008-09-22 14:46:27.143879710 +0200
700 @@ -965,10 +965,10 @@ static int got324(char *from, char *msg)
705 + set_keyegg(chan, p);
709 + set_keyegg(chan, p);
713 diff -burNp eggdrop1.6.19/src/mod/irc.mod/irc.c eggdrop1.6.19.new/src/mod/irc.mod/irc.c
714 --- eggdrop1.6.19/src/mod/irc.mod/irc.c 2008-02-16 22:41:09.000000000 +0100
715 +++ eggdrop1.6.19.new/src/mod/irc.mod/irc.c 2008-09-22 14:47:35.182249518 +0200
716 @@ -256,7 +256,7 @@ static void maybe_revenge(struct chanset
720 -static void set_key(struct chanset_t *chan, char *k)
721 +static void set_keyegg(struct chanset_t *chan, char *k)
723 nfree(chan->channel.key);
725 diff -burNp eggdrop1.6.19/src/mod/irc.mod/irc.h eggdrop1.6.19.new/src/mod/irc.mod/irc.h
726 --- eggdrop1.6.19/src/mod/irc.mod/irc.h 2008-02-16 22:41:09.000000000 +0100
727 +++ eggdrop1.6.19.new/src/mod/irc.mod/irc.h 2008-09-22 14:53:47.281677127 +0200
728 @@ -69,7 +69,7 @@ static void set_delay(struct chanset_t *
730 static void reset_chan_info(struct chanset_t *);
731 static void recheck_channel(struct chanset_t *, int);
732 -static void set_key(struct chanset_t *, char *);
733 +static void set_keyegg(struct chanset_t *, char *);
734 static void maybe_revenge(struct chanset_t *, char *, char *, int);
735 static int detect_chan_flood(char *, char *, char *, struct chanset_t *, int,
737 diff -burNp eggdrop1.6.19/src/mod/irc.mod/mode.c eggdrop1.6.19.new/src/mod/irc.mod/mode.c
738 --- eggdrop1.6.19/src/mod/irc.mod/mode.c 2008-02-16 22:41:09.000000000 +0100
739 +++ eggdrop1.6.19.new/src/mod/irc.mod/mode.c 2008-09-22 14:57:12.177766159 +0200
740 @@ -1128,7 +1128,7 @@ static int gotmode(char *from, char *ori
745 + set_keyegg(chan, op);
746 if (channel_active(chan))
747 got_key(chan, nick, from, op);
749 @@ -1139,7 +1139,7 @@ static int gotmode(char *from, char *ori
750 !chan_master(user) && !match_my_nick(nick))
751 add_mode(chan, '+', 'k', chan->key_prot);
753 - set_key(chan, NULL);
754 + set_keyegg(chan, NULL);
756 check_tcl_mode(nick, from, u, chan->dname, ms2, op);
758 diff -burNp eggdrop1.6.19/src/mod/module.h eggdrop1.6.19.new/src/mod/module.h
759 --- eggdrop1.6.19/src/mod/module.h 2008-02-16 22:41:06.000000000 +0100
760 +++ eggdrop1.6.19.new/src/mod/module.h 2008-09-22 15:00:36.262853551 +0200
761 @@ -471,13 +471,23 @@
762 /* IPv6 leftovers: 286 */
763 /* IPv6 leftovers: 287 */
765 -/* IPv6 leftovers: 288 */
767 +#define net_switch_to_ssl ((int (*)(int))global[289])
768 +#define use_ssl (*(int *)global[290]) /* kyotou */
769 +#define strip_mirc_codes ((void (*)(int, char *))global[291])
770 +#define check_ansi ((int (*) (char *))global[292])
771 +#define oatoi ((int (*) (const char *))global[293])
773 +#define str_isdigit ((int (*) (const char *))global[294])
774 +#define remove_crlf ((void (*)(char **))global[295])
776 #define strip_mirc_codes ((void (*)(int, char *))global[289])
777 #define check_ansi ((int (*) (char *))global[290])
778 #define oatoi ((int (*) (const char *))global[291])
780 #define str_isdigit ((int (*) (const char *))global[292])
781 #define remove_crlf ((void (*)(char **))global[293])
785 #define maskhost(a,b) _maskhost((a),(b),1)
786 diff -burNp eggdrop1.6.19/src/mod/server.mod/servmsg.c eggdrop1.6.19.new/src/mod/server.mod/servmsg.c
787 --- eggdrop1.6.19/src/mod/server.mod/servmsg.c 2008-02-16 22:41:10.000000000 +0100
788 +++ eggdrop1.6.19.new/src/mod/server.mod/servmsg.c 2008-09-22 15:16:40.818273894 +0200
789 @@ -1293,6 +1293,14 @@ static void server_resolve_success(int s
790 fatal("NO SERVERS WILL ACCEPT MY CONNECTION.", 0);
792 dcc[servidx].sock = serv;
794 + if (use_ssl) { /* kyotou */
795 + if (net_switch_to_ssl(serv)==0) {
796 + putlog(LOG_SERV, "*", "SSL %s %s (Error while switching to SSL)", IRC_FAILEDCONNECT, dcc[servidx].host);
801 /* Queue standard login */
802 dcc[servidx].timeval = now;
803 SERVER_SOCKET.timeout_val = &server_timeout;
804 diff -burNp eggdrop1.6.19/src/modules.c eggdrop1.6.19.new/src/modules.c
805 --- eggdrop1.6.19/src/modules.c 2008-02-16 22:41:04.000000000 +0100
806 +++ eggdrop1.6.19.new/src/modules.c 2008-09-22 15:30:23.753434245 +0200
815 +#include "openssl/md5.h"
825 @@ -94,6 +102,10 @@ extern int parties, noshare, dcc_total,
826 password_timeout, force_expire, protect_readonly, reserved_port_min,
827 reserved_port_max, copy_to_tmp, quiet_reject;
830 +extern int use_ssl; /* kyotou */
833 extern party_t *party;
834 extern time_t now, online_since;
835 extern tand_t *tandbot;
836 @@ -128,6 +140,9 @@ void check_static(char *name, char *(*fu
841 +int net_switch_to_ssl(int);
844 /* The null functions */
846 @@ -564,7 +579,13 @@ Function global_table[] = {
847 (Function) 0, /* IPv6 leftovers: 286 */
848 (Function) 0, /* IPv6 leftovers: 287 */
851 (Function) 0, /* IPv6 leftovers: 288 */
852 + (Function) net_switch_to_ssl,
853 + (Function) & use_ssl, /* kyotou */
855 + (Function) 0, /* IPv6 leftovers: 288 */
857 (Function) strip_mirc_codes,
858 (Function) check_ansi,
860 diff -burNp eggdrop1.6.19/src/net.c eggdrop1.6.19.new/src/net.c
861 --- eggdrop1.6.19/src/net.c 2008-02-16 22:41:04.000000000 +0100
862 +++ eggdrop1.6.19.new/src/net.c 2008-09-22 16:10:28.739840200 +0200
868 +# ifndef EGG_SSL_INCS
869 +# include <openssl/ssl.h>
870 +# include <openssl/err.h>
871 +# include <openssl/rand.h>
872 +# define EGG_SSL_INCS 1
879 extern struct dcc_t *dcc;
880 extern int backgrd, use_stderr, resolve_timeout, dcc_total;
881 extern unsigned long otraffic_irc_today, otraffic_bn_today, otraffic_dcc_today,
882 @@ -65,6 +77,12 @@ int firewallport = 1080; /* Default
883 char botuser[21] = "eggdrop"; /* Username of the user running the bot. */
884 int dcc_sanitycheck = 0; /* Do some sanity checking on dcc connections. */
887 +SSL_CTX *ssl_ctx=NULL;
888 +char *tls_rand_file = NULL;
889 +int use_ssl = 0; /* kyotou */
892 sock_list *socklist = NULL; /* Enough to be safe. */
894 sigjmp_buf alarmret; /* Env buffer for alarm() returns. */
895 @@ -88,6 +106,46 @@ IP my_atoul(char *s)
902 + char stackdata[1024];
903 + static char rand_file[300];
906 +#if OPENSSL_VERSION_NUMBER >= 0x00905100
908 + return 0; /* PRNG already good seeded */
910 + /* if the device '/dev/urandom' is present, OpenSSL uses it by default.
911 + * check if it's present, else we have to make random data ourselfs.
913 + if ((fh = fopen("/dev/urandom", "r"))) {
917 + if (RAND_file_name(rand_file, sizeof(rand_file)))
918 + tls_rand_file = rand_file;
921 + if (!RAND_load_file(rand_file, 1024)) {
922 + /* no .rnd file found, create new seed */
925 + RAND_seed(&c, sizeof(c));
927 + RAND_seed(&c, sizeof(c));
928 + RAND_seed(stackdata, sizeof(stackdata));
930 +#if OPENSSL_VERSION_NUMBER >= 0x00905100
931 + if (!RAND_status())
932 + return 2; /* PRNG still badly seeded */
939 /* Initialize the socklist
942 @@ -96,9 +154,35 @@ void init_net()
944 for (i = 0; i < MAXSOCKS; i++) {
945 socklist[i].flags = SOCK_UNUSED;
947 + socklist[i].ssl=NULL;
951 + /* good place to init ssl stuff */
952 + SSL_load_error_strings();
953 + OpenSSL_add_ssl_algorithms();
954 + ssl_ctx=SSL_CTX_new(SSLv23_client_method());
956 + fatal("SSL_CTX_new() failed",0);
958 + fatal("Wasn't able to properly seed the PRNG!",0);
963 +/* cleanup mess when quiting */
966 + SSL_CTX_free(ssl_ctx);
970 + RAND_write_file(tls_rand_file);
978 @@ -231,6 +315,13 @@ int sockoptions(int sock, int operation,
980 for (i = 0; i < MAXSOCKS; i++)
981 if ((socklist[i].sock == sock) && !(socklist[i].flags & SOCK_UNUSED)) {
983 + if (socklist[i].ssl) {
984 + SSL_shutdown(socklist[i].ssl);
985 + SSL_free(socklist[i].ssl);
986 + socklist[i].ssl=NULL;
989 if (operation == EGG_OPTION_SET)
990 socklist[i].flags |= sock_options;
991 else if (operation == EGG_OPTION_UNSET)
992 @@ -366,6 +457,64 @@ static int proxy_connect(int sock, char
997 +int net_switch_to_ssl(int sock) {
1000 + debug0("net_switch_to_ssl()");
1001 + while (i<MAXSOCKS) {
1002 + if (socklist[i].sock==sock) {
1007 + if (i==MAXSOCKS) {
1008 + debug0("Error while swithing to SSL - sock not found in list");
1012 + if (socklist[i].ssl) {
1013 + debug0("Error while swithing to SSL - already in ssl");
1016 + socklist[i].ssl = SSL_new(ssl_ctx);
1017 + if (!socklist[i].ssl) {
1018 + debug0("Error while swithing to SSL - SSL_new() error");
1022 + SSL_set_fd(socklist[i].ssl, socklist[i].sock);
1023 + err = SSL_connect(socklist[i].ssl);
1025 + while (err <= 0) {
1027 + errs=SSL_get_error(socklist[i].ssl,err);
1028 + if ((errs!=SSL_ERROR_WANT_READ)&&(errs!=SSL_ERROR_WANT_WRITE)&&
1029 + (errs!=SSL_ERROR_WANT_X509_LOOKUP)) {
1030 + putlog(LOG_DEBUG,"*", "SSL_connect() = %d, %s", err,
1031 + (char *)ERR_error_string(ERR_get_error(), NULL));
1032 + SSL_shutdown(socklist[i].ssl);
1033 + SSL_free(socklist[i].ssl);
1034 + socklist[i].ssl = NULL;
1038 + err = SSL_connect(socklist[i].ssl);
1042 + debug0("SSL_connect() success");
1045 + debug0("Error while SSL_connect()");
1046 + SSL_shutdown(socklist[i].ssl);
1047 + SSL_free(socklist[i].ssl);
1048 + socklist[i].ssl = NULL;
1054 /* Starts a connection attempt to a socket
1056 * If given a normal hostname, this will be resolved to the corresponding
1057 @@ -627,6 +776,9 @@ static int sockread(char *s, int *len)
1058 for (i = 0; i < MAXSOCKS; i++) {
1059 if ((!(socklist[i].flags & SOCK_UNUSED)) &&
1060 ((FD_ISSET(socklist[i].sock, &fd)) ||
1062 + ((socklist[i].ssl)&&(SSL_pending(socklist[i].ssl))) ||
1064 ((socklist[i].sock == STDOUT) && (!backgrd) &&
1065 (FD_ISSET(STDIN, &fd))))) {
1066 if (socklist[i].flags & (SOCK_LISTEN | SOCK_CONNECT)) {
1067 @@ -651,7 +803,31 @@ static int sockread(char *s, int *len)
1068 if ((socklist[i].sock == STDOUT) && !backgrd)
1069 x = read(STDIN, s, grab);
1073 + if (socklist[i].ssl) {
1074 + x=SSL_read(socklist[i].ssl,s,grab);
1076 + int err = SSL_get_error(socklist[i].ssl, x);
1079 + case SSL_ERROR_WANT_READ:
1082 + case SSL_ERROR_WANT_WRITE:
1085 + case SSL_ERROR_WANT_X509_LOOKUP:
1091 x = read(socklist[i].sock, s, grab);
1094 + x = read(socklist[i].sock, s, grab);
1096 if (x <= 0) { /* eof */
1097 if (errno != EAGAIN) { /* EAGAIN happens when the operation would
1098 * block on a non-blocking socket, if the
1099 @@ -944,6 +1120,26 @@ void tputs(register int z, char *s, unsi
1100 socklist[i].outbuflen += len;
1104 + if (socklist[i].ssl) {
1105 + x=SSL_write(socklist[i].ssl,s,len);
1107 + int err = SSL_get_error(socklist[i].ssl, x);
1110 + case SSL_ERROR_WANT_READ:
1113 + case SSL_ERROR_WANT_WRITE:
1116 + case SSL_ERROR_WANT_X509_LOOKUP:
1124 x = write(z, s, len);
1126 @@ -1010,6 +1206,27 @@ void dequeue_sockets()
1127 (socklist[i].outbuf != NULL) && (FD_ISSET(socklist[i].sock, &wfds))) {
1128 /* Trick tputs into doing the work */
1131 + if (socklist[i].ssl) {
1132 + x = write(socklist[i].sock, socklist[i].outbuf,
1133 + socklist[i].outbuflen);
1135 + int err = SSL_get_error(socklist[i].ssl, x);
1138 + case SSL_ERROR_WANT_READ:
1141 + case SSL_ERROR_WANT_WRITE:
1144 + case SSL_ERROR_WANT_X509_LOOKUP:
1151 x = write(socklist[i].sock, socklist[i].outbuf, socklist[i].outbuflen);
1152 if ((x < 0) && (errno != EAGAIN)
1154 diff -burNp eggdrop1.6.19/src/net.h eggdrop1.6.19.new/src/net.h
1155 --- eggdrop1.6.19/src/net.h 1970-01-01 01:00:00.000000000 +0100
1156 +++ eggdrop1.6.19.new/src/net.h 2008-09-22 16:12:38.979826983 +0200
1161 +# ifndef EGG_SSL_INCS
1162 +# include <openssl/ssl.h>
1163 +# include <openssl/err.h>
1164 +# include <openssl/rand.h>
1165 +# define EGG_SSL_INCS 1
1169 +/* This is used by the net module to keep track of sockets and what's
1180 + unsigned long outbuflen; /* Outbuf could be binary data */
1181 + unsigned long inbuflen; /* Inbuf could be binary data */
1184 +#endif /* USE_IPV6 */
1187 +#endif /* _EGG_NET_H */
1188 diff -burNp eggdrop1.6.19/src/patch.h eggdrop1.6.19.new/src/patch.h
1189 --- eggdrop1.6.19/src/patch.h 2008-04-19 06:21:20.000000000 +0200
1190 +++ eggdrop1.6.19.new/src/patch.h 2008-09-22 16:13:41.491758122 +0200
1195 -/* PATCH GOES HERE */
1202 diff -burNp eggdrop1.6.19/src/tcl.c eggdrop1.6.19.new/src/tcl.c
1203 --- eggdrop1.6.19/src/tcl.c 2008-02-16 22:41:04.000000000 +0100
1204 +++ eggdrop1.6.19.new/src/tcl.c 2008-09-22 16:16:08.499821489 +0200
1205 @@ -45,6 +45,10 @@ typedef struct {
1207 extern time_t online_since;
1210 +extern int use_ssl; /* kyotou */
1213 extern char origbotname[], botuser[], motdfile[], admin[], userfile[],
1214 firewall[], helpdir[], notify_new[], hostname[], myip[], moddir[],
1215 tempdir[], owner[], network[], botnetnick[], bannerfile[],
1216 @@ -522,6 +526,9 @@ static tcl_ints def_tcl_ints[] = {
1217 {"enable-simul", &enable_simul, 0}, /* compat */
1218 {"debug-output", &debug_output, 0}, /* compat */
1219 {"use-console-r", &use_console_r, 0}, /* compat */
1221 + {"use-ssl", &use_ssl, 0}, /* kyotou */
1226 diff -burNp eggdrop1.6.19/src/tclmisc.c eggdrop1.6.19.new/src/tclmisc.c
1227 --- eggdrop1.6.19/src/tclmisc.c 2008-02-16 22:41:04.000000000 +0100
1228 +++ eggdrop1.6.19.new/src/tclmisc.c 2008-09-22 16:17:34.872716077 +0200
1231 #include "modules.h"
1233 -#include "md5/md5.h"
1235 +#ifndef EGG_SSL_EXT
1236 + #include "md5/md5.h"
1238 +#include "openssl/md5.h"
1241 #ifdef TIME_WITH_SYS_TIME
1242 # include <sys/time.h>