Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into cmd_channel
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelortmann committed Dec 2, 2024
2 parents 4b041b3 + 0f5599e commit 6a2da12
Show file tree
Hide file tree
Showing 99 changed files with 1,053 additions and 510 deletions.
15 changes: 15 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
polar: # Replace with a single Polar username
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
thanks_dev: # Replace with a single thanks.dev username
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']
7 changes: 6 additions & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Tcl Versions
strategy:
matrix:
tcl_version: [ '8.5.19', '8.6.14', '8.7a5', '9.0b2' ]
tcl_version: [ '8.5.19', '8.6.14', '8.7a5', '9.0.0' ]
continue-on-error: true
runs-on: ubuntu-latest
steps:
Expand All @@ -31,6 +31,7 @@ jobs:
cd tcl${{ matrix.tcl_version }}/unix && \
./configure --prefix=$HOME/tcl && \
make -j4 && make install
- uses: ammaraskar/gcc-problem-matcher@master
- name: Build
run: |
./configure --with-tcl=$HOME/tcl/lib | tee configure.log
Expand Down Expand Up @@ -58,6 +59,7 @@ jobs:
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
- uses: ammaraskar/gcc-problem-matcher@master
- name: Build
run: |
cd $GITHUB_WORKSPACE/eggdrop
Expand Down Expand Up @@ -86,6 +88,7 @@ jobs:
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
- uses: ammaraskar/gcc-problem-matcher@master
- name: Build
run: |
cd $GITHUB_WORKSPACE/eggdrop
Expand Down Expand Up @@ -117,6 +120,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'eggdrop'
- uses: ammaraskar/gcc-problem-matcher@master
- name: Build
run: |
cd $GITHUB_WORKSPACE/eggdrop
Expand Down Expand Up @@ -159,6 +163,7 @@ jobs:
path: 'eggdrop'
- name: install dependencies
run: sudo apt-get update && sudo apt-get install tcl tcl-dev
- uses: ammaraskar/gcc-problem-matcher@master
- name: Build
run: |
cd $GITHUB_WORKSPACE/eggdrop
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
- uses: actions/checkout@v4
- name: install dependencies
run: sudo apt-get update && sudo apt-get install clang tcl tcl-dev openssl libssl-dev
- uses: ammaraskar/gcc-problem-matcher@master
if: ${{ matrix.cc == 'gcc' }}
- name: Build
env:
CC: ${{ matrix.cc }}
Expand All @@ -35,5 +37,6 @@ jobs:
- uses: actions/checkout@v4
- name: install dependencies
run: sudo apt-get update && sudo apt-get install tcl tcl-dev openssl libssl-dev
- uses: ammaraskar/gcc-problem-matcher@master
- name: Build
run: ./configure ${{ matrix.conf_tls }} ${{ matrix.conf_ipv6 }} ${{ matrix.conf_tdns }} && make config && make -j4
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ eggdrop
EGGMOD.stamp
mod.xlibs
__pycache__
.clangd
Binary file modified ChangeLog.gz
Binary file not shown.
5 changes: 5 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ Eggdrop v1.10.0:
created to hedge against frequent writes to disk, but is less
relveant with today's technology. Eggdrop now writes logfiles to
disk immediately.
- The old DNS module section was removed
- A Python module section was added, but does not load the python
module by default.
- The Autoscripts capability to load and manage some scripts from the
partyline is loaded by default

Documentation changes:
- Added documentation that covers values commonly used when writing
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ SYSTEM PRE-REQUISITES
Eggdrop also requires openssl (and its development headers) in order
to enable SSL/TLS protection of network data. The header files are
often called something similar to 'libssl-dev'. While not advised,
this requirement can be removed by compilling using
this requirement can be removed by compiling using
./configure --disable-tls, but you will not be able to connect to
TLS-protected IRC servers nor utilize secure botnet communication.

Expand Down
8 changes: 5 additions & 3 deletions UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ Upgrading Eggdrop

It is easy to upgrade Eggdrop to a new version! To have a full picture
of the changes made since your last upgrade, we recommend reading the
NEWS file. Upgrades from the 1.6 and 1.8 lines of Eggdrop should take
place with little to no issues. The config file, user files, and
channel files can all be reused.
NEWS file. Upgrades from the 1.8 and 1.9 lines of Eggdrop should take
place with little to no issues. While the config file, user files, and
channel files can all be reused, it is recommended to review the NEWS
files for each release to identify new configuration settings that
have been added.

For support, feel free to visit us on Libera #eggdrop.

Expand Down
2 changes: 1 addition & 1 deletion aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ AC_DEFUN([EGG_CHECK_MODULE_SUPPORT],
[
MODULES_OK="yes"
MOD_EXT="so"
DEFAULT_MAKE="debug"
DEFAULT_MAKE="eggdrop"
LOAD_METHOD="dl"
WEIRD_OS="yes"
UNKNOWN_OS="no"
Expand Down
5 changes: 3 additions & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac 0ea3718f.
# From configure.ac 495e922.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for Eggdrop 1.10.0.
#
Expand Down Expand Up @@ -6266,7 +6266,7 @@ printf "%s\n" "$egg_cv_var_system_release" >&6; }

MODULES_OK="yes"
MOD_EXT="so"
DEFAULT_MAKE="debug"
DEFAULT_MAKE="eggdrop"
LOAD_METHOD="dl"
WEIRD_OS="yes"
UNKNOWN_OS="no"
Expand Down Expand Up @@ -9062,6 +9062,7 @@ printf "%s\n" "$as_me: WARNING: --with-tcl argument should refer to directory co
`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Library/Frameworks/Tcl.framework 2>/dev/null` \
`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Network/Library/Frameworks/Tcl.framework 2>/dev/null` \
`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tcl.framework 2>/dev/null` \
`ls -d /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks 2>/dev/null` \
; do
if test -f "$i/Tcl.framework/tclConfig.sh" ; then
ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`"
Expand Down
Loading

0 comments on commit 6a2da12

Please sign in to comment.