Merge remote-tracking branch 'upstream/develop' into fix.share.features

Merged to resolve conflicts
eggheads · Aug 9, 2024 · 2733715 · 2733715
2 parents 59fe9ed + f80f8ae
commit 2733715
Show file tree

Hide file tree

Showing 164 changed files with 2,905 additions and 2,118 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -17,16 +17,53 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
-      run: sudo apt-get install openssl libssl-dev
+      run: sudo apt-get update && sudo apt-get install openssl libssl-dev
+    - uses: actions/cache@v4
+      id: tcl-cache
+      with:
+        path: ~/tcl
+        key: ${{ runner.os }}-tcl-${{ matrix.tcl_version }}
     - name: Build Tcl
+      if: steps.tcl-cache.outputs.cache-hit != 'true'
       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
+      run: |
+        ./configure --with-tcl=$HOME/tcl/lib | tee configure.log
+        LD_LIBRARY_PATH=$HOME/tcl/lib make config eggdrop
+        fgrep -q "Tcl version: ${{ matrix.tcl_version }}" configure.log
+  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 update && sudo apt-get install tcl tcl-dev
+    - uses: actions/cache@v4
+      id: ssl-cache
+      with:
+        path: ~/ssl
+        key: ${{ runner.os }}-ssl-0.9.8zh
+    - name: Build OpenSSL
+      if: steps.ssl-cache.outputs.cache-hit != 'true'
+      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 | tee configure.log
+        LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
+        fgrep -q "SSL/TLS Support: yes" configure.log
   ssl-version-10:
     name: OpenSSL 1.0
     continue-on-error: true
@@ -36,33 +73,56 @@ jobs:
       with: 
         path: 'eggdrop'
     - name: install dependencies
-      run: sudo apt-get install tcl tcl-dev
+      run: sudo apt-get update && sudo apt-get install tcl tcl-dev
+    - uses: actions/cache@v4
+      id: ssl-cache
+      with:
+        path: ~/ssl
+        key: ${{ runner.os }}-ssl-1.0.2u
     - name: Build OpenSSL
+      if: steps.ssl-cache.outputs.cache-hit != 'true'
       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 && \
+        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
+      run: |
+        cd $GITHUB_WORKSPACE/eggdrop
+        ./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib | tee configure.log
+        LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
+        fgrep -q "SSL/TLS Support: yes" configure.log
   ssl-version-11:
     name: OpenSSL 1.1
     continue-on-error: true
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/cache@v4
+      id: ssl-cache
+      with:
+        path: ~/ssl
+        key: ${{ runner.os }}-ssl-1.1.1w
     - uses: actions/checkout@v4
+      if: steps.ssl-cache.outputs.cache-hit != 'true'
       with:
         repository: openssl/openssl
         ref: 'OpenSSL_1_1_1w'
         path: 'openssl'
     - name: Build OpenSSL
+      if: steps.ssl-cache.outputs.cache-hit != 'true'
       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
+      run: sudo apt-get update && 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
+      run: |
+        cd $GITHUB_WORKSPACE/eggdrop
+        ./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib | tee configure.log
+        LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
+        fgrep -q "SSL/TLS Support: yes" configure.log
   ssl-versions-3x:
     name: OpenSSL 3.x
     strategy:
@@ -79,18 +139,29 @@ jobs:
         regex: "${{ matrix.ssl_version }}.[0-9]+"
         sort-tags: true
       id: openssl
+    - uses: actions/cache@v4
+      id: ssl-cache
+      with:
+        path: ~/ssl
+        key: ${{ runner.os }}-ssl-${{ steps.openssl.outputs.tag }}
     - uses: actions/checkout@v4
+      if: steps.ssl-cache.outputs.cache-hit != 'true'
       with:
         repository: openssl/openssl
         ref: ${{ steps.openssl.outputs.tag }}
         path: 'openssl'
     - name: Build OpenSSL
+      if: steps.ssl-cache.outputs.cache-hit != 'true'
       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
+      run: sudo apt-get update && 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
+      run: |
+        cd $GITHUB_WORKSPACE/eggdrop
+        ./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib64 | tee configure.log
+        LD_LIBRARY_PATH=$HOME/ssl/lib64 make config eggdrop
+        fgrep -q "SSL/TLS Support: yes" configure.log
diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
-      run: sudo apt-get install clang tcl tcl-dev openssl libssl-dev
+      run: sudo apt-get update && sudo apt-get install clang tcl tcl-dev openssl libssl-dev
     - name: Build
       env:
         CC: ${{ matrix.cc }}
@@ -34,6 +34,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
-      run: sudo apt-get install tcl tcl-dev openssl libssl-dev
+      run: sudo apt-get update && 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
diff --git a/.github/workflows/manual_autoconf.yml b/.github/workflows/manual_autoconf.yml
@@ -0,0 +1,20 @@
+name: Run and Commit autotools
+on:
+  workflow_dispatch:
+jobs:
+  run-script:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install pre-requisites
+        run: sudo apt-get update && sudo apt-get install build-essential autoconf
+      - name: Run autotools
+        run: bash ./misc/runautotools
+      - name: Commit changes
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "[email protected]"
+          git commit -a -m "Run autotools"
+          git push origin develop
+
diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
-      run: sudo apt-get install build-essential autoconf
+      run: sudo apt-get update && 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
@@ -34,7 +34,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies
-      run: sudo apt-get install build-essential autoconf tcl-dev tcl openssl libssl-dev
+      run: sudo apt-get update && sudo apt-get install build-essential autoconf tcl-dev tcl openssl libssl-dev
     - name: Run makedepend
       run: misc/makedepend
     - name: Check diff