merge upstream v1.5.7 (+6 master fixes) and feat: add SRTO_PERIODICNAKGATE (1.5.7+ceralive.2)

.github/workflows/abi.yml

@@ -47,13 +47,13 @@ jobs:
       run: |
         cd gitview_pr
         mkdir _build && cd _build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ../
+        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_BONDING=1 -DENABLE_PKTINFO=1 -DENABLE_MAXREXMITBW=1 ../
     - id: build
       name: Build and dump
       run: |
-        sudo apt install -y abi-dumper
-        sudo apt install -y tcl
-        cd gitview_pr/_build && cmake --build ./
+        sudo apt install -y abi-dumper abi-compliance-checker tcl
+        cd gitview_pr
+        cd _build && cmake --build ./
         make install DESTDIR=./installdir
         SRT_TAG_VERSION=v$(../scripts/get-build-version.tcl full)
         echo "SRT_TAG_VERSION=$SRT_TAG_VERSION" >> "$GITHUB_OUTPUT"
@@ -119,7 +119,7 @@ jobs:
         fi
         cd gitview_base
         mkdir _build && cd _build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ../
+        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DENABLE_BONDING=1 -DENABLE_PKTINFO=1 -DENABLE_MAXREXMITBW=1 ../
     - id: build_tag
       name: Build and dump
       if: ${{ success() }}
@@ -168,22 +168,30 @@ jobs:
         path: .
     - name: abi-check
       run: |
-        git clone https://github.com/lvc/abi-compliance-checker.git
-        #cd gitview_pr/submodules
-        #git submodule update --init abi-compliance-checker
-        cd abi-compliance-checker && sudo make install && cd ../
-        #cd ../..
+        sudo apt install -y abi-dumper abi-compliance-checker tcl
         echo "FILESYSTEM state before running abi-check at $PWD"
         ls -l
         sha256sum libsrt-base.dump
         sha256sum libsrt-pr.dump
-        abi-compliance-checker -l libsrt -old libsrt-base.dump -new libsrt-pr.dump
-        RES=$?
-        if (( RES != 0 )); then
-           echo "ABI/API Compatibility check failed with value $?"
-           exit $RES
+        RES=0
+        abi-compliance-checker -l libsrt -old libsrt-base.dump -new libsrt-pr.dump || RES=$?
+        # Flatten the report for download-preview
+        cd compat_reports
+        REPORT=$(find . -name *.html)
+        cp $REPORT compat_report.html
+        cd ..
+        if (( $RES != 0 )); then
+           echo "ABI/API Compatibility check failed with value $RES"
+           echo "RES=$RES" >>$GITHUB_ENV
+           exit 0
         fi
     - name: Download report
-      uses: actions/download-artifact@v8
+      uses: actions/upload-artifact@v7
       with:
-        path: compat_reports
+        name: abi-compliance-report
+        path: compat_reports/compat_report.html
+        archive: false
+    - name: Final result
+      run: |
+        echo "Final result: $RES"
+        exit $RES

.github/workflows/publish-release.yml

@@ -6,7 +6,7 @@ on:
       version:
         description: Debian package version
         required: true
-        default: 1.5.6+ceralive.1
+        default: 1.5.7+ceralive.2
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/runtime-package.yml

@@ -55,7 +55,7 @@ jobs:
                 CMAKE_CXX_COMPILER_LAUNCHER=ccache \
               packaging/build-deb.sh
               packaging/package-contract.sh
-              packaging/verify-runtime-replacement.sh dist/libsrt1.5-ceralive_1.5.6+ceralive.1_amd64.deb
+              packaging/verify-runtime-replacement.sh dist/libsrt1.5-ceralive_1.5.7+ceralive.2_amd64.deb
             '
       - name: Save ccache
         if: ${{ success() && github.event_name != 'pull_request' }}

.github/workflows/ubuntu-c++03.yml

@@ -38,14 +38,13 @@ jobs:
     - name: Set up ccache
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends ccache
+        sudo apt-get install -y --no-install-recommends ccache tcl cmake libssl-dev gdb
         ccache --max-size=200M
         ccache --zero-stats
     - name: configure
       run: |
-        sudo apt install -y tcl cmake libssl-dev gdb
         mkdir _build && cd _build
-        cmake ../ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DENABLE_STDCXX_SYNC=OFF -DUSE_CXX_STD=03 -DENABLE_ENCRYPTION=ON -DENABLE_UNITTESTS=ON -DENABLE_BONDING=${{ matrix.bonding }} -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON -DENABLE_CODE_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_LOGGING=${{ matrix.logging }}
+        cmake ../ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DENABLE_STDCXX_SYNC=OFF -DUSE_CXX_STD=03 -DENABLE_ENCRYPTION=ON -DENABLE_UNITTESTS=ON -DENABLE_BONDING=${{ matrix.bonding }} -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_LOGGING=${{ matrix.logging }}
     - name: build
       # That below is likely SonarQube remains, which was removed earlier.
       #run: cd _build && build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build .
@@ -56,7 +55,7 @@ jobs:
         ulimit -c unlimited
         cd _build && ctest --extra-verbose
         SUCCESS=$?
-        if [ -f core.test-srt ]; then gdb -batch ./test-srt -c core -ex bt -ex "info thread" -ex quit; else echo "NO CORE - NO CRY!"; fi;
+        if [ -f core.test-srt ]; then gdb -batch ./test-srt -c core.test-srt -ex bt -ex "info thread" -ex quit; else echo "NO CORE - NO CRY!"; fi;
         test $SUCCESS == 0;
     - name: Save ccache
       if: ${{ success() && github.event_name != 'pull_request' }}
@@ -67,7 +66,3 @@ jobs:
     - name: Show ccache statistics
       if: always()
       run: ccache --show-stats
-    - name: codecov
-      run: |
-        source ./scripts/collect-gcov.sh
-        bash <(curl -s https://codecov.io/bash)

.github/workflows/ubuntu-c++11.yml

@@ -36,10 +36,13 @@ jobs:
         restore-keys: srt-ccache-cxx11-${{ runner.os }}-${{ runner.arch }}-
     - name: prepare
       run: |
+        sudo apt update
         RUNON=${{ matrix.machine }}
         if [[ $RUNON == ubuntu-latest ]]; then
             sudo apt install -y gdb
         fi
+        sudo apt install -y tcl cmake
+        [[ $RUNON == ubuntu-24.04-arm ]] || sudo apt install libssl-dev
     - name: Set up ccache
       run: |
         sudo apt-get update
@@ -52,7 +55,7 @@ jobs:
         ENCRYPTION=ON
         [[ $RUNON == ubuntu-24.04-arm ]] && ENCRYPTION=OFF
         mkdir _build && cd _build
-        cmake ../ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DUSE_CXX_STD=11 -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=$ENCRYPTION -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON -DENABLE_CODE_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+        cmake ../ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DUSE_CXX_STD=11 -DENABLE_STDCXX_SYNC=ON -DENABLE_ENCRYPTION=$ENCRYPTION -DENABLE_UNITTESTS=ON -DENABLE_BONDING=ON -DENABLE_TESTING=ON -DENABLE_EXAMPLES=ON -DENABLE_DEBUG=ON -DENABLE_CODE_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
     - name: build
       run: cd _build && cmake --build .
     - name: test
@@ -61,7 +64,7 @@ jobs:
         ulimit -c unlimited
         cd _build && ctest --extra-verbose
         SUCCESS=$?
-        if [ -f core.test-srt ]; then gdb -batch ./test-srt -c core -ex bt -ex "info thread" -ex quit; else echo "NO CORE - NO CRY!"; fi;
+        if [ -f core.test-srt ]; then gdb -batch ./test-srt -c core.test-srt -ex bt -ex "info thread" -ex quit; else echo "NO CORE - NO CRY!"; fi;
         test $SUCCESS == 0;
     - name: Save ccache
       if: ${{ success() && github.event_name != 'pull_request' }}
@@ -73,6 +76,10 @@ jobs:
       if: always()
       run: ccache --show-stats
     - name: codecov
-      run: |
-        source ./scripts/collect-gcov.sh
-        bash <(curl -s https://codecov.io/bash)
+      uses: codecov/codecov-action@v4
+      with:
+          token: ${{ secrets.CODECOV_TOKEN }} 
+    # name: codecov
+    # run: |
+    #   ./scripts/codecov/update.sh
+    #   ./scripts/codecov/codecov upload-process ${CODECOV_TOKEN} --search-dir _build