Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into exp
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Ortmann committed Oct 2, 2023
2 parents 59031d8 + 45445f2 commit e73b4cf
Show file tree
Hide file tree
Showing 380 changed files with 17,362 additions and 14,498 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ See also: THANKS, doc/Versions, doc/Changes
------------------------------------------------------------------------------

Copyright (C) 1997 Robey Pointer
Copyright (C) 1999 - 2021 Eggheads Development Team
Copyright (C) 1999 - 2023 Eggheads Development Team
2 changes: 1 addition & 1 deletion CONTENTS
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ Last revised: September 21, 2018
Contains information on upgrading from a 1.6 bot to a 1.8 bot.
_____________________________________________________________________

Copyright (C) 2003 - 2021 Eggheads Development Team
Copyright (C) 2003 - 2023 Eggheads Development Team
2 changes: 1 addition & 1 deletion FEATURES
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ Eggdrop Features

Copyright (C) 1997 Robey Pointer

Copyright (C) 2000 - 2022 Eggheads Development Team
Copyright (C) 2000 - 2023 Eggheads Development Team
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,5 @@ the README file. If not, then READ IT!&@#%@!

Have fun with Eggdrop!

Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2022 Eggheads
Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2023 Eggheads
Development Team
33 changes: 31 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,35 @@ Last revised: December 4, 2021

_________________________________________________________________

Eggdrop v1.9.5:

General changes:
- Implemented a workaround for a Tcl issue parsing emojis that can cause a
crash
- Fixed an improper change to the display of bind flags that caused issues
with Tcl scripts that parse bind flags
- Added SSL header information to .status to help diagnose ./configure
mismatches
- Lots of under-the-hood bug fixes

Botnet changes:
- None

Tcl API changes:
- Tcl minimum required version is now 8.5! This actually happened in version
1.9.0; we just forgot to tell people. Oops! :)

Module changes:
- Updated woobie.mod with additional example code

Eggdrop config changes:
- None

Documentation changes:
- Added additional documentation to help write modules
- Updated botnet docs to include reference to TLS docs for secure links
- Updated Tcl repo from unmaintained FTP to HTTP repository

Eggdrop v1.9.4:

General changes:
Expand Down Expand Up @@ -181,7 +210,7 @@ Eggdrop v1.9.0:
- Added CAP support, allowing Eggdrop to extend IRC server capabilities
- Added support for SASL authentication
- Added a BETA threaded DNS capability, enabled with the --enable-tdns
configure flag. This allows asynchronus DNS requests similar to the what
configure flag. This allows asynchronous DNS requests similar to the what
the current DNS module offers, but using host system capability instead
of rewriting it from scratch. Using this means you no longer have to use
the DNS module.
Expand Down Expand Up @@ -288,4 +317,4 @@ Eggdrop v1.9.0:
________________________________________________________________________

Copyright (C) 1997 Robey Pointer
Copyright (C) 1999 - 2021 Eggheads Development Team
Copyright (C) 1999 - 2023 Eggheads Development Team
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -216,5 +216,5 @@ OBTAINING HELP
- Don't ask to ask- just state your question, along with any
relevant details and error messages

Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2022 Eggheads
Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2023 Eggheads
Development Team
6 changes: 4 additions & 2 deletions THANKS
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Fabian Fabian Knittel [email protected]
Fred1 Chris Fuller
G`Quann Florian Sander [email protected]
Geo Geo Van O [email protected]
guppy Jeff Fisher [email protected]
guppy Jeff Fisher [email protected]
ITE Federico Mennite [email protected]
Jason Jason Ede [email protected]
John` John [email protected]
Expand Down Expand Up @@ -236,6 +236,7 @@ eelcohuininga Eelco Huininga
Ehrenberg
ejm
Emmanuel Marty
Empus
Erick- Erick Velez [email protected]
eryg-kai
Evo|ver
Expand Down Expand Up @@ -312,7 +313,7 @@ jay
Jay Maynard
Jay S. Monk
jedis
Jeff Fisher [email protected]
Jeff Fisher [email protected]
jeffx
Jerome
jerrold
Expand Down Expand Up @@ -509,6 +510,7 @@ Robby [email protected]
Roger Yerramsetti
Rok Papez
romulus
rsc Robert Scheck
Rufus
S Wilcox
S7reaM
Expand Down
20 changes: 5 additions & 15 deletions aclocal.m4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dnl aclocal.m4: macros autoconf uses when building configure from configure.ac
dnl
dnl Copyright (C) 1999 - 2022 Eggheads Development Team
dnl Copyright (C) 1999 - 2023 Eggheads Development Team
dnl
dnl This program is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -1087,14 +1087,14 @@ dnl
AC_DEFUN([EGG_TCL_CHECK_VERSION],
[
if test "x$TCL_MAJOR_VERSION" = x || test "x$TCL_MINOR_VERSION" = x || test $TCL_MAJOR_VERSION -lt 8 || test $TCL_MAJOR_VERSION -eq 8 -a $TCL_MINOR_VERSION -lt 3; then
if test "x$TCL_MAJOR_VERSION" = x || test "x$TCL_MINOR_VERSION" = x || test $TCL_MAJOR_VERSION -lt 8 || test $TCL_MAJOR_VERSION -eq 8 -a $TCL_MINOR_VERSION -lt 5; then
cat << EOF >&2
configure: error:
Your Tcl version is much too old for Eggdrop to use. You should
download and compile a more recent version. The most reliable
current version is $tclrecommendver and can be downloaded from
${tclrecommendsite}. We require at least Tcl 8.3.
${tclrecommendsite}. We require at least Tcl 8.5.
See doc/COMPILE-GUIDE's 'Tcl Detection and Installation' section
for more information.
Expand All @@ -1114,16 +1114,6 @@ dnl
AC_DEFUN([EGG_CACHE_UNSET], [unset $1])


dnl EGG_TCL_CHECK_NOTIFIER_INIT
dnl
AC_DEFUN([EGG_TCL_CHECK_NOTIFIER_INIT],
[
if test $TCL_MAJOR_VERSION -gt 8 || test $TCL_MAJOR_VERSION -eq 8 -a $TCL_MINOR_VERSION -ge 4; then
AC_DEFINE(HAVE_TCL_NOTIFIER_INIT, 1, [Define for Tcl that has the Tcl_NotifierProcs struct member initNotifierProc (8.4 and later).])
fi
])


dnl EGG_SUBST_EGGVERSION()
dnl
AC_DEFUN([EGG_SUBST_EGGVERSION],
Expand Down Expand Up @@ -1432,7 +1422,6 @@ dnl
AC_DEFUN([EGG_IPV6_COMPAT],
[
if test "$enable_ipv6" = "yes"; then
AC_CHECK_FUNCS([gethostbyname2])
AC_CHECK_TYPES([struct in6_addr], egg_cv_var_have_in6_addr="yes", egg_cv_var_have_in6_addr="no", [
#include <sys/types.h>
#include <netinet/in.h>
Expand Down Expand Up @@ -1621,11 +1610,12 @@ AC_DEFUN([EGG_TLS_DETECT],
if test -z "$SSL_LIBS"; then
AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-lssl])
AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-lcrypto])
AC_CHECK_FUNCS([EVP_md5 EVP_sha1 a2i_IPADDRESS], , [[
AC_CHECK_FUNCS([EVP_sha1 a2i_IPADDRESS], , [[
havessllib="no"
break
]])
fi
AC_CHECK_FUNCS([EVP_md5])
AC_CHECK_FUNC(OPENSSL_buf2hexstr, ,
AC_CHECK_FUNC(hex_to_string,
AC_DEFINE([OPENSSL_buf2hexstr], [hex_to_string], [Define this to hex_to_string when using OpenSSL < 1.1.0])
Expand Down
108 changes: 80 additions & 28 deletions config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Copyright (C) 1997 Robey Pointer
* Copyright (C) 1999 - 2022 Eggheads Development Team
* Copyright (C) 1999 - 2023 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
Expand Down Expand Up @@ -111,9 +111,6 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H

/* Define to 1 if you have the `gethostbyname2' function. */
#undef HAVE_GETHOSTBYNAME2

/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE

Expand Down Expand Up @@ -177,12 +174,12 @@
/* Define to 1 if you have the `MD5_Update' function. */
#undef HAVE_MD5_UPDATE

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Define to 1 if you have the `memset_s' function. */
#undef HAVE_MEMSET_S

/* Define to 1 if you have the <minix/config.h> header file. */
#undef HAVE_MINIX_CONFIG_H

/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP

Expand Down Expand Up @@ -296,10 +293,6 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

/* Define for Tcl that has the Tcl_NotifierProcs struct member
initNotifierProc (8.4 and later). */
#undef HAVE_TCL_NOTIFIER_INIT

/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
`HAVE_STRUCT_TM_TM_ZONE' instead. */
#undef HAVE_TM_ZONE
Expand Down Expand Up @@ -394,13 +387,16 @@
/* The size of `void*', as computed by sizeof. */
#undef SIZEOF_VOIDP

/* Define to 1 if you have the ANSI C header files. */
/* Define to 1 if all of the C90 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
backward compatibility; new code need not use it. */
#undef STDC_HEADERS

/* Define if running on OSF/1 platform. */
#undef STOP_UAC

/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
macro is obsolete. */
#undef TIME_WITH_SYS_TIME

/* Define this to enable SSL support. */
Expand All @@ -413,21 +409,87 @@
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable general extensions on macOS. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
/* Enable X/Open compliant socket functions that do not require linking
with -lxnet on HP-UX 11.11. */
#ifndef _HPUX_ALT_XOPEN_SOCKET_API
# undef _HPUX_ALT_XOPEN_SOCKET_API
#endif
/* Identify the host operating system as Minix.
This macro does not affect the system headers' behavior.
A future release of Autoconf may stop defining this macro. */
#ifndef _MINIX
# undef _MINIX
#endif
/* Enable general extensions on NetBSD.
Enable NetBSD compatibility extensions on Minix. */
#ifndef _NETBSD_SOURCE
# undef _NETBSD_SOURCE
#endif
/* Enable OpenBSD compatibility extensions on NetBSD.
Oddly enough, this does nothing on OpenBSD. */
#ifndef _OPENBSD_SOURCE
# undef _OPENBSD_SOURCE
#endif
/* Define to 1 if needed for POSIX-compatible behavior. */
#ifndef _POSIX_SOURCE
# undef _POSIX_SOURCE
#endif
/* Define to 2 if needed for POSIX-compatible behavior. */
#ifndef _POSIX_1_SOURCE
# undef _POSIX_1_SOURCE
#endif
/* Enable POSIX-compatible threading on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
#endif
/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
# undef __STDC_WANT_IEC_60559_BFP_EXT__
#endif
/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
# undef __STDC_WANT_IEC_60559_DFP_EXT__
#endif
/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
#endif
/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */
#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
# undef __STDC_WANT_IEC_60559_TYPES_EXT__
#endif
/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
#ifndef __STDC_WANT_LIB_EXT2__
# undef __STDC_WANT_LIB_EXT2__
#endif
/* Enable extensions specified by ISO/IEC 24747:2009. */
#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
# undef __STDC_WANT_MATH_SPEC_FUNCS__
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
/* Enable X/Open extensions. Define to 500 only if necessary
to make mbstate_t available. */
#ifndef _XOPEN_SOURCE
# undef _XOPEN_SOURCE
#endif


Expand All @@ -443,16 +505,6 @@
# endif
#endif

/* Define to 1 if on MINIX. */
#undef _MINIX

/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE

/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE

/* Define this to a 64-bit type on Cygwin to satisfy OpenSSL dependencies. */
#undef __int64

Expand All @@ -473,7 +525,7 @@
if such a type exists, and if the system does not define it. */
#undef intptr_t

/* Define to `int' if <sys/types.h> does not define. */
/* Define as a signed integer type capable of holding a process identifier. */
#undef pid_t

/* Define to `unsigned int' if <sys/types.h> does not define. */
Expand Down
Loading

0 comments on commit e73b4cf

Please sign in to comment.