-diff -burN eggdrop1.6.15/acconfig.h eggdrop1.6.15-ssl/acconfig.h
---- eggdrop1.6.15/acconfig.h 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/acconfig.h 2003-05-19 16:41:56.000000000 +0200
-@@ -56,6 +56,9 @@
- /* Defines extension of Eggdrop modules. */
- #undef EGG_MOD_EXT
+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 @@
+ ])
-+/* Defines ssl mode */
-+#undef EGG_SSL_EXT
-+
- @BOTTOM@
-
- #endif /* !_EGG_CONFIG_H */
-diff -burN eggdrop1.6.15/aclocal.m4 eggdrop1.6.15-ssl/aclocal.m4
---- eggdrop1.6.15/aclocal.m4 2003-05-05 00:09:24.000000000 +0200
-+++ eggdrop1.6.15-ssl/aclocal.m4 2003-05-19 16:41:56.000000000 +0200
-@@ -15,6 +15,62 @@
- AC_MSG_RESULT()
- ])dnl
+dnl EGG_SSL_CRAP()
+dnl
+
+ if test -n "$SSL_INCLUDE" && test -n "$SSL_LIB" && test -n "$CRYPTO_LIB"; then
+ SSL_LIBS="-lssl -lcrypto -L$SSL_LIB -L$CRYPTO_LIB";
-+ AC_DEFINE(EGG_SSL_EXT)
++ AC_DEFINE([EGG_SSL_EXT], [], [SSL support])
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_RESULT(will try to find)
+ AC_CHECK_LIB(ssl,SSL_accept,[AC_DEFINE(EGG_SSL_EXT)
+ SSL_LIBS="-lssl -lcrypto"],[AC_MSG_ERROR([OpenSSL was not found. Please supply a pathname to OpenSSL])],-lcrypto)
-+ AC_CHECK_HEADERS("openssl/ssl.h",,[AC_MSG_ERROR([OpenSSL was not found. Please supply a pathname to OpenSSL])],)
-+
-+ AC_SUBST(SSL_LIBS)dnl
-+ AC_SUBST(SSL_INCLUDE)dnl
-+])
-+
-+#end of ssl checks - hoe
-+])dnl
-
- dnl EGG_MSG_CONFIGURE_END()
- dnl
-diff -burN eggdrop1.6.15/config.h.in eggdrop1.6.15-ssl/config.h.in
---- eggdrop1.6.15/config.h.in 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/config.h.in 2003-05-19 16:41:57.000000000 +0200
-@@ -60,6 +60,9 @@
- /* Define to 1 if you have the `clock' function. */
- #undef HAVE_CLOCK
-
-+/* Defines ssl mode */
-+#undef EGG_SSL_EXT
-+
- /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
- #undef HAVE_DIRENT_H
-diff -burN eggdrop1.6.15/configure eggdrop1.6.15-ssl/configure
---- eggdrop1.6.15/configure 2003-05-05 00:08:25.000000000 +0200
-+++ eggdrop1.6.15-ssl/configure 2003-05-19 16:41:57.000000000 +0200
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.54.
-+# Generated by GNU Autoconf 2.57.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
- # Free Software Foundation, Inc.
-@@ -36,7 +36,10 @@
- PS4='+ '
-
- # NLS nuisances.
--for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
- do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
-@@ -82,15 +85,15 @@
-
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conftest.sh
-- echo "exit 0" >>conftest.sh
-- chmod +x conftest.sh
-- if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
-- rm -f conftest.sh
-+ rm -f conf$$.sh
- fi
-
-
-@@ -306,7 +309,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 SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP AWK BASENAME UNAME MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP DEFAULT_MAKE MOD_EXT ENABLEIPV6 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 SET_MAKE RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S STRIP AWK BASENAME UNAME MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP DEFAULT_MAKE MOD_EXT ENABLEIPV6 EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS SSL_LIBS SSL_INCLUDE EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -839,14 +842,14 @@
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-cc-optimization disable -O2 cflag
- --enable-ipv6 enable IPv6 support
-- --disable-tcl-threads Disable threaded Tcl support if detected. (Ignore this
-- option unless you know what you are doing)
-+ --disable-tcl-threads disable threaded Tcl support if detected
-
- Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --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
-+ --with-ssl=PATH Include SSL support (DIR is OpenSSL's install dir).
-
- Some influential environment variables:
- CC C compiler command
-@@ -936,7 +939,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.54. Invocation command line was
-+generated by GNU Autoconf 2.57. Invocation command line was
-
- $ $0 $@
-
-@@ -988,24 +991,54 @@
-
- # Keep a trace of the command line.
- # Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
- # Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
- ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
- ac_sep=
--for ac_arg
-+ac_must_keep_next=false
-+for ac_pass in 1 2
- do
-+ for ac_arg
-+ do
- case $ac_arg in
-- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-- | --no-cr | --no-c | -n ) continue ;;
-- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
-+ case $ac_pass in
-+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+ 2)
-+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+ if test $ac_must_keep_next = true; then
-+ ac_must_keep_next=false # Got value, back to normal.
-+ else
-+ case $ac_arg in
-+ *=* | --config-cache | -C | -disable-* | --disable-* \
-+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+ | -with-* | --with-* | -without-* | --without-* | --x)
-+ case "$ac_configure_args0 " in
-+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+ esac
-+ ;;
-+ -* ) ac_must_keep_next=true ;;
-+ esac
-+ fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
-+ ;;
-+ esac
-+ done
- done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
-@@ -1611,8 +1644,10 @@
- fi
-
-
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
-@@ -1637,7 +1672,11 @@
-
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -1648,7 +1687,7 @@
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe"
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
-@@ -1667,27 +1706,39 @@
- # Be careful to initialize this variable, since it used to be cached.
- # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
- ac_cv_exeext=
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-- a.out ) # We found the default executable, but exeext='' is most
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+ ;;
-+ conftest.$ac_ext )
-+ # This is the source file.
-+ ;;
-+ [ab].out )
-+ # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
-- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
-+ *.* )
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool,
-+ # but it would be cool to find out if it's true. Does anybody
-+ # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
-- * ) break;;
-+ * )
-+ break;;
- esac
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- { { echo "$as_me:$LINENO: error: C compiler cannot create executables
--check \`config.log' for details." >&5
-+See \`config.log' for more details." >&5
- echo "$as_me: error: C compiler cannot create executables
--check \`config.log' for details." >&2;}
-+See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- fi
-
-@@ -1714,9 +1765,11 @@
- cross_compiling=yes
- else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&5
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'." >&2;}
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-@@ -1724,7 +1777,7 @@
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-
--rm -f a.out a.exe conftest$ac_cv_exeext
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
-@@ -1755,8 +1808,10 @@
- esac
- done
- else
-- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -1774,7 +1829,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -1799,9 +1858,12 @@
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -1818,7 +1880,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -1846,7 +1912,8 @@
- ac_compiler_gnu=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_compiler_gnu=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -1866,7 +1933,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -1891,7 +1962,8 @@
- ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_prog_cc_g=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -1922,7 +1994,11 @@
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
-@@ -1985,7 +2061,8 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext
- done
-@@ -2036,7 +2113,11 @@
- do
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdlib.h>
- $ac_declaration
- int
-@@ -2062,13 +2143,18 @@
- :
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- continue
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_declaration
- int
- main ()
-@@ -2093,7 +2179,8 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
-@@ -2106,7 +2193,8 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-@@ -2153,12 +2241,22 @@
- do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
--#include <assert.h>
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -2181,7 +2279,8 @@
- :
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Broken: fails on valid input.
- continue
- fi
-@@ -2191,7 +2290,11 @@
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -2215,7 +2318,8 @@
- continue
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -2244,12 +2348,22 @@
- do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
--#include <assert.h>
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- Syntax error
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -2272,7 +2386,8 @@
- :
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Broken: fails on valid input.
- continue
- fi
-@@ -2282,7 +2397,11 @@
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -2306,7 +2425,8 @@
- continue
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # Passes both tests.
- ac_preproc_ok=:
- break
-@@ -2319,8 +2439,10 @@
- if $ac_preproc_ok; then
- :
- else
-- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
--echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -2351,7 +2473,11 @@
- echo $ECHO_N "checking for AIX... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #ifdef _AIX
- yes
- #endif
-@@ -2381,7 +2507,11 @@
- ac_cv_search_strerror=no
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -2413,7 +2543,8 @@
- ac_cv_search_strerror="none required"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_strerror" = no; then
-@@ -2421,7 +2552,11 @@
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -2454,7 +2589,8 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- done
-@@ -2475,43 +2611,54 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
- #include <float.h>
-
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
- ac_cv_header_stdc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_header_stdc=no
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_ext
-+rm -f conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <string.h>
-
- _ACEOF
-@@ -2529,7 +2676,11 @@
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <stdlib.h>
-
- _ACEOF
-@@ -2550,13 +2701,18 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #else
--# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-@@ -2589,7 +2745,8 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
-@@ -2628,7 +2785,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
-
- #include <$ac_header>
-@@ -2648,7 +2809,8 @@
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Header=no"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -2679,7 +2841,11 @@
- echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <minix/config.h>
- _ACEOF
-@@ -2698,7 +2864,8 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -2710,7 +2877,11 @@
- echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <minix/config.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -2733,7 +2904,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -2746,14 +2918,32 @@
- { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
- echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for minix/config.h" >&5
- echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
-@@ -2806,7 +2996,11 @@
- CC="$CC -pipe"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -2831,7 +3025,8 @@
- egg_cv_var_ccpipe="yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- egg_cv_var_ccpipe="no"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -2849,15 +3044,15 @@
-
-
- # Checks for programs
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
- all:
-- @echo 'ac_maketemp="${MAKE}"'
-+ @echo 'ac_maketemp="$(MAKE)"'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-@@ -3306,7 +3501,11 @@
- WIN32FLAGS=
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -3339,7 +3538,8 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-
- ac_compile_save="$ac_compile"
- save_CC="$CC"
-@@ -3347,7 +3547,11 @@
- CC="$CC -mwin32"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -3383,7 +3587,8 @@
-
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-
- ac_compile="$ac_compile_save"
- CC="$save_CC"
-@@ -3643,7 +3848,11 @@
- LIBS="-lsocket $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -3675,7 +3884,8 @@
- ac_cv_lib_socket_socket=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_socket_socket=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -3702,7 +3912,11 @@
- LIBS="-lnsl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -3734,7 +3948,8 @@
- ac_cv_lib_nsl_connect=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_nsl_connect=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -3761,7 +3976,11 @@
- LIBS="-ldns $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -3793,7 +4012,8 @@
- ac_cv_lib_dns_gethostbyname=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dns_gethostbyname=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -3820,7 +4040,11 @@
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -3852,7 +4076,8 @@
- ac_cv_lib_dl_dlopen=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_dlopen=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -3878,7 +4103,11 @@
- LIBS="-lm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -3910,7 +4139,8 @@
- ac_cv_lib_m_tan=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_m_tan=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -3932,7 +4162,11 @@
- LIBS="-lpthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -3964,7 +4198,8 @@
- ac_cv_lib_pthread_pthread_mutex_init=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_pthread_pthread_mutex_init=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -3985,7 +4220,11 @@
- LIBS="-lpthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -4017,7 +4256,8 @@
- ac_cv_lib_pthread___pthread_mutex_init=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_pthread___pthread_mutex_init=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -4038,7 +4278,11 @@
- LIBS="-lpthreads $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -4070,7 +4314,8 @@
- ac_cv_lib_pthreads_pthread_mutex_init=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_pthreads_pthread_mutex_init=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -4089,31 +4334,44 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char pthread_mutex_init (); below. */
--#include <assert.h>
-+ which can conflict with char pthread_mutex_init (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char pthread_mutex_init ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_pthread_mutex_init) || defined (__stub___pthread_mutex_init)
- choke me
- #else
--f = pthread_mutex_init;
-+char (*f) () = pthread_mutex_init;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != pthread_mutex_init;
- ;
- return 0;
- }
-@@ -4133,7 +4391,8 @@
- ac_cv_func_pthread_mutex_init=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_func_pthread_mutex_init=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -4166,7 +4425,11 @@
- LIBS="-ldl $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
-
- int
-@@ -4192,7 +4455,8 @@
- ac_cv_lib_dl_main=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dl_main=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -4222,7 +4486,11 @@
- LIBS="-ldld $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -4254,7 +4522,8 @@
- ac_cv_lib_dld_shl_load=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_lib_dld_shl_load=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -4292,7 +4561,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <$ac_hdr>
-
-@@ -4320,7 +4593,8 @@
- eval "$as_ac_Header=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Header=no"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -4347,7 +4621,11 @@
- ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -4379,7 +4657,8 @@
- ac_cv_search_opendir="none required"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_opendir" = no; then
-@@ -4387,7 +4666,11 @@
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -4420,7 +4703,8 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- done
-@@ -4444,7 +4728,11 @@
- ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -4476,7 +4764,8 @@
- ac_cv_search_opendir="none required"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_opendir" = no; then
-@@ -4484,7 +4773,11 @@
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -4517,7 +4810,8 @@
- break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- done
-@@ -4540,7 +4834,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
-@@ -4575,7 +4873,8 @@
- ac_cv_header_sys_wait_h=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_header_sys_wait_h=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -4608,7 +4907,11 @@
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
-@@ -4627,7 +4930,8 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -4639,7 +4943,11 @@
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -4662,7 +4970,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -4675,14 +4984,32 @@
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-@@ -4711,7 +5038,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/time.h>
- #include <time.h>
-@@ -4740,7 +5071,8 @@
- ac_cv_header_time=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_header_time=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -4779,7 +5111,11 @@
- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
-@@ -4798,7 +5134,8 @@
- ac_header_compiler=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_compiler=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -4810,7 +5147,11 @@
- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -4833,7 +5174,8 @@
- ac_header_preproc=yes
- else
- echo "$as_me: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-@@ -4846,14 +5188,32 @@
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
- echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
- echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
- echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
- esac
- echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-@@ -4884,7 +5244,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -4912,7 +5276,8 @@
- ac_cv_type_pid_t=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_pid_t=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -4936,7 +5301,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -4964,7 +5333,8 @@
- ac_cv_type_size_t=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_size_t=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -4988,7 +5358,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- int
- main ()
-@@ -5059,7 +5433,8 @@
- ac_cv_c_const=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_c_const=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -5082,7 +5457,11 @@
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/param.h>
-
-@@ -5112,7 +5491,11 @@
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/param.h>
-
-@@ -5142,20 +5525,26 @@
- ac_cv_c_bigendian=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_c_bigendian=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- # It does not; compile a test program.
- if test "$cross_compiling" = yes; then
- # try to guess the endianness by grepping values into an object file
- ac_cv_c_bigendian=unknown
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
- short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-@@ -5195,13 +5584,18 @@
- fi
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- int
- main ()
- {
-@@ -5230,7 +5624,8 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
-@@ -5267,7 +5662,11 @@
- for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- #ifndef __cplusplus
- typedef int foo_t;
- static $ac_kw foo_t static_foo () {return 0; }
-@@ -5290,7 +5689,8 @@
- ac_cv_c_inline=$ac_kw; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
-@@ -5318,7 +5718,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5346,7 +5750,8 @@
- ac_cv_type_long=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_long=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -5368,7 +5773,11 @@
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5396,7 +5805,11 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5423,7 +5836,8 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
-@@ -5435,10 +5849,15 @@
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5466,7 +5885,11 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5493,7 +5916,8 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
-@@ -5505,7 +5929,8 @@
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -5516,7 +5941,11 @@
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5543,26 +5972,35 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
--echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (long)); }
- unsigned long ulongval () { return (long) (sizeof (long)); }
-@@ -5610,10 +6048,13 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5
--echo "$as_me: error: cannot compute sizeof (long), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-@@ -5638,7 +6079,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5666,7 +6111,8 @@
- ac_cv_type_int=yes
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_cv_type_int=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -5688,7 +6134,11 @@
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5716,7 +6166,11 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5743,7 +6197,8 @@
- ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
-@@ -5755,10 +6210,15 @@
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5786,7 +6246,11 @@
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5813,7 +6277,8 @@
- ac_lo=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
-@@ -5825,7 +6290,8 @@
- done
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo= ac_hi=
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-@@ -5836,7 +6302,11 @@
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- int
- main ()
-@@ -5863,26 +6333,35 @@
- ac_hi=$ac_mid
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
--echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- else
- if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
--echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- $ac_includes_default
- long longval () { return (long) (sizeof (int)); }
- unsigned long ulongval () { return (long) (sizeof (int)); }
-@@ -5930,10 +6409,13 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
--echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int), 77
-+See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-@@ -5964,7 +6446,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
- #include <fcntl.h>
- #include <sys/socket.h>
-@@ -6000,7 +6486,8 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
- egg_cv_ipv6_supported=no
- fi
-@@ -6032,8 +6519,8 @@
-
- else
- ac_cv_ipv6="no"
-- echo "$as_me:$LINENO: result: $ac_cv_ipv6" >&5
--echo "${ECHO_T}$ac_cv_ipv6" >&6
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-
- fi;
- if test "$ac_cv_ipv6" = "yes"
-@@ -6055,7 +6542,13 @@
-
-
-
--for ac_func in clock getrusage setpgid uname sigaction sigemptyset rename
-+
-+
-+
-+
++ AC_CHECK_HEADERS("openssl/ssl.h",,[AC_MSG_ERROR([OpenSSL was not found. Please supply a pathname to OpenSSL])],)
+
++ AC_SUBST(SSL_LIBS)dnl
++ AC_SUBST(SSL_INCLUDE)dnl
++])
+
-+for ac_func in clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize memset random srandom
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -6065,31 +6558,44 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below. */
--#include <assert.h>
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char $ac_func ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--f = $ac_func;
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
-
-+int
-+main ()
-+{
-+return f != $ac_func;
- ;
- return 0;
- }
-@@ -6109,7 +6615,8 @@
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++#end of ssl checks - hoe (.16 by poci)
++])dnl
+
- eval "$as_ac_var=no"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -6130,83 +6637,13 @@
-
-
-
--for ac_func in strcasecmp strncasecmp getdtablesize memset random srandom
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func ();
--char (*f) ();
-
--int
--main ()
--{
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--f = $ac_func;
--#endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "$as_ac_var=yes"
--else
-- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--eval "$as_ac_var=no"
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
-
-
-
-
-
--
--
--
--for ac_func in dlopen dprintf snprintf vsnprintf isascii inet_aton inet_ntop
-+for ac_func in dlopen dprintf snprintf vsnprintf isascii inet_aton inet_ntop memcpy strftime fsync gethostbyname2 getipnodebyname
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -6216,105 +6653,44 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below. */
--#include <assert.h>
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char $ac_func ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--f = $ac_func;
-+char (*f) () = $ac_func;
- #endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "$as_ac_var=yes"
--else
-- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--eval "$as_ac_var=no"
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--
--
--
--
--
--for ac_func in memcpy strftime fsync gethostbyname2 getipnodebyname
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below. */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
--extern "C"
-+}
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char $ac_func ();
--char (*f) ();
-
- int
- main ()
- {
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--f = $ac_func;
--#endif
--
-+return f != $ac_func;
- ;
- return 0;
- }
-@@ -6334,7 +6710,8 @@
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+
- eval "$as_ac_var=no"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -6360,31 +6737,44 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below. */
--#include <assert.h>
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char $ac_func ();
--char (*f) ();
--
--int
--main ()
--{
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
- #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
- choke me
- #else
--f = $ac_func;
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
- #endif
+ 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 @@
+ /* Define to 1 if you have the `clock' function. */
+ #undef HAVE_CLOCK
-+int
-+main ()
-+{
-+return f != $ac_func;
- ;
- return 0;
- }
-@@ -6404,7 +6794,8 @@
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++/* Defines ssl mode */
++#undef EGG_SSL_EXT
+
- eval "$as_ac_var=no"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -6457,7 +6848,11 @@
- else
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ /* 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"
- #include <stdio.h>
+-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=''
-@@ -6488,7 +6883,8 @@
- else
- echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- ( exit $ac_status )
- egg_cv_var_libsafe_sscanf="yes"
- fi
-@@ -6994,7 +7390,11 @@
- LIBS="-l$TCL_TEST_LIB $TCL_TEST_OTHERLIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ # Initialize some variables set by options.
+@@ -856,6 +856,7 @@
+ --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
++ --with-ssl=PATH Include SSL support (DIR is OpenSSL's install dir).
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -7026,7 +7426,8 @@
- eval "$as_ac_Lib=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Lib=no"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -7073,7 +7474,11 @@
- LIBS="-l$TCL_TEST_LIB $TCL_TEST_OTHERLIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
--#include "confdefs.h"
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
+ Some influential environment variables:
+ CC C compiler command
+@@ -10100,6 +10101,374 @@
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -7105,7 +7510,8 @@
- eval "$as_ac_Lib=yes"
- else
- echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
- eval "$as_ac_Lib=no"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-@@ -7201,6 +7607,346 @@
- # ---------- end of (what used to be) robey's Tcl thingies
+#ssl checks - hoe
+echo "$as_me:$LINENO: checking whether to include SSL support" >&5
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl -lcrypto $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+
+ac_cv_lib_ssl_SSL_accept=no
+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl -lcrypto $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest$ac_exeext'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+
+ac_cv_lib_ssl_SSL_accept=no
+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
++ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
-+ { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+
+ac_header_compiler=no
+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+ yes:no )
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
+ ;;
-+ no:yes )
++ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
++## -------------------------------- ##
++## Report this to bugs@eggheads.org ##
++## -------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
-+ eval "$as_ac_Header=$ac_header_preproc"
++ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi;
+
-+#end of ssl checks - hoe
-+
-+
- if test "$NEED_DL" = 1 && test "$ac_cv_func_dlopen" = "no"
- then
- if test "$LINUX" = "yes"
-@@ -7320,7 +8066,7 @@
- t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
--if cmp -s $cache_file confcache; then :; else
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
- cat confcache >$cache_file
-@@ -7380,6 +8126,8 @@
- # configure, is in config.log if it exists.
-
- debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
-
-@@ -7414,7 +8162,10 @@
- PS4='+ '
-
- # NLS nuisances.
--for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
- do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
-@@ -7460,15 +8211,15 @@
-
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conftest.sh
-- echo "exit 0" >>conftest.sh
-- chmod +x conftest.sh
-- if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
-- rm -f conftest.sh
-+ rm -f conf$$.sh
- fi
-
-
-@@ -7631,7 +8382,7 @@
- cat >&5 <<_CSEOF
-
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.54. Invocation command line was
-+generated by GNU Autoconf 2.57. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -7671,6 +8422,7 @@
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
-+ -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
-@@ -7693,7 +8445,7 @@
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.54,
-+configured by $0, generated by GNU Autoconf 2.57,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -7730,12 +8482,9 @@
- case $ac_option in
- # Handling of the options.
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-- echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-- exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
--_ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
-@@ -7757,6 +8506,9 @@
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+ ac_cs_silent=: ;;
-
- # This is an error.
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-@@ -7771,6 +8523,20 @@
- shift
- done
-
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+ exec 6>/dev/null
-+ ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
++#end of ssl checks - hoe (.16 by poci)
+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
+
- _ACEOF
-
- cat >>$CONFIG_STATUS <<_ACEOF
-@@ -7818,6 +8584,9 @@
- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
- fi
-
-+# Have a temporary directory for convenience. Make it in the build tree
-+# simply because there is no reason to put it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
- # Create a temporary directory, and hook for its removal unless debugging.
- $debug ||
- {
-@@ -7826,17 +8595,17 @@
- }
- # Create a (secure) tmp directory for tmp files.
--: ${TMPDIR=/tmp}
-+
- {
-- tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=$TMPDIR/cs$$-$RANDOM
-+ tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
- } ||
- {
-- echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+ echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
+ # Substitute Makefile variables.
-@@ -7921,6 +8690,8 @@
+@@ -10811,6 +11180,8 @@
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,@DEST@,$DEST,;t t
+ s,@DESTDIR@,$DESTDIR,;t t
s,@MOD_UPDIR@,$MOD_UPDIR,;t t
-@@ -8303,7 +9074,7 @@
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
- if test x"$ac_file" != x-; then
-- if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
- else
-@@ -8452,8 +9223,11 @@
- # need to make the FD available again.
- if test "$no_create" != yes; then
- ac_cs_success=:
-+ ac_config_status_args=
-+ test "$silent" = yes &&
-+ ac_config_status_args="$ac_config_status_args --quiet"
- exec 5>/dev/null
-- $SHELL $CONFIG_STATUS || ac_cs_success=false
-+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
-diff -burN eggdrop1.6.15/configure.in eggdrop1.6.15-ssl/configure.in
---- eggdrop1.6.15/configure.in 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/configure.in 2003-05-19 16:41:57.000000000 +0200
-@@ -124,6 +124,8 @@
+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 @@
+ EGG_TCL_LIB_REQS
EGG_TCL_LUSH
- # ---------- end of (what used to be) robey's Tcl thingies
+EGG_SSL_CRAP
+
- EGG_FUNC_DLOPEN
+ # Substitute Makefile variables.
EGG_SUBST_EGGVERSION
-diff -burN eggdrop1.6.15/Makefile.in eggdrop1.6.15-ssl/Makefile.in
---- eggdrop1.6.15/Makefile.in 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/Makefile.in 2003-05-19 16:41:57.000000000 +0200
-@@ -61,6 +61,8 @@
- # stuff for Tcl
+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
+@@ -1,12 +0,0 @@
+-# disabled_modules -- File which lists all Eggdrop modules that are
+-# disabled by default.
+-#
+-# $Id$
+-#
+-# Note:
+-# - Lines which start with a '#' character are ignored.
+-# - Every module name needs to be on its own line
+-
+-# Woobie only serves as an example for module programming. No need to
+-# compile it for normal bots ...
+-woobie
+diff -burN eggdrop1.6.17.orig/eggdrop.conf.orig eggdrop1.6.17/eggdrop.conf.orig
+--- eggdrop1.6.17.orig/eggdrop.conf.orig 2004-11-01 14:40:44.107455640 +0100
++++ eggdrop1.6.17/eggdrop.conf.orig 1970-01-01 01:00:00.000000000 +0100
+@@ -1,1353 +0,0 @@
+-#! /usr/bin/eggdrop
+-# ^- This should contain a fully qualified path to your Eggdrop executable.
+-#
+-# $Id$
+-#
+-# This is a sample Eggdrop configuration file which includes all possible
+-# settings that can be used to configure your bot.
+-#
+-# The pound signs (#) that you see at the beginning of some lines mean that
+-# the remainder of that line is a comment, or just for your information. By
+-# adding or deleting pound signs, you can comment or uncomment a setting,
+-# respectively.
+-#
+-# Arguments for a command or setting may be inclosed in <>'s or []'s in the
+-# example/description. Arguments in <>'s are required, while [] means optional.
+-#
+-# More detailed descriptions of all these settings can be found in
+-# doc/settings/.
+-
+-
+-
+-##### BASIC SETTINGS #####
+-
+-# This setting defines the username the bot uses on IRC. This setting has
+-# no effect if an ident daemon is running on your bot's machine.
+-set username "lamest"
+-
+-# This setting defines which contact person should be shown in .status,
+-# /msg help, and other places. You really should include this information.
+-set admin "Lamer <email: lamer@lamest.lame.org>"
+-
+-# This setting is used only for info to share with others on your botnet.
+-# Set this to the IRC network your bot is connected to.
+-set network "I.didn't.edit.my.config.file.net"
+-
+-# This setting defines the timezone is your bot in. It's used for internal
+-# routines as well as for logfile timestamping and scripting purposes.
+-# The timezone string specifies the name of the timezone and must be three
+-# or more alphabetic characters. For example, Central European Time(UTC+1)
+-# should be "CET".
+-set timezone "EST"
+-
+-# The offset setting specifies the time value to be added to the local
+-# time to get Coordinated Universal Time (UTC aka GMT). The offset is
+-# positive if the local timezone is west of the Prime Meridian and
+-# negative if it is east. The value (in hours) must be between -23 and
+-# 23. For example, if the timezone is UTC+1, the offset is -1.
+-set offset "5"
+-
+-# If you don't want to use the timezone setting for scripting purposes only,
+-# but instead everywhere possible, un-comment the following line.
+-#set env(TZ) "$timezone $offset"
+-
+-# If you're using virtual hosting (your machine has more than 1 IP), you
+-# may want to specify the particular IP to bind to. You can specify either
+-# by hostname or by IP. You may also want to set the hostname here if
+-# Eggdrop has trouble detecting it when it starts up.
+-#set my-hostname "virtual.host.com"
+-#set my-ip "99.99.0.0"
+-
+-# If you want to have your Eggdrop messages displayed in a language other
+-# than English, change this setting to match your preference. An alternative
+-# would be to set the environment variable EGG_LANG to that value.
+-#
+-# Languages included with Eggdrop: Danish, English, French, Finnish, German.
+-#addlang "english"
+-
+-
+-##### LOG FILES #####
+-
+-# Eggdrop is capable of logging various things, from channel chatter to
+-# commands people use on the bot and file transfers. Logfiles are normally
+-# kept for 24 hours. Afterwards, they will be renamed to "(logfile).yesterday".
+-# After 48 hours, they will be overwritten by the logfile of the next day.
+-#
+-# Events are logged by certain categories. This way, you can specify
+-# exactly what kind of events you want sent to various logfiles.
+-#
+-# Logfile flags:
+-# b - information about bot linking and userfile sharing
+-# c - commands
+-# d - misc debug information
+-# h - raw share traffic
+-# j - joins, parts, quits, and netsplits on the channel
+-# k - kicks, bans, and mode changes on the channel
+-# m - private msgs, notices and ctcps to the bot
+-# o - misc info, errors, etc (IMPORTANT STUFF)
+-# p - public text on the channel
+-# r - raw incoming server traffic
+-# s - server connects, disconnects, and notices
+-# t - raw botnet traffic
+-# v - raw outgoing server traffic
+-# w - wallops (make sure the bot sets +w in init-server)
+-# x - file transfers and file-area commands
+-#
+-# Note that modes d, h, r, t, and v can fill disk quotas quickly. There are
+-# also eight user-defined levels (1-8) which can be used by Tcl scripts.
+-#
+-# Each logfile belongs to a certain channel. Events of type 'k', 'j', and 'p'
+-# are logged to whatever channel they happened on. Most other events are
+-# currently logged to every channel. You can make a logfile belong to all
+-# channels by assigning it to channel "*".
+-
+-# This is the maximum number of logfiles allowed. This setting can be
+-# increased; however, don't decrease it.
+-set max-logs 5
+-
+-# This is the maximum size of your logfiles. Set it to 0 to disable.
+-# This value is in kilobytes, so '550' would mean cycle logs when it
+-# reaches the size of 550 kilobytes. Note that this only works if you
+-# have keep-all-logs 0 (OFF).
+-set max-logsize 0
+-
+-# This could be good if you have had problem with the logfile filling
+-# your quota/hard disk or if you log +p and publish it to the web and
+-# need more up-to-date info. Note that this setting might increase the
+-# CPU usage of your bot (on the other hand it will decrease your mem usage).
+-set quick-logs 0
+-
+-# This setting allows you the logging of raw incoming server traffic via
+-# console/log flag 'r', raw outgoing server traffic via console/log mode 'v',
+-# raw botnet traffic via console/log mode 't', and raw share traffic via
+-# console/log mode 'h'. These flags can create a large security hole,
+-# allowing people to see user passwords. This is now restricted to +n users
+-# only. Please choose your owners with care.
+-set raw-log 0
+-
+-# This creates a logfile named eggdrop.log containing private msgs/ctcps,
+-# commands, errors, and misc. info from any channel.
+-logfile mco * "logs/eggdrop.log"
+-
+-# This creates a logfile named lamest.log containing joins, parts,
+-# netsplits, kicks, bans, mode changes, and public chat on the
+-# channel #lamest.
+-logfile jpk #lamest "logs/lamest.log"
+-
+-# Use this feature to timestamp entries in the log file.
+-set log-time 1
+-
+-# If you want to keep your logfiles forever, turn this setting on. All
+-# logfiles will get suffix ".[day, 2 digits][month, 3 letters][year, 4 digits]".
+-# Note that your quota/hard-disk might be filled by this, so check your
+-# logfiles often and download them.
+-set keep-all-logs 0
+-
+-# If keep-all-logs is 1, this setting will define the suffix of the logfiles.
+-# The default will result in a suffix like "04May2000". "%Y%m%d" will produce
+-# the often used yyyymmdd format. Read the strftime manpages for more options.
+-# NOTE: On systems which don't support strftime, the default format will
+-# be used _always_.
+-set logfile-suffix ".%d%b%Y"
+-
+-# You can specify when Eggdrop should switch logfiles and start fresh. You
+-# must use military time for this setting. 300 is the default, and describes
+-# 03:00 (AM).
+-set switch-logfiles-at 300
+-
+-# "Writing user file..." and "Writing channel file..." messages won't be
+-# logged anymore if this option is enabled.
+-set quiet-save 0
+-
+-
+-##### CONSOLE #####
+-
+-# This is the default console mode. It uses the same event flags as the log
+-# files do. The console channel is automatically set to your "primary" channel,
+-# which is set in the modules section of the config file. Masters can change
+-# their console channel and modes with the '.console' command.
+-
+-set console "mkcobxs"
+-
+-
+-##### FILES AND DIRECTORIES #####
+-
+-# Specify here the filename your userfile should be saved as.
+-set userfile "LamestBot.user"
+-
+-# Specify here the filename Eggdrop will save its pid to. If no pidfile is
+-# specified, pid.(botnet-nick) will be used.
+-#set pidfile "pid.LamestBot"
+-
+-# If you want your userfile to be sorted upon saving, enable this setting.
+-# This causes the bot to use bit more CPU when saving the usefile.
+-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!
+-set help-path "/usr/share/eggdrop/help/"
+-
+-# Specify here where Eggdrop should look for text files. This is used for
+-# certain Tcl and DCC commands.
+-set text-path "/usr/share/eggdrop/"
+-
+-# Set here a place to store temporary files.
+-set temp-path "/tmp"
+-
+-# The MOTD (Message Of The day) is displayed when people dcc chat or telnet
+-# to the bot. Look at doc/TEXT-SUBSTITUTIONS for options.
+-set motd "/usr/share/eggdrop/motd"
+-
+-# This banner will be displayed on telnet connections. Look at
+-# doc/TEXT-SUBSTITUTIONS for options.
+-set telnet-banner "/usr/share/eggdrop/banner"
+-
+-# 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.
+-#
+-# To remind you:
+-#
+-# u g o u g o u g o
+-# 0600 rw------- 0400 r-------- 0200 -w------- u - user
+-# 0660 rw-rw---- 0440 r--r----- 0220 -w--w---- g - group
+-# 0666 rw-rw-rw- 0444 r--r--r-- 0222 -w--w--w- o - others
+-#
+-# Note that the default 0600 is the most secure one and should only be changed
+-# if you need your files for shell scripting or other external applications.
+-set userfile-perm 0600
+-
+-
+-##### BOTNET/DCC/TELNET #####
+-
+-# Settings in this section should be unimportant for you until you deal
+-# with botnets (multiple Eggdrops connected together to maximize efficiency).
+-# You should read doc/BOTNET before modifying these settings.
+-
+-# If you want to use a different nickname on the botnet than you use on
+-# IRC (i.e. if you're on an un-trusted botnet), un-comment the next line
+-# and set it to the nick you would like to use.
+-#set botnet-nick "LlamaBot"
+-
+-# This opens a telnet port by which you and other bots can interact with the
+-# Eggdrop by telneting in.
+-#
+-# There are more options for the listen command in doc/tcl-commands.doc. Note
+-# that if you are running more than one bot on the same machine, you will want
+-# to space the telnet ports at LEAST 5 apart, although 10 is even better.
+-#
+-# Valid ports are typically anything between 1025 and 65535 assuming the
+-# port is not already in use.
+-#
+-# If you would like the bot to listen for users and bots in separate ports,
+-# use the following format:
+-#
+-# listen 3333 bots
+-# listen 4444 users
+-#
+-# If you wish to use only one port, use this format:
+-#
+-# listen 3333 all
+-#
+-# You need to un-comment this line and change the port number in order to open
+-# the listen port. You should not keep this set to 3333.
+-#listen 3333 all
+-
+-# This setting defines whether or not people can boot users on the Eggdrop
+-# from other bots in your botnet. Valid settings are:
+-# 0 - allow *no* outside boots
+-# 1 - allow boots from sharebots
+-# 2 - allow any boots
+-set remote-boots 2
+-
+-# This setting prohibits remote bots from telling your Eggdrop to unlink from
+-# share bots.
+-set share-unlinks 1
+-
+-# This setting will drop telnet connections not matching a known host. It
+-# greatly improves protection from IRCops, but makes it impossible to add
+-# hosts on limbo (NOIRC) bots or have NEW as a valid login.
+-set protect-telnet 0
+-
+-# This setting will make the bot ignore DCC chat requests which appear to
+-# have bogus information on the grounds that the user may have been trying
+-# to make the bot connect to somewhere that will get it into trouble, or
+-# that the user has a broken client (like mIRC tends to do), in which case
+-# the connect wouldn't work anyway. It's suggested that you turn this on.
+-set dcc-sanitycheck 0
+-
+-# This settings defines a time in seconds that the bot should wait before
+-# a dcc chat, telnet, or relay connection times out.
+-set ident-timeout 5
+-
+-# Define here whether or not a +o user still needs the +p flag to dcc the bot.
+-set require-p 0
+-
+-# If you want people allow to telnet in and type 'NEW' to become a new user,
+-# set this to 1. This is similar to the 'hello' msg command. The protect-telnet
+-# setting must be set to 0 to use this.
+-set open-telnets 0
+-
+-# If you don't want Eggdrop to identify itself as an eggdrop on a telnet
+-# connection, set this setting to 1. Eggdrop will display 'Nickname' instead.
+-set stealth-telnets 0
+-
+-# If you want Eggdrop to display a banner when telneting in, set this setting
+-# to 1. The telnet banner is set by 'set telnet-banner'.
+-set use-telnet-banner 0
+-
+-# This settings defines a time in seconds that the bot should wait before
+-# a dcc chat, telnet, or relay connection times out.
+-set connect-timeout 15
+-
+-# Specify here the number of lines to accept from a user on the partyline
+-# within 1 second before they are considered to be flooding and therefore
+-# get booted.
+-set dcc-flood-thr 3
+-
+-# Define here how many telnet connection attempts in how many seconds from
+-# the same host constitute a flood. The correct format is Attempts:Seconds.
+-set telnet-flood 5:60
+-
+-# If you want telnet-flood to apply even to +f users, set this setting to 1.
+-set paranoid-telnet-flood 1
+-
+-# Set here the amount of seconds before giving up on hostname/address
+-# lookup (you might want to increase this if you are on a slow network).
+-set resolve-timeout 15
+-
+-
+-##### MORE ADVANCED SETTINGS #####
+-
+-# Set this to your socks host if your Eggdrop sits behind a firewall. If
+-# you use a Sun "telnet passthru" firewall, prefix the host with a '!'.
+-#set firewall "!sun-barr.ebay:3666"
+-
+-# If you have a NAT firewall (you box has an IP in one of the following
+-# ranges: 192.168.0.0-192.168.255.255, 172.16.0.0-172.31.255.255,
+-# 10.0.0.0-10.255.255.255 and your firewall transparently changes your
+-# address to a unique address for your box) or you have IP masquerading
+-# between you and the rest of the world, and /dcc chat, /ctcp chat or
+-# userfile sharing aren't working, enter your outside IP here. Do not
+-# enter anything for my-ip or my-hostname if you use this setting.
+-#set nat-ip "127.0.0.1"
+-
+-# If you want all dcc file transfers to use a particular portrange either
+-# because you're behind a firewall, or for other security reasons, set it
+-# here.
+-#set reserved-portrange 2010:2020
+-
+-# Set the time in minutes that temporary ignores should last.
+-set ignore-time 15
+-
+-# Define here what Eggdrop considers 'hourly'. All calls to it, including such
+-# things as note notifying or userfile saving, are affected by this.
+-# For example:
+-#
+-# set hourly-updates 15
+-#
+-# The bot will save its userfile 15 minutes past every hour.
+-set hourly-updates 00
+-
+-# Un-comment the next line and set the list of owners of the bot.
+-# You NEED to change this setting.
+-#set owner "MrLame, MrsLame"
+-
+-# Who should a note be sent to when new users are learned?
+-set notify-newusers "$owner"
+-
+-# Enter the flags that all new users should get by default. See '.help whois'
+-# on the partyline for a list of flags and their descriptions.
+-set default-flags "hp"
+-
+-# Enter all user-defined fields that should be displayed in a '.whois'.
+-# This will only be shown if the user has one of these extra fields.
+-# You might prefer to comment this out and use the userinfo1.0.tcl script
+-# which provides commands for changing all of these.
+-set whois-fields "url birthday"
+-
+-# Enable this setting if you want your Eggdrop to die upon receiving a SIGHUP
+-# kill signal. Otherwise, the Eggdrop will just save its userfile and rehash.
+-set die-on-sighup 0
+-
+-# Enable this setting if you want your Eggdrop to die upon receiving a SIGTERM
+-# kill signal. Otherwise, the Eggdrop will just save its userfile and rehash.
+-set die-on-sigterm 1
+-
+-# Comment these two lines if you wish to enable the .tcl and .set commands.
+-# If you select your owners wisely, you should be okay enabling these.
+-unbind dcc n tcl *dcc:tcl
+-unbind dcc n set *dcc:set
+-
+-# If you enable this setting, only permanent owners (owner setting) will be
+-# able to use .tcl and .set. Moreover, if you want only let permanent owners
+-# use .dump, then set this to 2.
+-set must-be-owner 1
+-
+-# Comment out this line to add the 'simul' partyline command (owners can
+-# manipulate other people on the party line). Please select owners wisely
+-# and use this command ethically!
+-unbind dcc n simul *dcc:simul
+-
+-# Set here the maximum number of dcc connections you will allow. You can
+-# increase this later, but never decrease it.
+-set max-dcc 50
+-
+-# Enable this setting if you want +d & +k users to use commands bound as -|-.
+-set allow-dk-cmds 1
+-
+-# If your Eggdrop rejects bots that actually have already disconnected from
+-# another hub, but the disconnect information has not yet spread over the
+-# botnet due to lag, use this setting. The bot will wait dupwait-timeout
+-# seconds before it checks again and then finally reject the bot.
+-set dupwait-timeout 5
+-
+-# You MUST remove this line for your bot to start. This has been added to
+-# prevent you from starting up a bot that is not fully configured. Bots
+-# that have not been fully configured may join the wrong IRC network, the
+-# wrong channels, or generally do things that you do not want. Please make
+-# sure that you have double-checked every setting. There's also a similar line
+-# lower down, just to make sure you're reading :)
+-die "Please make sure you edit your config file completely."
+-
+-
+-##### MODULES #####
+-
+-# Below are various settings for the modules included with Eggdrop.
+-# PLEASE READ AND EDIT THEM CAREFULLY, even if you're an old hand at
+-# Eggdrop, things change.
+-
+-# This path specifies the path were Eggdrop should look for its modules.
+-# 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 ####
+-
+-# This module provides asynchronous dns support. This will avoid long
+-# periods where the bot just hangs there, waiting for a hostname to
+-# resolve, which will often let it timeout on all other connections.
+-loadmodule dns
+-
+-
+-#### CHANNELS MODULE ####
+-
+-# This module provides channel related support for the bot. Without it,
+-# you won't be able to make the bot join a channel or save channel
+-# specific userfile information.
+-loadmodule channels
+-
+-# Enter here the filename where dynamic channel settings are stored.
+-set chanfile "LamestBot.chan"
+-
+-# Set this setting to 1 if you want your bot to expire bans/exempts/invites set
+-# by other opped bots on the channel.
+-set force-expire 0
+-
+-# Set this setting to 1 if you want your bot to share user greets with other
+-# bots on the channel if sharing user data.
+-set share-greet 0
+-
+-# Set this setting to 1 if you want to allow users to store an info line.
+-set use-info 1
+-
+-# The following settings are used as default values when you .+chan #chan or .tcl
+-# channel add #chan. Look in the section below for explanation of every option.
+-
+-set global-flood-chan 10:60
+-set global-flood-deop 3:10
+-set global-flood-kick 3:10
+-set global-flood-join 5:60
+-set global-flood-ctcp 3:60
+-set global-flood-nick 5:60
+-set global-aop-delay 5:30
+-set global-idle-kick 0
+-set global-chanmode "nt"
+-set global-stopnethack-mode 0
+-set global-revenge-mode 0
+-set global-ban-time 120
+-set global-exempt-time 60
+-set global-invite-time 60
+-
+-set global-chanset {
+- -autoop -autovoice
+- -bitch +cycle
+- +dontkickops +dynamicbans
+- +dynamicexempts +dynamicinvites
+- -enforcebans +greet
+- -inactive -nodesynch
+- -protectfriends +protectops
+- -revenge -revengebot
+- -secret -seen
+- +shared +statuslog
+- +userbans +userexempts
+- +userinvites -protecthalfops
+- -autohalfop
+-}
+-
+-# Add each static channel you want your bot to sit in using the following
+-# command. There are many different possible settings you can insert into
+-# this command, which are explained below.
+-#
+-# channel add #lamest {
+-# chanmode "+nt-likm"
+-# idle-kick 0
+-# stopnethack-mode 0
+-# revenge-mode 0
+-# ban-time 120
+-# exempt-time 60
+-# invite-time 60
+-# aop-delay 5:30
+-# need-op { putserv "PRIVMSG #lamest :op me cos i'm lame!" }
+-# need-invite { putserv "PRIVMSG #lamest :let me in!" }
+-# need-key { putserv "PRIVMSG #lamest :let me in!" }
+-# need-unban { putserv "PRIVMSG #lamest :let me in!" }
+-# need-limit { putserv "PRIVMSG #lamest :let me in!" }
+-# flood-chan 10:60
+-# flood-deop 3:10
+-# flood-kick 3:10
+-# flood-join 5:60
+-# flood-ctcp 3:60
+-# flood-nick 5:60
+-# }
+-#
+-# chanmode +/-<modes>
+-# This setting makes the bot enforce channel modes. It will always add
+-# the +<modes> and remove the -<modes> modes.
+-# idle-kick 0
+-# This setting will make the bot check every minute for idle
+-# users. Set this to 0 to disable idle check.
+-#
+-# stopnethack-mode 0
+-# This setting will make the bot de-op anyone who enters the channel
+-# with serverops. There are seven different modes for this settings:
+-# 0 turn off,
+-# 1 isoptest (allow serverop if registered op)
+-# 2 wasoptest (allow serverop if op before split)
+-# 3 allow serverop if isop or wasop
+-# 4 allow serverop if isop and wasop.
+-# 5 If the channel is -bitch, see stopnethack-mode 3
+-# If the channel is +bitch, see stopnethack-mode 1
+-# 6 If the channel is -bitch, see stopnethack-mode 2
+-# If the channel is +bitch, see stopnethack-mode 4
+-#
+-# revenge-mode 0
+-# This settings defines how the bot should punish bad users when
+-# revenging. There are four possible settings:
+-# 0 Deop the user.
+-# 1 Deop the user and give them the +d flag for the channel.
+-# 2 Deop the user, give them the +d flag for the channel, and kick them.
+-# 3 Deop the user, give them the +d flag for the channel, kick, and ban them.
+-#
+-# ban-time 120
+-# Set here how long temporary bans will last (in minutes). If you
+-# set this setting to 0, the bot will never remove them.
+-#
+-# exempt-time 60
+-# Set here how long temporary exempts will last (in minutes). If you
+-# set this setting to 0, the bot will never remove them. The bot will
+-# check the exempts every X minutes, but will not remove the exempt if
+-# a ban is set on the channel that matches that exempt. Once the ban is
+-# removed, then the exempt will be removed the next time the bot checks.
+-# Please note that this is an IRCnet feature.
+-#
+-# invite-time 60
+-# Set here how long temporary invites will last (in minutes). If you
+-# set this setting to 0, the bot will never remove them. The bot will
+-# check the invites every X minutes, but will not remove the invite if
+-# a channel is set to +i. Once the channel is -i then the invite will be
+-# removed the next time the bot checks. Please note that this is an IRCnet
+-# feature.
+-#
+-# aop-delay (minimum:maximum)
+-# This is used for autoop, autohalfop, autovoice. If an op or voice joins a
+-# channel while another op or voice is pending, the bot will attempt to put
+-# both modes on one line.
+-# aop-delay 0 No delay is used.
+-# aop-delay X An X second delay is used.
+-# aop-delay X:Y A random delay between X and Y is used.
+-#
+-# need-op { putserv "PRIVMSG #lamest :op me cos i'm lame!" }
+-# This setting will make the bot run the script enclosed in brackets
+-# if it does not have ops. This must be shorter than 120 characters.
+-# If you use scripts like getops.tcl or botnetop.tcl, you don't need
+-# to set this setting.
+-#
+-# need-invite { putserv "PRIVMSG #lamest :let me in!" }
+-# This setting will make the bot run the script enclosed in brackets
+-# if it needs an invite to the channel. This must be shorter than 120
+-# characters. If you use scripts like getops.tcl or botnetop.tcl, you
+-# don't need to set this setting.
+-#
+-# need-key { putserv "PRIVMSG #lamest :let me in!" }
+-# This setting will make the bot run the script enclosed in brackets
+-# if it needs the key to the channel. This must be shorter than 120
+-# characters. If you use scripts like getops.tcl or botnetop.tcl, you
+-# don't need to set this setting
+-#
+-# need-unban { putserv "PRIVMSG #lamest :let me in!" }
+-# This setting will make the bot run the script enclosed in brackets
+-# if it needs to be unbanned on the channel. This must be shorter than
+-# 120 characters. If you use scripts like getops.tcl or botnetop.tcl,
+-# you don't need to set this setting
+-#
+-# need-limit { putserv "PRIVMSG #lamest :let me in!" }
+-# This setting will make the bot run the script enclosed in brackets
+-# if it needs the limit to be raised on the channel. This must be
+-# shorter than 120 characters. If you use scripts like getops.tcl or
+-# botnetop.tcl, you don't need to set this setting
+-#
+-# flood-chan 10:60
+-# Set here how many channel messages in how many seconds from one
+-# host constitutes a flood. Setting this to 0 or 0:0 disables
+-# flood protection for the channel.
+-#
+-# flood-deop 3:10
+-# Set here how many deops in how many seconds from one host constitutes
+-# a flood. Setting this to 0 or 0:0 disables deop flood protection for
+-# the channel.
+-#
+-# flood-kick 3:10
+-# Set here how many kicks in how many seconds from one host constitutes
+-# a flood. Setting this to 0 or 0:0 disables kick flood protection for
+-# the channel.
+-#
+-# flood-join 5:60
+-# Set here how many joins in how many seconds from one host constitutes
+-# a flood. Setting this to 0 or 0:0 disables join flood protection for
+-# the channel.
+-#
+-# flood-ctcp 3:60
+-# Set here how many channel ctcps in how many seconds from one host
+-# constitutes a flood. Setting this to 0 or 0:0 disables ctcp flood
+-# protection for the channel.
+-#
+-# flood-nick 5:60
+-# Set here how many nick changes in how many seconds from one host
+-# constitutes a flood. Setting this to 0 or 0:0 disables nick flood
+-# protection for the channel.
+-#
+-# There are many different options for channels which you can
+-# define. They can be enabled or disabled using the channel set command by a
+-# plus or minus in front of them.
+-#
+-# channel set #lamest +enforcebans +dynamicbans +userbans +dynamicexempts
+-# channel set #lamest +userexempts +dynamicinvites +userinvites +protectops
+-# channel set #lamest +protectfriends +statuslog +revenge -protecthalfops
+-# channel set #lamest +revengebot +dontkickops +autovoice -autoop -autohalfop
+-# channel set #lamest -bitch -secret -shared +greet +cycle
+-#
+-# A complete list of all available channel settings:
+-#
+-# enforcebans
+-# When a ban is set, kick people who are on the channel and match
+-# the ban?
+-#
+-# dynamicbans
+-# Only activate bans on the channel when necessary? This keeps
+-# the channel's ban list from getting excessively long. The bot
+-# still remembers every ban, but it only activates a ban on the
+-# channel when it sees someone join who matches that ban.
+-#
+-# userbans
+-# Allow bans to be made by users directly? If turned off, the bot
+-# will require all bans to be made through the bot's console.
+-#
+-# dynamicexempts
+-# Only activate exempts on the channel when necessary? This keeps
+-# the channel's exempt list from getting excessively long. The bot
+-# still remembers every exempt, but it only activates a exempt on
+-# the channel when it sees a ban set that matches the exempt. The
+-# exempt remains active on the channel for as long as the ban is
+-# still active.
+-#
+-# userexempts
+-# Allow exempts to be made by users directly? If turned off, the
+-# bot will require all exempts to be made through the bot's console.
+-#
+-# dynamicinvites
+-# Only activate invites on the channel when necessary? This keeps
+-# the channel's invite list from getting excessively long. The bot
+-# still remembers every invite, but the invites are only activated
+-# when the channel is set to invite only and a user joins after
+-# requesting an invite. Once set, the invite remains until the
+-# channel goes to -i.
+-#
+-# userinvites
+-# Allow invites to be made by users directly? If turned off, the
+-# bot will require all invites to be made through the bot's console.
+-#
+-# autoop
+-# Op users with the +o flag as soon as they join the channel?
+-# This is insecure and not recommended.
+-#
+-# autohalfop
+-# Halfop users with the +l flag as soon as they join the channel?
+-# This is insecure and not recommended.
+-#
+-# bitch
+-# Only let users with +o) flag be opped on the channel?
+-#
+-# greet
+-# Say a user's info line when they join the channel?
+-#
+-# protectops
+-# Re-op a user with the +o flag if they get deopped?
+-#
+-# protecthalfops
+-# Re-halfop a user with the +l flag if they get dehalfopped?
+-#
+-# protectfriends
+-# Re-op a user with the +f flag if they get deopped?
+-#
+-# statuslog
+-# Log the channel status line every 5 minutes? This shows the bot's
+-# status on the channel (op, voice, etc.), the channel's modes, and
+-# the number of +m/+o/+v/+n/+b/+e/+I users on the channel. A sample
+-# status line follows:
+-#
+-# [01:40] @#lamest (+istn) : [m/1 o/1 v/4 n/7 b/1 e/5 I/7]
+-#
+-# revenge
+-# Remember people who deop/kick/ban the bot, valid ops, or friends
+-# and punish them? Users with the +f flag are exempt from revenge.
+-#
+-# revengebot
+-# This is similar to to the 'revenge' option, but it only triggers
+-# if a bot gets deopped, kicked or banned.
+-#
+-# autovoice
+-# Voice users with the +v flag when they join the channel?
+-#
+-# secret
+-# Prevent this channel from being listed on the botnet?
+-#
+-# shared
+-# Share channel-related user info for this channel?
+-#
+-# cycle
+-# Cycle the channel when it has no ops?
+-#
+-# dontkickops
+-# Do you want the bot not to be able to kick users who have the +o
+-# flag, letting them kick-flood for instance to protect the channel
+-# against clone attacks.
+-#
+-# inactive
+-# This prevents the bot from joining the channel (or makes it leave
+-# the channel if it is already there). It can be useful to make the
+-# bot leave a channel without losing its settings, channel-specific
+-# user flags, channel bans, and without affecting sharing.
+-#
+-# seen
+-# Respond to seen requests in the channel? The seen module must be
+-# loaded for this to work.
+-#
+-# nodesynch
+-# Allow non-ops to perform channel modes? This can stop the bot from
+-# fighting with services such as ChanServ, or from kicking IRCops when
+-# setting channel modes without having ops.
+-#
+-# Here is a shorter example:
+-#
+-# channel add #botcentral {
+-# chanmode "+mntisl 1"
+-# idle-kick 1
+-# }
+-# channel set #botcentral +bitch +enforcebans -greet +revenge
+-
+-
+-#### SERVER MODULE ####
+-
+-# This module provides the core server support. You have to load this
+-# if you want your bot to come on IRC. Not loading this is equivalent
+-# to the old NO_IRC define.
+-loadmodule server
+-
+-# What is your network?
+-# 0 = EFnet
+-# 1 = IRCnet
+-# 2 = Undernet
+-# 3 = DALnet
+-# 4 = +e/+I/max-modes 20 Hybrid
+-# 5 = Others
+-set net-type 0
+-
+-# Set the nick the bot uses on IRC, and on the botnet unless you specify a
+-# separate botnet-nick, here.
+-set nick "Lamestbot"
+-
+-# Set the alternative nick which the bot uses on IRC if the nick specified
+-# by 'set nick' is unavailable. All '?' characters will be replaced by random
+-# numbers.
+-set altnick "Llamab?t"
+-
+-# Set what should be displayed in the real-name field for the bot on IRC.
+-set realname "/msg LamestBot hello"
+-
+-# This is a Tcl script to be run immediately after connecting to a server.
+-bind evnt - init-server evnt:init_server
+-
+-proc evnt:init_server {type} {
+- global botnick
+- putquick "MODE $botnick +i-ws"
+-}
+-
+-# Set the default port which should be used if none is specified with
+-# '.jump' or in 'set servers'.
+-set default-port 6667
+-
+-# This is the bot's server list. The bot will start at the first server listed,
+-# and cycle through them whenever it gets disconnected. You need to change these
+-# servers to YOUR network's servers.
+-#
+-# The format is:
+-# server[:port[:password]]
+-#
+-# Both the port and password fields are optional; however, if you want to set a
+-# password you must also set a port. If a port isn't specified it will default to
+-# your default-port setting.
+-set servers {
+- you.need.to.change.this:6667
+- another.example.com:7000:password
+-}
+-
+-# This setting makes the bot try to get his original nickname back if its
+-# primary nickname is already in use.
+-set keep-nick 1
+-
+-# Set this to 1 if you don't want your the bot to strip a leading '~' on
+-# user@hosts.
+-set strict-host 0
+-
+-# This setting makes the bot squelch the error message when rejecting a DCC
+-# CHAT, SEND or message command. Normally, Eggdrop notifies the user that the
+-# command has been rejected because they don't have access. Note that sometimes
+-# IRC server operators detect bots that way.
+-set quiet-reject 1
+-
+-# If you want your bot to answer lower case ctcp requests (non rfc-
+-# compliant), set this setting to 1. mIRC will do this, most other
+-# clients will not.
+-set lowercase-ctcp 0
+-
+-# Set how many ctcps should be answered at once.
+-set answer-ctcp 3
+-
+-# Set here how many msgs in how many seconds from one host constitutes
+-# a flood. If you set this to 0:0, msg flood protection will be disabled.
+-set flood-msg 5:60
+-
+-# Set here how many ctcps in how many seconds from one host constitutes
+-# a flood. If you set this to 0:0, ctcp flood protection will be disabled.
+-set flood-ctcp 3:60
+-
+-# This settings makes the bot cycle forever through the server list until
+-# it successfully connects to one.
+-set never-give-up 1
+-
+-# This setting defines how long Eggdrop should wait before moving from one
+-# server to another on disconnect. If you set 0 here, Eggdrop will not wait
+-# at all and will connect instantly. Setting this too low could result in
+-# your bot being K:Lined.
+-set server-cycle-wait 60
+-
+-# Set here how long Eggdrop should wait for a response when connecting to a
+-# server before giving up and moving on to next server.
+-set server-timeout 60
+-
+-# If the number of servers on the net gets below this number, the bot
+-# will jump to a new server (it will assume it's on the losing end of
+-# a netsplit). Set this to 0 to turn off. If your bot is running on
+-# any major IRC network, this should probably be turned off.
+-set servlimit 0
+-
+-# Set this to 1 if Eggdrop should check for stoned servers? (where the
+-# server connection has died, but Eggdrop hasn't been notified yet).
+-set check-stoned 1
+-
+-# If you want your bot to exit the server if it receives an ERROR message,
+-# set this to 1.
+-set serverror-quit 1
+-
+-# Set here the maximum number of lines to queue to the server. If you're
+-# going to dump large chunks of text to people over IRC, you will probably
+-# want to raise this. 300 is fine for most people though.
+-set max-queue-msg 300
+-
+-# If you want Eggdrop to trigger binds for ignored users, set this to 1.
+-set trigger-on-ignore 0
+-
+-# Allow identical messages in the mode queue?
+-set double-mode 1
+-
+-# Allow identical messages in the server queue?
+-set double-server 1
+-
+-# Allow identical messages in the help queue?
+-set double-help 1
+-
+-# This optimizes the kick queue. It also traces nick changes and parts in
+-# the channel and changes the kick queue accordingly. There are three
+-# different options for this setting:
+-# 0 = Turn it off.
+-# 1 = Optimize the kick queue by summarizing kicks.
+-# 2 = Trace nick changes and parts on the channel and change the queue
+-# accordingly. For example, bot will not try to kick users who have
+-# already parted the channel.
+-# ATTENTION: Setting 2 is very CPU intensive.
+-set optimize-kicks 1
+-
+-# If your network supports more recipients per command then 1, you can
+-# change this behavior here. Set this to the number of recipients per
+-# command, or set this to 0 for unlimited.
+-set stack-limit 4
+-
+-### SERVER MODULE - OTHER NETWORKS (net-type 5) ###
+-
+-# This settings defines how umode +r is understood by Eggdrop. Some networks
+-# use +r to indicate a restricted connection. If this is your case, and you
+-# want your bot to leave restricted servers and jump to the next server on its
+-# list, then set it to 1.
+-#set check-mode-r 1
+-
+-# This setting allows you to specify the maximum nick-length supported by your
+-# network. The default setting is 9. The maximum supported length by Eggdrop
+-# is 32.
+-#set nick-len 9
+-
+-#### CTCP MODULE ####
+-
+-# This module provides the normal ctcp replies that you'd expect.
+-# Without it loaded, CTCP CHAT will not work. The server module
+-# is required for this module to function.
+-loadmodule ctcp
+-
+-# Set here how the ctcp module should answer ctcps. There are 3 possible
+-# operating modes:
+-# 0: Normal behavior is used.
+-# 1: The bot ignores all ctcps, except for CHAT and PING requests
+-# by users with the +o flag.
+-# 2: Normal behavior is used, however the bot will not answer more
+-# than X ctcps in Y seconds (defined by 'set flood-ctcp').
+-set ctcp-mode 0
+-
+-# There are also several variables to help make your bot less noticeable.
+-# They are: ctcp-version, ctcp-finger, and ctcp-userinfo. You can use set to set
+-# them to values you'd like.
+-
+-
+-#### IRC MODULE ####
+-
+-# This module provides basic IRC support for your bot. You have to
+-# load this if you want your bot to come on IRC. The server and channels
+-# modules must be loaded for this module to function.
+-loadmodule irc
+-
+-# Set this to 1 if you want to bounce all server bans.
+-set bounce-bans 1
+-
+-# Set this to 1 if you want to bounce all server exemptions (+e modes).
+-# This is disabled if use-exempts is disabled.
+-set bounce-exempts 0
+-
+-# Set this to 1 if you want to bounce all server invitations (+I modes).
+-# This is disabled if use-invites is disabled.
+-set bounce-invites 0
+-
+-# Set this to 1 if you want to bounce all server modes.
+-set bounce-modes 0
+-
+-# Set here the maximum number of bans you want the bot to set on a channel.
+-# Eggdrop will not place any more bans if this limit is reached. Undernet
+-# currently allows 45 bans, IRCnet allows 30, EFnet allows 100, and DALnet
+-# allows 100.
+-set max-bans 30
+-
+-# Set here the maximum number of exempts you want Eggdrop to set on a channel.
+-# Eggdrop will not place any more exempts if this limit is reached.
+-set max-exempts 20
+-
+-# Set here the maximum number of invites you want Eggdrop to set on a channel.
+-# Eggdrop will not place any more invites if this limit is reached.
+-set max-invites 20
+-
+-# There is a global limit for +b/+e/+I modes. This limit should be set to
+-# the same value as max-bans for networks that do not support +e/+I.
+-set max-modes 30
+-
+-# The following settings should be left commented unless the default values
+-# are being overridden. By default, exempts and invites are on for EFnet and
+-# IRCnet, but off for all other large networks. This behavior can be modified
+-# with the following 2 flags. If your network doesn't support +e/+I modes then
+-# you will be unable to use these features.
+-#
+-# Do you want to enable exempts (+e modes)?
+-#set use-exempts 0
+-
+-# Do you want to enable invites (+I modes)?
+-#set use-invites 0
+-
+-# Set this to 1 if you want the bot to kick for control character/ctcp
+-# avalanches to a channel. Remember that if it does, it won't ban them.
+-# This can start kick floods.
+-set kick-fun 0
+-
+-# Set this to 1 if you want the bot to ban for control character/ctcp
+-# avalanches to a channel. This can prevent kick floods, but it also can
+-# fill the banlist.
+-set ban-fun 0
+-
+-# If you want people to be able to add themselves to the bot's userlist
+-# with the default userflags (defined above in the config file) via the
+-# 'hello' msg command, set this to 1.
+-set learn-users 0
+-
+-# Set here the time (in seconds) to wait for someone to return from a netsplit
+-# (i.e. wasop will expire afterwards). Set this to 1500 on IRCnet since its
+-# nick delay stops after 30 minutes.
+-set wait-split 600
+-
+-# Set here the time (in seconds) that someone must have been off-channel
+-# before re-displaying their info line.
+-set wait-info 180
+-
+-# Set this to the maximum number of bytes to send in the arguments
+-# of modes sent to the server. Most servers default this to 200.
+-set mode-buf-length 200
+-
+-# Many IRCops find bots by seeing if they reply to 'hello' in a msg.
+-# You can change this to another word by un-commenting the following
+-# two lines and changing "myword" to the word wish to use instead of
+-# 'hello'. It must be a single word.
+-#unbind msg - hello *msg:hello
+-#bind msg - myword *msg:hello
+-
+-# Many takeover attempts occur due to lame users blindly /msg ident'ing to
+-# the bot and attempting to guess passwords. We now unbind this command by
+-# default to discourage them. You can enable these commands by commenting the
+-# following two lines.
+-unbind msg - ident *msg:ident
+-unbind msg - addhost *msg:addhost
+-
+-# Some IRC servers are using some non-standard op-like channel prefixes/modes.
+-# Define them here so the bot can recognize them. Just "@" should be fine for
+-# most networks. Un-comment the second line for some UnrealIRCds.
+-
+-set opchars "@"
+-#set opchars "@&~"
+-
+-# If you are so lame you want the bot to display peoples info lines, even
+-# when you are too lazy to add their chanrecs to a channel, set this to 1.
+-# *NOTE* This means *every* user with an info line will have their info
+-# line displayed on EVERY channel they join (provided they have been gone
+-# longer than wait-info).
+-set no-chanrec-info 0
+-
+-### IRC MODULE - IRCnet SPECIFIC FEATURES (net-type 1) ###
+-
+-# Attention: Use these settings *only* if you set 'net-type' to 1!
+-
+-# At the moment, the current IRCnet IRCd version (2.10) doesn't support the
+-# mixing of b, o and v modes with e and I modes. This might be changed in the
+-# future, so use 1 at the moment for this setting.
+-set prevent-mixing 1
+-
+-### IRC MODULE - OTHER NETWORKS (net-type 5) ###
+-
+-# Attention: Use these settings *only* if you set 'net-type' to 5!
+-
+-# If your network supports more users per kick command then 1, you can
+-# change this behavior here. Set this to the number of users to kick at
+-# once, or set this to 0 for all at once.
+-#set kick-method 1
+-
+-# Some networks allow you to stack lots of channel modes into one line.
+-# They're all guaranteed to support at least 3, so that's the default.
+-# If you know your network supports more, you may want to adjust this.
+-# This setting is limited to 6, although if you want to use a higher value,
+-# you can modify this by changing the value of MODES_PER_LINE_MAX in
+-# src/chan.h and recompiling the bot.
+-#set modes-per-line 3
+-
+-# Some networks don't include the +l limit and +k or -k key modes
+-# in the modes-per-line (see above) limitation. Set include-lk to 0 for
+-# these networks.
+-#set include-lk 1
+-
+-# Set this to 1 if your network uses IRCu2.10.01 specific /who requests.
+-# Eggdrop can, therefore, ask only for exactly what's needed.
+-#set use-354 0
+-
+-# If your network doesn't use rfc 1459 compliant string matching routines,
+-# set this to 0.
+-#set rfc-compliant 1
+-
+-
+-#### TRANSFER MODULE ####
+-
+-# The transfer module provides DCC SEND/GET support and userfile transfer
+-# support for userfile sharing. Un-comment the next line to load it if you
+-# need this functionality.
+-#loadmodule transfer
+-
+-# Set here the maximum number of simultaneous downloads to allow for
+-# each user.
+-set max-dloads 3
+-
+-# Set here the block size for dcc transfers. ircII uses 512 bytes,
+-# but admits that it may be too small. 1024 is standard these days.
+-# 0 is turbo-dcc (recommended).
+-set dcc-block 0
+-
+-# Enable this setting if you want to copy files into the /tmp directory
+-# before sending them. This is useful on most systems for file stability,
+-# but if your directories are NFS mounted, it's a pain, and you'll want
+-# to set this to 0. If you are low on disk space, you may also want to
+-# set this to 0.
+-set copy-to-tmp 1
+-
+-# Set here the time (in seconds) to wait before an inactive transfer times out.
+-set xfer-timeout 30
+-
+-
+-#### SHARE MODULE ####
+-
+-# This module provides userfile sharing support between two directly
+-# linked bots. The transfer and channels modules are required for this
+-# module to correctly function. Un-comment the following line to load
+-# the share module.
+-#loadmodule share
+-
+-# Settings in this section must be un-commented before setting.
+-
+-# When two bots get disconnected, this setting allows them to create a
+-# resync buffer which saves all changes done to the userfile during
+-# the disconnect. When they reconnect, they will not have to transfer
+-# the complete user file, but, instead, just send the resync buffer.
+-#
+-# NOTE: This has been known to cause loss of channel flags and other
+-# problems. Using this setting is not recommended.
+-#set allow-resync 0
+-
+-# This setting specifies how long to hold another bots resync data
+-# before flushing it.
+-#set resync-time 900
+-
+-# When sharing user lists, DON'T ACCEPT global flag changes from other bots?
+-# NOTE: The bot will still send changes made on the bot, it just won't accept
+-# any global flag changes from other bots. This overrides the private-globals
+-# setting (below).
+-#set private-global 0
+-
+-# When sharing user lists, if private-global isn't set, which global flag
+-# changes from other bots should be ignored?
+-#set private-globals "mnot"
+-
+-# When sharing user lists, which channel flags changes from other bots
+-# should be ignored?
+-#set private-chanflags "mn"
+-
+-# When sharing user lists, don't accept ANY userfile changes from other
+-# bots? Paranoid people should use this feature on their hub bot. This
+-# will force all userlist changes to be made via the hub.
+-#set private-user 0
+-
+-# When you have multilevel botnet, this option permits hub, to make changes,
+-# even when private-global, private-chanflags and/or private-user are set.
+-# NOTE: this option doesn't permit hub to force flags filtered by
+-# private-globals
+-#set permit-hub 1
+-
+-# This setting makes the bot discard its own bot records in favor of
+-# the ones sent by the hub.
+-# NOTE: No passwords or botflags are shared, only ports and
+-# address are added to sharing procedure. This only works with hubs that
+-# are v1.5.1 or higher.
+-#set override-bots 0
+-
+-
+-#### COMPRESS MODULE ####
+-
+-# This module provides provides support for file compression. This allows the
+-# bot to transfer compressed user files and therefore save a significant amount
+-# of bandwidth. The share module must be loaded to load this module. Un-comment
+-# the following line to the compress module.
+-#loadmodule compress
+-
+-# Allow compressed sending of user files? The user files are compressed with
+-# the compression level defined in `compress-level'.
+-set share-compressed 1
+-
+-# This is the default compression level used. These levels are the same as
+-# those used by GNU gzip.
+-#set compress-level 9
+-
+-
+-#### FILESYSTEM MODULE ####
+-
+-# This module provides an area within the bot where users can store and
+-# manage files. With this module, the bot is usable as a file server. The
+-# transfer module is required for this module to function. Un-comment
+-# the following line to load the filesys module.
+-#loadmodule filesys
+-
+-# Set here the 'root' directory for the file system.
+-set files-path "/home/mydir/filesys"
+-
+-# If you want to allow uploads, set this to the directory uploads
+-# should be put into. Set this to "" if you don't want people to
+-# upload files to your bot.
+-set incoming-path "/home/mydir/filesys/incoming"
+-
+-# If you don't want to have a central incoming directory, but instead
+-# want uploads to go to the current directory that a user is in, set
+-# this setting to 1.
+-set upload-to-pwd 0
+-
+-# Eggdrop creates a '.filedb' file in each subdirectory of your file area
+-# to keep track of its own file system information. If you can't do that (for
+-# example, if the dcc path isn't owned by you, or you just don't want it to do
+-# that) specify a path here where you'd like all of the database files to be
+-# stored instead.
+-set filedb-path ""
+-
+-# Set here the maximum number of people that can be in the file area at once.
+-# Setting this to 0 makes it effectively infinite.
+-set max-file-users 20
+-
+-# Set here the maximum allowable file size that will be received (in KB).
+-# Setting this to 0 makes it effectively infinite.
+-set max-filesize 1024
+-
+-
+-#### NOTES MODULE ####
+-
+-# This module provides support for storing of notes for users from each other.
+-# Note sending between currently online users is supported in the core, this is
+-# only for storing the notes for later retrieval.
+-loadmodule notes
+-
+-# Set here the filename where private notes between users are stored.
+-set notefile "LamestBot.notes"
+-
+-# Set here the maximum number of notes to allow to be stored for each user
+-# (to prevent flooding).
+-set max-notes 50
+-
+-# Set here how long (in days) to store notes before expiring them.
+-set note-life 60
+-
+-# Set this to 1 if you want to allow users to specify a forwarding address
+-# for forwarding notes to another account on another bot.
+-set allow-fwd 0
+-
+-# Set this to 1 if you want the bot to let people know hourly if they have
+-# any notes.
+-set notify-users 1
+-
+-# Set this to 1 if you want the bot to let people know on join if they have
+-# any notes.
+-set notify-onjoin 1
+-
+-# Comment out this next line. Otherwise, your bot won't start.
+-die "You didn't edit your config file completely like you were told, did you?"
+-
+-
+-#### CONSOLE MODULE ####
+-
+-# This module provides storage of console settings when you exit the
+-# bot or type .store on the partyline.
+-loadmodule console
+-
+-# Save users console settings automatically? Otherwise, they have
+-# to use the .store command.
+-set console-autosave 1
+-
+-# If a user doesn't have any console settings saved, which channel
+-# do you want them automatically put on?
+-set force-channel 0
+-
+-# Enable this setting if a user's global info line should be displayed
+-# when they join a botnet channel.
+-set info-party 0
+-
+-
+-#### WOOBIE MODULE ####
+-
+-# This is for demonstrative purposes only. If you are looking for starting
+-# point in writing modules, woobie is the right thing.
+-#loadmodule woobie
+-
+-
+-#### SEEN MODULE ####
+-
+-# This module provides very basic seen commands via msg, on channel or via dcc.
+-# This module works only for users in the bot's userlist. If you are looking for
+-# a better and more advanced seen module, try the gseen module by G'Quann. You
+-# can find it at http://www.visions-of-fantasy.de/gseen.mod/.
+-#loadmodule seen
+-
+-
+-#### BLOWFISH MODULE ####
+-
+-# IF YOU DON'T READ THIS YOU MAY RENDER YOUR USERFILE USELESS LATER
+-# Eggdrop encrypts its userfile, so users can have secure passwords.
+-# 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.
+-#loadmodule blowfish
+-
+-
+-#### ASSOC MODULE ####
+-
+-# This module provides assoc support, i.e. naming channels on the botnet.
+-# You can load it by un-commenting the following line.
+-#loadmodule assoc
+-
+-
+-#### WIRE MODULE ####
+-
+-# This module provides all the standard .wire commands via dcc. It is an
+-# encrypted partyline communication tool, compatible with wire.tcl. An
+-# encryption module must be loaded to use this module. Un-comment the
+-# following line to load the wire module.
+-#loadmodule wire
+-
+-#### UPTIME MODULE ####
+-
+-# This module reports uptime statistics to http://uptime.eggheads.org.
+-# Go look and see what your uptime is! It takes about 9 hours to show up,
+-# so if your bot isn't listed, try again later. The server module must be
+-# loaded for this module to function.
+-#
+-# Information sent to the server includes the bot's uptime, botnet-nick,
+-# server, version, and IP address. This information is stored in a temporary
+-# logfile for debugging purposes only. The only publicly available information
+-# will be the bot's botnet-nick, version and uptime. If you do not wish for this
+-# information to be sent, comment out the following line.
+-loadmodule uptime
+-
+-##### SCRIPTS #####
+-
+-# This is a good place to load scripts to use with your bot.
+-
+-# This line loads script.tcl from the scripts directory inside your Eggdrop's
+-# 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 /usr/share/eggdrop/scripts/script.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.
+-# NOTE: This can also cause problems with some newer scripts.
+-source /usr/share/eggdrop/scripts/compat.tcl
+-
+-# This script provides many useful informational functions, like setting
+-# users' URLs, e-mail address, ICQ numbers, etc. You can modify it to add
+-# extra entries.
+-source /usr/share/eggdrop/scripts/userinfo.tcl
+-loadhelp userinfo.help
+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
+@@ -1,8 +0,0 @@
+-all:
+- @echo ""
+- @echo "Before you can compile your bot you have to configure it."
+- @echo "Please start the configure script now:"
+- @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 @@
+ RANLIB = @RANLIB@
+ MOD_EXT = @MOD_EXT@
XREQS = @TCL_REQS@
- XLIBS = @TCL_LIBS@ @LIBS@
+XSSL_LIBS = @SSL_LIBS@
+XSSL_INCLUDE = @SSL_INCLUDE@
TCLLIB = @TCLLIB@
TCLLIBFN = @TCLLIBFN@
-@@ -86,7 +88,8 @@
+@@ -89,7 +91,8 @@
MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \
'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
--'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=' 'MODOBJS='
+-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS='
+'XSSL_LIBS=$(XSSL_LIBS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' \
+'XSSL_INCLUDE=$(XSSL_INCLUDE)' 'EGGBUILD=' 'MODOBJS='
MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
- 'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)'
-@@ -95,12 +98,13 @@
+ 'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \
+@@ -99,12 +102,13 @@
'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)' \
-@@ -109,7 +113,8 @@
+@@ -113,7 +117,8 @@
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)' \
--'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
+-'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o'
+'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.15/src/dcc.c eggdrop1.6.15-ssl/src/dcc.c
---- eggdrop1.6.15/src/dcc.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/dcc.c 2003-05-19 16:41:57.000000000 +0200
+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
@@ -32,7 +32,11 @@
#include "tandem.h"
extern struct userrec *userlist;
extern struct chanset_t *chanset;
-diff -burN eggdrop1.6.15/src/dccutil.c eggdrop1.6.15-ssl/src/dccutil.c
---- eggdrop1.6.15/src/dccutil.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/dccutil.c 2003-05-19 16:41:57.000000000 +0200
+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
@@ -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.15/src/eggdrop.h eggdrop1.6.15-ssl/src/eggdrop.h
---- eggdrop1.6.15/src/eggdrop.h 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/eggdrop.h 2003-05-19 16:41:57.000000000 +0200
-@@ -594,17 +594,7 @@
- /* This is used by the net module to keep track of sockets and what's
- * queued on them
- */
+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 @@
+ #define HELP_TEXT 2
+ #define HELP_IRC 16
+
+-/* This is used by the net module to keep track of sockets and what's
+- * queued on them
+- */
-typedef struct {
- int sock;
- short flags;
- char *outbuf;
- unsigned long outbuflen; /* Outbuf could be binary data */
- unsigned long inbuflen; /* Inbuf could be binary data */
--#ifdef USE_IPV6
-- unsigned int af;
--#endif /* USE_IPV6 */
-} sock_list;
-+/* sock_list moved to net.h */
enum {
EGG_OPTION_SET = 1, /* Set option(s). */
-diff -burN eggdrop1.6.15/src/main.c eggdrop1.6.15-ssl/src/main.c
---- eggdrop1.6.15/src/main.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/main.c 2003-05-19 16:41:57.000000000 +0200
-@@ -162,6 +162,9 @@
+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 @@
int cx_ptr = 0;
#endif
+#ifdef EGG_SSL_EXT
-+ int clean_net();
++int clean_net();
+#endif
void fatal(const char *s, int recoverable)
{
-@@ -172,6 +175,9 @@
+@@ -171,6 +174,9 @@
for (i = 0; i < dcc_total; i++)
if (dcc[i].sock >= 0)
killsock(dcc[i].sock);
-+#ifdef EGG_SSL_EXT
++ #ifdef EGG_SSL_EXT
+ clean_net();
-+#endif
++ #endif
unlink(pid_file);
if (!recoverable) {
bg_send_quit(BG_ABORT);
-diff -burN eggdrop1.6.15/src/Makefile.in eggdrop1.6.15-ssl/src/Makefile.in
---- eggdrop1.6.15/src/Makefile.in 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/Makefile.in 2003-05-19 16:41:57.000000000 +0200
-@@ -15,7 +15,8 @@
+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 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
++XSSL_LIBS = @SSL_LIBS@
++XSSL_INCLUDE = @SSL_INCLUDE@
+
CC = @CC@
LD = @CC@
- STRIP = @STRIP@
--CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
-+#CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
-+CFLAGS = @CFLAGS@ -I$(XSSL_INCLUDE) -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
- CPPFLAGS = @CPPFLAGS@
-
- eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \
-@@ -37,7 +38,8 @@
- @echo "Linking eggdrop... $(EGGBUILD)"
+@@ -37,7 +39,7 @@
+ @echo "Linking eggdrop $(EGGBUILD)."
@echo ""
@touch mod/mod.xlibs
- $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
-+# $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
-+ $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(XSSL_LIBS) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
++ $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` $(XSSL_LIBS) $(XSSL_INCLUDE)
$(STRIP) ../$(EGGEXEC)
- @echo "Successful compile: $(EGGEXEC)"
@echo ""
-diff -burN eggdrop1.6.15/src/md5/md5c.c eggdrop1.6.15-ssl/src/md5/md5c.c
---- eggdrop1.6.15/src/md5/md5c.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/md5/md5c.c 2003-05-19 16:41:57.000000000 +0200
-@@ -15,6 +15,9 @@
- * and avoid compile-time configuration.
- */
+ @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
+@@ -17,9 +17,23 @@
-+#include "../config.h"
-+#ifndef EGG_SSL_EXT
-+
#include <string.h>
++#ifndef EGG_SSL_EXT
#include "md5.h"
-@@ -269,3 +272,5 @@
++#else
++#include "openssl/md5.h"
++#endif
++
+ #include "compat/compat.h"
- egg_memset(ctx, 0, sizeof(ctx));
- }
++typedef unsigned long MD5_u32plus;
+
-+#endif
-diff -burN eggdrop1.6.15/src/md5/md5.h eggdrop1.6.15-ssl/src/md5/md5.h
---- eggdrop1.6.15/src/md5/md5.h 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/md5/md5.h 2003-05-19 16:41:57.000000000 +0200
-@@ -6,6 +6,9 @@
++typedef struct {
++ MD5_u32plus lo, hi;
++ MD5_u32plus a, b, c, d;
++ unsigned char buffer[64];
++ MD5_u32plus block[16];
++} MD5_CTX;
++
+ /*
+ * 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 @@
+ * 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 @@
extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
#endif
+#endif
-diff -burN eggdrop1.6.15/src/mod/compress.mod/compress.c eggdrop1.6.15-ssl/src/mod/compress.mod/compress.c
---- eggdrop1.6.15/src/mod/compress.mod/compress.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/mod/compress.mod/compress.c 2003-05-19 16:41:57.000000000 +0200
-@@ -31,11 +31,12 @@
-
- #include <string.h>
- #include <errno.h>
--#include <zlib.h>
-
- #include "src/mod/module.h"
- #include "share.mod/share.h"
-
-+#include <zlib.h>
-+
- #include "compress_config.h"
- #ifdef HAVE_MMAP
- # include <sys/types.h>
-diff -burN eggdrop1.6.15/src/mod/irc.mod/chan.c eggdrop1.6.15-ssl/src/mod/irc.mod/chan.c
---- eggdrop1.6.15/src/mod/irc.mod/chan.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/mod/irc.mod/chan.c 2003-05-19 16:41:57.000000000 +0200
-@@ -924,10 +924,10 @@
+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 @@
q = strchr(p, ' ');
if (q != NULL) {
*q = 0;
*p = 0;
}
}
-diff -burN eggdrop1.6.15/src/mod/irc.mod/irc.c eggdrop1.6.15-ssl/src/mod/irc.mod/irc.c
---- eggdrop1.6.15/src/mod/irc.mod/irc.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/mod/irc.mod/irc.c 2003-05-19 16:41:57.000000000 +0200
-@@ -253,7 +253,7 @@
+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 @@
/* Set the key.
*/
{
nfree(chan->channel.key);
if (k == NULL) {
-diff -burN eggdrop1.6.15/src/mod/irc.mod/irc.h eggdrop1.6.15-ssl/src/mod/irc.mod/irc.h
---- eggdrop1.6.15/src/mod/irc.mod/irc.h 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/mod/irc.mod/irc.h 2003-05-19 16:41:57.000000000 +0200
+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 @@
static void reset_chan_info(struct chanset_t *);
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.15/src/mod/irc.mod/mode.c eggdrop1.6.15-ssl/src/mod/irc.mod/mode.c
---- eggdrop1.6.15/src/mod/irc.mod/mode.c 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/mod/irc.mod/mode.c 2003-05-19 16:41:57.000000000 +0200
-@@ -1106,7 +1106,7 @@
+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 @@
}
check_tcl_mode(nick, from, u, chan->dname, ms2, op);
if (ms2[0] == '+') {
if (channel_active(chan))
got_key(chan, nick, from, op);
} else {
-@@ -1117,7 +1117,7 @@
+@@ -1139,7 +1139,7 @@
!chan_master(user) && !match_my_nick(nick))
add_mode(chan, '+', 'k', chan->key_prot);
}
}
break;
case 'o':
-diff -burN eggdrop1.6.15/src/mod/module.h eggdrop1.6.15-ssl/src/mod/module.h
---- eggdrop1.6.15/src/mod/module.h 2003-05-05 00:05:32.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/mod/module.h 2003-05-19 16:42:33.000000000 +0200
-@@ -477,8 +477,12 @@
- #define file_readable ((int (*) (char *))global[285])
- #define getprotocol ((int (*)(char *))global[286])
- #define open_listen_by_af ((int (*) (int *, int))global[287])
--/* 288 - 291 */
-+/* 288 - 293 */
- #define egg_inet_ntop ((int (*)(int af, const void *src, char *dst, socklen_t size))global[288])
+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
+@@ -471,13 +471,23 @@
+ /* IPv6 leftovers: 286 */
+ /* IPv6 leftovers: 287 */
+ /* 288 - 291 */
+-/* IPv6 leftovers: 288 */
+#ifdef EGG_SSL_EXT
+#define net_switch_to_ssl ((int (*)(int))global[289])
+#define use_ssl (*(int *)global[290]) /* kyotou */
++#define strip_mirc_codes ((void (*)(int, char *))global[291])
++#define check_ansi ((int (*) (char *))global[292])
++#define oatoi ((int (*) (const char *))global[293])
++/* 292 - 295 */
++#define str_isdigit ((int (*) (const char *))global[294])
++#define remove_crlf ((void (*)(char **))global[295])
++#else
+ #define strip_mirc_codes ((void (*)(int, char *))global[289])
+ #define check_ansi ((int (*) (char *))global[290])
+ #define oatoi ((int (*) (const char *))global[291])
+ /* 292 - 295 */
+ #define str_isdigit ((int (*) (const char *))global[292])
+ #define remove_crlf ((void (*)(char **))global[293])
+#endif
/* hostmasking */
#define maskhost(a,b) _maskhost((a),(b),1)
-diff -burN eggdrop1.6.15/src/mod/server.mod/servmsg.c eggdrop1.6.15-ssl/src/mod/server.mod/servmsg.c
---- eggdrop1.6.15/src/mod/server.mod/servmsg.c 2003-05-05 00:05:33.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/mod/server.mod/servmsg.c 2003-05-19 16:41:57.000000000 +0200
-@@ -1242,6 +1242,14 @@
+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 @@
fatal("NO SERVERS WILL ACCEPT MY CONNECTION.", 0);
} else {
dcc[servidx].sock = serv;
-+#ifdef EGG_SSL_EXT
-+ if (use_ssl) { /* kyotou */
-+ if (net_switch_to_ssl(serv)==0) {
-+ putlog(LOG_SERV, "*", "SSL %s %s (Error while switching to SSL)", IRC_FAILEDCONNECT, dcc[servidx].host);
-+ lostdcc(servidx);
-+ }
-+ }
-+#endif
++ #ifdef EGG_SSL_EXT
++ if (use_ssl) { /* kyotou */
++ if (net_switch_to_ssl(serv)==0) {
++ putlog(LOG_SERV, "*", "SSL %s %s (Error while switching to SSL)", IRC_FAILEDCONNECT, dcc[servidx].host);
++ lostdcc(servidx);
++ }
++ }
++ #endif
/* Queue standard login */
dcc[servidx].timeval = now;
SERVER_SOCKET.timeout_val = &server_timeout;
-diff -burN eggdrop1.6.15/src/modules.c eggdrop1.6.15-ssl/src/modules.c
---- eggdrop1.6.15/src/modules.c 2003-05-05 00:05:33.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/modules.c 2003-05-19 16:41:57.000000000 +0200
-@@ -28,7 +28,13 @@
+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
+@@ -29,9 +29,17 @@
#include "main.h"
#include "modules.h"
#include "tandem.h"
+#include "openssl/md5.h"
+#endif
+
- #include <ctype.h>
- #ifndef STATIC
- # ifdef HPUX_HACKS
-@@ -65,6 +71,7 @@
- extern struct dcc_t *dcc;
-
#include "users.h"
-+#include "net.h"
-
- extern struct userrec *userlist, *lastuser;
-@@ -83,6 +90,9 @@
- default_flags, require_p, share_greet, use_invites, use_exempts,
++#include "net.h"
++
+ #ifndef STATIC
+ # ifdef MOD_USE_SHL
+ # include <dl.h>
+@@ -94,6 +102,10 @@
password_timeout, force_expire, protect_readonly, reserved_port_min,
reserved_port_max, copy_to_tmp, quiet_reject;
+
+#ifdef EGG_SSL_EXT
+extern int use_ssl; /* kyotou */
+#endif
-
++
extern party_t *party;
extern time_t now, online_since;
-@@ -97,6 +107,11 @@
- int xtra_unpack();
- static int module_rename(char *name, char *newname);
+ extern tand_t *tandbot;
+@@ -128,6 +140,10 @@
+ }
+ #endif /* STATIC */
+#ifdef EGG_SSL_EXT
+int net_switch_to_ssl(int);
+#endif
-+
+
- #ifndef STATIC
-
-@@ -563,7 +578,13 @@
- (Function) file_readable,
- (Function) getprotocol,
- (Function) open_listen_by_af,
+ /* The null functions */
+ void null_func()
+@@ -564,7 +580,13 @@
+ (Function) 0, /* IPv6 leftovers: 286 */
+ (Function) 0, /* IPv6 leftovers: 287 */
+ /* 288 - 291 */
+#ifdef EGG_SSL_EXT
-+ (Function) egg_inet_ntop,
+ (Function) 0, /* IPv6 leftovers: 288 */
+ (Function) net_switch_to_ssl,
-+ (Function) & use_ssl /* kyotou */
++ (Function) & use_ssl, /* kyotou */
+#else
- (Function) egg_inet_ntop
++ (Function) 0, /* IPv6 leftovers: 288 */
+#endif
- };
-
- void init_modules(void)
-diff -burN eggdrop1.6.15/src/net.c eggdrop1.6.15-ssl/src/net.c
---- eggdrop1.6.15/src/net.c 2003-05-05 00:05:33.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/net.c 2003-05-19 16:41:57.000000000 +0200
-@@ -34,6 +34,17 @@
+ (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 @@
# endif
#endif
+#ifdef EGG_SSL_EXT
-+# ifndef EGG_SSL_INCS
-+# include <openssl/ssl.h>
-+# include <openssl/err.h>
-+# include <openssl/rand.h>
-+# define EGG_SSL_INCS 1
-+# endif
++# ifndef EGG_SSL_INCS
++# include <openssl/ssl.h>
++# include <openssl/err.h>
++# include <openssl/rand.h>
++# define EGG_SSL_INCS 1
++# endif
+#endif
+
+#include "net.h"
++
+
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,
-@@ -53,6 +64,11 @@
- char botuser[21] = "eggdrop"; /* Username of the user running the bot */
- int dcc_sanitycheck = 0; /* We should do some sanity checking on dcc
- * connections. */
+@@ -46,7 +58,11 @@
+ int firewallport = 1080; /* Default port of socks 4/5 firewalls. */
+ 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 */
+ sock_list *socklist = NULL; /* Enough to be safe. */
int MAXSOCKS = 0;
- jmp_buf alarmret; /* Env buffer for alarm() returns */
-@@ -109,6 +125,45 @@
- #endif /* USE_IPV6 */
+ jmp_buf alarmret; /* Env buffer for alarm() returns. */
+@@ -70,6 +86,46 @@
+ return ret;
}
+#ifdef EGG_SSL_EXT
+ char stackdata[1024];
+ static char rand_file[300];
+ FILE *fh;
-+
++
+#if OPENSSL_VERSION_NUMBER >= 0x00905100
+ if (RAND_status())
+ return 0; /* PRNG already good seeded */
+ return 0;
+}
+#endif
++
+
/* Initialize the socklist
*/
void init_net()
-@@ -117,9 +172,35 @@
+@@ -78,8 +134,34 @@
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();
+ OpenSSL_add_ssl_algorithms();
+ ssl_ctx=SSL_CTX_new(SSLv23_client_method());
-+ if (!ssl_ctx)
-+ fatal("SSL_CTX_new() failed",0);
++ if (!ssl_ctx)
++ fatal("SSL_CTX_new() failed",0);
+ if (seed_PRNG())
-+ fatal("Wasn't able to properly seed the PRNG!",0);
++ 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()
{
- int i, tot = 0;
-@@ -382,6 +463,13 @@
- return;
+@@ -289,6 +371,13 @@
+
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_shutdown(socklist[i].ssl);
-+ SSL_free(socklist[i].ssl);
-+ socklist[i].ssl=NULL;
-+ }
++ SSL_free(socklist[i].ssl);
++ socklist[i].ssl=NULL;
++ }
+#endif
close(socklist[i].sock);
if (socklist[i].inbuf != NULL) {
nfree(socklist[i].inbuf);
-@@ -625,6 +713,63 @@
+@@ -428,6 +517,63 @@
return sock;
}
+
+ SSL_set_fd(socklist[i].ssl, socklist[i].sock);
+ err = SSL_connect(socklist[i].ssl);
-+
++
+ while (err <= 0) {
+ int errs;
+ errs=SSL_get_error(socklist[i].ssl,err);
+ SSL_shutdown(socklist[i].ssl);
+ SSL_free(socklist[i].ssl);
+ socklist[i].ssl = NULL;
-+ return 0;
++ return 0;
+ }
+ usleep(1000);
+ err = SSL_connect(socklist[i].ssl);
+ }
+
+ if (err==1) {
-+ debug0("SSL_connect() success");
++ debug0("SSL_connect() success");
+ return 1;
+ }
-+ debug0("Error while SSL_connect()");
++ debug0("Error while SSL_connect()");
+ SSL_shutdown(socklist[i].ssl);
-+ SSL_free(socklist[i].ssl);
++ SSL_free(socklist[i].ssl);
+ socklist[i].ssl = NULL;
+ return 0;
+}
/* Ordinary non-binary connection attempt */
int open_telnet(char *server, int port)
{
-@@ -957,6 +1102,9 @@
+@@ -639,6 +785,9 @@
for (i = 0; i < MAXSOCKS; i++) {
if ((!(socklist[i].flags & SOCK_UNUSED)) &&
((FD_ISSET(socklist[i].sock, &fd)) ||
+#ifdef EGG_SSL_EXT
-+ ((socklist[i].ssl)&&(SSL_pending(socklist[i].ssl))) ||
-+#endif
++ ((socklist[i].ssl)&&(SSL_pending(socklist[i].ssl))) ||
++#endif
((socklist[i].sock == STDOUT) && (!backgrd) &&
(FD_ISSET(STDIN, &fd))))) {
if (socklist[i].flags & (SOCK_LISTEN | SOCK_CONNECT)) {
-@@ -981,7 +1129,31 @@
+@@ -663,7 +812,31 @@
if ((socklist[i].sock == STDOUT) && !backgrd)
x = read(STDIN, s, grab);
else
+ }
+#else
+ x = read(socklist[i].sock, s, grab);
-+#endif
++#endif
if (x <= 0) { /* eof */
if (errno != EAGAIN) { /* EAGAIN happens when the operation would
* block on a non-blocking socket, if the
-@@ -1283,6 +1455,26 @@
+@@ -956,6 +1129,26 @@
socklist[i].outbuflen += len;
return;
}
+ x = -1;
+ switch (err) {
+ case SSL_ERROR_WANT_READ:
-+ errno = EAGAIN;
++ errno = EAGAIN;
+ break;
+ case SSL_ERROR_WANT_WRITE:
+ errno = EAGAIN;
+ errno = EAGAIN;
+ break;
+ }
-+ }
++ }
+ } else
-+#endif
++#endif
/* Try. */
x = write(z, s, len);
if (x == -1)
-@@ -1354,6 +1546,27 @@
+@@ -1022,6 +1215,27 @@
(socklist[i].outbuf != NULL) && (FD_ISSET(socklist[i].sock, &wfds))) {
/* Trick tputs into doing the work */
errno = 0;
+#ifdef EGG_SSL_EXT
-+ if (socklist[i].ssl) {
++ if (socklist[i].ssl) {
+ x = write(socklist[i].sock, socklist[i].outbuf,
+ socklist[i].outbuflen);
+ if (x < 0) {
+ }
+ }
+ } else
-+#endif
++#endif
x = write(socklist[i].sock, socklist[i].outbuf, socklist[i].outbuflen);
if ((x < 0) && (errno != EAGAIN)
#ifdef EBADSLT
-diff -burN eggdrop1.6.15/src/net.h eggdrop1.6.15-ssl/src/net.h
---- eggdrop1.6.15/src/net.h 1970-01-01 01:00:00.000000000 +0100
-+++ eggdrop1.6.15-ssl/src/net.h 2003-05-19 16:41:57.000000000 +0200
+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
@@ -0,0 +1,30 @@
+#ifndef _EGG_NET_H
+#define _EGG_NET_H
+typedef struct {
+ int sock;
+#ifdef EGG_SSL_EXT
-+ SSL *ssl;
++ SSL *ssl;
+#endif
+ short flags;
+ char *inbuf;
+} sock_list;
+
+#endif /* _EGG_NET_H */
-diff -burN eggdrop1.6.15/src/patch.h eggdrop1.6.15-ssl/src/patch.h
---- eggdrop1.6.15/src/patch.h 2003-05-05 00:08:01.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/patch.h 2003-05-19 16:41:57.000000000 +0200
-@@ -32,6 +32,9 @@
+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 @@
+ *
+ *
*/
- #ifndef _EGG_PATCH_H
- #define _EGG_PATCH_H
+-/* PATCH GOES HERE */
+#ifdef EGG_SSL_EXT
+patch("SSL");
+#endif
/*
*
*
-diff -burN eggdrop1.6.15/src/tcl.c eggdrop1.6.15-ssl/src/tcl.c
---- eggdrop1.6.15/src/tcl.c 2003-05-05 00:05:33.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/tcl.c 2003-05-19 16:41:57.000000000 +0200
-@@ -44,6 +44,9 @@
-
+diff -burN eggdrop1.6.17.orig/src/patch.h.orig eggdrop1.6.17/src/patch.h.orig
+--- eggdrop1.6.17.orig/src/patch.h.orig 2004-11-01 14:40:44.071461112 +0100
++++ eggdrop1.6.17/src/patch.h.orig 1970-01-01 01:00:00.000000000 +0100
+@@ -1,200 +0,0 @@
+-/*
+- * patch.h
+- * header file for adding patches to Eggdrop's version string
+- *
+- * PLACE YOUR PATCHES HERE...
+- *
+- * HOW TO DO IT:
+- *
+- * replace a *** PATCH GOES HERE *** line with a patch("patchname");
+- * statement, leave the rest of the file alone, this allows better
+- * overlapping patches.
+- *
+- * $Id$
+- */
+-/*
+- * Copyright (C) 1997 Robey Pointer
+- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Eggheads Development Team
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- */
+-#ifndef _EGG_PATCH_H
+-#define _EGG_PATCH_H
+-/*
+- *
+- *
+- */
+-patch("multilevel_sharing");
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* PATCH GOES HERE */
+-/*
+- *
+- *
+- */
+-/* if that's not enough, maybe you should release a new version :) */
+-#endif /* _EGG_PATCH_H */
+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 @@
extern time_t online_since;
-+#ifdef EGG_SSL_EXT
-+extern int use_ssl; /* kyotou */
-+#endif
++#ifdef EGG_SSL_EXT\r
++extern int use_ssl; /* kyotou */\r
++#endif
++
extern char origbotname[], botuser[], motdfile[], admin[], userfile[],
firewall[], helpdir[], notify_new[], hostname[], myip[], moddir[],
-@@ -529,6 +532,9 @@
+ tempdir[], owner[], network[], botnetnick[], bannerfile[],
+@@ -524,6 +528,9 @@
{"enable-simul", &enable_simul, 0}, /* compat */
{"debug-output", &debug_output, 0}, /* compat */
{"use-console-r", &use_console_r, 0}, /* compat */
-+#ifdef EGG_SSL_EXT
-+ {"use-ssl", &use_ssl, 0}, /* kyotou */
++#ifdef EGG_SSL_EXT\r
++ {"use-ssl", &use_ssl, 0}, /* kyotou */\r
+#endif
{NULL, NULL, 0}
};
-diff -burN eggdrop1.6.15/src/tclmisc.c eggdrop1.6.15-ssl/src/tclmisc.c
---- eggdrop1.6.15/src/tclmisc.c 2003-05-05 00:05:33.000000000 +0200
-+++ eggdrop1.6.15-ssl/src/tclmisc.c 2003-05-19 16:41:57.000000000 +0200
+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 @@
#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>
- # include <time.h>
+ # include <sys/time.h>
projects / packages / eggdrop.git / commitdiff