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
michaelortmann committed Nov 11, 2022
2 parents b99e37d + 272983c commit 1050954
Show file tree
Hide file tree
Showing 72 changed files with 596 additions and 460 deletions.
5 changes: 3 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ Eggdrop uses the GNU autoconfigure scripts to make things easier.
Note that you must use full path for every file to be correctly
installed.

[The following is performed from the directory installed above.]

5. Since version 1.8, Eggdrop can use SSL to protect botnet links. If
you intend on protecting botnet traffic between Eggdrops, you must
generate SSL certificates by running:
Expand All @@ -84,6 +82,9 @@ Eggdrop uses the GNU autoconfigure scripts to make things easier.

Read docs/TLS for more info on this process.

[The following steps are performed in the directory you just installed
Eggdrop into from the previous step]

6. Edit your config file completely.

7. Start the bot with the "-m" option to create a user file, i.e. :
Expand Down
26 changes: 26 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,32 @@ Last revised: December 4, 2021

_________________________________________________________________

Eggdrop v1.9.4:

General changes:
- Fixed a DNS bug causing Eggdrop to often hang on DCC or telnet
connections
- 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.
- Fixed some inaccurate log messages
- Fixed some format specifiers that could cause crashes in certain
situations
- Fixed logging of TAGMSG messages
- Fixed unspecified behavior of freeaddrinfo() on some BSD systems

Botnet changes:
- None

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

Eggdrop config changes:
- None


Eggdrop v1.9.3:

General changes:
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac bc41b3ea.
# From configure.ac 13ab0170.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Eggdrop 1.9.3.
# Generated by GNU Autoconf 2.69 for Eggdrop 1.9.4.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -583,8 +583,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Eggdrop'
PACKAGE_TARNAME='eggdrop'
PACKAGE_VERSION='1.9.3'
PACKAGE_STRING='Eggdrop 1.9.3'
PACKAGE_VERSION='1.9.4'
PACKAGE_STRING='Eggdrop 1.9.4'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1334,7 +1334,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Eggdrop 1.9.3 to adapt to many kinds of systems.
\`configure' configures Eggdrop 1.9.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1401,7 +1401,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Eggdrop 1.9.3:";;
short | recursive ) echo "Configuration of Eggdrop 1.9.4:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Eggdrop configure 1.9.3
Eggdrop configure 1.9.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2222,7 +2222,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Eggdrop $as_me 1.9.3, which was
It was created by Eggdrop $as_me 1.9.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -10513,7 +10513,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Eggdrop $as_me 1.9.3, which was
This file was extended by Eggdrop $as_me 1.9.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -10579,7 +10579,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Eggdrop config.status 1.9.3
Eggdrop config.status 1.9.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl configure.ac: this file is processed by autoconf to produce ./configure.

AC_PREREQ(2.61)
AC_INIT([Eggdrop],[1.9.3],[[email protected]])
AC_INIT([Eggdrop],[1.9.4],[[email protected]])
AC_COPYRIGHT([Copyright (C) 1999 - 2022 Eggheads Development Team])
AC_LANG([C])
AC_REVISION([m4_esyscmd([misc/getcommit])])
Expand Down
4 changes: 2 additions & 2 deletions doc/BOTNET
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Botnet Sharing and Linking

WHAT IS A BOTNET?

A botnet consists of one or more bots linked together. This can allow
A botnet consists of two or more bots linked together. This can allow
bots to op each other securely, control floods efficiently, and share
user lists, ban lists, exempt/invite lists, and ignore lists (if
sharing is enabled).
Expand All @@ -18,7 +18,7 @@ The following are some common terms used in this document:

Botnet

A botnet consists of one or more bots connected together.
A botnet consists of two or more bots connected together.

Link

Expand Down
2 changes: 0 additions & 2 deletions doc/PBKDF2
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ there).

1. Ensure

::

loadmodule pbkdf2

is uncommented in the config file (or added, if this is a config file
Expand Down
2 changes: 1 addition & 1 deletion doc/html/_static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.9.3',
VERSION: '1.9.4',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
Expand Down
7 changes: 4 additions & 3 deletions doc/html/about/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>About Eggdrop &#8212; Eggdrop 1.9.2 documentation</title>
<title>About Eggdrop &#8212; Eggdrop 1.9.4 documentation</title>
<link rel="stylesheet" href="../_static/eggdrop.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
Expand All @@ -24,7 +24,7 @@
<img class="logo" src="../_static/eggman.png.gif" alt="Logo"/>
</a></p>
<div class="headertitle"><a
href="../index.html">Eggdrop 1.9.2 documentation</a></div>
href="../index.html">Eggdrop 1.9.4 documentation</a></div>
<div class="rel" role="navigation" aria-label="related navigation">
<a href="../modules/writing.html" title="Writing an Eggdrop Module"
accesskey="P">previous</a> |
Expand Down Expand Up @@ -56,6 +56,7 @@ <h3>Table of Contents</h3>
<li class="toctree-l1"><a class="reference internal" href="../using/ipv6.html">IPv6 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tls.html">TLS support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/ircv3.html">IRCv3 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/accounts.html">Account tracking in Eggdrop</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/pbkdf2info.html">Encryption/Hashing</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/twitchinfo.html">Twitch</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tricks.html">Advanced Tips</a></li>
Expand Down Expand Up @@ -176,7 +177,7 @@ <h1>About Eggdrop<a class="headerlink" href="#about-eggdrop" title="Permalink to

<div class="footer" role="contentinfo">
&#169; Copyright 2022, Eggheads.
Last updated on May 26, 2022.
Last updated on Nov 10, 2022.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
7 changes: 4 additions & 3 deletions doc/html/about/legal.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Boring legal stuff &#8212; Eggdrop 1.9.2 documentation</title>
<title>Boring legal stuff &#8212; Eggdrop 1.9.4 documentation</title>
<link rel="stylesheet" href="../_static/eggdrop.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
Expand All @@ -23,7 +23,7 @@
<img class="logo" src="../_static/eggman.png.gif" alt="Logo"/>
</a></p>
<div class="headertitle"><a
href="../index.html">Eggdrop 1.9.2 documentation</a></div>
href="../index.html">Eggdrop 1.9.4 documentation</a></div>
<div class="rel" role="navigation" aria-label="related navigation">
<a href="about.html" title="About Eggdrop"
accesskey="P">previous</a>
Expand Down Expand Up @@ -53,6 +53,7 @@ <h3>Table of Contents</h3>
<li class="toctree-l1"><a class="reference internal" href="../using/ipv6.html">IPv6 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tls.html">TLS support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/ircv3.html">IRCv3 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/accounts.html">Account tracking in Eggdrop</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/pbkdf2info.html">Encryption/Hashing</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/twitchinfo.html">Twitch</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tricks.html">Advanced Tips</a></li>
Expand Down Expand Up @@ -127,7 +128,7 @@ <h1>Boring legal stuff<a class="headerlink" href="#boring-legal-stuff" title="Pe

<div class="footer" role="contentinfo">
&#169; Copyright 2022, Eggheads.
Last updated on May 26, 2022.
Last updated on Nov 10, 2022.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
16 changes: 13 additions & 3 deletions doc/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Eggdrop, an open source IRC bot &#8212; Eggdrop 1.9.3 documentation</title>
<title>Eggdrop, an open source IRC bot &#8212; Eggdrop 1.9.4 documentation</title>
<link rel="stylesheet" href="_static/eggdrop.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
Expand All @@ -23,7 +23,7 @@
<img class="logo" src="_static/eggman.png.gif" alt="Logo"/>
</a></p>
<div class="headertitle"><a
href="#">Eggdrop 1.9.3 documentation</a></div>
href="#">Eggdrop 1.9.4 documentation</a></div>
<div class="rel" role="navigation" aria-label="related navigation">
<a href="install/readme.html" title="README"
accesskey="N">next</a>
Expand Down Expand Up @@ -53,6 +53,7 @@ <h3>Table of Contents</h3>
<li class="toctree-l1"><a class="reference internal" href="using/ipv6.html">IPv6 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="using/tls.html">TLS support</a></li>
<li class="toctree-l1"><a class="reference internal" href="using/ircv3.html">IRCv3 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="using/accounts.html">Account tracking in Eggdrop</a></li>
<li class="toctree-l1"><a class="reference internal" href="using/pbkdf2info.html">Encryption/Hashing</a></li>
<li class="toctree-l1"><a class="reference internal" href="using/twitchinfo.html">Twitch</a></li>
<li class="toctree-l1"><a class="reference internal" href="using/tricks.html">Advanced Tips</a></li>
Expand Down Expand Up @@ -211,6 +212,15 @@ <h2>Where to find more help<a class="headerlink" href="#where-to-find-more-help"
<li class="toctree-l2"><a class="reference internal" href="using/ircv3.html#supported-cap-capabilities">Supported CAP capabilities</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="using/accounts.html">Account tracking in Eggdrop</a><ul>
<li class="toctree-l2"><a class="reference internal" href="using/accounts.html#required-server-capabilities">Required Server Capabilities</a></li>
<li class="toctree-l2"><a class="reference internal" href="using/accounts.html#enabling-eggdrop-account-tracking">Enabling Eggdrop Account Tracking</a></li>
<li class="toctree-l2"><a class="reference internal" href="using/accounts.html#checking-account-tracking-status">Checking Account-tracking Status</a></li>
<li class="toctree-l2"><a class="reference internal" href="using/accounts.html#determining-if-a-server-supports-account-capabilities">Determining if a Server Supports Account Capabilities</a></li>
<li class="toctree-l2"><a class="reference internal" href="using/accounts.html#best-effort-account-tracking">Best-Effort Account Tracking</a></li>
<li class="toctree-l2"><a class="reference internal" href="using/accounts.html#using-accounts-with-tcl-scripts">Using Accounts with Tcl Scripts</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="using/pbkdf2info.html">Encryption/Hashing</a><ul>
<li class="toctree-l2"><a class="reference internal" href="using/pbkdf2info.html#background">Background</a></li>
<li class="toctree-l2"><a class="reference internal" href="using/pbkdf2info.html#usage">Usage</a></li>
Expand Down Expand Up @@ -365,7 +375,7 @@ <h2>Where to find more help<a class="headerlink" href="#where-to-find-more-help"

<div class="footer" role="contentinfo">
&#169; Copyright 2022, Eggheads.
Last updated on Jul 12, 2022.
Last updated on Nov 10, 2022.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
13 changes: 8 additions & 5 deletions doc/html/install/install.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Installing Eggdrop &#8212; Eggdrop 1.9.2 documentation</title>
<title>Installing Eggdrop &#8212; Eggdrop 1.9.4 documentation</title>
<link rel="stylesheet" href="../_static/eggdrop.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
Expand All @@ -24,7 +24,7 @@
<img class="logo" src="../_static/eggman.png.gif" alt="Logo"/>
</a></p>
<div class="headertitle"><a
href="../index.html">Eggdrop 1.9.2 documentation</a></div>
href="../index.html">Eggdrop 1.9.4 documentation</a></div>
<div class="rel" role="navigation" aria-label="related navigation">
<a href="readme.html" title="README"
accesskey="P">previous</a> |
Expand Down Expand Up @@ -61,6 +61,7 @@ <h3>Table of Contents</h3>
<li class="toctree-l1"><a class="reference internal" href="../using/ipv6.html">IPv6 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tls.html">TLS support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/ircv3.html">IRCv3 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/accounts.html">Account tracking in Eggdrop</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/pbkdf2info.html">Encryption/Hashing</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/twitchinfo.html">Twitch</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tricks.html">Advanced Tips</a></li>
Expand Down Expand Up @@ -160,9 +161,8 @@ <h2>Quick Startup<a class="headerlink" href="#quick-startup" title="Permalink to
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">make</span> <span class="n">install</span> <span class="n">DEST</span><span class="o">=/</span><span class="n">home</span><span class="o">/</span><span class="n">user</span><span class="o">/</span><span class="n">otherdir</span>
</pre></div>
</div>
<p>Note that you must use full path for every file to be correctly
<p class="last">Note that you must use full path for every file to be correctly
installed.</p>
<p class="last">[The following is performed from the directory installed above.]</p>
</dd>
</dl>
</li>
Expand All @@ -183,6 +183,9 @@ <h2>Quick Startup<a class="headerlink" href="#quick-startup" title="Permalink to
</pre></div>
</div>
</li>
</ol>
<p>[The following steps are performed in the directory you just installed Eggdrop into from the previous step]</p>
<ol class="arabic" start="6">
<li><p class="first">Edit your config file completely.</p>
</li>
<li><p class="first">Start the bot with the “-m” option to create a user file, i.e.</p>
Expand Down Expand Up @@ -281,7 +284,7 @@ <h2>Modules<a class="headerlink" href="#modules" title="Permalink to this headli

<div class="footer" role="contentinfo">
&#169; Copyright 2022, Eggheads.
Last updated on May 26, 2022.
Last updated on Nov 10, 2022.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
7 changes: 4 additions & 3 deletions doc/html/install/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>README &#8212; Eggdrop 1.9.2 documentation</title>
<title>README &#8212; Eggdrop 1.9.4 documentation</title>
<link rel="stylesheet" href="../_static/eggdrop.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
Expand All @@ -24,7 +24,7 @@
<img class="logo" src="../_static/eggman.png.gif" alt="Logo"/>
</a></p>
<div class="headertitle"><a
href="../index.html">Eggdrop 1.9.2 documentation</a></div>
href="../index.html">Eggdrop 1.9.4 documentation</a></div>
<div class="rel" role="navigation" aria-label="related navigation">
<a href="../index.html" title="Eggdrop, an open source IRC bot"
accesskey="P">previous</a> |
Expand Down Expand Up @@ -68,6 +68,7 @@ <h3>Table of Contents</h3>
<li class="toctree-l1"><a class="reference internal" href="../using/ipv6.html">IPv6 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tls.html">TLS support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/ircv3.html">IRCv3 support</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/accounts.html">Account tracking in Eggdrop</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/pbkdf2info.html">Encryption/Hashing</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/twitchinfo.html">Twitch</a></li>
<li class="toctree-l1"><a class="reference internal" href="../using/tricks.html">Advanced Tips</a></li>
Expand Down Expand Up @@ -326,7 +327,7 @@ <h2>Obtaining Help<a class="headerlink" href="#obtaining-help" title="Permalink

<div class="footer" role="contentinfo">
&#169; Copyright 2022, Eggheads.
Last updated on May 26, 2022.
Last updated on Nov 10, 2022.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
Loading

0 comments on commit 1050954

Please sign in to comment.