Skip to content

Commit caa6694

Browse files
michaelortmannmichaelortmann
committed
Merge commit remote-tracking branch 'upstream/develop' into ident2
2 parents 15926ca + 18fc952 commit caa6694

File tree

192 files changed

+4575
-2847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+4575
-2847
lines changed

‎.github/FUNDING.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
thanks_dev: # Replace with a single thanks.dev username
15+
custom: ['https://www.digitalocean.com/?refcode=2b2e5ea689b2&utm_campaign=Referral_Invite&utm_medium=Referral_Program', 'https://www.eggheads.org'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

‎.github/workflows/dependencies.yml‎

Lines changed: 67 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,32 @@ jobs:
1111
name: Tcl Versions
1212
strategy:
1313
matrix:
14-
tcl_version: [ '8.5.19', '8.6.14', '8.7a5', '9.0b2' ]
14+
tcl_version: [ '8.5.19', '8.6.14', '8.7a5', '9.0.0' ]
1515
continue-on-error: true
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: install dependencies
20-
run: sudo apt-get install openssl libssl-dev
20+
run: sudo apt-get update && sudo apt-get install openssl libssl-dev
21+
- uses: actions/cache@v4
22+
id: tcl-cache
23+
with:
24+
path: ~/tcl
25+
key: ${{ runner.os }}-tcl-${{ matrix.tcl_version }}
2126
- name: Build Tcl
27+
if: steps.tcl-cache.outputs.cache-hit != 'true'
2228
run: |
2329
wget http://prdownloads.sourceforge.net/tcl/tcl${{ matrix.tcl_version }}-src.tar.gz && \
2430
tar xzf tcl${{ matrix.tcl_version }}-src.tar.gz && \
2531
cd tcl${{ matrix.tcl_version }}/unix && \
2632
./configure --prefix=$HOME/tcl && \
2733
make -j4 && make install
34+
- uses: ammaraskar/gcc-problem-matcher@master
2835
- name: Build
29-
run: ./configure --with-tcl=$HOME/tcl/lib && LD_LIBRARY_PATH=$HOME/tcl/lib make config eggdrop
36+
run: |
37+
./configure --with-tcl=$HOME/tcl/lib | tee configure.log
38+
LD_LIBRARY_PATH=$HOME/tcl/lib make config eggdrop
39+
fgrep -q "Tcl version: ${{ matrix.tcl_version }}" configure.log
3040
ssl-version-098:
3141
name: OpenSSL 0.9.8
3242
continue-on-error: true
@@ -36,15 +46,26 @@ jobs:
3646
with:
3747
path: 'eggdrop'
3848
- name: install dependencies
39-
run: sudo apt-get install tcl tcl-dev
49+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev
50+
- uses: actions/cache@v4
51+
id: ssl-cache
52+
with:
53+
path: ~/ssl
54+
key: ${{ runner.os }}-ssl-0.9.8zh
4055
- name: Build OpenSSL
56+
if: steps.ssl-cache.outputs.cache-hit != 'true'
4157
run: |
4258
wget https://www.openssl.org/source/old/0.9.x/openssl-0.9.8zh.tar.gz && \
4359
sha256sum --status --check <(echo f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 openssl-0.9.8zh.tar.gz) && \
4460
tar xzf openssl-0.9.8zh.tar.gz && \
4561
cd openssl-0.9.8zh && ./config --prefix=$HOME/ssl -fPIC && make -j4 && make install_sw
62+
- uses: ammaraskar/gcc-problem-matcher@master
4663
- name: Build
47-
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
64+
run: |
65+
cd $GITHUB_WORKSPACE/eggdrop
66+
./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib | tee configure.log
67+
LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
68+
fgrep -q "SSL/TLS Support: yes" configure.log
4869
ssl-version-10:
4970
name: OpenSSL 1.0
5071
continue-on-error: true
@@ -54,35 +75,58 @@ jobs:
5475
with:
5576
path: 'eggdrop'
5677
- name: install dependencies
57-
run: sudo apt-get install tcl tcl-dev
78+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev
79+
- uses: actions/cache@v4
80+
id: ssl-cache
81+
with:
82+
path: ~/ssl
83+
key: ${{ runner.os }}-ssl-1.0.2u
5884
- name: Build OpenSSL
85+
if: steps.ssl-cache.outputs.cache-hit != 'true'
5986
run: |
6087
wget https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz && \
6188
sha256sum --status --check <(echo ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 openssl-1.0.2u.tar.gz) && \
6289
tar xzf openssl-1.0.2u.tar.gz && \
6390
cd openssl-1.0.2u && ./config --prefix=$HOME/ssl -fPIC && make -j4 && make install_sw
91+
- uses: ammaraskar/gcc-problem-matcher@master
6492
- name: Build
65-
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
93+
run: |
94+
cd $GITHUB_WORKSPACE/eggdrop
95+
./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib | tee configure.log
96+
LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
97+
fgrep -q "SSL/TLS Support: yes" configure.log
6698
ssl-version-11:
6799
name: OpenSSL 1.1
68100
continue-on-error: true
69101
runs-on: ubuntu-latest
70102
steps:
103+
- uses: actions/cache@v4
104+
id: ssl-cache
105+
with:
106+
path: ~/ssl
107+
key: ${{ runner.os }}-ssl-1.1.1w
71108
- uses: actions/checkout@v4
109+
if: steps.ssl-cache.outputs.cache-hit != 'true'
72110
with:
73111
repository: openssl/openssl
74112
ref: 'OpenSSL_1_1_1w'
75113
path: 'openssl'
76114
- name: Build OpenSSL
115+
if: steps.ssl-cache.outputs.cache-hit != 'true'
77116
run: |
78117
cd $GITHUB_WORKSPACE/openssl && ./config --prefix=$HOME/ssl && make -j4 && make install_sw
79118
- name: install dependencies
80-
run: sudo apt-get install tcl tcl-dev
119+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev
81120
- uses: actions/checkout@v4
82121
with:
83122
path: 'eggdrop'
123+
- uses: ammaraskar/gcc-problem-matcher@master
84124
- name: Build
85-
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
125+
run: |
126+
cd $GITHUB_WORKSPACE/eggdrop
127+
./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib | tee configure.log
128+
LD_LIBRARY_PATH=$HOME/ssl/lib make config eggdrop
129+
fgrep -q "SSL/TLS Support: yes" configure.log
86130
ssl-versions-3x:
87131
name: OpenSSL 3.x
88132
strategy:
@@ -99,18 +143,30 @@ jobs:
99143
regex: "${{ matrix.ssl_version }}.[0-9]+"
100144
sort-tags: true
101145
id: openssl
146+
- uses: actions/cache@v4
147+
id: ssl-cache
148+
with:
149+
path: ~/ssl
150+
key: ${{ runner.os }}-ssl-${{ steps.openssl.outputs.tag }}
102151
- uses: actions/checkout@v4
152+
if: steps.ssl-cache.outputs.cache-hit != 'true'
103153
with:
104154
repository: openssl/openssl
105155
ref: ${{ steps.openssl.outputs.tag }}
106156
path: 'openssl'
107157
- name: Build OpenSSL
158+
if: steps.ssl-cache.outputs.cache-hit != 'true'
108159
run: |
109160
cd $GITHUB_WORKSPACE/openssl && ./config --prefix=$HOME/ssl && make -j4 && make install_sw
110161
- uses: actions/checkout@v4
111162
with:
112163
path: 'eggdrop'
113164
- name: install dependencies
114-
run: sudo apt-get install tcl tcl-dev
165+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev
166+
- uses: ammaraskar/gcc-problem-matcher@master
115167
- name: Build
116-
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
168+
run: |
169+
cd $GITHUB_WORKSPACE/eggdrop
170+
./configure --with-sslinc=$HOME/ssl/include --with-ssllib=$HOME/ssl/lib64 | tee configure.log
171+
LD_LIBRARY_PATH=$HOME/ssl/lib64 make config eggdrop
172+
fgrep -q "SSL/TLS Support: yes" configure.log

‎.github/workflows/make.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: install dependencies
19-
run: sudo apt-get install clang tcl tcl-dev openssl libssl-dev
19+
run: sudo apt-get update && sudo apt-get install clang tcl tcl-dev openssl libssl-dev
20+
- uses: ammaraskar/gcc-problem-matcher@master
21+
if: ${{ matrix.cc == 'gcc' }}
2022
- name: Build
2123
env:
2224
CC: ${{ matrix.cc }}
@@ -34,6 +36,7 @@ jobs:
3436
steps:
3537
- uses: actions/checkout@v4
3638
- name: install dependencies
37-
run: sudo apt-get install tcl tcl-dev openssl libssl-dev
39+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev openssl libssl-dev
40+
- uses: ammaraskar/gcc-problem-matcher@master
3841
- name: Build
3942
run: ./configure ${{ matrix.conf_tls }} ${{ matrix.conf_ipv6 }} ${{ matrix.conf_tdns }} && make config && make -j4

‎.github/workflows/manual_autoconf.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Run and Commit autotools
2+
on:
3+
workflow_dispatch:
4+
jobs:
5+
run-script:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Check out repository code
9+
uses: actions/checkout@v4
10+
- name: Install pre-requisites
11+
run: sudo apt-get update && sudo apt-get install build-essential autoconf
12+
- name: Run autotools
13+
run: bash ./misc/runautotools
14+
- name: Commit changes
15+
run: |
16+
git config --global user.name "GitHub Actions"
17+
git config --global user.email "[email protected]"
18+
git commit -a -m "Run autotools"
19+
git push origin develop
20+

‎.github/workflows/misc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: install dependencies
16-
run: sudo apt-get install build-essential autoconf
16+
run: sudo apt-get update && sudo apt-get install build-essential autoconf
1717
- name: Stage configure with revision removed
1818
run: |
1919
for i in `find . -name configure`; do sed -i 's/From configure.ac .*//' $i; git add $i; done
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636
- name: install dependencies
37-
run: sudo apt-get install build-essential autoconf tcl-dev tcl openssl libssl-dev
37+
run: sudo apt-get update && sudo apt-get install build-essential autoconf tcl-dev tcl openssl libssl-dev
3838
- name: Run makedepend
3939
run: misc/makedepend
4040
- name: Check diff

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ eggdrop
4040
EGGMOD.stamp
4141
mod.xlibs
4242
__pycache__
43+
.clangd

‎ChangeLog.gz‎

318 KB
Binary file not shown.

0 commit comments

Comments
 (0)