Skip to content

Commit

Permalink
Merge branch 'develop' into feature/msgtags
Browse files Browse the repository at this point in the history
  • Loading branch information
vanosg committed Jan 26, 2020
2 parents c5fd46c + 282809f commit a39f0e1
Show file tree
Hide file tree
Showing 305 changed files with 846 additions and 1,046 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/ccpp.yml
@@ -0,0 +1,23 @@
name: C/C++ CI

on:
pull_request:
branches:
- develop

jobs:
build:
name: compile test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: install dependencies
run: sudo apt-get install tcl tcl-dev openssl libssl-dev
- name: configure
run: ./configure
- name: make config
run: make config
- name: make
run: make
- name: make install
run: make install
2 changes: 1 addition & 1 deletion AUTHORS
Expand Up @@ -101,4 +101,4 @@ See also: THANKS, doc/Versions, doc/Changes
------------------------------------------------------------------------------

Copyright (C) 1997 Robey Pointer
Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion CONTENTS
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 - 2019 Eggheads Development Team
Copyright (C) 2003 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion FEATURES
Expand Up @@ -49,4 +49,4 @@ EGGDROP FEATURES

Copyright (C) 1997 Robey Pointer

Copyright (C) 2000 - 2019 Eggheads Development Team
Copyright (C) 2000 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion INSTALL
Expand Up @@ -196,5 +196,5 @@ the README file. If not, then READ IT!&@#%@!

Have fun with Eggdrop!

Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2019 Eggheads
Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2020 Eggheads
Development Team
4 changes: 2 additions & 2 deletions NEWS
Expand Up @@ -192,7 +192,7 @@ Eggdrop v1.8.0:

BOTNET

Because 1.8 bots attempt to link with SSL if available everytime, make
Because 1.8 bots attempt to link with SSL if available every time, make
sure you generate a certificate on your hub bot with "make sslcert" after
"make install".

Expand Down Expand Up @@ -236,4 +236,4 @@ Eggdrop v1.8.0:
________________________________________________________________________

Copyright (C) 1997 Robey Pointer
Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion README
Expand Up @@ -377,5 +377,5 @@ OBTAINING HELP
If there are any other serious Eggdrop related channels that should be
added to the above list, please let us know.

Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2019 Eggheads
Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2020 Eggheads
Development Team
4 changes: 2 additions & 2 deletions UPGRADING
Expand Up @@ -63,7 +63,7 @@ Changes made to Eggdrop 1.8.x from Eggdrop1.6.x:

BOTNET

Because 1.8 bots attempt to link with SSL if available everytime, make
Because 1.8 bots attempt to link with SSL if available every time, make
sure you generate a certificate on your hub bot with "make sslcert" after
"make install".

Expand Down Expand Up @@ -324,4 +324,4 @@ Changes made to Eggdrop 1.6.x from Eggdrop1.4.x:


Copyright (C) 1997 Robey Pointer
Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion aclocal.m4
@@ -1,6 +1,6 @@
dnl aclocal.m4: macros autoconf uses when building configure from configure.ac
dnl
dnl Copyright (C) 1999 - 2019 Eggheads Development Team
dnl Copyright (C) 1999 - 2020 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
5 changes: 1 addition & 4 deletions config.h.in
Expand Up @@ -2,7 +2,7 @@

/*
* Copyright (C) 1997 Robey Pointer
* Copyright (C) 1999 - 2019 Eggheads Development Team
* Copyright (C) 1999 - 2020 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 @@ -126,9 +126,6 @@
/* Define to 1 if you have the `inet_aton' function. */
#undef HAVE_INET_ATON

/* Define to 1 if you have the `inet_ntop' function. */
#undef HAVE_INET_NTOP

/* Define to 1 if you have the `inet_pton' function. */
#undef HAVE_INET_PTON

Expand Down
14 changes: 7 additions & 7 deletions configure
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac 7ea72e91.
# From configure.ac ccc2fa3a.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Eggdrop 1.9.0.
#
Expand All @@ -12,7 +12,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
# Copyright (C) 1999 - 2019 Eggheads Development Team
# Copyright (C) 1999 - 2020 Eggheads Development Team
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
Expand Down Expand Up @@ -1510,7 +1510,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
_ACEOF
exit
fi
Expand Down Expand Up @@ -6744,7 +6744,7 @@ ac_config_commands="$ac_config_commands $ac_stdint_h"


# Checks for functions and their arguments.
for ac_func in clock dprintf getrandom getrusage inet_aton inet_ntop isascii random rand lrand48 setpgid snprintf strlcpy vsnprintf
for ac_func in clock dprintf getrandom getrusage inet_aton isascii random rand lrand48 setpgid snprintf strlcpy vsnprintf
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
Expand Down Expand Up @@ -8076,8 +8076,8 @@ $as_echo "$SHLIB_LD" >&6; }
TCL_LIB_SPEC="$TCL_LIB_SPEC $ac_cv_lib_pthread"
fi
TCL_INCLUDE_SPEC=""
TCL_VERSION=`grep TCL_VERSION $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
TCL_PATCHLEVEL=`grep TCL_PATCH_LEVEL $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
TCL_VERSION=`grep TCL_VERSION $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/"/, "", $3); print $3}'`
TCL_PATCHLEVEL=`grep TCL_PATCH_LEVEL $TCLINC/$TCLINCFN | $HEAD_1 | $AWK '{gsub(/"/, "", $3); print $3}'`
TCL_MAJOR_VERSION=`echo $TCL_VERSION | cut -d. -f1`
TCL_MINOR_VERSION=`echo $TCL_VERSION | cut -d. -f2`
if test $TCL_MAJOR_VERSION -gt 8 || test $TCL_MAJOR_VERSION -eq 8 -a $TCL_MINOR_VERSION -ge 6; then
Expand Down Expand Up @@ -9120,7 +9120,7 @@ $as_echo "#define HAVE_OPENSSL_MD5 1" >>confdefs.h
# Substitute Makefile variables.
EGGVERSION=`grep '^ *# *define *EGG_STRINGVER ' $srcdir/src/version.h | $AWK '{gsub(/(\")/, "", $NF); print $NF}'`
EGGVERSION=`grep '^ *# *define *EGG_STRINGVER ' $srcdir/src/version.h | $AWK '{gsub(/(")/, "", $NF); print $NF}'`
egg_version_num=`echo $EGGVERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", $1, $2, $3)}'`
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Expand Up @@ -2,7 +2,7 @@ dnl configure.ac: this file is processed by autoconf to produce ./configure.

AC_PREREQ(2.61)
AC_INIT([Eggdrop],[1.9.0],[bugs@eggheads.org])
AC_COPYRIGHT([Copyright (C) 1999 - 2019 Eggheads Development Team])
AC_COPYRIGHT([Copyright (C) 1999 - 2020 Eggheads Development Team])
AC_LANG([C])
AC_REVISION([m4_esyscmd([misc/getcommit])])
AC_CONFIG_SRCDIR(src/eggdrop.h)
Expand All @@ -14,7 +14,7 @@ AC_PRESERVE_HELP_ORDER
dnl config.h stuff
AH_TOP([/*
* Copyright (C) 1997 Robey Pointer
* Copyright (C) 1999 - 2019 Eggheads Development Team
* Copyright (C) 1999 - 2020 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,7 +111,7 @@ AX_TYPE_SOCKLEN_T
AX_CREATE_STDINT_H([eggint.h])

# Checks for functions and their arguments.
AC_CHECK_FUNCS([clock dprintf getrandom getrusage inet_aton inet_ntop isascii random rand lrand48 setpgid snprintf strlcpy vsnprintf])
AC_CHECK_FUNCS([clock dprintf getrandom getrusage inet_aton isascii random rand lrand48 setpgid snprintf strlcpy vsnprintf])
AC_FUNC_SELECT_ARGTYPES
EGG_FUNC_B64_NTOP
EGG_FUNC_VPRINTF
Expand Down
2 changes: 1 addition & 1 deletion doc/ABOUT
Expand Up @@ -65,4 +65,4 @@ ABOUT EGGDROP
ahead and erase this directory now. It's almost impossible to do what
you want with this bot.

Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/BANS
Expand Up @@ -78,4 +78,4 @@ BANS, INVITES, AND EXEMPTS
file) or until the channel goes -i again, whichever happens
last.

Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/BOTNET
Expand Up @@ -317,4 +317,4 @@ MAKING BOTS SHARE USER RECORDS
|-+beldin
`-+Lameshare

Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/COMPILE-GUIDE
Expand Up @@ -565,4 +565,4 @@ Last revised: July 25, 2019
_____________________________________________________________________

Copyright (C) 1997 Robey Pointer
Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/CONTENTS
Expand Up @@ -72,4 +72,4 @@ Last revised: Nov 01, 2010
notes in reverse chronological order.
_____________________________________________________________________

Copyright (C) 2003 - 2019 Eggheads Development Team
Copyright (C) 2003 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/FIRST-SCRIPT
Expand Up @@ -96,4 +96,4 @@ maybe).

# Here's the end of the script.

Copyright (C) 2003 - 2019 Eggheads Development Team
Copyright (C) 2003 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/IPV6
Expand Up @@ -77,4 +77,4 @@ Other affected variables:
nat-ip works with IPv4 as it used to. It has no meaning for IPv6 and
is not queried for IPv6 connections.

Copyright (C) 2010 - 2019 Eggheads Development Team
Copyright (C) 2010 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/KNOWN-PROBLEMS
Expand Up @@ -21,4 +21,4 @@ KNOWN PROBLEMS
characters are handled in a script as text, you run into errors.
Eggdrop can't handle these errors at the moment.

Copyright (C) 2003 - 2019 Eggheads Development Team
Copyright (C) 2003 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/MODULES
Expand Up @@ -425,4 +425,4 @@ WHAT TO DO WITH A MODULE?
the modules directory on ftp.eggheads.org. Don't forget to mention in
your text file which version Eggdrop the module is written for.

Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/PARTYLINE
Expand Up @@ -37,4 +37,4 @@ prefixed with an apostrophe is sent to all users on the local bot only.
You can change channels with the ".chat" command or even leave all
channels with ".chat off".

Copyright (C) 2002 - 2019 Eggheads Development Team
Copyright (C) 2002 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/PATCH-HOWTO
Expand Up @@ -120,4 +120,4 @@ To create a patch using the diff tool:

ftp://ftp.eggheads.org/pub/eggdrop/patches/1.9

Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/TEXT-SUBSTITUTIONS
Expand Up @@ -56,4 +56,4 @@ Other variables:
| %{center} | center the following text (70 columns) |
+-------------+---------------------------------------------------------+

Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/TLS
Expand Up @@ -211,4 +211,4 @@ verification and authorization.
Higher values enable specific exceptions like allowing self-signed
or expired certificates. Details are documented in eggdrop.conf.

Copyright (C) 2010 - 2019 Eggheads Development Team
Copyright (C) 2010 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/TRICKS
Expand Up @@ -42,4 +42,4 @@ EGGDROP TRICKS
set userfile "$myvar.user"
set chanfile "$myvar.chan"

Copyright (C) 1999 - 2019 Eggheads Development Team
Copyright (C) 1999 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/USERS
Expand Up @@ -58,4 +58,4 @@ global flag applies to all channels. The standard global flags are:
user-defined flags. These are used by scripts, and their uses very
depending on the script that uses them.

Copyright (C) 2002 - 2019 Eggheads Development Team
Copyright (C) 2002 - 2020 Eggheads Development Team
2 changes: 1 addition & 1 deletion doc/WEIRD-MESSAGES
Expand Up @@ -51,4 +51,4 @@ WEIRD MESSAGES THAT GET LOGGED
When converted to lowercase, these symbols fail to get
processed, and joins are not reported, although parts are.

Copyright (C) 2003 - 2019 Eggheads Development Team
Copyright (C) 2003 - 2020 Eggheads Development Team
6 changes: 3 additions & 3 deletions doc/html/appendices/first-script.html
Expand Up @@ -184,7 +184,7 @@ <h1>Your First Eggdrop Script<a class="headerlink" href="#your-first-eggdrop-scr
# Here&#39;s the end of the script.
</pre></div>
</div>
<p>Copyright (C) 2003 - 2019 Eggheads Development Team</p>
<p>Copyright (C) 2003 - 2020 Eggheads Development Team</p>
</div>


Expand All @@ -210,8 +210,8 @@ <h1>Your First Eggdrop Script<a class="headerlink" href="#your-first-eggdrop-scr
<div class="right">

<div class="footer" role="contentinfo">
&#169; Copyright 2019, Eggheads.
Last updated on Oct 25, 2019.
&#169; Copyright 2020, Eggheads.
Last updated on Jan 20, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions doc/html/appendices/index.html
Expand Up @@ -136,8 +136,8 @@ <h3 style="margin-top: 1.5em;">Search</h3>
<div class="right">

<div class="footer" role="contentinfo">
&#169; Copyright 2019, Eggheads.
Last updated on Oct 25, 2019.
&#169; Copyright 2020, Eggheads.
Last updated on Jan 20, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions doc/html/appendices/known-probs.html
Expand Up @@ -124,7 +124,7 @@ <h1>Known Problems<a class="headerlink" href="#known-problems" title="Permalink
</li>
</ul>
</div></blockquote>
<p>Copyright (C) 2003 - 2019 Eggheads Development Team</p>
<p>Copyright (C) 2003 - 2020 Eggheads Development Team</p>
</div></blockquote>
</div>

Expand Down Expand Up @@ -153,8 +153,8 @@ <h1>Known Problems<a class="headerlink" href="#known-problems" title="Permalink
<div class="right">

<div class="footer" role="contentinfo">
&#169; Copyright 2019, Eggheads.
Last updated on Oct 25, 2019.
&#169; Copyright 2020, Eggheads.
Last updated on Jan 20, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions doc/html/appendices/text-sub.html
Expand Up @@ -206,7 +206,7 @@ <h1>Textfile Substitutions<a class="headerlink" href="#textfile-substitutions" t
</tbody>
</table>
<blockquote>
<div>Copyright (C) 1999 - 2019 Eggheads Development Team</div></blockquote>
<div>Copyright (C) 1999 - 2020 Eggheads Development Team</div></blockquote>
</div>


Expand Down Expand Up @@ -234,8 +234,8 @@ <h1>Textfile Substitutions<a class="headerlink" href="#textfile-substitutions" t
<div class="right">

<div class="footer" role="contentinfo">
&#169; Copyright 2019, Eggheads.
Last updated on Oct 25, 2019.
&#169; Copyright 2020, Eggheads.
Last updated on Jan 20, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions doc/html/appendices/tricks.html
Expand Up @@ -144,7 +144,7 @@ <h1>Eggdrop Tricks<a class="headerlink" href="#eggdrop-tricks" title="Permalink
</div>
</li>
</ul>
<p>Copyright (C) 1999 - 2019 Eggheads Development Team</p>
<p>Copyright (C) 1999 - 2020 Eggheads Development Team</p>
</div></blockquote>
</div>

Expand Down Expand Up @@ -173,8 +173,8 @@ <h1>Eggdrop Tricks<a class="headerlink" href="#eggdrop-tricks" title="Permalink
<div class="right">

<div class="footer" role="contentinfo">
&#169; Copyright 2019, Eggheads.
Last updated on Oct 25, 2019.
&#169; Copyright 2020, Eggheads.
Last updated on Jan 20, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.5.
</div>
</div>
Expand Down

0 comments on commit a39f0e1

Please sign in to comment.