Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into random2
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Ortmann committed Oct 2, 2023
2 parents 86a2b61 + 45445f2 commit 0897599
Show file tree
Hide file tree
Showing 119 changed files with 11,714 additions and 8,662 deletions.
4 changes: 2 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Eggdrop v1.9.5:

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

Module changes:
- Updated woobie.mod with additional example code
Expand Down Expand Up @@ -210,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
4 changes: 2 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 @@ -313,7 +313,7 @@ jay
Jay Maynard
Jay S. Monk
jedis
Jeff Fisher [email protected]
Jeff Fisher [email protected]
jeffx
Jerome
jerrold
Expand Down
3 changes: 2 additions & 1 deletion aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1610,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
99 changes: 79 additions & 20 deletions config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -174,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 @@ -387,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 @@ -406,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 @@ -436,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 @@ -466,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 0897599

Please sign in to comment.