Merge remote-tracking branch 'upstream/develop' into ident2

.github/workflows/dependencies.yml

@@ -0,0 +1,116 @@
+name: Tcl/SSL Versions
+
+on:
+  pull_request:
+    branches: [ develop ]
+  push:
+    branches: [ develop ]
+
+jobs:
+  tcl-versions:
+    name: Tcl Versions
+    strategy:
+      matrix:
+        tcl_version: [ '8.5.19', '8.6.14', '8.7a5', '9.0b2' ]
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: install dependencies
+      run: sudo apt-get install openssl libssl-dev
+    - name: Build Tcl
+      run: |
+        wget http://prdownloads.sourceforge.net/tcl/tcl${{ matrix.tcl_version }}-src.tar.gz && \
+        tar xzf tcl${{ matrix.tcl_version }}-src.tar.gz && \
+        cd tcl${{ matrix.tcl_version }}/unix && \
+        ./configure --prefix=$HOME/tcl && \
+        make -j4 && make install
+    - name: Build
+      run: ./configure --with-tcl=$HOME/tcl/lib && LD_LIBRARY_PATH=$HOME/tcl/lib make config eggdrop
+  ssl-version-098:
+    name: OpenSSL 0.9.8
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with: 
+        path: 'eggdrop'
+    - name: install dependencies
+      run: sudo apt-get install tcl tcl-dev
+    - name: Build OpenSSL
+      run: |
+        wget https://www.openssl.org/source/old/0.9.x/openssl-0.9.8zh.tar.gz && \
+        sha256sum --status --check <(echo f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 openssl-0.9.8zh.tar.gz) && \
+        tar xzf openssl-0.9.8zh.tar.gz && \
+        cd openssl-0.9.8zh && ./config --prefix=$HOME/ssl -fPIC && make -j4 && make install_sw
+    - name: Build
+      run: cd $GITHUB_WORKSPACE/eggdrop && ./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib && LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
+  ssl-version-10:
+    name: OpenSSL 1.0
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with: 
+        path: 'eggdrop'
+    - name: install dependencies
+      run: sudo apt-get install tcl tcl-dev
+    - name: Build OpenSSL
+      run: |
+        wget https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz && \
+        sha256sum --status --check <(echo ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 openssl-1.0.2u.tar.gz) && \
+        tar xzf openssl-1.0.2u.tar.gz && \
+        cd openssl-1.0.2u && ./config --prefix=$HOME/ssl -fPIC && make -j4 && make install_sw
+    - name: Build
+      run: cd $GITHUB_WORKSPACE/eggdrop && ./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib && LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
+  ssl-version-11:
+    name: OpenSSL 1.1
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        repository: openssl/openssl
+        ref: 'OpenSSL_1_1_1w'
+        path: 'openssl'
+    - name: Build OpenSSL
+      run: |
+        cd $GITHUB_WORKSPACE/openssl && ./config --prefix=$HOME/ssl && make -j4 && make install_sw
+    - name: install dependencies
+      run: sudo apt-get install tcl tcl-dev
+    - uses: actions/checkout@v4
+      with:
+        path: 'eggdrop'
+    - name: Build
+      run: cd $GITHUB_WORKSPACE/eggdrop && ./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib && LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
+  ssl-versions-3x:
+    name: OpenSSL 3.x
+    strategy:
+      matrix:
+        ssl_version: [ '3.0', '3.1', '3.2', '3.3' ]
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+    - uses: oprypin/find-latest-tag@v1
+      with:
+        repository: openssl/openssl
+        releases-only: true
+        prefix: 'openssl-'
+        regex: "${{ matrix.ssl_version }}.[0-9]+"
+        sort-tags: true
+      id: openssl
+    - uses: actions/checkout@v4
+      with:
+        repository: openssl/openssl
+        ref: ${{ steps.openssl.outputs.tag }}
+        path: 'openssl'
+    - name: Build OpenSSL
+      run: |
+        cd $GITHUB_WORKSPACE/openssl && ./config --prefix=$HOME/ssl && make -j4 && make install_sw
+    - uses: actions/checkout@v4
+      with:
+        path: 'eggdrop'
+    - name: install dependencies
+      run: sudo apt-get install tcl tcl-dev
+    - name: Build
+      run: cd $GITHUB_WORKSPACE/eggdrop && ./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib64 && LD_LIBRARY_PATH=$HOME/ssl/lib64 make config eggdrop

.github/workflows/make.yml

@@ -0,0 +1,39 @@
+name: Eggdrop Compile
+
+on:
+  pull_request:
+    branches: [ develop ]
+  push:
+    branches: [ develop ]
+
+jobs:
+  default-build:
+    name: Compile Test
+    strategy:
+      matrix:
+        cc: [ 'gcc', 'clang' ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: install dependencies
+      run: sudo apt-get install clang tcl tcl-dev openssl libssl-dev
+    - name: Build
+      env:
+        CC: ${{ matrix.cc }}
+      run: ./configure && make config && make -j4 && make install
+  feature-test:
+    name: Features
+    continue-on-error: true
+    needs: default-build
+    strategy:
+      matrix:
+        conf_tls: [ '', '--disable-tls' ]
+        conf_ipv6: [ '', '--disable-ipv6' ]
+        conf_tdns: [ '', '--disable-tdns' ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: install dependencies
+      run: sudo apt-get install tcl tcl-dev openssl libssl-dev
+    - name: Build
+      run: ./configure ${{ matrix.conf_tls }} ${{ matrix.conf_ipv6 }} ${{ matrix.conf_tdns }} && make config && make -j4

.github/workflows/misc.yml

@@ -0,0 +1,45 @@
+name: Check autotools/makedepend
+
+on:
+  pull_request:
+    branches: [ develop ]
+  push:
+    branches: [ develop ]
+
+jobs:
+  autotools-check:
+    name: Check if misc/runautotools needs to be run
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: install dependencies
+      run: sudo apt-get install build-essential autoconf
+    - name: Stage configure with revision removed
+      run: |
+        for i in `find . -name configure`; do sed -i 's/From configure.ac .*//' $i; git add $i; done
+    - name: Run autotools
+      run: misc/runautotools
+    - name: Remove configure revision again
+      run: |
+        for i in `find . -name configure`; do sed -i 's/From configure.ac .*//' $i; done
+    - name: Check diff
+      run: |
+        git diff | tee .gitdiff
+        if [ -s .gitdiff ]; then
+          exit 1
+        fi
+  makedepend-check:
+    name: Check if misc/makedepend needs to be run
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: install dependencies
+      run: sudo apt-get install build-essential autoconf tcl-dev tcl openssl libssl-dev
+    - name: Run makedepend
+      run: misc/makedepend
+    - name: Check diff
+      run: |
+        git diff | tee .gitdiff
+        if [ -s .gitdiff ]; then
+          exit 1
+        fi

.gitignore

@@ -39,3 +39,4 @@ config.cache
 eggdrop
 EGGMOD.stamp
 mod.xlibs
+__pycache__

AUTHORS

@@ -104,4 +104,4 @@ See also: THANKS, doc/Versions, doc/Changes
 ------------------------------------------------------------------------------
 
 Copyright (C) 1997 Robey Pointer
-Copyright (C) 1999 - 2023 Eggheads Development Team
+Copyright (C) 1999 - 2024 Eggheads Development Team

CONTENTS

@@ -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 - 2023 Eggheads Development Team
+  Copyright (C) 2003 - 2024 Eggheads Development Team

FEATURES

@@ -44,4 +44,4 @@ Eggdrop Features
 
 Copyright (C) 1997 Robey Pointer
 
-Copyright (C) 2000 - 2023 Eggheads Development Team
+Copyright (C) 2000 - 2024 Eggheads Development Team

INSTALL

@@ -158,5 +158,5 @@ the README file. If not, then READ IT!&@#%@!
 
 Have fun with Eggdrop!
 
-  Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2023 Eggheads
+  Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2024 Eggheads
   Development Team

Makefile.in

@@ -490,6 +490,7 @@ install-doc: install-start
 	cd doc/ && $(MAKE_INSTALL) install
 
 install-scripts: install-start
-	+@cd scripts/ && $(MAKE_INSTALL) install
+	+@cd scripts/ && $(MAKE_INSTALL) install; \
+	cd ../src/mod && $(MAKE_INSTALL) install-scripts
 
 #safety hash

NEWS

@@ -317,4 +317,4 @@ Eggdrop v1.9.0:
   ________________________________________________________________________
 
 Copyright (C) 1997 Robey Pointer
-Copyright (C) 1999 - 2023 Eggheads Development Team
+Copyright (C) 1999 - 2024 Eggheads Development Team

README

@@ -61,7 +61,7 @@ FTP
   The latest Eggdrop stable source code is always located at
   https://geteggdrop.com. You can also download the current stable,
   previous stable, and development snapshot via FTP at
-  ftp.eggheads.org/pub/Eggdrop/source
+  ftp://ftp.eggheads.org/pub/eggdrop/source
 
 Git Development Snapshot
 
@@ -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 - 2023 Eggheads
+Copyright (C) 1997 Robey Pointer Copyright (C) 1999 - 2024 Eggheads
 Development Team

aclocal.m4

@@ -1,6 +1,6 @@
 dnl aclocal.m4: macros autoconf uses when building configure from configure.ac
 dnl
-dnl Copyright (C) 1999 - 2023 Eggheads Development Team
+dnl Copyright (C) 1999 - 2024 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
@@ -20,6 +20,9 @@ dnl
 dnl Load tcl macros
 builtin(include,m4/tcl.m4)
 
+dnl Load python macros
+builtin(include,m4/python.m4)
+
 dnl Load gnu autoconf archive macros
 builtin(include,m4/ax_create_stdint_h.m4)
 builtin(include,m4/ax_lib_socket_nsl.m4)
@@ -313,7 +316,7 @@ AC_DEFUN([EGG_FUNC_B64_NTOP],
 
   # Check for b64_ntop. If we have b64_ntop, we assume b64_pton as well.
   AC_MSG_CHECKING(for b64_ntop)
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
       #include <sys/types.h>
       #include <netinet/in.h>
       #include <resolv.h>
@@ -325,7 +328,7 @@ AC_DEFUN([EGG_FUNC_B64_NTOP],
     AC_MSG_CHECKING(for b64_ntop with -lresolv)
     OLD_LIBS="$LIBS"
     LIBS="$LIBS -lresolv"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
         #include <sys/types.h>
         #include <netinet/in.h>
         #include <resolv.h>
@@ -338,7 +341,7 @@ AC_DEFUN([EGG_FUNC_B64_NTOP],
       AC_MSG_CHECKING(for b64_ntop with -lnetwork)
       OLD_LIBS="$LIBS"
       LIBS="-lnetwork"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([[
         #include <sys/types.h>
         #include <netinet/in.h>
         #include <resolv.h>
@@ -1512,7 +1515,7 @@ AC_DEFUN([EGG_TLS_ENABLE],
   AC_MSG_CHECKING([whether to enable TLS support])
   AC_ARG_ENABLE(tls,
     [  --disable-tls           disable TLS support ], [tls_enabled="$enableval"],
-    [tls_enabled="$enableval"])
+    [tls_enabled="yes"])
 
   AC_MSG_RESULT([$tls_enabled])
 ])