Skip to content

Commit

Permalink
Merge branch 'main' into coverity
Browse files Browse the repository at this point in the history
  • Loading branch information
sreimers committed Jan 3, 2024
2 parents 34e66c7 + 6799654 commit 78ed46a
Show file tree
Hide file tree
Showing 40 changed files with 383 additions and 211 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/abi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: 'v3.6.0'
ref: 'v3.7.0'
path: old

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: current

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "build openssl"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
CMAKE_GENERATOR: Ninja

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: openssl path macos
if: ${{ runner.os == 'macOS' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: fix flaky azure mirrors
if: ${{ runner.os == 'Linux' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install OpenSSL
if: ${{ matrix.config.openssl }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
CMAKE_GENERATOR: Ninja

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: fix flaky azure mirrors
if: ${{ runner.os == 'Linux' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Prepare
run: cmake -B ${{github.workspace}}/build
- uses: vapier/coverity-scan-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
CMAKE_GENERATOR: Ninja

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install devel tools
run: |
yum -y install gcc clang cmake make openssl-devel zlib-devel ninja-build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
CMAKE_GENERATOR: Ninja

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Test in FreeBSD
id: test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: ccheck
run: |
wget "https://raw.githubusercontent.com/baresip/baresip/main/test/ccheck.py"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
run: |
sudo apt-get update && sudo apt-get install -y mingw-w64 ninja-build
- uses: actions/checkout@v3 # needed for pr checkout
- uses: actions/checkout@v4 # needed for pr checkout

- uses: sreimers/[email protected]
with:
name: baresip-win32
repo: https://github.com/baresip/baresip-win32
secret: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: baresip-win32/re

Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
needs: MinGW-w64-build

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v2
- uses: sreimers/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/musl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
CMAKE_GENERATOR: Ninja

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install devel tools
run: |
apk add musl-dev git cmake gcc make binutils openssl-dev linux-headers zlib-dev ninja
apk add musl-dev git cmake gcc g++ make binutils openssl-dev linux-headers zlib-dev ninja
- name: make
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sanitizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
ASAN_OPTIONS: fast_unwind_on_malloc=0

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: fix flaky azure mirrors
if: ${{ runner.os == 'Linux' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
SONAR_SERVER_URL: "https://sonarcloud.io"
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
OPENSSL_ROOT_DIR: "assets/${{ matrix.ssl }}"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: fix flaky azure mirrors
if: ${{ runner.os == 'Linux' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/strict-c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
CMAKE_GENERATOR: Ninja

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: fix flaky azure mirrors
if: ${{ runner.os == 'Linux' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/valgrind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
CMAKE_GENERATOR: Ninja

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: fix flaky azure mirrors
if: ${{ runner.os == 'Linux' }}
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,30 @@ All notable changes to libre will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [v3.8.0] - 2023-12-27

## What's Changed
* Update README.md by @alfredh in https://github.com/baresip/re/pull/1013
* rem/aufile: aufile_get_length use aufmt_sample_size by @larsimmisch in https://github.com/baresip/re/pull/1011
* rem/aufile: test and fix aufile_set_position nread by @larsimmisch in https://github.com/baresip/re/pull/1010
* ci/ssl: bump assets release by @sreimers in https://github.com/baresip/re/pull/1014
* readme: update supported openssl versions by @sreimers in https://github.com/baresip/re/pull/1015
* ci: upgrade android to openssl 3.2.0 by @alfredh in https://github.com/baresip/re/pull/1017
* sipsess/connect: don't create a dialog for 100 responses by @maximilianfridrich in https://github.com/baresip/re/pull/1018
* aubuf: fix build with re_trace_event by @cspiel1 in https://github.com/baresip/re/pull/1019
* trace: fix coverity warnings by @alfredh in https://github.com/baresip/re/pull/1024
* aumix: fix coverity defect in destructor by @alfredh in https://github.com/baresip/re/pull/1025
* main: fix doxygen comment by @alfredh in https://github.com/baresip/re/pull/1026
* connect: do not enforce Contact header in 1XX responses with To tag by @maximilianfridrich in https://github.com/baresip/re/pull/1028
* test/sipsess: test re-INVITE with wait for ACK by @cspiel1 in https://github.com/baresip/re/pull/1027
* dialog: fix rtags of forking INVITE by @maximilianfridrich in https://github.com/baresip/re/pull/1023
* cmake: add RE_LIBS config and add atomic check by @sreimers in https://github.com/baresip/re/pull/1029
* ci: use actions/checkout@v4 by @robert-scheck in https://github.com/baresip/re/pull/1031

**Full Changelog**: https://github.com/baresip/re/compare/v3.7.0...v3.8.0


## [v3.7.0] - 2023-11-06

## What's Changed
Expand Down
54 changes: 5 additions & 49 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
# Versioning
#

cmake_minimum_required(VERSION 3.13)
cmake_minimum_required(VERSION 3.14)

project(re
VERSION 3.7.0
VERSION 3.8.0
LANGUAGES C
HOMEPAGE_URL https://github.com/baresip/re
DESCRIPTION "Generic library for real-time communications"
)

set(PROJECT_SOVERSION 19) # bump if ABI breaks
set(PROJECT_SOVERSION 20) # bump if ABI breaks

# Pre-release identifier, comment out on a release
# Increment for breaking changes (dev2, dev3...)
Expand Down Expand Up @@ -607,50 +607,6 @@ if(USE_REM)
endif()


##############################################################################
#
# Linking LIBS
#

set(LINKLIBS Threads::Threads ${RESOLV_LIBRARY})

if(BACKTRACE_FOUND)
list(APPEND LINKLIBS ${Backtrace_LIBRARIES})
endif()

if(ZLIB_FOUND)
list(APPEND LINKLIBS ZLIB::ZLIB)
endif()

if(USE_OPENSSL)
list(APPEND LINKLIBS OpenSSL::SSL OpenSSL::Crypto)
endif()

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
list(APPEND LINKLIBS
"-framework SystemConfiguration" "-framework CoreFoundation"
)
endif()

if(WIN32)
list(APPEND LINKLIBS
qwave
iphlpapi
wsock32
ws2_32
dbghelp
)
else()
list(APPEND LINKLIBS m)
endif()

if(UNIX)
list(APPEND LINKLIBS
${CMAKE_DL_LIBS}
)
endif()


##############################################################################
#
# Main target object
Expand All @@ -675,7 +631,7 @@ target_include_directories(re-objs PRIVATE
if(LIBRE_BUILD_SHARED)
list(APPEND RE_INSTALL_TARGETS re-shared)
add_library(re-shared SHARED $<TARGET_OBJECTS:re-objs>)
target_link_libraries(re-shared PRIVATE ${LINKLIBS})
target_link_libraries(re-shared PRIVATE ${RE_LIBS})
set_target_properties(re-shared PROPERTIES VERSION
${PROJECT_SOVERSION}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
set_target_properties(re-shared PROPERTIES SOVERSION ${PROJECT_SOVERSION})
Expand All @@ -692,7 +648,7 @@ endif()
if(LIBRE_BUILD_STATIC)
list(APPEND RE_INSTALL_TARGETS re)
add_library(re STATIC $<TARGET_OBJECTS:re-objs>)
target_link_libraries(re PUBLIC ${LINKLIBS})
target_link_libraries(re PUBLIC ${RE_LIBS})
target_include_directories(re PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2020 - 2023, Baresip Foundation (https://github.com/baresip)
Copyright (c) 2010 - 2023, Alfred E. Heggestad
Copyright (C) 2020 - 2024, Baresip Foundation (https://github.com/baresip)
Copyright (c) 2010 - 2024, Alfred E. Heggestad
Copyright (c) 2010 - 2020, Richard Aas
Copyright (c) 2010 - 2020, Creytiv.com
All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ libre README
libre is a Generic library for real-time communications with async IO support.

- Copyright (C) 2010 - 2020 Creytiv.com
- Copyright (C) 2020 - 2023 Baresip Foundation (https://github.com/baresip)
- Copyright (C) 2020 - 2024 Baresip Foundation (https://github.com/baresip)

![Build](https://github.com/baresip/re/workflows/Build/badge.svg)
![ccheck](https://github.com/baresip/re/workflows/ccheck/badge.svg)
Expand Down
Loading

0 comments on commit 78ed46a

Please sign in to comment.