Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into fix401
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Ortmann committed Oct 3, 2023
2 parents 1050954 + 45445f2 commit 426f489
Show file tree
Hide file tree
Showing 387 changed files with 19,292 additions and 14,521 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
10 changes: 7 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,12 @@ Eggdrop into from the previous step]

automatically restart if the machine goes down or (heaven
forbid) the bot should crash. Eggdrop includes a helper script
to generate a proper crontab script and entry. You can run this
script by typing:
to auto-generate either a systemd or crontab entry. To add a
systemd job, run:

./scripts/autobotchk [yourconfig.conf] -systemd

or to add a crontab job, run:

./scripts/autobotchk [yourconfig.conf]

Expand Down Expand Up @@ -154,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
39 changes: 36 additions & 3 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,42 @@ 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:
- Fixed a DNS bug causing Eggdrop to often hang on DCC or telnet
connections
- BETA: Added -systemd option to autobotchk script to restart Eggdrop via
systemd instead of cron
- Reverted matchattr match syntax to previous functionality. Matching
against "-" as a flag will once again successfully match against "no"
flags, instead of returning an error.
Expand All @@ -33,9 +64,11 @@ Eggdrop v1.9.4:
- None

Tcl API changes:
- Moved the 'gotmsg' function back as a raw bind. It was inadvertantly
- Moved the 'gotmsg' function back as a raw bind. It was inadvertently
moved to a rawt bind in 1.9.3, causing issuse with scripts attempting to
unbind this internal reference
Module changes:
- None

Eggdrop config changes:
- None
Expand Down Expand Up @@ -177,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 @@ -284,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
32 changes: 20 additions & 12 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -156,28 +156,36 @@ COMMAND LINE
Most people never use any of the options except -m and you usually
only need to use that once.

SETTING UP A CRONTAB
AUTO-STARTING EGGDROP

Systems go down from time to time, taking your Eggdrop along with it.
You may not be not around to restart it manually, so you can instead use
your host's crontab system to automatically restart Eggdrop should it
quit for any reason. Eggdrop comes with an autobotchk shell script
creates that both checks if your Eggdrop is still running, and a crontab
entry to run the botchk script every 10 minutes.
features of the operating system to automatically restart Eggdrop should
it quit for any reason. Eggdrop comes with an autobotchk shell script
that can create either a systemd or crontab entry. The systemd option
will monitor your Eggdrop and a) start it when the machine boots and b)
restart the Eggdrop if it crashes for any reason. The (older) crontab
option will check (by default) every 10 minutes to see if your Eggdrop
is still running, and attempt to restart it if it is not.

Using autobotchk is probably the fastest way of creating your botchk
and adding a crontab entry. From the install directory, simply run:
To auto-generate a systemd job, from the Eggdrop install directory,
simply run:

./scripts/autobotchk <Eggdrop config file> -systemd

To auto-geneerate a script to check Eggdrop's status and run it via a
crontab entry, simply run:

./scripts/autobotchk <Eggdrop config file>

This will crontab your bot using the default setup. If you want a list
of autobotchk options, type './autobotchk'. An example with options
would be:
of autobotchk options, type './autobotchk'. A crontab example with
options would be:

./scripts/autobotchk <Eggdrop config file> -noemail -5

This would setup crontab to run the botchk every 5 minutes and also to
not send you email saying that it restarted your bot.
This would setup crontab to run the botchk every 5 minutes and not
send you an email saying that it restarted your bot.

DOCUMENTATION

Expand Down Expand Up @@ -208,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
Loading

0 comments on commit 426f489

Please sign in to comment.