Merge branch 'master' into master-patched

Author: jeda

.appveyor.yml

@@ -18,7 +18,7 @@ install:
 build_script:
     - git submodule update --init
     - mkdir build
-    - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; ../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; 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"
@@ -27,4 +27,4 @@ build_script:
     - 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; env ZNC_QT_VER=5 make VERBOSE=1 inttest < /dev/null"

.ci/Jenkinsfile.crowdin

@@ -11,7 +11,7 @@ def upstream_user = 'znc'
 def upstream_repo = 'znc'
 def my_user = 'znc-jenkins'
 def my_repo = 'znc'
-def branches = ['master', '1.9.x']
+def branches = ['master', '1.10.x']
 
 def pr_mode = false
 
@@ -22,7 +22,8 @@ timestamps {
         step([$class: 'WsCleanup'])
       }
       def tasks = [:]
-      def crowdin_cli = "java -jar ${tool 'crowdin-cli'}/crowdin-cli.jar --config .ci/crowdin.yml"
+      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}"
@@ -43,18 +44,16 @@ timestamps {
               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}"
-                    // sh "$crowdin_cli upload translations --branch ${upstream_branch}"
-                    sh "$crowdin_cli download --branch ${upstream_branch}"
+                    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}"
                   }
-                }
-                sh 'LANG=C.UTF-8 find . -name "*.po" -exec msgfilter -i "{}" -o "{}.replacement" .ci/cleanup-po.pl ";"'
-                sh 'find . -name "*.po" -exec mv "{}.replacement" "{}" ";"'
-                withCredentials([string(credentialsId: 'fe727e3e-a8e0-4019-817f-6583c3c51ef7', variable: 'CROWDIN_API2_KEY')]) {
-                  def headers = [[maskValue: true, name: 'Authorization', value: "Bearer ${env.CROWDIN_API2_KEY}"], [maskValue: false, name: 'User-Agent', value: 'https://github.com/znc/znc/blob/master/.ci/Jenkinsfile.crowdin']]
+                  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'
               }
@@ -74,17 +73,18 @@ timestamps {
                   echo 'No changes found'
                   return
                 }
-                sh "git remote add my git@github.com:${my_user}/${my_repo}.git"
                 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"
                 }
-                // Create pull request if it doesn't exist yet
                 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}"

.ci/crowdin.yml

@@ -1,6 +1,7 @@
-project_identifier: znc-bouncer
+# https://crowdin.com/project/znc-bouncer
+project_id: 289533
 preserve_hierarchy: true
-api_key_env: CROWDIN_API_KEY
+api_token_env: CROWDIN_API_KEY
 base_path_env: CROWDIN_BASE_PATH
 
 files:

.codecov.yml

@@ -11,9 +11,9 @@ fixes:
 codecov:
   ci:
     # Cygwin fails integration test with --coverage enabled, I don't know why
-    - !appveyor
+    - "!appveyor"
     # FreeBSD doesn't support C++ coverage yet (can't find libprofile_rt.a)
-    - !jenkins.znc.in
+    - "!jenkins.znc.in"
 coverage:
   status:
     project:

.github/build.sh

@@ -6,7 +6,7 @@ ls -la
 cpanm --local-lib=~/perl5 local::lib
 eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
 cpanm --notest Devel::Cover::Report::Clover
-pip3 install --user coverage
+pip3 install --user --break-system-packages coverage
 export ZNC_MODPERL_COVERAGE=1
 #export ZNC_MODPYTHON_COVERAGE=1
 
@@ -32,22 +32,22 @@ sudo make install
 /usr/local/bin/znc --version
 
 # 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" PYTHONWARNINGS=error make VERBOSE=1 inttest
+env LLVM_PROFILE_FILE="$PWD/inttest.profraw.%p" ZNC_MODPERL_COVERAGE_OPTS="-db,$PWD/cover_db" PYTHONWARNINGS=error make VERBOSE=1 inttest
 ls -lRa
 
 ~/perl5/bin/cover --no-gcov --report=clover
 
 case "${CC:-gcc}" in
 	gcc)
-		lcov --directory . --capture --output-file lcov-coverage.txt
+		lcov --directory . --capture --output-file lcov-coverage.txt --ignore-errors mismatch
 		lcov --list lcov-coverage.txt
 		;;
 	clang)
 		if [[ x$(uname) == xDarwin ]]; then
 			export PATH=$PATH:/Library/Developer/CommandLineTools/usr/bin
 		fi
 		llvm-profdata merge unittest.profraw -o unittest.profdata
-		llvm-profdata merge inttest.profraw -o inttest.profdata
+		llvm-profdata merge inttest.profraw* -o inttest.profdata
 		llvm-cov show -show-line-counts-or-regions -instr-profile=unittest.profdata test/unittest_bin > 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

.github/ubuntu_deps.sh

@@ -1,4 +1,4 @@
 sudo apt-get update
-sudo apt-get install -y tcl-dev libsasl2-dev libicu-dev swig qtbase5-dev libboost-locale-dev libperl-dev libargon2-dev cpanminus gettext clang llvm lcov
+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
 

.github/workflows/build.yml

@@ -6,26 +6,26 @@ on:
 jobs:
   gcc:
     name: GCC
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
       - run: source .github/ubuntu_deps.sh
       - run: source .github/build.sh
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v5
         with:
           name: ${{ github.job }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: codecov debug results ${{ github.job }}
           path: "/tmp/codecov.*.gz"
 
   tarball:
     name: Tarball
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
       - run: source .github/ubuntu_deps.sh
@@ -36,68 +36,68 @@ jobs:
           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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: znc-tarball
           path: /tmp/znc-git*.tar.gz
           if-no-files-found: error
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v5
         with:
           name: ${{ github.job }}
 
   # can be removed when asan below is fixed
   clang:
     name: Clang
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       CXX: clang++
       CC: clang
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
       - run: source .github/ubuntu_deps.sh
       - run: source .github/build.sh
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v5
         with:
           name: ${{ github.job }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: codecov debug results ${{ github.job }}
           path: "/tmp/codecov.*.gz"
 
 
   #clang_asan:
     #name: Clang ASAN
-    #runs-on: ubuntu-20.04
+    #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
+      #- uses: actions/checkout@v5
         #with:
           #submodules: true
       #- run: source .github/ubuntu_deps.sh
       #- run: source .github/build.sh
-      #- uses: codecov/codecov-action@v3
+      #- uses: codecov/codecov-action@v5
 
   #clang_tsan:
     #name: Clang TSAN
-    #runs-on: ubuntu-20.04
+    #runs-on: ubuntu-24.04
     #env:
       #CXX: clang++
       #CC: clang
       #CXXFLAGS: "-fsanitize=thread -O1 -fPIE"
       #LDFLAGS: "-fsanitize=thread"
     #steps:
-      #- uses: actions/checkout@v4
+      #- uses: actions/checkout@v5
         #with:
           #submodules: true
       #- run: source .github/ubuntu_deps.sh
       #- run: source .github/build.sh
-      #- uses: codecov/codecov-action@v3
+      #- uses: codecov/codecov-action@v5
 
       # TODO: enable
       #CXXFLAGS: "-fsanitize=memory -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize-memory-track-origins"
@@ -114,14 +114,17 @@ jobs:
       CXX: clang++
       CC: clang
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
       - run: |
           brew update
-          brew install icu4c qt5 gettext pkg-config cpanminus boost
+          brew install icu4c qt6 gettext pkg-config cpanminus boost argon2 swig
       - run: source .github/build.sh
-      - uses: codecov/codecov-action@v3
+        env:
+          # https://github.com/znc/znc/issues/1937
+          GTEST_FILTER: "-*Modpython*:LanguagesTests/AllLanguages.ServerDependentCapInModule/1"
+      - uses: codecov/codecov-action@v5
 
   docker:
     name: Docker push
@@ -131,7 +134,7 @@ jobs:
       - tarball
       - clang
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
       - id: tagger
@@ -156,7 +159,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - uses: docker/build-push-action@v5
+      - uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.repository == 'znc/znc' && github.event_name == 'push' }}
@@ -170,7 +173,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
       - run: sudo apt-get update

.github/workflows/cifuzz.yml

@@ -20,7 +20,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/codeql.yml

@@ -2,7 +2,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ 'master', '1.6.x' ]
+    branches: [ 'master', '1.9.x' ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ 'master' ]
@@ -12,7 +12,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
@@ -25,17 +25,22 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: true
-    - run: source .github/ubuntu_deps.sh
+    - 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

.gitignore

@@ -1,5 +1,6 @@
 /man/*.gz
 .depend
+.cache/
 
 # Generated by autogen.sh
 /aclocal.m4
@@ -73,3 +74,10 @@ CMakeFiles/
 /CMakeCache.txt
 /install_manifest.txt
 /install_manifest_*.txt
+
+# OOT builds
+/build*
+
+# LSP
+.clangd/
+compile_commands.json