diff --git a/.appveyor.yml b/.appveyor.yml
index 193c25a3..6df0cd1d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,48 +4,27 @@
# TODO: test msvc
version: 0.0.0.0.1-branch-{branch}-build-{build}
clone_depth: 10
-environment:
- matrix:
- - cygwin_url: https://cygwin.com/setup-x86_64.exe
- build_with: cmake
- - cygwin_url: https://cygwin.com/setup-x86.exe
- build_with: cmake
- - cygwin_url: https://cygwin.com/setup-x86_64.exe
- build_with: autoconf
- - cygwin_url: https://cygwin.com/setup-x86.exe
- build_with: autoconf
install:
- - ps: Invoke-WebRequest $env:cygwin_url -OutFile c:\cygwin-setup.exe
+ - ps: Invoke-WebRequest https://cygwin.com/setup-x86_64.exe -OutFile c:\cygwin-setup.exe
# libcrypt-devel is needed only on x86_64 and only for modperl... probably some dependency problem.
- - c:\cygwin-setup.exe --quiet-mode --no-shortcuts --no-startmenu --no-desktop --upgrade-also --only-site --site http://cygwin.mirror.constant.com/ --root c:\cygwin-root --local-package-dir c:\cygwin-setup-cache --packages automake,gcc-g++,make,pkg-config,wget,openssl-devel,libicu-devel,zlib-devel,libcrypt-devel,perl,python3-devel,swig,libsasl2-devel,libQt5Core-devel,cmake,libboost-devel,gettext-devel
+ - c:\cygwin-setup.exe --quiet-mode --no-shortcuts --no-startmenu --no-desktop --upgrade-also --only-site --site http://cygwin.mirror.constant.com/ --root c:\cygwin-root --local-package-dir c:\cygwin-setup-cache --packages gcc-g++,make,pkg-config,wget,libssl-devel,libicu-devel,zlib-devel,libcrypt-devel,perl,python3-devel,swig,libsasl2-devel,libQt5Core-devel,cmake,libboost-devel,gettext-devel,libargon2-devel
- c:\cygwin-root\bin\sh -lc "echo Hi"
- c:\cygwin-root\bin\sh -lc "uname -a"
- c:\cygwin-root\bin\sh -lc "cat /proc/cpuinfo"
- c:\cygwin-root\bin\sh -lc "cat /proc/meminfo"
- c:\cygwin-root\bin\sh -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1"
- ps: Push-AppveyorArtifact cygcheck.log
- - ps: |
- if ($env:build_with -eq "cmake") {
- $env:cfg_suffix = ".sh"
- $env:unittest = "unittest"
- $env:inttest = "inttest"
- } else {
- $env:cfg_suffix = ""
- $env:unittest = "test"
- $env:inttest = "test2"
- }
# stdin is broken at AppVeyor, so we open it explicitly as /dev/null
build_script:
- git submodule update --init
- - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh < /dev/null"
- mkdir build
- - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; ../configure$cfg_suffix --enable-charset --enable-zlib --enable-openssl --enable-perl --enable-python --enable-cyrus < /dev/null; result=$?; if [[ $build_with == cmake ]]; then cmake --system-information > config.log; fi; appveyor PushArtifact config.log; exit $result"
+ - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; env ZNC_QT_VER=5 ../configure --enable-charset --enable-zlib --enable-openssl --enable-perl --enable-python --enable-cyrus --enable-argon < /dev/null; result=$?; cmake --system-information > config.log; appveyor PushArtifact config.log; exit $result"
- c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make VERBOSE=1 -j2 < /dev/null"
- c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make install < /dev/null"
- c:\cygwin-root\bin\sh -lc "znc --version"
# fix fork()
- c:\cygwin-root\bin\sh -lc "find /usr/local/lib/znc -iname '*.dll' -o -iname '*.so' | tee /tmp/files-to-rebase"
- - c:\cygwin-root\bin\sh -lc "rebaseall -v -T /tmp/files-to-rebase"
+ - c:\cygwin-root\bin\sh -lc "rebase -s -v $(cat /tmp/files-to-rebase)"
test_script:
- - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make VERBOSE=1 $unittest < /dev/null"
- - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make VERBOSE=1 $inttest < /dev/null"
+ - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make VERBOSE=1 unittest < /dev/null"
+ - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; env ZNC_QT_VER=5 make VERBOSE=1 inttest < /dev/null"
diff --git a/.ci/Jenkinsfile.crowdin b/.ci/Jenkinsfile.crowdin
new file mode 100644
index 00000000..bbdd07fe
--- /dev/null
+++ b/.ci/Jenkinsfile.crowdin
@@ -0,0 +1,121 @@
+#!groovy
+// This script is run daily by https://jenkins.znc.in/ to:
+// * upload new English strings to https://crowdin.com/project/znc-bouncer
+// * download new translations
+// * commits results to ZNC repo
+
+import groovy.json.JsonSlurper;
+import groovy.json.JsonOutput;
+
+def upstream_user = 'znc'
+def upstream_repo = 'znc'
+def my_user = 'znc-jenkins'
+def my_repo = 'znc'
+def branches = ['master', '1.9.x']
+
+def pr_mode = false
+
+timestamps {
+ node {
+ timeout(time: 30, unit: 'MINUTES') {
+ stage('WsCleanup') {
+ step([$class: 'WsCleanup'])
+ }
+ def tasks = [:]
+ def crowdin_cli = "java -jar ${tool 'crowdin-cli'}/crowdin-cli.jar"
+ def crowdin_cli_suffix = "--config .ci/crowdin.yml"
+ for (def branch in branches) {
+ def upstream_branch = branch
+ def my_branch = "l10n_${branch}"
+ tasks[branch] = {
+ stage(upstream_branch) {
+ dir(upstream_branch) {
+ stage("Checkout ${upstream_branch}") {
+ checkout([$class: 'GitSCM', branches: [[name: "*/${upstream_branch}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'SubmoduleOption', recursiveSubmodules: true]], userRemoteConfigs: [[credentialsId: '6ef10f80-20dc-4661-af45-52a6e1e15749', name: 'upstream', url: "git@github.com:${upstream_user}/${upstream_repo}.git"]]])
+ }
+ stage("Prepare strings for ${upstream_branch}") {
+ dir("build") {
+ sh "cmake .."
+ sh 'make translation'
+ }
+ sh 'rm -rf build/'
+ sh 'git status'
+ }
+ stage("Crowdin for ${upstream_branch}") {
+ withCredentials([string(credentialsId: '11c7e2b4-f990-4670-98a4-c89d2a5a2f43', variable: 'CROWDIN_API_KEY')]) {
+ withEnv(['CROWDIN_BASE_PATH='+pwd()]) {
+ sh "$crowdin_cli upload sources --branch ${upstream_branch} ${crowdin_cli_suffix}"
+ // sh "$crowdin_cli upload translations --branch ${upstream_branch} ${crowdin_cli_suffix}"
+ sh "$crowdin_cli download --branch ${upstream_branch} ${crowdin_cli_suffix}"
+ }
+ def headers = [[maskValue: true, name: 'Authorization', value: "Bearer ${env.CROWDIN_API_KEY}"], [maskValue: false, name: 'User-Agent', value: 'https://github.com/znc/znc/blob/master/.ci/Jenkinsfile.crowdin']]
+ def contributors = httpRequest consoleLogResponseBody: true, customHeaders: headers, url: "https://crowdin.com/api/v2/projects/289533/members?limit=500"
+ writeFile file: 'contributors.tmp', text: contributors.content
+ }
+ sh 'LANG=C.UTF-8 find . -name "*.po" -exec msgfilter -i "{}" -o "{}.replacement" .ci/cleanup-po.pl ";"'
+ sh 'find . -name "*.po" -exec mv "{}.replacement" "{}" ";"'
+ sh '.ci/crowdin-contributors.py < contributors.tmp'
+ sh 'rm contributors.tmp'
+ }
+ stage("Push ${upstream_branch}") {
+ sh 'git config user.name "ZNC-Jenkins"'
+ sh 'git config user.email jenkins@znc.in'
+ sh 'git status'
+ def git_status_short = sh (script: 'git status --short', returnStdout: true)
+ def modified_locales = sh (
+ script: 'git status --short | grep -o -E "[^ ]+\\.po$" | sed "s/.po//g" | grep -o -E "[a-z]{2}_[A-Z]{2}$" | sort -u | tr "\\n" " " | sed -E "s/ $//"',
+ returnStdout: true
+ )
+ sh 'git add .'
+ try {
+ sh "git commit -m 'Update translations from Crowdin for ${modified_locales}'"
+ } catch(e) {
+ echo 'No changes found'
+ return
+ }
+ if (!pr_mode) {
+ sshagent(credentials: ['baf2df74-935d-40e5-b20f-076e92fa3e9f']) {
+ sh "git push upstream HEAD:refs/heads/${upstream_branch}"
+ }
+ return
+ }
+ // Create pull request if it doesn't exist yet
+ // Note: the following code hasn't been executed for long time, so probably nothing here works anymore, APIs might have changed, etc.
+ sh "git remote add my git@github.com:${my_user}/${my_repo}.git"
+ sshagent(credentials: ['6ef10f80-20dc-4661-af45-52a6e1e15749']) {
+ sh "git push my HEAD:refs/heads/${my_branch} -f"
+ }
+ withCredentials([string(credentialsId: '7a2546ae-8a29-4eab-921c-6a4803456dce', variable: 'GITHUB_OAUTH_KEY')]) {
+ def headers = [[maskValue: true, name: 'Authorization', value: "token ${env.GITHUB_OAUTH_KEY}"], [maskValue: false, name: 'Accept', value: 'application/vnd.github.v3+json'], [maskValue: false, name: 'User-Agent', value: 'https://github.com/znc/znc/blob/master/.ci/Jenkinsfile.crowdin']]
+ def pulls = httpRequest consoleLogResponseBody: true, customHeaders: headers, url: "https://api.github.com/repos/${upstream_user}/${upstream_repo}/pulls?head=${my_user}:${my_branch}&base=${upstream_branch}"
+ pulls = new JsonSlurper().parseText(pulls.content)
+ if (!pulls) {
+ def bodyContents = "Crowdin: https://crowdin.com/project/znc-bouncer\nJenkins Build: ${env.BUILD_URL}"
+ bodyContents += "\n\nModified locales:\n${modified_locales}"
+ bodyContents += "\n\nModified files${git_status_short}"
+
+ httpRequest consoleLogResponseBody: true,
+ customHeaders: headers,
+ url: "https://api.github.com/repos/${upstream_user}/${upstream_repo}/pulls",
+ httpMode: 'POST',
+ requestBody: JsonOutput.toJson(
+ [
+ head: my_user + ':' + my_branch,
+ base: upstream_branch,
+ title: "Update translations in ${upstream_branch} (${modified_locales})",
+ body: bodyContents
+ ]
+ )
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ parallel tasks
+ }
+ }
+}
+
+// vim: set ts=2 sw=2 et:
diff --git a/.ci/cleanup-po.pl b/.ci/cleanup-po.pl
new file mode 100755
index 00000000..392e890b
--- /dev/null
+++ b/.ci/cleanup-po.pl
@@ -0,0 +1,18 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use v5.10;
+
+local $/;
+my $text = <>;
+
+if ($ENV{MSGFILTER_MSGID}) {
+ print $text;
+} else {
+ for (split(/^/, $text)) {
+ next if /^PO-Revision-Date:/;
+ s/^Last-Translator: \K.*/Various people/;
+ print;
+ }
+}
diff --git a/.ci/crowdin-contributors.py b/.ci/crowdin-contributors.py
new file mode 100755
index 00000000..b1bdebc8
--- /dev/null
+++ b/.ci/crowdin-contributors.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+import json
+import sys
+
+array = []
+
+data = json.load(sys.stdin)
+for user in data['data']:
+ user = user['data']
+ if user['fullName']:
+ array.append('* {} ({})'.format(user['username'], user['fullName']))
+ else:
+ array.append('* ' + user['username'])
+
+array.sort(key=lambda x: x.lower())
+
+sys.stdout = open('TRANSLATORS.md', 'wt', encoding='utf-8')
+
+print('These people helped translating ZNC to various languages:')
+print()
+for u in array:
+ print(u)
+print()
+print('Generated from https://crowdin.com/project/znc-bouncer')
diff --git a/.ci/crowdin.yml b/.ci/crowdin.yml
new file mode 100644
index 00000000..ec27c0d5
--- /dev/null
+++ b/.ci/crowdin.yml
@@ -0,0 +1,13 @@
+# https://crowdin.com/project/znc-bouncer
+project_id: 289533
+preserve_hierarchy: true
+api_token_env: CROWDIN_API_KEY
+base_path_env: CROWDIN_BASE_PATH
+
+files:
+ - source: /src/po/znc.pot
+ translation: /src/po/znc.%locale_with_underscore%.po
+ update_option: update_as_unapproved
+ - source: "/modules/po/*.pot"
+ translation: /modules/po/%file_name%.%locale_with_underscore%.po
+ update_option: update_as_unapproved
diff --git a/.travis-generate-docs.sh b/.ci/generate-docs.sh
similarity index 86%
rename from .travis-generate-docs.sh
rename to .ci/generate-docs.sh
index c60ac52d..c2e399f6 100755
--- a/.travis-generate-docs.sh
+++ b/.ci/generate-docs.sh
@@ -7,7 +7,7 @@ doxygen
cd "$HOME"
git clone --depth=1 --branch=gh-pages github:znc/docs.git gh-pages || exit 1
-cd "$TRAVIS_BUILD_DIR/doc/html/"
+cd "$GITHUB_WORKSPACE/doc/html/"
mv ~/gh-pages/.git ./
echo docs.znc.in > CNAME
git add -A
@@ -28,9 +28,9 @@ if [[ ! -f ~/docs_need_commit ]]; then
fi
git commit -F- < unittest-cmake-coverage.txt
+ llvm-cov show -show-line-counts-or-regions -instr-profile=inttest.profdata /usr/local/bin/znc > inttest-znc-coverage.txt
+ find /usr/local/lib/znc -name '*.so' -or -name '*.bundle' | while read f; do llvm-cov show -show-line-counts-or-regions -instr-profile=inttest.profdata $f > inttest-$(basename $f)-coverage.txt; done
+ ;;
+esac
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..64284b90
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+---
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "monthly"
diff --git a/.github/ubuntu_deps.sh b/.github/ubuntu_deps.sh
new file mode 100644
index 00000000..bc0bec58
--- /dev/null
+++ b/.github/ubuntu_deps.sh
@@ -0,0 +1,4 @@
+sudo apt-get update
+sudo apt-get install -y tcl-dev libsasl2-dev libicu-dev swig qt6-base-dev libboost-locale-dev libperl-dev libargon2-dev cpanminus gettext clang llvm lcov
+sudo apt-get upgrade -y
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..e79ee380
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,190 @@
+name: build
+on:
+ - push
+ - pull_request
+
+jobs:
+ gcc:
+ name: GCC
+ runs-on: ubuntu-24.04
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - run: source .github/ubuntu_deps.sh
+ - run: source .github/build.sh
+ - uses: codecov/codecov-action@v5
+ with:
+ name: ${{ github.job }}
+ - uses: actions/upload-artifact@v4
+ with:
+ name: codecov debug results ${{ github.job }}
+ path: "/tmp/codecov.*.gz"
+
+ tarball:
+ name: Tarball
+ runs-on: ubuntu-24.04
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - run: source .github/ubuntu_deps.sh
+ - run: |
+ date=$(date +%Y-%m-%d)
+ ./make-tarball.sh --nightly znc-git-$date /tmp/znc-git-$date.tar.gz
+ tar xvf /tmp/znc-git-$date.tar.gz
+ cd znc-git-$date
+ export CFGFLAGS="--with-gtest=$GITHUB_WORKSPACE/third_party/googletest/googletest --with-gmock=$GITHUB_WORKSPACE/third_party/googletest/googlemock --disable-swig"
+ source $GITHUB_WORKSPACE/.github/build.sh
+ - uses: actions/upload-artifact@v4
+ with:
+ name: znc-tarball
+ path: /tmp/znc-git*.tar.gz
+ if-no-files-found: error
+ - uses: codecov/codecov-action@v5
+ with:
+ name: ${{ github.job }}
+
+ # can be removed when asan below is fixed
+ clang:
+ name: Clang
+ runs-on: ubuntu-24.04
+ env:
+ CXX: clang++
+ CC: clang
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - run: source .github/ubuntu_deps.sh
+ - run: source .github/build.sh
+ - uses: codecov/codecov-action@v5
+ with:
+ name: ${{ github.job }}
+ - uses: actions/upload-artifact@v4
+ with:
+ name: codecov debug results ${{ github.job }}
+ path: "/tmp/codecov.*.gz"
+
+
+ #clang_asan:
+ #name: Clang ASAN
+ #runs-on: ubuntu-24.04
+ #env:
+ #CXX: clang++
+ #CC: clang
+ #CXXFLAGS: "-fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIE"
+ #LDFLAGS: "-fsanitize=address -pie"
+ #steps:
+ #- uses: actions/checkout@v4
+ #with:
+ #submodules: true
+ #- run: source .github/ubuntu_deps.sh
+ #- run: source .github/build.sh
+ #- uses: codecov/codecov-action@v5
+
+ #clang_tsan:
+ #name: Clang TSAN
+ #runs-on: ubuntu-24.04
+ #env:
+ #CXX: clang++
+ #CC: clang
+ #CXXFLAGS: "-fsanitize=thread -O1 -fPIE"
+ #LDFLAGS: "-fsanitize=thread"
+ #steps:
+ #- uses: actions/checkout@v4
+ #with:
+ #submodules: true
+ #- run: source .github/ubuntu_deps.sh
+ #- run: source .github/build.sh
+ #- uses: codecov/codecov-action@v5
+
+ # TODO: enable
+ #CXXFLAGS: "-fsanitize=memory -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize-memory-track-origins"
+ #LDFLAGS: "-fsanitize=memory"
+
+ #CXXFLAGS: "-fsanitize=undefined -O1 -fPIE -fno-sanitize-recover"
+ #LDFLAGS: "-fsanitize=undefined -pie -fno-sanitize-recover"
+
+ macos:
+ name: macOS
+ runs-on: macos-latest
+ env:
+ # This doesn't make big difference, since it's the same compiler, but we also use this variable to select lcov vs llvm-cov
+ CXX: clang++
+ CC: clang
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - run: |
+ brew update
+ brew install icu4c qt6 gettext pkg-config cpanminus boost argon2 swig
+ - run: source .github/build.sh
+ env:
+ # https://github.com/znc/znc/issues/1937
+ GTEST_FILTER: "-*Modpython*:LanguagesTests/AllLanguages.ServerDependentCapInModule/1"
+ - uses: codecov/codecov-action@v5
+
+ docker:
+ name: Docker push
+ runs-on: ubuntu-latest
+ needs:
+ - gcc
+ - tarball
+ - clang
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - id: tagger
+ run: |
+ git fetch --unshallow
+ echo "::set-output name=describe::$(git describe)"
+ if [[ "$GITHUB_REF" == refs/heads/master ]]; then
+ echo "::set-output name=latest::type=raw,latest"
+ fi
+ - uses: docker/metadata-action@v5
+ id: meta
+ with:
+ images: zncbouncer/znc-git
+ tags: |
+ type=ref,event=branch
+ type=ref,event=branch,suffix=-${{steps.tagger.outputs.describe}}
+ ${{steps.tagger.outputs.latest}}
+ - run: echo "${GITHUB_REF#refs/heads/}-${{steps.tagger.outputs.describe}}" > .nightly
+ - run: cat .nightly
+ - uses: docker/login-action@v3
+ if: ${{ github.repository == 'znc/znc' && github.event_name == 'push' }}
+ with:
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_PASSWORD }}
+ - uses: docker/build-push-action@v6
+ with:
+ context: .
+ push: ${{ github.repository == 'znc/znc' && github.event_name == 'push' }}
+ tags: ${{ steps.meta.outputs.tags }}
+ labels: ${{ steps.meta.outputs.labels }}
+ build-args: |
+ VERSION_EXTRA=+docker-git-
+
+ docs:
+ name: Docs push
+ runs-on: ubuntu-latest
+ if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - run: sudo apt-get update
+ - run: sudo apt-get install -y doxygen graphviz python3-yaml
+ - run: echo "$KEY" > ~/znc-github-key
+ env:
+ KEY: ${{ secrets.SSH_GITHUB_KEY_FOR_CI_BOT }}
+ - run: chmod 0600 ~/znc-github-key
+ - run: mkdir -p ~/.ssh
+ - run: cp .ci/ssh-config ~/.ssh/config
+ # It's not travis anymore, but oh well. TODO: fix
+ - run: git config --global user.email "travis-ci@znc.in"
+ - run: git config --global user.name "znc-travis"
+ - run: .ci/generate-docs.sh
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
new file mode 100644
index 00000000..de6b7c4f
--- /dev/null
+++ b/.github/workflows/cifuzz.yml
@@ -0,0 +1,27 @@
+# Fuzzer is configured at https://github.com/google/oss-fuzz/tree/master/projects/znc
+name: CIFuzz
+on: [pull_request]
+jobs:
+ Fuzzing:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Build Fuzzers
+ id: build
+ uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'znc'
+ dry-run: false
+ language: c++
+ - name: Run Fuzzers
+ uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'znc'
+ fuzz-seconds: 300
+ dry-run: false
+ language: c++
+ - name: Upload Crash
+ uses: actions/upload-artifact@v4
+ if: failure() && steps.build.outcome == 'success'
+ with:
+ name: artifacts
+ path: ./out/artifacts
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 00000000..5b72f88b
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,48 @@
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ 'master', '1.9.x' ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ 'master' ]
+ schedule:
+ - cron: '1 14 * * 6'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-24.04
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'cpp', 'javascript', 'python' ]
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ submodules: true
+ - run: |
+ source .github/ubuntu_deps.sh
+ sudo apt-get remove -y qt6-base-dev
+ sudo apt-get install -y qtbase5-dev
+
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v3
+ with:
+ languages: ${{ matrix.language }}
+
+ - run: source .github/build.sh
+ env:
+ ZNC_QT_VER: "5"
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v3
+ with:
+ category: "/language:${{matrix.language}}"
diff --git a/.gitmodules b/.gitmodules
index 548e642f..e21f1e3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,12 @@
[submodule "Csocket"]
path = third_party/Csocket
- url = https://github.com/jimloco/Csocket.git
+ url = https://github.com/znc/Csocket
[submodule "third_party/googletest"]
path = third_party/googletest
url = https://github.com/google/googletest
+[submodule "docker"]
+ path = docker
+ url = https://github.com/znc/znc-docker
+[submodule "third_party/cctz"]
+ path = third_party/cctz
+ url = https://github.com/google/cctz
diff --git a/.travis-coverity-scan.py b/.travis-coverity-scan.py
index ce96bb6d..e8e70a95 100755
--- a/.travis-coverity-scan.py
+++ b/.travis-coverity-scan.py
@@ -29,3 +29,4 @@ with open('.travis.yml', 'w') as f:
subprocess.check_call(['git checkout -b coverity_scan'], shell=True)
subprocess.check_call(['git commit .travis.yml -m"Automatic coverity scan for {}"'.format(datetime.date.today())], shell=True)
subprocess.check_call(['git push coverity coverity_scan -f'], shell=True)
+subprocess.call(['git push coverity master'], shell=True)
diff --git a/.travis-coverity.yml b/.travis-coverity.yml
index fbb3ad66..c9dd1daf 100644
--- a/.travis-coverity.yml
+++ b/.travis-coverity.yml
@@ -11,11 +11,11 @@ addons:
name: "znc/coverity"
description: "Build submitted via Travis CI"
notification_email: coverity@znc.in
- build_command_prepend: "./bootstrap.sh; ./configure --enable-perl --enable-python --enable-tcl --enable-cyrus"
+ build_command_prepend: "./configure --enable-perl --enable-python --enable-tcl --enable-cyrus"
build_command: "make VERBOSE=1"
branch_pattern: coverity_scan
script:
- /bin/true
sudo: required
-dist: trusty
+dist: bionic
diff --git a/.travis-github.enc b/.travis-github.enc
deleted file mode 100644
index 381fb565..00000000
Binary files a/.travis-github.enc and /dev/null differ
diff --git a/.travis.yml b/.travis.yml
index 785d24bc..c3c2f3b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,68 +1,52 @@
language: cpp
-env:
- global:
- # SECRET_KEY, used to push docs to github and to init coverity scans
- - secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg="
# These linux-specific parameters could be moved into matrix.include items, but that's lots of repetition
sudo: required
-dist: trusty
+dist: bionic
+arch: amd64
+services:
+ - docker
-# See https://github.com/google/sanitizers/issues/856
-group: deprecated-2017Q3
-
-# TODO: add Linux LLVM coverage; clang 3.5.0 on ubuntu trusty is too old.
matrix:
fast_finish: true
include:
- os: linux
+ dist: xenial
compiler: gcc
- env: BUILD_TYPE=normal BUILD_WITH=cmake COVERAGE=gcov
+ env: BUILD_TYPE=normal
+ - os: linux
+ compiler: clang
+ env: BUILD_TYPE=asan
+ - os: linux
+ compiler: clang
+ env: BUILD_TYPE=tsan
+ # TODO: enable
+ # - os: linux
+ # compiler: clang
+ # env: BUILD_TYPE=msan
+ # - os: linux
+ # compiler: clang
+ # env: BUILD_TYPE=ubsan
- os: linux
compiler: gcc
- env: BUILD_TYPE=normal BUILD_WITH=autoconf COVERAGE=gcov
- - os: linux
- compiler: clang
- env: BUILD_TYPE=asan BUILD_WITH=cmake COVERAGE=no
- - os: linux
- compiler: clang
- env: BUILD_TYPE=tsan BUILD_WITH=cmake COVERAGE=no
+ env: BUILD_TYPE=normal
+ arch: arm64
- os: osx
- osx_image: xcode7.3 # OS X 10.11
+ osx_image: xcode9.3 # macOS 10.13
compiler: clang
- env: BUILD_TYPE=normal BUILD_WITH=cmake COVERAGE=llvm
- - os: osx
- osx_image: xcode7.3 # OS X 10.11
- compiler: clang
- env: BUILD_TYPE=normal BUILD_WITH=autoconf COVERAGE=llvm
- - os: osx
- osx_image: xcode8.3 # macOS 10.12
- compiler: clang
- env: BUILD_TYPE=normal BUILD_WITH=cmake COVERAGE=llvm
- - os: osx
- osx_image: xcode8.3 # macOS 10.12
- compiler: clang
- env: BUILD_TYPE=normal BUILD_WITH=autoconf COVERAGE=llvm
- - os: osx
- osx_image: xcode9.1 # macOS 10.12
- compiler: clang
- env: BUILD_TYPE=normal BUILD_WITH=cmake COVERAGE=llvm
- - os: osx
- osx_image: xcode9.1 # macOS 10.12
- compiler: clang
- env: BUILD_TYPE=normal BUILD_WITH=autoconf COVERAGE=llvm
+ env: BUILD_TYPE=normal
- os: linux
compiler: gcc
- env: BUILD_TYPE=tarball BUILD_WITH=cmake COVERAGE=gcov
- - os: linux
- compiler: gcc
- env: BUILD_TYPE=tarball BUILD_WITH=autoconf COVERAGE=gcov
+ env: BUILD_TYPE=tarball
- stage: deploy
os: linux
+ env:
+ # SECRET_KEY, used to push docs to github and to init coverity scans
+ - secure: "ne14MIcNsUNKjqtgrLHJTHXCUUMKfkV/o4sm2scWYOiIl8s1Hoqnx6mPYIr8qnedIra8fsI7sWVxXLDLd/KMTN9v9WpCwc6Sf45vYtkfrS+rNOr86wOeEbgaxDTsb2UDJhtK0InhhpkipA5jrFzQuMMMEB+JgBQltKV43wmd7Yc="
before_install:
install:
- if [[ "$TRAVIS_REPO_SLUG" == "znc/znc" && "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_BRANCH" == "master" ]]; then ATTEMPT_DEPLOY=yes; else ATTEMPT_DEPLOY=no; fi
- - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then openssl aes-256-cbc -d -in .travis-github.enc -out ~/znc-github-key -k ${SECRET_KEY}; fi
+ - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then openssl aes-256-cbc -d -salt -pbkdf2 -in .travis-github.enc -out ~/znc-github-key -k ${SECRET_KEY}; fi
- export SECRET_KEY=no
- if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then sudo apt-get update; fi
- if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then sudo apt-get install -y doxygen graphviz python3-yaml; fi
@@ -78,71 +62,83 @@ matrix:
- if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then ./.travis-generate-docs.sh; fi
- if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then ./.travis-coverity-scan.py; fi
after_success:
+ - stage: deploy
+ os: linux
+ env:
+ # DOCKER_USERNAME
+ - secure: "kiR372QH5Srye2beHVamOVLIPeXnDipWfzvzGJEZzbpH+aXsiD+CkbtulCR+XnKpnUAXQTmEc5ts1KjI9MGlxvP1ztxW8HMDGUMF4iFAjgZO8GyAZlH5I7pMEw7D5pn3W9y1LuCW5C9IsDcWnNTJkm32D7N34lLBCTQVw68ooDk="
+ # DOCKER_PASSWORD
+ - secure: "FMKQarGQJ/MFXnQQWEnlWMM+XItbDPgm5tzCn4k36AsAB1s1SiQ08wmy2Ys/+kRvnPN3Clpl8P2C8CoRTMJ8WCUYZVmf3HsqvsLdrODyusR5/N1y5eOKWxo+t1qN2Jzt6oIi/ofUZdn5mdzt8yif+ufxoez+2ncZDt5HoB/suHE="
+ before_install:
+ install:
+ - if [[ "$TRAVIS_REPO_SLUG" == "znc/znc" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then ATTEMPT_DEPLOY=yes; else ATTEMPT_DEPLOY=no; fi
+ - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi
+ - export DOCKER_PASSWORD=no DOCKER_USERNAME=no
+ script:
+ - echo "$TRAVIS_BRANCH-$(git describe)" > .nightly
+ - docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse HEAD` --build-arg VERSION_EXTRA=+docker-git- -t "zncbouncer/znc-git:$TRAVIS_BRANCH" -t "zncbouncer/znc-git:$TRAVIS_BRANCH-$(git describe)" .
+ - if [[ "$ATTEMPT_DEPLOY" == "yes" && "$TRAVIS_BRANCH" == "master" ]]; then docker tag "zncbouncer/znc-git:$TRAVIS_BRANCH" zncbouncer/znc-git:latest; fi
+ - if [[ "$ATTEMPT_DEPLOY" == "yes" ]]; then docker push zncbouncer/znc-git; fi
+ after_success:
before_install:
+ - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # https://github.com/travis-ci/travis-ci/issues/8920
- "echo os: [$TRAVIS_OS_NAME] build: [$BUILD_TYPE]"
- - export SECRET_KEY=no
- export CFGFLAGS= MYCXXFLAGS= MYLDFLAGS=
- if [[ "$BUILD_TYPE" == "tarball" ]]; then CFGFLAGS+=" --with-gtest=$TRAVIS_BUILD_DIR/third_party/googletest/googletest --with-gmock=$TRAVIS_BUILD_DIR/third_party/googletest/googlemock --disable-swig"; fi
- if [[ "$BUILD_TYPE" == "asan" ]]; then MYCXXFLAGS+=" -fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIE" MYLDFLAGS+=" -fsanitize=address -pie"; fi
- if [[ "$BUILD_TYPE" == "tsan" ]]; then MYCXXFLAGS+=" -fsanitize=thread -O1 -fPIE" MYLDFLAGS+=" -fsanitize=thread"; fi
- - if [[ "$BUILD_WITH" == "cmake" ]]; then CFGSUFFIX=.sh UNITTEST=unittest INTTEST=inttest; else CFGSUFFIX= UNITTEST=test INTTEST=test2; fi
- - if [[ "$COVERAGE" == "gcov" ]]; then MYCXXFLAGS+=" --coverage" MYLDFLAGS+=" --coverage"; fi
- - if [[ "$COVERAGE" == "llvm" ]]; then MYCXXFLAGS+=" -fprofile-instr-generate -fcoverage-mapping" MYLDFLAGS+=" -fprofile-instr-generate"; fi
- # UBSan randomly crashes clang, and very often :(
- # CFGFLAGS= MYCXXFLAGS="-fsanitize=undefined -O1 -fPIE -fno-sanitize-recover" MYLDFLAGS="-fsanitize=undefined -pie -fno-sanitize-recover"
+ - if [[ "$BUILD_TYPE" == "msan" ]]; then MYCXXFLAGS+=" -fsanitize=memory -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize-memory-track-origins" MYLDFLAGS+=" -fsanitize=memory"; fi
+ - if [[ "$BUILD_TYPE" == "ubsan" ]]; then MYCXXFLAGS=" -fsanitize=undefined -O1 -fPIE -fno-sanitize-recover" MYLDFLAGS="-fsanitize=undefined -pie -fno-sanitize-recover"; fi
+ - if [[ "$CC" == "gcc" ]]; then MYCXXFLAGS+=" --coverage" MYLDFLAGS+=" --coverage"; fi
+ - if [[ "$CC" == "clang" ]]; then MYCXXFLAGS+=" -fprofile-instr-generate -fcoverage-mapping" MYLDFLAGS+=" -fprofile-instr-generate"; fi
install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cat /proc/cpuinfo /proc/meminfo; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then lsb_release -a; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:teward/swig3.0; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:beineri/opt-qt551-trusty; fi # default qt5.2 from trusty doesn't support QByteArray::toStdString()
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_WITH" == "cmake" ]]; then sudo add-apt-repository -y ppa:george-edison55/cmake-3.x; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libperl-dev tcl-dev libsasl2-dev libicu-dev swig3.0 qt55base libboost-locale-dev; fi
- # Clang 3.5 TSan is broken on Travis Ubuntu 14.04. Clang 3.8 seems to work, but only without -pie (https://github.com/google/sanitizers/issues/503)
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_TYPE" == "tsan" ]]; then sudo apt-get install -y clang-3.8; export CC=clang-3.8 CXX=clang++-3.8; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt55/bin/qt55-env.sh; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_WITH" == "cmake" ]]; then sudo apt-get install -y cmake; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source ~/virtualenv/python3.5/bin/activate; fi # for pip3
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PKG_CONFIG_PATH="/opt/python/3.5/lib/pkgconfig:$PKG_CONFIG_PATH" LD_LIBRARY_PATH="/opt/python/3.5/lib:$LD_LIBRARY_PATH"; fi
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libperl-dev tcl-dev libsasl2-dev libicu-dev swig qtbase5-dev libboost-locale-dev python3-pip cpanminus; fi
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y cmake; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib); fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpanm --notest Devel::Cover::Report::Clover; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export ZNC_MODPERL_COVERAGE=1; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sw_vers; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep cpu; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sysctl -a | grep mem; fi
+ # Something broke in Travis brew making it impossible to update python versions (complaining about nil:NilClass), so remove preinstalled brew and install from scratch
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm -rf /usr/local/Cellar/* /usr/local/opt/* /usr/local/share/aclocal; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; hash -r; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew config; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install swig python3 icu4c jq openssl qt5 gettext; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_WITH" == "cmake" ]]; then brew outdated cmake || brew upgrade cmake; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install swig icu4c jq qt5 gettext python cmake openssl pkg-config; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated python || brew upgrade python; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated cmake || brew upgrade cmake; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew info --json=v1 --installed | jq .; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PKG_CONFIG_PATH="$(brew --prefix qt5)/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
- - pip3 install coverage
+ - pip3 install --user coverage
- export ZNC_MODPYTHON_COVERAGE=1
- "echo pkg-config path: [$PKG_CONFIG_PATH]"
script:
+ - set -v
- if [[ "$BUILD_TYPE" == "tarball" ]]; then ./make-tarball.sh --nightly znc-git-2015-01-16 /tmp/znc-tarball.tar.gz; fi
- if [[ "$BUILD_TYPE" == "tarball" ]]; then cd /tmp; tar xvf znc-tarball.tar.gz; fi
- if [[ "$BUILD_TYPE" == "tarball" ]]; then cd /tmp/znc-git-2015-01-16; fi
- - if [[ "$BUILD_TYPE" != "tarball" && "$BUILD_WITH" != "cmake" ]]; then ./bootstrap.sh; fi
- mkdir build
- cd build
- - ../configure$CFGSUFFIX --enable-debug --enable-perl --enable-python --enable-tcl --enable-cyrus --enable-charset $CFGFLAGS CXXFLAGS="$CXXFLAGS $MYCXXFLAGS" LDFLAGS="$LDFLAGS $MYLDFLAGS"
- - if [[ "$BUILD_WITH" == "cmake" ]]; then cmake --system-information; else cat config.log; fi
+ - ../configure.sh --enable-debug --enable-perl --enable-python --enable-tcl --enable-cyrus --enable-charset $CFGFLAGS CXXFLAGS="$CXXFLAGS $MYCXXFLAGS" LDFLAGS="$LDFLAGS $MYLDFLAGS"
+ - cmake --system-information
- make VERBOSE=1
- - env LLVM_PROFILE_FILE="$PWD/unittest.profraw" make VERBOSE=1 $UNITTEST
+ - env LLVM_PROFILE_FILE="$PWD/unittest.profraw" make VERBOSE=1 unittest
- sudo make install
# TODO: use DEVEL_COVER_OPTIONS for https://metacpan.org/pod/Devel::Cover
- - env LLVM_PROFILE_FILE="$PWD/inttest.profraw" ZNC_MODPERL_COVERAGE_OPTS="-db,$PWD/cover_db" make VERBOSE=1 $INTTEST
+ - env LLVM_PROFILE_FILE="$PWD/inttest.profraw" ZNC_MODPERL_COVERAGE_OPTS="-db,$PWD/cover_db" PYTHONWARNINGS=error make VERBOSE=1 inttest
- /usr/local/bin/znc --version
after_success:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/perl5/bin/cover --no-gcov --report=clover; fi
- |
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$COVERAGE" == "llvm" ]]; then
+ if [[ "$TRAVIS_OS_NAME" == "osx" && "$CC" == "clang" ]]; then
xcrun llvm-profdata merge unittest.profraw -o unittest.profdata
xcrun llvm-profdata merge inttest.profraw -o inttest.profdata
xcrun llvm-cov show -show-line-counts-or-regions -instr-profile=unittest.profdata test/unittest_bin > unittest-cmake-coverage.txt
- xcrun llvm-cov show -show-line-counts-or-regions -instr-profile=unittest.profdata unittest > unittest-autoconf-coverage.txt
xcrun llvm-cov show -show-line-counts-or-regions -instr-profile=inttest.profdata /usr/local/bin/znc > inttest-znc-coverage.txt
find /usr/local/lib/znc -name '*.so' -or -name '*.bundle' | while read f; do xcrun llvm-cov show -show-line-counts-or-regions -instr-profile=inttest.profdata $f > inttest-$(basename $f)-coverage.txt; done
fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02ff01b1..348024b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2017 ZNC, see the NOTICE file for details.
+# Copyright (C) 2004-2025 ZNC, see the NOTICE file for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
# limitations under the License.
#
-cmake_minimum_required(VERSION 3.1)
-project(ZNC VERSION 1.7.0)
-set(ZNC_VERSION 1.7.x)
+cmake_minimum_required(VERSION 3.13)
+project(ZNC VERSION 1.10.0 LANGUAGES CXX)
+set(ZNC_VERSION 1.10.x)
set(append_git_version true)
set(alpha_version "") # e.g. "-rc1"
set(VERSION_EXTRA "" CACHE STRING
@@ -41,12 +41,10 @@ endfunction()
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
-include(TestCXX11)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED true)
+include(TestCXX17)
if(NOT CYGWIN)
- # We don't want to use -std=gnu++11 instead of -std=c++11, but among other
- # things, -std=c++11 on cygwin defines __STRICT_ANSI__ which makes cygwin
+ # We don't want to use -std=gnu++17 instead of -std=c++17, but among other
+ # things, -std=c++17 on cygwin defines __STRICT_ANSI__ which makes cygwin
# not to compile: undefined references to strerror_r, to fdopen, to
# strcasecmp, etc (their declarations in system headers are between ifdef)
set(CMAKE_CXX_EXTENSIONS false)
@@ -57,6 +55,7 @@ include(use_homebrew)
include(GNUInstallDirs)
include(CheckCXXSymbolExists)
include(copy_csocket)
+include(CMakePushCheckState)
set(CMAKE_THREAD_PREFER_PTHREAD true)
set(THREADS_PREFER_PTHREAD_FLAG true)
@@ -79,9 +78,28 @@ macro(tristate_option opt help)
endif()
endmacro()
+set(ZNC_CMAKE_FIND_DEPS "")
+set(zncpubdeps)
+
tristate_option(OPENSSL "Support SSL")
if(WANT_OPENSSL)
find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED})
+
+ if(OPENSSL_FOUND)
+ # SSL_SESSION was made opaque in OpenSSL 1.1.0;
+ # LibreSSL gained that function later too.
+ # TODO: maybe remove this check at some point, and stop supporting old
+ # libssl versions
+ cmake_push_check_state(RESET)
+ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+ check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h
+ HAVE_SSL_SESSION_get0_cipher)
+ cmake_pop_check_state()
+ set(ZNC_CMAKE_FIND_DEPS
+ "${ZNC_CMAKE_FIND_DEPS}\nfind_dependency(OpenSSL)")
+ list(APPEND zncpubdeps OpenSSL::SSL)
+ endif()
endif()
set(HAVE_LIBSSL "${OPENSSL_FOUND}")
@@ -96,23 +114,25 @@ set(HAVE_ZLIB "${ZLIB_FOUND}")
tristate_option(CYRUS "Support authentication with Cyrus")
if(WANT_CYRUS)
- pkg_check_modules(CYRUS libsasl2)
+ pkg_check_modules(CYRUS IMPORTED_TARGET libsasl2)
if(NOT CYRUS_FOUND)
# libsasl2.pc is missing on 2.1.25 which is on ubuntu 14.04
# next ubuntu version has 2.1.26 which has libsasl2.pc
#
# osx (as of El Capitan) doesn't have it either...
- set(_old_cmake_required_libraries "${CMAKE_REQUIRED_LIBRARIES}")
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} -lsasl2)
- # sys/types.h here is workaround for sasl 2.1.26:
- # https://github.com/znc/znc/issues/1243
- # https://lists.andrew.cmu.edu/pipermail/cyrus-sasl/2012-December/002572.html
- # https://cgit.cyrus.foundation/cyrus-sasl/commit/include/sasl.h?id=2f740223fa1820dd71e6ab0e50d4964760789209
- check_cxx_symbol_exists(sasl_server_init "sys/types.h;sasl/sasl.h"
- CYRUS_HARDCODED)
- set(CMAKE_REQUIRED_LIBRARIES "${_old_cmake_required_libraries}")
+ cmake_push_check_state(RESET)
+ set(CMAKE_REQUIRED_LIBRARIES -lsasl2)
+ # sys/types.h here is workaround for sasl 2.1.26:
+ # https://github.com/znc/znc/issues/1243
+ # https://lists.andrew.cmu.edu/pipermail/cyrus-sasl/2012-December/002572.html
+ # https://cgit.cyrus.foundation/cyrus-sasl/commit/include/sasl.h?id=2f740223fa1820dd71e6ab0e50d4964760789209
+ check_cxx_symbol_exists(sasl_server_init "sys/types.h;sasl/sasl.h"
+ CYRUS_HARDCODED)
+ cmake_pop_check_state()
if(CYRUS_HARDCODED)
- set(CYRUS_LDFLAGS -lsasl2)
+ add_library(HardcodedCyrusDep INTERFACE)
+ add_library(PkgConfig::CYRUS ALIAS HardcodedCyrusDep)
+ target_link_libraries(HardcodedCyrusDep INTERFACE sasl2)
set(CYRUS_FOUND true)
endif()
endif()
@@ -121,11 +141,21 @@ if(WANT_CYRUS)
endif()
endif()
+tristate_option(ARGON "Store password hashes using Argon2id instead of SHA-256")
+if(WANT_ARGON)
+ pkg_check_modules(ARGON ${TRISTATE_ARGON_REQUIRED} IMPORTED_TARGET libargon2)
+endif()
+set(ZNC_HAVE_ARGON "${ARGON_FOUND}")
+
tristate_option(ICU "Support character encodings")
if(WANT_ICU)
- pkg_check_modules(ICU ${TRISTATE_ICU_REQUIRED} icu-uc)
+ pkg_check_modules(ICU ${TRISTATE_ICU_REQUIRED} IMPORTED_TARGET icu-uc)
endif()
set(HAVE_ICU "${ICU_FOUND}")
+if(ICU_FOUND)
+ set(ZNC_CMAKE_FIND_DEPS "${ZNC_CMAKE_FIND_DEPS}\nfind_dependency_pc(ICU icu-uc)")
+ list(APPEND zncpubdeps PkgConfig::ICU)
+endif()
set(WANT_PERL false CACHE BOOL "Support Perl modules")
set(WANT_PYTHON false CACHE BOOL "Support Python modules")
@@ -159,7 +189,7 @@ if(WANT_PYTHON AND NOT EXISTS
endif()
endif()
if(search_swig)
- find_package(SWIG 3.0.0)
+ find_package(SWIG 4.0.1)
if(NOT SWIG_FOUND)
message(FATAL_ERROR
"Can't find SWIG, therefore Perl and Python aren't supported. "
@@ -171,8 +201,54 @@ if(WANT_PERL)
find_package(PerlLibs 5.10 REQUIRED)
endif()
if (WANT_PYTHON)
+ set (_MIN_PYTHON_VERSION 3.4)
find_package(Perl 5.10 REQUIRED)
- pkg_check_modules(PYTHON "${WANT_PYTHON_VERSION}" REQUIRED)
+ # VERSION_GREATER_EQUAL is available only since 3.7
+ if (CMAKE_VERSION VERSION_LESS 3.12)
+ else()
+ # Even if FindPython3 is available (since CMake 3.12) we still use
+ # pkg-config, because FindPython has a hardcoded list of python
+ # versions, which may become outdated when new pythons are released,
+ # but when cmake in the distro is old.
+ #
+ # Why FindPython3 is useful at all? Because sometimes there is no
+ # python3.pc, but only python-3.5.pc and python-3.6.pc; which would
+ # force user to provide the version explicitly via
+ # WANT_PYTHON_VERSION. This is the case on Gentoo when NOT building
+ # via emerge.
+ if (WANT_PYTHON_VERSION STREQUAL "python3")
+ find_package(Python3 COMPONENTS Development)
+ else()
+ # We used to pass value like "python-3.5" to the variable.
+ if (WANT_PYTHON_VERSION MATCHES "^(python-)?(.*)$")
+ find_package(Python3 COMPONENTS Development
+ EXACT "${CMAKE_MATCH_2}")
+ else()
+ message(FATAL_ERROR "Invalid value of WANT_PYTHON_VERSION")
+ endif()
+ endif()
+ if (Python3_FOUND AND Python3_VERSION VERSION_LESS
+ ${_MIN_PYTHON_VERSION})
+ message(STATUS
+ "Python too old, need at least ${_MIN_PYTHON_VERSION}")
+ set(Python3_FOUND OFF)
+ else()
+ # Compatibility with pkg-config variables
+ set(Python3_LDFLAGS "${Python3_LIBRARIES}")
+ endif()
+ endif()
+ if (NOT Python3_FOUND AND WANT_PYTHON_VERSION MATCHES "^python")
+ # Since python 3.8, -embed is required for embedding.
+ pkg_check_modules(Python3
+ "${WANT_PYTHON_VERSION}-embed >= ${_MIN_PYTHON_VERSION}")
+ if (NOT Python3_FOUND)
+ pkg_check_modules(Python3
+ "${WANT_PYTHON_VERSION} >= ${_MIN_PYTHON_VERSION}")
+ endif()
+ endif()
+ if (NOT Python3_FOUND)
+ message(FATAL_ERROR "Python 3 is not found. Try disabling it.")
+ endif()
endif()
set(WANT_TCL false CACHE BOOL "Support Tcl modules")
@@ -192,6 +268,7 @@ if(Boost_LOCALE_FOUND AND GETTEXT_MSGFMT_EXECUTABLE)
set(HAVE_I18N true)
else()
set(HAVE_I18N false)
+ message(STATUS "Boost.Locale or gettext (msgfmt) is not found, disabling i18n support")
endif()
if(HAVE_I18N AND GETTEXT_MSGMERGE_EXECUTABLE)
@@ -208,11 +285,41 @@ else()
set(CSOCK_USE_POLL true)
endif()
+find_package(cctz QUIET)
+set(cctz_cc "")
+if (cctz_FOUND)
+ message(STATUS "Found cctz at ${cctz_DIR}")
+else()
+ message(STATUS "Will build cctz")
+ set(cctz_cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/civil_time_detail.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_fixed.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_format.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_if.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_impl.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_info.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_libc.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_lookup.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/time_zone_posix.cc
+ ${PROJECT_SOURCE_DIR}/third_party/cctz/src/zone_info_source.cc
+ )
+ add_library(cctz INTERFACE)
+ add_library(cctz::cctz ALIAS cctz)
+ target_include_directories(cctz INTERFACE
+ $)
+ if (APPLE)
+ find_library(CoreFoundation CoreFoundation REQUIRED)
+ target_link_libraries(cctz INTERFACE ${CoreFoundation})
+ endif()
+endif()
+
check_cxx_symbol_exists(getopt_long "getopt.h" HAVE_GETOPT_LONG)
check_cxx_symbol_exists(lstat "sys/types.h;sys/stat.h;unistd.h" HAVE_LSTAT)
check_cxx_symbol_exists(getpassphrase "stdlib.h" HAVE_GETPASSPHRASE)
check_cxx_symbol_exists(tcsetattr "termios.h;unistd.h" HAVE_TCSETATTR)
check_cxx_symbol_exists(clock_gettime "time.h" HAVE_CLOCK_GETTIME)
+check_cxx_symbol_exists(gethostname "unistd.h" ZNC_HAVE_GETHOSTNAME)
+check_cxx_symbol_exists(uname "sys/utsname.h" ZNC_HAVE_UNAME)
# Note that old broken systems, such as OpenBSD, NetBSD, which don't support
# AI_ADDRCONFIG, also have thread-unsafe getaddrinfo(). Gladly, they fixed
@@ -237,12 +344,24 @@ if(append_git_version)
endif()
-
file(GLOB csocket_files LIST_DIRECTORIES FALSE
"${PROJECT_SOURCE_DIR}/third_party/Csocket/Csocket.*")
if(csocket_files STREQUAL "")
- message(FATAL_ERROR " It looks like git submodules are not initialized.\n"
- " Run: git submodule update --init --recursive")
+ execute_process(COMMAND git status
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ RESULT_VARIABLE git_status_var
+ OUTPUT_QUIET
+ ERROR_QUIET)
+ if(git_status_var)
+ message(FATAL_ERROR
+ " It looks like git submodules are not initialized.\n"
+ " Either this is not a git clone, or you don't have git installed.\n"
+ " Fetch the tarball from the website: https://znc.in/releases/ ")
+ else()
+ message(FATAL_ERROR
+ " It looks like git submodules are not initialized.\n"
+ " Run: git submodule update --init --recursive")
+ endif()
endif()
install(DIRECTORY webskins
@@ -294,6 +413,8 @@ else()
endif()
configure_file("include/znc/zncconfig.h.cmake.in" "include/znc/zncconfig.h")
+configure_file("test/integration/znctestconfig.h.cmake.in"
+ "test/integration/znctestconfig.h")
add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(modules)
@@ -318,6 +439,8 @@ include(CMakePackageConfigHelpers)
write_basic_package_version_file("ZNCConfigVersion.cmake"
COMPATIBILITY AnyNewerVersion)
install(FILES
+ "${PROJECT_SOURCE_DIR}/cmake/CMakeFindDependencyMacroPC.cmake"
+ "${PROJECT_SOURCE_DIR}/cmake/use_homebrew.cmake"
"${PROJECT_BINARY_DIR}/ZNCConfig.cmake"
"${PROJECT_BINARY_DIR}/ZNCConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_DATADIR}/znc/cmake")
@@ -344,12 +467,13 @@ summary_line("SSL " "${OPENSSL_FOUND}")
summary_line("IPv6 " "${WANT_IPV6}")
summary_line("Async DNS" "${HAVE_THREADED_DNS}")
summary_line("Perl " "${PERLLIBS_FOUND}")
-summary_line("Python " "${PYTHON_FOUND}")
+summary_line("Python " "${Python3_FOUND}")
summary_line("Tcl " "${TCL_FOUND}")
summary_line("Cyrus " "${CYRUS_FOUND}")
summary_line("Charset " "${ICU_FOUND}")
summary_line("Zlib " "${ZLIB_FOUND}")
summary_line("i18n " "${HAVE_I18N}")
+summary_line("Argon2 " "${ZNC_HAVE_ARGON}")
include(render_framed_multiline)
render_framed_multiline("${summary_lines}")
@@ -357,8 +481,3 @@ render_framed_multiline("${summary_lines}")
message("")
message("Now you can run 'make' to compile ZNC")
message("")
-
-# TODO
-# ====
-#
-# remove old configure.ac and Makefile.in
diff --git a/ChangeLog.md b/ChangeLog.md
index be60e106..d6bf6460 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,392 @@
+# ZNC 1.9.1 (2024-07-03)
+
+* This is a security release to fix CVE-2024-39844: remote code execution vulnerability in modtcl.
+ * To mitigate this for existing installations, simply unload the modtcl module for every user, if it's loaded. Note that only users with admin rights can load modtcl at all.
+ * Thanks to Johannes Kuhn (DasBrain) for reporting, to glguy for the patch, and to multiple IRC network operators for help with mitigating this on server side before disclosure.
+* Improve tooltips in webadmin.
+
+
+# ZNC 1.9.0 (2024-02-22)
+
+## New
+* Support for capability negotiation 302 and `cap-notify`. ZNC now has API `AddServerDependentCapability()`, using which modules can easily implement new capabilities: if server supports a cap, it will automatically be offered to clients which support `cap-notify` and ZNC will notify the module when the capability is enabled or disabled for server and for each client.
+ * Several capabilities (`away-notify`, `account-notify`, `extended-join`) were moved from the core to a new module: corecaps.
+ * The corecaps module is loaded automatically when upgrading from old config and when creating new config, but it's possible to unload it.
+ * Note: users who were using pre-release versions of 1.9.x (from git or from nightly tarballs) won't have it loaded automatically, because the existing config states `Version = 1.9`. In such case you can load it manually. This is to honor choice of users who decide to unload it, since we don't know whether the module is missing intentionally.
+ * Added support for `account-tag` capability, also in corecaps module.
+* Updated password hashing algorithm from SHA-256 to Argon2id (if libargon2 is installed). Existing passwords are transparently upgraded upon login.
+* Allow ordering of channels: via `ListChans`, `MoveChan` and `SwapChans` commands, and via webadmin.
+* New user options: `DenySetIdent`, `DenySetNetwork`, `DenySetRealName`, `DenySetQuitMsg`, `DenySetCTCPReplies`.
+* Switched `--makeconf` wizard default network from freenode to Libera.
+* Added Portuguese and Turkish translations.
+* znc-buildmod: output where the module was written to
+
+## Fixes
+* Fixed crash when receiving SASL lines from server without having negotiated SASL via CAP.
+* Fixed build with SWIG 4.2.0.
+* Fixed build with LibreSSL.
+* Fixed handling of timezones when parsing server-time tags received from server.
+* Use module names as the module ident, otherwise some clients were merging conversations with different modules together.
+* Stopped sending invalid 333 (`RPL_TOPICWHOTIME`) to client if topic owner is unknown.
+* Fixed an ODR violation.
+* Better hide password in PASS debug lines, sometimes it was not hidden.
+* CAP REQ sent by client without CAP LS now suspends the registration as the spec requires.
+
+## Modules
+* autoop: In some cases settings were parsed incorrectly, resulting in failure to do the autoop, now it's fixed.
+* clientnotify: Added options to reduce amount of notifications depending on the IP and the client ID of the connecting client.
+* controlpanel: Fixed help output.
+* log: Log nickserv account in the joins lines.
+* modperl: Allow overriding label for timers, which means now there can be more than 1 timer per module.
+* modpython:
+ * Rewrote internals of how modpython loads modules.
+ * Main motivation for the switch from using `imp` to using `importlib` was to support Python 3.12+.
+ * As an additional benefit, now it's possible to structure the module as a python package (a subdirectory with `__init__.py` and other .py files).
+ * All the old python modules should load as they were before.
+ * ZNC no longer supports loading a C python extension directly through modpython (though I doubt there were any users of that obscure feature): if you want to some parts of the module to be compiled, you can always import that from `__init__.py`.
+ * Implemented `Module.AddCommand()`
+* route_replies:
+ * Added Solanum-specific 337 (`RPL_WHOISTEXT`) to possible replies of `/whois`.
+ * Route replies to `/topic`.
+* sasl: Don't forward 908 (`RPL_SASLMECHS`) to clients.
+* webadmin: Fixed order of breadcrumbs in network page.
+* watch: Allow new entries to use spaces.
+
+## Notes for package maintainers
+* Require C++17 compiler. That is, GCC 8+ or Clang 5+.
+* Removed autoconf, leaving only CMake as the build system. The `configure` script is now merely a wrapper for CMake, and accepts mostly the same parameters as the old `configure`. You can use either `configure` as before, or CMake directly. Minimum supported CMake version is 3.13.
+* If cctz library is available on the system, it will be used, otherwise the bundled copy will be used.
+* libargon2 is new optional dependency.
+* Dropped support for Python < 3.4
+* Dropped support for SWIG < 4.0.1
+* The systemd unit now passes `--datadir=/var/lib/znc`.
+
+## Internal
+* Switched to steady clock for cache map and for sockets to fix certain issues with leap seconds and DST.
+* Made `CUser::Put...()` send to all clients instead of only networkless clients. Deprecate `CUser::PutAllUser()`.
+* Setup Github Actions to replace old Travis CI setup.
+* Added CIFuzz.
+* Added CodeQL.
+* List of translators is now automatically generated from Crowdin.
+* Modernized the way how CMake is used.
+* Updated default SSL settings from Mozilla recommendations.
+* Rewrote message parsing using `std::string_view`, improving the performance of the parser.
+* Web: removed legacy xhtml syntax.
+* Documented more functions.
+* Made some integration tests run faster by changing ServerThrottle value in the test.
+
+
+
+# ZNC 1.8.2 (2020-07-07)
+
+## New
+* Polish translation
+* List names of translators in TRANSLATORS.md file in source, as this contribution isn't directly reflected in git log
+* During --makeconf warn about listening on port 6697 too, not only about 6667
+
+## Fixes
+* webadmin: When confirming deletion of a network and selecting No, redirect to the edituser page instead of listusers page
+* Make more client command results translateable, which were missed before
+
+
+
+# ZNC 1.8.1 (2020-05-07)
+
+Fixed bug introduced in ZNC 1.8.0:
+
+Authenticated users can trigger an application crash (with a NULL pointer dereference) if echo-message is not enabled and there is no network. CVE-2020-13775
+
+
+
+# ZNC 1.8.0 (2020-05-01)
+
+## New
+* Output of various commands (e.g. `/znc help`) was switched from a table to a list
+* Support IP while verifying SSL certificates
+* Make it more visible that admins have lots of privileges
+
+## Fixes
+* Fix parsing of channel modes when the last parameter starts with a colon, improving compatibility with InspIRCd v3
+* Fix null dereference on startup when reading invalid config
+* Don't show server passwords on ZNC startup
+* Fix build with newer OpenSSL
+* Fix in-source CMake build
+* Fix echo-message for `status`
+
+## Modules
+* controlpanel: Add already supported NoTrafficTimeout User variable to help output
+* modpython:
+ * Use FindPython3 in addition to pkg-config in CMake to simplify builds on Gentoo when not using emerge
+ * Support python 3.9
+* modtcl: Added GetNetworkName
+* partyline: Module is removed
+* q: Module is removed
+* route_replies: Handle more numerics
+* sasl: Fix sending of long authentication information
+* shell: Unblock signals when spawning child processes
+* simple_away: Convert to UTC time
+* watch: Better support multiple clients
+* webadmin: Better wording for TrustPKI setting
+
+## Internal
+* Refactor the way how SSL certificate is checked to simplify future socket-related refactors
+* Build integration test and ZNC itself with the same compiler (https://bugs.gentoo.org/699258)
+* Various improvements for translation CI
+* Normalize variable name sUserName/sUsername
+* Make de-escaping less lenient
+
+
+
+# ZNC 1.7.5 (2019-09-23)
+
+* modpython: Add support for Python 3.8
+* modtcl: install .tcl files when building with CMake
+* nickserv: report success of Clear commands
+* Update translations, add Italian, Bulgarian, fix name of Dutch
+* Update error messages to be clearer
+* Add a deprecation warning to ./configure to use CMake instead in addition to an already existing warning in README
+
+
+
+# ZNC 1.7.4 (2019-06-19)
+
+## Fixes
+* This is a security release to fix CVE-2019-12816 (remote code execution by existing non-admin users). Thanks to Jeriko One for the bugreport.
+* Send "Connected!" messages to client to the correct nick.
+
+# Internal
+* Increase znc-buildmod timeout in the test.
+
+
+
+# ZNC 1.7.3 (2019-03-30)
+
+## Fixes
+This is a security release to fix CVE-2019-9917. Thanks to LunarBNC for the bugreport.
+
+## New
+Docker only: the znc image now supports --user option of docker run.
+
+
+
+# ZNC 1.7.2 (2019-01-19)
+
+## New
+* Add French translation
+* Update translations
+
+## Fixes
+* Fix compilation without deprecated APIs in OpenSSL
+* Distinguish Channel CTCP Requests and Replies
+* admindebug: Enforce need of TTY to turn on debug mode
+* controlpanel: Add missing return to ListNetMods
+* webadmin: Fix adding the last allowed network
+
+## Internal
+* Add more details to DNS error logs
+
+
+
+# ZNC 1.7.1 (2018-07-17)
+
+## Security critical fixes
+* CVE-2018-14055: non-admin user could gain admin privileges and shell access by injecting values into znc.conf.
+* CVE-2018-14056: path traversal in HTTP handler via ../ in a web skin name.
+
+## Core
+* Fix znc-buildmod to not hardcode the compiler used to build ZNC anymore in CMake build
+* Fix language selector. Russian and German were both not selectable.
+* Fix build without SSL support
+* Fix several broken strings
+* Stop spamming users about debug mode. This feature was added in 1.7.0, now reverted.
+
+## New
+* Add partial Spanish, Indonesian, and Dutch translations
+
+## Modules
+* adminlog: Log the error message again (regression of 1.7.0)
+* admindebug: New module, which allows admins to turn on/off --debug in runtime
+* flooddetach: Fix description of commands
+* modperl: Fix memory leak in NV handling
+* modperl: Fix functions which return VCString
+* modpython: Fix functions which return VCString
+* webadmin: Fix fancy CTCP replies editor for Firefox. It was showing the plain version even when JS is enabled
+
+## Internal
+* Deprecate one of the overloads of CMessage::GetParams(), rename it to CMessage::GetParamsColon()
+* Don't throw from destructor in the integration test
+* Fix a warning with integration test / gmake / znc-buildmod interaction.
+
+
+
+# ZNC 1.7.0 (2018-05-01)
+
+## New
+* Add CMake build. Minimum supported CMake version is 3.1. For now ZNC can be built with either CMake or autoconf. In future autoconf is going to be removed.
+ * Currently `znc-buildmod` requires python if CMake was used; if that's a concern for you, please open a bug.
+* Increase minimum GCC version from 4.7 to 4.8. Minimum Clang version stays at 3.2.
+* Make ZNC UI translateable to different languages (only with CMake), add partial Russian and German translations.
+ * If you want to translate ZNC to your language, please join https://crowdin.com/project/znc-bouncer
+* Configs written before ZNC 0.206 can't be read anymore
+* Implement IRCv3.2 capabilities `away-notify`, `account-notify`, `extended-join`
+* Implement IRCv3.2 capabilities `echo-message`, `cap-notify` on the "client side"
+* Update capability names as they are named in IRCv3.2: `znc.in/server-time-iso`→`server-time`, `znc.in/batch`→`batch`. Old names will continue working for a while, then will be removed in some future version.
+* Make ZNC request `server-time` from server when available
+* Increase accepted line length from 1024 to 2048 to give some space to message tags
+* Separate buffer size settings for channels and queries
+* Support separate `SSLKeyFile` and `SSLDHParamFile` configuration in addition to existing `SSLCertFile`
+* Add "AuthOnlyViaModule" global/user setting
+* Added pyeval module
+* Added stripcontrols module
+* Add new substitutions to ExpandString: `%empty%` and `%network%`.
+* Stop defaulting real name to "Got ZNC?"
+* Make the user aware that debug mode is enabled.
+* Added `ClearAllBuffers` command
+* Don't require CSRF token for POSTs if the request uses HTTP Basic auth.
+* Set `HttpOnly` and `SameSite=strict` for session cookies
+* Add SNI SSL client support
+* Add support for CIDR notation in allowed hosts list and in trusted proxy list
+* Add network-specific config for cert validation in addition to user-supplied fingerprints: `TrustAllCerts`, defaults to false, and `TrustPKI`, defaults to true.
+* Add `/attach` command for symmetry with `/detach`. Unlike `/join` it allows wildcards.
+* Timestamp format now supports sub-second precision with `%f`. Used in awaystore, listsockets, log modules and buffer playback when client doesn't support server-time
+* Build on macOS using ICU, Python, and OpenSSL from Homebrew, if available
+* Remove `--with-openssl=/path` option from ./configure. SSL is still supported and is still configurable
+
+## Fixes
+* Revert tables to how they were in ZNC 1.4
+* Remove flawed Add/Del/ListBindHost(s). They didn't correctly do what they were intended for, but users often confused them with the SetBindHost option. SetBindHost still works.
+* Fix disconnection issues when being behind NAT by decreasing the interval how often PING is sent and making it configurable via a setting to change ping timeout time
+* Change default flood rates to match RFC1459, prevent excess flood problems
+* Match channel names and hostmasks case-insensitively in autoattach, autocycle, autoop, autovoice, log, watch modules
+* Fix crash in shell module which happens if client disconnects at a wrong time
+* Decrease CPU usage when joining channels during startup or reconnect, add config write delay setting
+* Always send the users name in NOTICE when logging in.
+* Don't try to quit multiple times
+* Don't send PART to client which sent QUIT
+* Send failed logins to NOTICE instead of PRIVMSG
+* Stop creating files with odd permissions on Solaris
+* Save channel key on JOIN even if user was not on the channel yet
+* Stop buffering and echoing CTCP requests and responses to other clients with self-message, except for /me
+* Support discovery of tcl 8.6 during `./configure`
+
+## Modules
+* adminlog:
+ * Make path configurable
+* alias:
+ * Add `Dump` command to copy your config between users
+* awaystore:
+ * Add `-chans` option which records channel highlights
+* blockmotd:
+ * Add `GetMotd` command
+* clearbufferonmsg:
+ * Add options which events trigger clearation of buffers.
+* controlpanel:
+ * Add the `DelServer` command.
+ * Add `$user` and `$network` aliases for `$me` and `$net` respectively
+ * Allow reseting channel-specific `AutoClearChanBuffer` and `BufferSize` settings by setting them to `-`
+ * Change type of values from "double" to "number", which is more obvious for non-programmers
+* crypt:
+ * Fix build with LibreSSL
+ * Cover notices, actions and topics
+ * Don't use the same or overlapping NickPrefix as StatusPrefix
+ * Add DH1080 key exchange
+ * Add Get/SetNickPrefix commands, hide the internal keyword from ListKeys
+* cyrusauth:
+ * Improve UI
+* fail2ban:
+ * Make timeout and attempts configurable, add BAN, UNBAN and LIST commands
+* flooddetach:
+ * Detach on nick floods
+* keepnick:
+ * Improve behaviour by listening to ircd-side numeric errors
+* log:
+ * Add `-timestamp` option
+ * Add options to hide joins, quits and nick changes.
+ * Stop forcing username and network name to be lower case in filenames
+ * Log user quit messages
+* missingmotd:
+ * Include nick in IRC numeric 422 command, reduce client confusion
+* modperl:
+ * Provide `operator ""` for `ZNC::String`
+ * Honor `PERL5LIB` env var
+ * Fix functions like `HasPerm()` which accept `char`
+ * When a broken module couldn't be loaded, it couldn't be loaded anymore even if it was fixed later.
+ * Force strings to UTF-8 in modperl to fix double encoding during concatenation/interpolation.
+* modpython:
+ * Require ZNC to be built with encodings support
+ * Disable legacy encoding mode when modpython is loaded.
+ * Support `CQuery` and `CServer`
+* nickserv:
+ * Use `/nickserv identify` by default instead of `/msg nickserv`.
+ * Support messages from X3 services
+* notify_connect:
+ * Show client identification
+* sasl:
+ * Add web interface
+ * Enable all known mechanisms by default
+ * Make the first requirement for SET actually mandatory, return information about settings if no input for SET
+* schat:
+ * Require explicit path to certificate.
+* simple_away:
+ * Use ExpandString for away reason, rename old `%s` to `%awaytime%`
+ * Add `MinClients` option
+* stickychan:
+ * Save registry on every stick/unstick action, auto-save if channel key changes
+ * Stop checking so often, increase delay to once every 3 minutes
+* webadmin:
+ * Make server editor and CTCP replies editor more fancy, when JS is enabled
+ * Make tables sortable.
+ * Allow reseting chan buffer size by entering an empty value
+ * Show per-network traffic info
+ * Make the traffic info page visible for non-admins, non-admins can see only their traffic
+
+## Internal
+* Stop pretending that ZNC ABI is stable, when it's not. Make module version checks more strict and prevent crashes when loading a module which are built for the wrong ZNC version.
+* Add an integration test
+* Various HTML changes
+* Introduce a CMessage class and its subclasses
+* Add module callbacks which accept CMessage, deprecate old callbacks
+* Add `OnNumericMessage` module callback, which previously was possible only with `OnRaw`, which could give unexpected results if the message has IRCv3.2 tags.
+* Modernize code to use more C++11 features
+* Various code cleanups
+* Fix CSS of `_default_` skin for Fingerprints section
+* Add `OnUserQuitMessage()` module hook.
+* Add `OnPrivBufferStarting()` and `OnPrivBufferEnding()` hooks
+* `CString::WildCmp()`: add an optional case-sensitivity argument
+* Do not call `OnAddUser()` hook during ZNC startup
+* Allow modules to override CSRF protection.
+* Rehash now reloads only global settings
+* Remove `CAP CLEAR`
+* Add `CChan::GetNetwork()`
+* `CUser`: add API for removing and clearing allowed hosts
+* `CZNC`: add missing SSL-related getters and setters
+* Add a possibility (not an "option") to disable launch after --makeconf
+* Move Unix signal processing to a dedicated thread.
+* Add clang-format configuration, switch tabs to spaces.
+* `CString::StripControls()`: Strip background colors when we reset foreground
+* Make chan modes and permissions to be char instead of unsigned char.
+
+## Cosmetic
+* Alphabetically sort the modules we compile using autoconf/Makefile
+* Alphabetically sort output of `znc --help`
+* Change output during startup to be more compact
+* Show new server name when reconnecting to a different server with `/znc jump`
+* Hide passwords in listservers output
+* Filter out ZNC passwords in output of `znc -D`
+* Switch znc.in URLs to https
+
+
+
+# ZNC 1.6.6 (2018-03-05)
+
+* Fix use-after-free in `znc --makepem`. It was broken for a long time, but
+ started segfaulting only now. This is a useability fix, not a security fix,
+ because self-signed (or signed by a CA) certificates can be created
+ without using `--makepem`, and then combined into znc.pem.
+* Fix build on Cygwin.
+
+
+
# ZNC 1.6.5 (2017-03-12)
## Fixes
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..fc052a5c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,53 @@
+FROM alpine:3.19
+
+ARG VERSION_EXTRA=""
+
+ARG CMAKEFLAGS="-DVERSION_EXTRA=${VERSION_EXTRA} -DCMAKE_INSTALL_PREFIX=/opt/znc -DWANT_CYRUS=YES -DWANT_PERL=YES -DWANT_PYTHON=YES -DWANT_ARGON=YES"
+ARG MAKEFLAGS=""
+
+LABEL org.label-schema.schema-version="1.0"
+LABEL org.label-schema.vcs-url="https://github.com/znc/znc"
+LABEL org.label-schema.url="https://znc.in"
+
+COPY . /znc-src
+
+RUN set -x \
+ && adduser -S znc \
+ && addgroup -S znc
+RUN apk add --no-cache \
+ argon2-libs \
+ boost \
+ build-base \
+ ca-certificates \
+ cmake \
+ cyrus-sasl \
+ gettext \
+ icu-dev \
+ icu-data-full \
+ openssl-dev \
+ perl \
+ python3 \
+ su-exec \
+ tini \
+ tzdata
+RUN apk add --no-cache --virtual build-dependencies \
+ argon2-dev \
+ boost-dev \
+ cyrus-sasl-dev \
+ perl-dev \
+ python3-dev \
+ swig \
+ && cd /znc-src \
+ && mkdir build && cd build \
+ && cmake .. ${CMAKEFLAGS} \
+ && make $MAKEFLAGS \
+ && make install \
+ && apk del build-dependencies \
+ && cd / && rm -rf /znc-src
+
+COPY docker/slim/entrypoint.sh /
+COPY docker/*/??-*.sh docker/*/startup-sequence/??-*.sh /startup-sequence/
+
+VOLUME /znc-data
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/Jenkinsfile b/Jenkinsfile
index c14632f8..1d8f594b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,10 @@
timestamps {
node('freebsd') {
- // freebsd 10.3 + pkg install git openjdk cmake icu pkgconf swig30 python3 boost-libs gettext-tools qt5-buildtools qt5-network qt5-qmake
+ // AWS EC2 AMI: FreeBSD 14.1-STABLE-amd64-20241003 UEFI-PREFERRED base UFS
+ // pkg install git openjdk22 cmake icu pkgconf swig python3 boost-libs gettext-tools qt6-base libargon2
+ // Then fill known_hosts with https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints
+ // (needed for crowdin cron job in jenkins)
timeout(time: 30, unit: 'MINUTES') {
def wsdir = pwd()
stage('Checkout') {
@@ -12,7 +15,7 @@ timestamps {
}
dir("$wsdir/build") {
stage('Build') {
- sh "cmake $wsdir -DWANT_PERL=ON -DWANT_PYTHON=ON -DCMAKE_INSTALL_PREFIX=$wsdir/build/install-prefix"
+ sh "cmake $wsdir -DWANT_PERL=ON -DWANT_PYTHON=ON -DWANT_ARGON=ON -DCMAKE_INSTALL_PREFIX=$wsdir/build/install-prefix"
sh 'make VERBOSE=1 all'
}
stage('Unit test') {
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 5b2d058f..00000000
--- a/Makefile.in
+++ /dev/null
@@ -1,263 +0,0 @@
-SHELL := @SHELL@
-
-# Support out-of-tree builds
-srcdir := @srcdir@
-VPATH := @srcdir@
-
-prefix := @prefix@
-exec_prefix := @exec_prefix@
-datarootdir := @datarootdir@
-bindir := @bindir@
-datadir := @datadir@
-sysconfdir := @sysconfdir@
-libdir := @libdir@
-includedir := @includedir@
-sbindir := @sbindir@
-localstatedir := @localstatedir@
-systemdsystemunitdir := @systemdsystemunitdir@
-CXX := @CXX@
-CXXFLAGS := -I$(srcdir)/include -Iinclude @CPPFLAGS@ @CXXFLAGS@
-LDFLAGS := @LDFLAGS@
-LIBS := @LIBS@
-LIBZNC := @LIBZNC@
-LIBZNCDIR:= @LIBZNCDIR@
-MODDIR := @MODDIR@
-DATADIR := @DATADIR@
-PKGCONFIGDIR := $(libdir)/pkgconfig
-INSTALL := @INSTALL@
-INSTALL_PROGRAM := @INSTALL_PROGRAM@
-INSTALL_SCRIPT := @INSTALL_SCRIPT@
-INSTALL_DATA := @INSTALL_DATA@
-GIT := @GIT@
-SED := @SED@
-
-GTEST_DIR := @GTEST_DIR@
-GMOCK_DIR := @GMOCK_DIR@
-ifeq "$(GTEST_DIR)" ""
-GTEST_DIR := $(srcdir)/third_party/googletest/googletest
-endif
-ifeq "$(GMOCK_DIR)" ""
-GMOCK_DIR := $(srcdir)/third_party/googletest/googlemock
-endif
-qt_CFLAGS := @qt_CFLAGS@ -fPIC -std=c++11 -pthread
-qt_LIBS := @qt_LIBS@ -pthread
-
-# Force the simple internal regex engine to get consistent behavior on all platforms.
-# See https://code.google.com/p/chromium/issues/detail?id=317224 for more details.
-GTEST_FLAGS := -DGTEST_HAS_POSIX_RE=0 -I$(GMOCK_DIR)/include -I$(GTEST_DIR)/include
-# Silence warnings about overload virtual Csock::Write(), and missing field
-# initializers in both gtest and gmock
-GTEST_FLAGS += -Wno-overloaded-virtual -Wno-missing-field-initializers
-
-LIB_SRCS := ZNCString.cpp Csocket.cpp znc.cpp IRCNetwork.cpp User.cpp IRCSock.cpp \
- Client.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
- FileUtils.cpp HTTPSock.cpp Template.cpp ClientCommand.cpp Socket.cpp SHA256.cpp \
- WebModules.cpp Listener.cpp Config.cpp ZNCDebug.cpp Threads.cpp version.cpp Query.cpp \
- SSLVerifyHost.cpp Message.cpp Translation.cpp
-LIB_SRCS := $(addprefix src/,$(LIB_SRCS))
-BIN_SRCS := src/main.cpp
-LIB_OBJS := $(patsubst %cpp,%o,$(LIB_SRCS))
-BIN_OBJS := $(patsubst %cpp,%o,$(BIN_SRCS))
-TESTS := StringTest ConfigTest UtilsTest ThreadTest NickTest ClientTest NetworkTest \
- MessageTest ModulesTest IRCSockTest QueryTest BufferTest UserTest
-TESTS := $(addprefix test/,$(addsuffix .o,$(TESTS)))
-CLEAN := znc src/*.o test/*.o core core.* .version_extra .depend modules/.depend \
- unittest $(LIBZNC)
-DISTCLEAN := Makefile config.log config.status znc-buildmod include/znc/zncconfig.h \
- modules/Makefile man/Makefile znc.pc znc-uninstalled.pc test/Makefile
-
-CXXFLAGS += -D_MODDIR_=\"$(MODDIR)\" -D_DATADIR_=\"$(DATADIR)\"
-
-ifneq "$(V)" ""
-VERBOSE=1
-endif
-ifeq "$(VERBOSE)" ""
-Q=@
-E=@echo
-C=-s
-else
-Q=
-E=@\#
-C=
-endif
-
-.PHONY: all man modules clean distclean install version_extra_recompile test
-.SECONDARY:
-
-all: znc man modules $(LIBZNC)
- @echo ""
- @echo " ZNC was successfully compiled."
- @echo " Use '$(MAKE) install' to install ZNC to '$(prefix)'."
-
-ifeq "$(LIBZNC)" ""
-OBJS := $(BIN_OBJS) $(LIB_OBJS)
-
-znc: $(OBJS)
- $(E) Linking znc...
- $(Q)$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-else
-znc: $(BIN_OBJS) $(LIBZNC)
- $(E) Linking znc...
- $(Q)$(CXX) $(LDFLAGS) -o $@ $(BIN_OBJS) -L. -lznc -Wl,-rpath,$(LIBZNCDIR) $(LIBS)
-
-$(LIBZNC): $(LIB_OBJS)
- $(E) Linking $(LIBZNC)...
- $(Q)$(CXX) $(LDFLAGS) -shared -o $@ $(LIB_OBJS) $(LIBS) -Wl,--out-implib=libznc.dll.a
-endif
-
-unittest: $(LIB_OBJS) test/gtest-all.o test/gmock-all.o test/gmock-main.o $(TESTS)
- $(E) Linking unit test...
- $(Q)$(CXX) $(LDFLAGS) -o $@ $(LIB_OBJS) test/gtest-all.o test/gmock-all.o test/gmock-main.o $(TESTS) $(LIBS)
-
-inttest: test/Integration.o test/Int-gtest-all.o test/Int-gmock-all.o test/Int-gmock-main.o
- $(E) Linking integration test...
- $(Q)g++ -std=c++11 -o $@ test/Integration.o test/Int-gtest-all.o test/Int-gmock-all.o test/Int-gmock-main.o $(LIBS) $(qt_LIBS)
-
-man:
- @$(MAKE) -C man $(C)
-
-modules: $(LIBZNC) include/znc/Csocket.h
- @$(MAKE) -C modules $(C)
-
-clean:
- rm -rf $(CLEAN)
- @$(MAKE) -C modules clean;
- @$(MAKE) -C man clean
-
-distclean: clean
- rm -rf $(DISTCLEAN)
-
-src/%.o: src/%.cpp Makefile include/znc/Csocket.h
- @mkdir -p .depend src
- $(E) Building core object $*...
- $(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MD -MF .depend/$*.dep -MT $@
-
-test/%.o: test/%.cpp Makefile include/znc/Csocket.h
- @mkdir -p .depend test
- $(E) Building test object $*...
- $(Q)$(CXX) $(CXXFLAGS) $(GTEST_FLAGS) -c -o $@ $< -MD -MF .depend/$*.test.dep -MT $@
-
-test/gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc Makefile
- @mkdir -p .depend test
- $(E) Building test object gtest-all...
- $(Q)$(CXX) $(CXXFLAGS) $(GTEST_FLAGS) -I$(GTEST_DIR) -c -o $@ $< -MD -MF .depend/gtest-all.dep -MT $@
-
-test/gmock-all.o: $(GMOCK_DIR)/src/gmock-all.cc Makefile
- @mkdir -p .depend test
- $(E) Building test object gmock-all...
- $(Q)$(CXX) $(CXXFLAGS) $(GTEST_FLAGS) -I$(GMOCK_DIR) -c -o $@ $< -MD -MF .depend/gmock-all.dep -MT $@
-
-test/gmock-main.o: $(GMOCK_DIR)/src/gmock_main.cc Makefile
- @mkdir -p .depend test
- $(E) Building test object gmock-main...
- $(Q)$(CXX) $(CXXFLAGS) $(GTEST_FLAGS) -c -o $@ $< -MD -MF .depend/gmock-main.dep -MT $@
-
-# Qt fails under TSAN, so CXXFLAGS/LDFLAGS can't be used.
-test/Integration.o: test/integration/main.cpp Makefile
- @mkdir -p .depend test
- $(E) Building test object Integration...
- $(Q)g++ $(qt_CFLAGS) $(GTEST_FLAGS) -c -o $@ $< -MD -MF .depend/Integration.test.dep -MT $@ '-DZNC_BIN_DIR="$(bindir)"' '-DZNC_SRC_DIR="$(realpath $(srcdir))"'
-test/Int-gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc Makefile
- @mkdir -p .depend test
- $(E) Building test object Int-gtest-all...
- $(Q)g++ $(qt_CFLAGS) $(GTEST_FLAGS) -I$(GTEST_DIR) -c -o $@ $< -MD -MF .depend/Int-gtest-all.dep -MT $@
-test/Int-gmock-all.o: $(GMOCK_DIR)/src/gmock-all.cc Makefile
- @mkdir -p .depend test
- $(E) Building test object Int-gmock-all...
- $(Q)g++ $(qt_CFLAGS) $(GTEST_FLAGS) -I$(GMOCK_DIR) -c -o $@ $< -MD -MF .depend/Int-gmock-all.dep -MT $@
-test/Int-gmock-main.o: $(GMOCK_DIR)/src/gmock_main.cc Makefile
- @mkdir -p .depend test
- $(E) Building test object Int-gmock-main...
- $(Q)g++ $(qt_CFLAGS) $(GTEST_FLAGS) -c -o $@ $< -MD -MF .depend/Int-gmock-main.dep -MT $@
-
-ifneq "THIS_IS_NOT_TARBALL" ""
-# If git commit was changed since previous build, add a phony target to dependencies, forcing version.o to be recompiled
-# Nightlies have pregenerated version.cpp
-src/version.cpp: Makefile version.sh $(shell if [ x`cat .version_extra 2> /dev/null` != x`$(srcdir)/version.sh "$(GIT)" 3>&2 2> /dev/null` ]; then echo version_extra_recompile; fi)
- @mkdir -p .depend src
- $(E) Building source file version.cpp...
- $(Q)WRITE_OUTPUT=yes $(srcdir)/version.sh "$(GIT)" > .version_extra 2> /dev/null
-
-CLEAN += src/version.cpp
-endif
-
-CLEAN += src/Csocket.cpp include/znc/Csocket.h
-
-src/Csocket.cpp: third_party/Csocket/Csocket.cc
- @rm -f $@
- @mkdir -p src
- @sed -e 's:#include "Csocket.h":#include :' $^ > $@
-include/znc/Csocket.h: third_party/Csocket/Csocket.h
- @rm -f $@
- @mkdir -p include/znc
- @sed -e 's:#include "defines.h":#include :' $^ > $@
-third_party/Csocket/Csocket.h third_party/Csocket/Csocket.cc:
- @echo It looks like git submodules are not initialized. Run: git submodule update --init --recursive
- @exit 1
-
-znc.service: znc.service.in
- @sed -e "s:\@CMAKE_INSTALL_FULL_BINDIR\@:$(bindir):" $^ > $@
-
-CLEAN += znc.service
-
-install: znc znc.service $(LIBZNC)
- test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir)
- test -d $(DESTDIR)$(includedir)/znc || $(INSTALL) -d $(DESTDIR)$(includedir)/znc
- test -d $(DESTDIR)$(PKGCONFIGDIR) || $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
- test -d $(DESTDIR)$(MODDIR) || $(INSTALL) -d $(DESTDIR)$(MODDIR)
- test -d $(DESTDIR)$(DATADIR) || $(INSTALL) -d $(DESTDIR)$(DATADIR)
- cp -R $(srcdir)/webskins $(DESTDIR)$(DATADIR)
- find $(DESTDIR)$(DATADIR)/webskins -type d -exec chmod 0755 '{}' \;
- find $(DESTDIR)$(DATADIR)/webskins -type f -exec chmod 0644 '{}' \;
- $(INSTALL_PROGRAM) znc $(DESTDIR)$(bindir)
- $(INSTALL_SCRIPT) znc-buildmod $(DESTDIR)$(bindir)
- $(INSTALL_DATA) $(srcdir)/include/znc/*.h $(DESTDIR)$(includedir)/znc
- $(INSTALL_DATA) include/znc/*.h $(DESTDIR)$(includedir)/znc
- $(INSTALL_DATA) znc.pc $(DESTDIR)$(PKGCONFIGDIR)
- @$(MAKE) -C modules install DESTDIR=$(DESTDIR);
- if test -n "$(LIBZNC)"; then \
- test -d $(DESTDIR)$(LIBZNCDIR) || $(INSTALL) -d $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
- $(INSTALL_PROGRAM) $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
- $(INSTALL_PROGRAM) libznc.dll.a $(DESTDIR)$(libdir) || exit 1 ; \
- fi
- @$(MAKE) -C man install DESTDIR=$(DESTDIR)
- @HAVE_SYSTEMD_TRUE@test -d $(DESTDIR)$(systemdsystemunitdir) || $(INSTALL) -d $(DESTDIR)$(systemdsystemunitdir)
- @HAVE_SYSTEMD_TRUE@$(INSTALL_DATA) $(srcdir)/znc.service $(DESTDIR)$(systemdsystemunitdir)
- @echo ""
- @echo "******************************************************************"
- @echo " ZNC was successfully installed."
- @echo " You can use '$(bindir)/znc --makeconf'"
- @echo " to generate a config file."
- @echo ""
- @echo " If you need help with using ZNC, please visit our wiki at:"
- @echo " https://znc.in"
-
-uninstall:
- rm $(DESTDIR)$(bindir)/znc
- rm $(DESTDIR)$(bindir)/znc-buildmod
- rm $(DESTDIR)$(includedir)/znc/*.h
- rm $(DESTDIR)$(PKGCONFIGDIR)/znc.pc
- rm -rf $(DESTDIR)$(DATADIR)/webskins
- if test -n "$(LIBZNC)"; then \
- rm $(DESTDIR)$(LIBZNCDIR)/$(LIBZNC) || exit 1 ; \
- rmdir $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
- fi
- @$(MAKE) -C man uninstall DESTDIR=$(DESTDIR)
- @if test -n "modules"; then \
- $(MAKE) -C modules uninstall DESTDIR=$(DESTDIR); \
- fi
- rmdir $(DESTDIR)$(bindir)
- rmdir $(DESTDIR)$(includedir)/znc
- rmdir $(DESTDIR)$(PKGCONFIGDIR)
- @echo "Successfully uninstalled, but empty directories were left behind"
-
-test: unittest
- $(Q)./unittest
-
-# This test uses files at /lib/znc, which is less than ideal, especially from build scripts of distros.
-# That's why it's a separate make target.
-test2: inttest
- $(Q)./inttest
-
--include $(wildcard .depend/*.dep)
diff --git a/NOTICE b/NOTICE
index c06d08d3..e08eeaa5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -16,6 +16,7 @@ ZNC includes code from jQuery UI (http://jqueryui.com/), licensed under the MIT
ZNC includes code from Selectize (http://brianreavis.github.io/selectize.js/), licensed under the Apache License 2.0.
ZNC includes modified code from CMakeFindFrameworks.cmake by Kitware, Inc., licensed under BSD License.
ZNC includes modified code from TestLargeFiles.cmake, licensed under Boost Software License, Version 1.0.
+ZNC includes code from cctz (https://github.com/google/cctz), licensed under the Apache License 2.0.
ZNC is developed by these people:
diff --git a/README.md b/README.md
index e06df555..5330ee9a 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
-# [](https://znc.in) - An advanced IRC bouncer
+# [](https://znc.in) - An advanced IRC bouncer
-[](https://travis-ci.org/znc/znc)
+[](https://github.com/znc/znc/actions/workflows/build.yml)
[](https://jenkins.znc.in/job/znc/job/znc/job/master/)
[](https://ci.appveyor.com/project/DarthGandalf/znc/branch/master)
-[](https://www.bountysource.com/trackers/1759-znc?utm_source=1759&utm_medium=shield&utm_campaign=TRACKER_BADGE)
[](https://codecov.io/gh/znc/znc)
-[](https://scan.coverity.com/projects/znc-coverity)
## Table of contents
@@ -26,10 +24,8 @@ Core:
* GNU make
* pkg-config
-* GCC 4.7 or clang 3.2
-* Either of:
- * autoconf and automake (but only if building from git, not from tarball)
- * CMake
+* GCC 8 or clang 5
+* CMake 3.13
## Optional Requirements
@@ -43,8 +39,8 @@ modperl:
* SWIG if building from git
modpython:
-* python and its bundled libpython
-* perl is required
+* python 3.4+ and its bundled libpython
+* perl is a build dependency
* macOS: Python from Homebrew is preferred over system version
* SWIG if building from git
@@ -54,47 +50,37 @@ cyrusauth:
Character Encodings:
* To get proper character encoding and charsets install ICU (`libicu4-dev`)
+I18N (UI translation):
+* Boost.Locale
+* gettext is a build dependency
+
+Argon2 password hash:
+* libargon2
+
## Installing ZNC
-Currently there are 2 build systems in place: CMake and `./configure`.
-`./configure` will eventually be removed.
-There is also `configure.sh` which should make migration to CMake easier:
-it accepts the same parameters as `./configure`,
-but calls CMake with CMake-style parameters.
-
-### Installing with CMake
-
Installation from source code is performed using the CMake toolchain.
```shell
-cmake .
+mkdir build
+cd build
+cmake ..
make
make install
```
You can use `cmake-gui` or `ccmake` for more interactiveness.
+There is also `configure.sh` which should make migration to CMake easier:
+it accepts the same parameters as old `./configure`,
+but calls CMake with CMake-style parameters.
+
Note for FreeBSD users:
By default base OpenSSL is selected.
If you want the one from ports, use `-DOPENSSL_ROOT_DIR=/usr/local`.
For troubleshooting, `cmake --system-information` will show you details.
-### Installing with `./configure`
-
-Installation from source code is performed using the `automake` toolchain.
-If you are building from git, you will need to run `./autogen.sh` first to
-produce the `configure` script.
-
-```shell
-./configure
-make
-make install
-```
-
-You can use `./configure --help` if you want to get a list of options, though
-the defaults should be suiting most needs.
-
## Setting up znc.conf
For setting up a configuration file in `~/.znc` you can simply do
@@ -152,7 +138,7 @@ These directories are also in there:
- moddata - Global modules save their settings here.
(e.g. webadmin saves the current skin name in here)
- users - This is per-user data and mainly contains just a moddata
- directory.
+ directory and a directory for each network configured.
## ZNC's config file
@@ -188,9 +174,8 @@ Python modules are loaded through the global module
## Further information
-Please visit https://znc.in/ or #znc on freenode if you still have questions:
-- [freenode webchat](https://webchat.freenode.net/?nick=znc_....&channels=znc)
-- [ircs://irc.freenode.net:6697/znc](ircs://irc.freenode.net:6697/znc)
+Please visit https://znc.in/ or #znc on Libera.Chat if you still have questions:
+- [ircs://irc.libera.chat:6697/#znc](ircs://irc.libera.chat:6697/#znc)
You can get the latest development version with git:
`git clone https://github.com/znc/znc.git --recursive`
diff --git a/TRANSLATORS.md b/TRANSLATORS.md
new file mode 100644
index 00000000..74f0da3c
--- /dev/null
+++ b/TRANSLATORS.md
@@ -0,0 +1,52 @@
+These people helped translating ZNC to various languages:
+
+* Alcahest ([X] Alcahest)
+* Altay
+* aycanuAydemir
+* bashgeek (Daniel)
+* CaPaCuL
+* casmo (Casper)
+* ChaosEngine (Andrzej Pauli)
+* cirinho (Ciro Moniz)
+* CJSStryker
+* Danit
+* DarthGandalf
+* dgw
+* Dreiundachzig
+* Dremski
+* eggoez (Baguz Ach)
+* eleanorsilly (ellie is not coding in the slightest)
+* freonesuka (Андрей Вальтер)
+* gremax
+* hypech
+* JakaMedia (Jaka Media Teknologi)
+* Jay2k1
+* kloun (Victor Kukshiev)
+* kumanoff
+* leon-th (Leon T.)
+* LiteHell
+* lorenzosu
+* M0onshadow (Maelan)
+* MikkelDK
+* mkgeeky (mkgeeky)
+* moonlightzzz (moonlightz)
+* natinaum (natinaum)
+* PauloHeaven (Paul)
+* peterstanke (MAGIC)
+* psychon
+* remhaze
+* shillos5 (Nicholas Kyriakides)
+* simos (filippo.cortigiani)
+* sukien
+* SunOS
+* tojestzart (tojestzart)
+* Un1matr1x (Falk Seidel)
+* unavailable (style)
+* Vimart
+* Wollino
+* Xaris_ (Xaris)
+* xAtlas (Atlas)
+* Xinayder (Alexandre Oliveira)
+* Zarthus (Jos Ahrens)
+
+Generated from https://crowdin.com/project/znc-bouncer
diff --git a/ZNCConfig.cmake.in b/ZNCConfig.cmake.in
index c6108e49..660895bd 100644
--- a/ZNCConfig.cmake.in
+++ b/ZNCConfig.cmake.in
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2016 ZNC, see the NOTICE file for details.
+# Copyright (C) 2004-2025 ZNC, see the NOTICE file for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +14,13 @@
# limitations under the License.
#
-include("${CMAKE_CURRENT_LIST_DIR}/znc.cmake")
+include(CMakeFindDependencyMacro)
+include("${CMAKE_CURRENT_LIST_DIR}/CMakeFindDependencyMacroPC.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/use_homebrew.cmake")
+@ZNC_CMAKE_FIND_DEPS@
+
+include("${CMAKE_CURRENT_LIST_DIR}/znc_internal.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/znc_public.cmake")
include(CMakeParseArguments)
# For some reason cygwin fails to build modules if Threads::Threads
@@ -36,16 +42,12 @@ endif()
function(znc_setup_module)
cmake_parse_arguments(znc_mod "" "TARGET;NAME" "" ${ARGN})
set_target_properties("${znc_mod_TARGET}" PROPERTIES
- CXX_STANDARD 11
- CXX_STANDARD_REQUIRED true
OUTPUT_NAME "${znc_mod_NAME}"
PREFIX ""
SUFFIX ".so"
NO_SONAME true
- CXX_VISIBILITY_PRESET "hidden"
- COMPILE_DEFINITIONS "znc_export_lib_EXPORTS")
- set(znc_link "@znc_link@")
- target_link_libraries("${znc_mod_TARGET}" PUBLIC "znc_internal_${znc_link}")
+ CXX_VISIBILITY_PRESET "hidden")
+ target_link_libraries("${znc_mod_TARGET}" PRIVATE ZNC::ZNC)
endfunction()
message(STATUS "Found ZNC @ZNC_VERSION@")
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 85e17395..00000000
--- a/autogen.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-# This is based on various examples which can be found everywhere.
-set -e
-
-FLAGS=${FLAGS--Wall}
-ACLOCAL=${ACLOCAL-aclocal}
-AUTOHEADER=${AUTOHEADER-autoheader}
-AUTOCONF=${AUTOCONF-autoconf}
-AUTOMAKE=${AUTOMAKE-automake}
-ACLOCAL_FLAGS="${ACLOCAL_FLAGS--I m4} ${FLAGS}"
-AUTOHEADER_FLAGS="${AUTOHEADER_FLAGS} ${FLAGS}"
-AUTOCONF_FLAGS="${AUTOCONF_FLAGS} ${FLAGS}"
-AUTOMAKE_FLAGS="${AUTOMAKE_FLAGS---add-missing} ${FLAGS}"
-
-die() {
- echo "$@"
- exit 1
-}
-do_cmd() {
- echo "Running '$@'"
- $@
-}
-
-test -f configure.ac || die "No configure.ac found."
-which pkg-config > /dev/null || die "ERROR: pkg-config not found. Install pkg-config and run $0 again"
-
-# Generate aclocal.m4 for use by autoconf
-do_cmd $ACLOCAL $ACLOCAL_FLAGS
-# Generate zncconfig.h.in for configure
-do_cmd $AUTOHEADER $AUTOHEADER_FLAGS
-# Generate configure
-do_cmd $AUTOCONF $AUTOCONF_FLAGS
-
-# Copy config.sub, config.guess, install.sh, ...
-# This will complain that we don't use automake, let's just ignore that
-do_cmd $AUTOMAKE $AUTOMAKE_FLAGS || true
-test -f config.guess -a -f config.sub -a -f install-sh ||
- die "Automake didn't install config.guess, config.sub and install-sh!"
-
-echo "(Yes, automake is supposed to fail, ignore that)"
-echo
-
-echo "You may now run ./configure."
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 120000
index 5347ab2e..00000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1 +0,0 @@
-autogen.sh
\ No newline at end of file
diff --git a/cmake/CMakeFindDependencyMacroPC.cmake b/cmake/CMakeFindDependencyMacroPC.cmake
new file mode 100644
index 00000000..9857838b
--- /dev/null
+++ b/cmake/CMakeFindDependencyMacroPC.cmake
@@ -0,0 +1,101 @@
+# This is directly based on CMake's CMakeFindDependencyMacro from 3.26.5, the only change is that it uses pkg_check_modules instead of find_package
+
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+CMakeFindDependencyMacro
+------------------------
+
+.. command:: find_dependency
+
+ The ``find_dependency()`` macro wraps a :command:`find_package` call for
+ a package dependency::
+
+ find_dependency( [...])
+
+ It is designed to be used in a
+ :ref:`Package Configuration File `
+ (``Config.cmake``). ``find_dependency`` forwards the correct
+ parameters for ``QUIET`` and ``REQUIRED`` which were passed to
+ the original :command:`find_package` call. Any additional arguments
+ specified are forwarded to :command:`find_package`.
+
+ If the dependency could not be found it sets an informative diagnostic
+ message and calls :command:`return` to end processing of the calling
+ package configuration file and return to the :command:`find_package`
+ command that loaded it.
+
+ .. note::
+
+ The call to :command:`return` makes this macro unsuitable to call
+ from :ref:`Find Modules`.
+
+Package Dependency Search Optimizations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If ``find_dependency`` is called with arguments identical to a previous
+call in the same directory, perhaps due to diamond-shaped package
+dependencies, the underlying call to :command:`find_package` is optimized
+out. This optimization is important to support large package dependency
+graphs while avoiding a combinatorial explosion of repeated searches.
+However, the heuristic cannot account for ambient variables that
+affect package behavior, such as ``_USE_STATIC_LIBS``,
+offered by some packages. Therefore package configuration files should
+avoid setting such variables before their calls to ``find_dependency``.
+
+.. versionchanged:: 3.15
+ Previously, the underlying call to :command:`find_package` was always
+ optimized out if the package had already been found. CMake 3.15
+ removed the optimization to support cases in which ``find_dependency``
+ call arguments request different components.
+
+.. versionchanged:: 3.26
+ The pre-3.15 optimization was restored, but with the above-described
+ heuristic to account for varying ``find_dependency`` call arguments.
+
+#]=======================================================================]
+
+macro(find_dependency_pc dep)
+find_dependency(PkgConfig)
+ string(SHA256 cmake_fd_call_hash "${dep};${ARGN};${${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED}")
+ if(_CMAKE_${dep}_${cmake_fd_call_hash}_FOUND)
+ unset(cmake_fd_call_hash)
+ else()
+ list(APPEND _CMAKE_${dep}_HASH_STACK ${cmake_fd_call_hash})
+ set(cmake_fd_quiet_arg)
+ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
+ set(cmake_fd_quiet_arg QUIET)
+ endif()
+ set(cmake_fd_required_arg)
+ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
+ set(cmake_fd_required_arg REQUIRED)
+ endif()
+
+ get_property(cmake_fd_alreadyTransitive GLOBAL PROPERTY
+ _CMAKE_${dep}_TRANSITIVE_DEPENDENCY
+ )
+
+ pkg_check_modules(${dep}
+ ${cmake_fd_quiet_arg}
+ ${cmake_fd_required_arg}
+ IMPORTED_TARGET ${ARGN}
+ )
+ list(POP_BACK _CMAKE_${dep}_HASH_STACK cmake_fd_call_hash)
+ set("_CMAKE_${dep}_${cmake_fd_call_hash}_FOUND" "${${dep}_FOUND}")
+
+ if(NOT DEFINED cmake_fd_alreadyTransitive OR cmake_fd_alreadyTransitive)
+ set_property(GLOBAL PROPERTY _CMAKE_${dep}_TRANSITIVE_DEPENDENCY TRUE)
+ endif()
+
+ unset(cmake_fd_alreadyTransitive)
+ unset(cmake_fd_call_hash)
+ unset(cmake_fd_quiet_arg)
+ unset(cmake_fd_required_arg)
+ if (NOT ${dep}_FOUND)
+ set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "${CMAKE_FIND_PACKAGE_NAME} could not be found because dependency ${dep} could not be found.")
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND False)
+ return()
+ endif()
+ endif()
+endmacro()
diff --git a/cmake/FindPerlLibs.cmake b/cmake/FindPerlLibs.cmake
index f89b31bd..2f2a8cd1 100644
--- a/cmake/FindPerlLibs.cmake
+++ b/cmake/FindPerlLibs.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2017 ZNC, see the NOTICE file for details.
+# Copyright (C) 2004-2025 ZNC, see the NOTICE file for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/cmake/TestCXX11.cmake b/cmake/TestCXX17.cmake
similarity index 52%
rename from cmake/TestCXX11.cmake
rename to cmake/TestCXX17.cmake
index 5147e2ea..795e547f 100644
--- a/cmake/TestCXX11.cmake
+++ b/cmake/TestCXX17.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2017 ZNC, see the NOTICE file for details.
+# Copyright (C) 2004-2025 ZNC, see the NOTICE file for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,26 +14,26 @@
# limitations under the License.
#
-if(NOT DEFINED cxx11check)
- message(STATUS "Checking for C++11 support")
- get_filename_component(_CXX11Check_dir "${CMAKE_CURRENT_LIST_FILE}"
+if(NOT DEFINED cxx17check)
+ message(STATUS "Checking for C++17 support")
+ get_filename_component(_CXX17Check_dir "${CMAKE_CURRENT_LIST_FILE}"
DIRECTORY)
- try_compile(cxx11_supported
- "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cxx11check"
- "${_CXX11Check_dir}/cxx11check" cxx11check
- OUTPUT_VARIABLE _CXX11Check_tryout)
- if(cxx11_supported)
- message(STATUS "Checking for C++11 support - supported")
- SET(cxx11check 1 CACHE INTERNAL "C++11 support")
+ try_compile(cxx17_supported
+ "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cxx17check"
+ "${_CXX17Check_dir}/cxx17check" cxx17check
+ OUTPUT_VARIABLE _CXX17Check_tryout)
+ if(cxx17_supported)
+ message(STATUS "Checking for C++17 support - supported")
+ SET(cxx17check 1 CACHE INTERNAL "C++17 support")
file(APPEND
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log"
- "Output of C++11 check:\n${_CXX11Check_tryout}\n")
+ "Output of C++17 check:\n${_CXX17Check_tryout}\n")
else()
file(APPEND
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log"
- "Error in C++11 check:\n${_CXX11Check_tryout}\n")
- message(STATUS "Checking for C++11 support - not supported")
+ "Error in C++17 check:\n${_CXX17Check_tryout}\n")
+ message(STATUS "Checking for C++17 support - not supported")
message(FATAL_ERROR " Upgrade your compiler.\n"
- " GCC 4.7+ and Clang 3.2+ are known to work.")
+ " GCC 8+ and Clang 5+ should work.")
endif()
endif()
diff --git a/cmake/copy_csocket.cmake b/cmake/copy_csocket.cmake
index df48c93b..380e0359 100644
--- a/cmake/copy_csocket.cmake
+++ b/cmake/copy_csocket.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2017 ZNC, see the NOTICE file for details.
+# Copyright (C) 2004-2025 ZNC, see the NOTICE file for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/cmake/copy_csocket_cmd.cmake b/cmake/copy_csocket_cmd.cmake
index fc4f250c..fa83eeb3 100644
--- a/cmake/copy_csocket_cmd.cmake
+++ b/cmake/copy_csocket_cmd.cmake
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2016 ZNC, see the NOTICE file for details.
+# Copyright (C) 2004-2025 ZNC, see the NOTICE file for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/cmake/cxx11check/CMakeLists.txt b/cmake/cxx17check/CMakeLists.txt
similarity index 80%
rename from cmake/cxx11check/CMakeLists.txt
rename to cmake/cxx17check/CMakeLists.txt
index 651dfe64..5985f6b5 100644
--- a/cmake/cxx11check/CMakeLists.txt
+++ b/cmake/cxx17check/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2017 ZNC, see the NOTICE file for details.
+# Copyright (C) 2004-2025 ZNC, see the NOTICE file for details.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
# limitations under the License.
#
-cmake_minimum_required(VERSION 3.0)
-project(cxx11check)
+cmake_minimum_required(VERSION 3.13)
+project(cxx11check LANGUAGES CXX)
set(CMAKE_VERBOSE_MAKEFILE true)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED true)
add_executable(main main.cpp)
diff --git a/cmake/cxx11check/main.cpp b/cmake/cxx17check/main.cpp
similarity index 90%
rename from cmake/cxx11check/main.cpp
rename to cmake/cxx17check/main.cpp
index 376ed5d6..3e704c31 100644
--- a/cmake/cxx11check/main.cpp
+++ b/cmake/cxx17check/main.cpp
@@ -10,6 +10,8 @@
// and this notice are preserved. This file is offered as-is, without any
// warranty.
+#include