Skip to content

Commit 7e0b3d2

Browse files
michaelortmannmichaelortmann
committed
Merge remote-tracking branch 'upstream/develop' into botrealname
2 parents 41743a1 + 9426d52 commit 7e0b3d2

File tree

431 files changed

+12981
-5437
lines changed

Some content is hidden

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

431 files changed

+12981
-5437
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/ccpp.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.github/workflows/configure_flags.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎.github/workflows/dependencies.yml‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
name: Tcl/SSL Versions
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
push:
7+
branches: [ develop ]
8+
9+
jobs:
10+
tcl-versions:
11+
name: Tcl Versions
12+
strategy:
13+
matrix:
14+
tcl_version: [ '8.5.19', '8.6.14', '8.7a5', '9.0.0' ]
15+
continue-on-error: true
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: install dependencies
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 }}
26+
- name: Build Tcl
27+
if: steps.tcl-cache.outputs.cache-hit != 'true'
28+
run: |
29+
wget http://prdownloads.sourceforge.net/tcl/tcl${{ matrix.tcl_version }}-src.tar.gz && \
30+
tar xzf tcl${{ matrix.tcl_version }}-src.tar.gz && \
31+
cd tcl${{ matrix.tcl_version }}/unix && \
32+
./configure --prefix=$HOME/tcl && \
33+
make -j4 && make install
34+
- uses: ammaraskar/gcc-problem-matcher@master
35+
- name: Build
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
40+
ssl-version-098:
41+
name: OpenSSL 0.9.8
42+
continue-on-error: true
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/checkout@v4
46+
with:
47+
path: 'eggdrop'
48+
- name: install dependencies
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
55+
- name: Build OpenSSL
56+
if: steps.ssl-cache.outputs.cache-hit != 'true'
57+
run: |
58+
wget https://www.openssl.org/source/old/0.9.x/openssl-0.9.8zh.tar.gz && \
59+
sha256sum --status --check <(echo f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 openssl-0.9.8zh.tar.gz) && \
60+
tar xzf openssl-0.9.8zh.tar.gz && \
61+
cd openssl-0.9.8zh && ./config --prefix=$HOME/ssl -fPIC && make -j4 && make install_sw
62+
- uses: ammaraskar/gcc-problem-matcher@master
63+
- name: Build
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
69+
ssl-version-10:
70+
name: OpenSSL 1.0
71+
continue-on-error: true
72+
runs-on: ubuntu-latest
73+
steps:
74+
- uses: actions/checkout@v4
75+
with:
76+
path: 'eggdrop'
77+
- name: install dependencies
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
84+
- name: Build OpenSSL
85+
if: steps.ssl-cache.outputs.cache-hit != 'true'
86+
run: |
87+
wget https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz && \
88+
sha256sum --status --check <(echo ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 openssl-1.0.2u.tar.gz) && \
89+
tar xzf openssl-1.0.2u.tar.gz && \
90+
cd openssl-1.0.2u && ./config --prefix=$HOME/ssl -fPIC && make -j4 && make install_sw
91+
- uses: ammaraskar/gcc-problem-matcher@master
92+
- name: Build
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
98+
ssl-version-11:
99+
name: OpenSSL 1.1
100+
continue-on-error: true
101+
runs-on: ubuntu-latest
102+
steps:
103+
- uses: actions/cache@v4
104+
id: ssl-cache
105+
with:
106+
path: ~/ssl
107+
key: ${{ runner.os }}-ssl-1.1.1w
108+
- uses: actions/checkout@v4
109+
if: steps.ssl-cache.outputs.cache-hit != 'true'
110+
with:
111+
repository: openssl/openssl
112+
ref: 'OpenSSL_1_1_1w'
113+
path: 'openssl'
114+
- name: Build OpenSSL
115+
if: steps.ssl-cache.outputs.cache-hit != 'true'
116+
run: |
117+
cd $GITHUB_WORKSPACE/openssl && ./config --prefix=$HOME/ssl && make -j4 && make install_sw
118+
- name: install dependencies
119+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev
120+
- uses: actions/checkout@v4
121+
with:
122+
path: 'eggdrop'
123+
- uses: ammaraskar/gcc-problem-matcher@master
124+
- name: Build
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
130+
ssl-versions-3x:
131+
name: OpenSSL 3.x
132+
strategy:
133+
matrix:
134+
ssl_version: [ '3.0', '3.1', '3.2', '3.3' ]
135+
continue-on-error: true
136+
runs-on: ubuntu-latest
137+
steps:
138+
- uses: oprypin/find-latest-tag@v1
139+
with:
140+
repository: openssl/openssl
141+
releases-only: true
142+
prefix: 'openssl-'
143+
regex: "${{ matrix.ssl_version }}.[0-9]+"
144+
sort-tags: true
145+
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 }}
151+
- uses: actions/checkout@v4
152+
if: steps.ssl-cache.outputs.cache-hit != 'true'
153+
with:
154+
repository: openssl/openssl
155+
ref: ${{ steps.openssl.outputs.tag }}
156+
path: 'openssl'
157+
- name: Build OpenSSL
158+
if: steps.ssl-cache.outputs.cache-hit != 'true'
159+
run: |
160+
cd $GITHUB_WORKSPACE/openssl && ./config --prefix=$HOME/ssl && make -j4 && make install_sw
161+
- uses: actions/checkout@v4
162+
with:
163+
path: 'eggdrop'
164+
- name: install dependencies
165+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev
166+
- uses: ammaraskar/gcc-problem-matcher@master
167+
- name: Build
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: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Eggdrop Compile
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
push:
7+
branches: [ develop ]
8+
9+
jobs:
10+
default-build:
11+
name: Compile Test
12+
strategy:
13+
matrix:
14+
cc: [ 'gcc', 'clang' ]
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: install dependencies
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' }}
22+
- name: Build
23+
env:
24+
CC: ${{ matrix.cc }}
25+
run: ./configure && make config && make -j4 && make install
26+
feature-test:
27+
name: Features
28+
continue-on-error: true
29+
needs: default-build
30+
strategy:
31+
matrix:
32+
conf_tls: [ '', '--disable-tls' ]
33+
conf_ipv6: [ '', '--disable-ipv6' ]
34+
conf_tdns: [ '', '--disable-tdns' ]
35+
runs-on: ubuntu-latest
36+
steps:
37+
- uses: actions/checkout@v4
38+
- name: install dependencies
39+
run: sudo apt-get update && sudo apt-get install tcl tcl-dev openssl libssl-dev
40+
- uses: ammaraskar/gcc-problem-matcher@master
41+
- name: Build
42+
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 "actions@github.com"
18+
git commit -a -m "Run autotools"
19+
git push origin develop
20+

‎.github/workflows/misc.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Check autotools/makedepend
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
push:
7+
branches: [ develop ]
8+
9+
jobs:
10+
autotools-check:
11+
name: Check if misc/runautotools needs to be run
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- name: install dependencies
16+
run: sudo apt-get update && sudo apt-get install build-essential autoconf
17+
- name: Stage configure with revision removed
18+
run: |
19+
for i in `find . -name configure`; do sed -i 's/From configure.ac .*//' $i; git add $i; done
20+
- name: Run autotools
21+
run: misc/runautotools
22+
- name: Remove configure revision again
23+
run: |
24+
for i in `find . -name configure`; do sed -i 's/From configure.ac .*//' $i; done
25+
- name: Check diff
26+
run: |
27+
git diff | tee .gitdiff
28+
if [ -s .gitdiff ]; then
29+
exit 1
30+
fi
31+
makedepend-check:
32+
name: Check if misc/makedepend needs to be run
33+
runs-on: ubuntu-latest
34+
steps:
35+
- uses: actions/checkout@v4
36+
- name: install dependencies
37+
run: sudo apt-get update && sudo apt-get install build-essential autoconf tcl-dev tcl openssl libssl-dev
38+
- name: Run makedepend
39+
run: misc/makedepend
40+
- name: Check diff
41+
run: |
42+
git diff | tee .gitdiff
43+
if [ -s .gitdiff ]; then
44+
exit 1
45+
fi

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ config.cache
3939
eggdrop
4040
EGGMOD.stamp
4141
mod.xlibs
42+
__pycache__
43+
.clangd

‎AUTHORS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ See also: THANKS, doc/Versions, doc/Changes
104104
------------------------------------------------------------------------------
105105

106106
Copyright (C) 1997 Robey Pointer
107-
Copyright (C) 1999 - 2023 Eggheads Development Team
107+
Copyright (C) 1999 - 2024 Eggheads Development Team

‎CONTENTS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ Last revised: September 21, 2018
8282
Contains information on upgrading from a 1.6 bot to a 1.8 bot.
8383
_____________________________________________________________________
8484

85-
Copyright (C) 2003 - 2023 Eggheads Development Team
85+
Copyright (C) 2003 - 2024 Eggheads Development Team

0 commit comments

Comments
 (0)