Merge remote-tracking branch 'upstream/develop' into py.dir

Merge done to trigger new CI run

.github/workflows/dependencies.yml

@@ -0,0 +1,96 @@
+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-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 && 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

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

README

@@ -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

config.h.in

@@ -132,9 +132,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `isascii' function. */
-#undef HAVE_ISASCII
-
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 #undef HAVE_LIBCRYPTO
 
@@ -287,6 +284,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
 /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac 98f8972a.
+# From configure.ac 4af46aa3.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.71 for Eggdrop 1.9.5.
 #
@@ -2789,7 +2789,6 @@ as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
 as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
 as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
 as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
-as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H"
 as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H"
 as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
 as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H"
@@ -6855,8 +6854,6 @@ fi
 fi
 
 
-
-
 ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
 if test "x$ac_cv_header_arpa_inet_h" = xyes
 then :
@@ -6940,6 +6937,12 @@ if test "x$ac_cv_header_sys_time_h" = xyes
 then :
   printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
 
+fi
+ac_fn_c_check_header_compile "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TIME_H 1" >>confdefs.h
+
 fi
 ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
 if test "x$ac_cv_header_unistd_h" = xyes
@@ -8215,12 +8218,6 @@ if test "x$ac_cv_func_inet_aton" = xyes
 then :
   printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii"
-if test "x$ac_cv_func_isascii" = xyes
-then :
-  printf "%s\n" "#define HAVE_ISASCII 1" >>confdefs.h
-
 fi
 ac_fn_c_check_func "$LINENO" "memset_s" "ac_cv_func_memset_s"
 if test "x$ac_cv_func_memset_s" = xyes
@@ -10635,7 +10632,6 @@ printf "%s\n" "#define EGG_TDNS 1" >>confdefs.h
 
 
 # Check for Python
-EGG_PYTHON_ENABLE
 
 
 # Check whether --with-python-config was given.

configure.ac

@@ -91,9 +91,8 @@ EGG_CHECK_OS
 # Checks for header files.
 EGG_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS_ONCE([sys/time.h])
 
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h locale.h netdb.h netinet/in.h stdio.h stdarg.h stddef.h sys/file.h sys/param.h sys/select.h sys/socket.h sys/time.h unistd.h wchar.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h locale.h netdb.h netinet/in.h stdio.h stdarg.h stddef.h sys/file.h sys/param.h sys/select.h sys/socket.h sys/time.h time.h unistd.h wchar.h])
 
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -113,7 +112,7 @@ AX_TYPE_SOCKLEN_T
 AX_CREATE_STDINT_H([eggint.h])
 
 # Checks for functions and their arguments.
-AC_CHECK_FUNCS([dprintf explicit_bzero memset_explicit explicit_memset getrandom inet_aton isascii memset_s snprintf strlcpy vsnprintf])
+AC_CHECK_FUNCS([dprintf explicit_bzero memset_explicit explicit_memset getrandom inet_aton memset_s snprintf strlcpy vsnprintf])
 AC_FUNC_SELECT_ARGTYPES
 EGG_FUNC_B64_NTOP
 AC_FUNC_MMAP
@@ -165,7 +164,6 @@ EGG_TLS_DETECT
 EGG_TDNS_ENABLE
 
 # Check for Python
-EGG_PYTHON_ENABLE
 EGG_PYTHON_WITHCONFIG