The branch, master has been updated via 6799f13 Bump version to 1.2.4 via a984d2e Rename CHANGELOG via e7a70b8 gitlab-ci: Add ubuntu runner via 2e862a0 gitlab-ci: Remove debian cross mips build via 2ba55b1 tests: Fix a compile warning on Ubuntu via 43578b9 tests: Fix a coverty warning in echo_srv from 7bced01 swrap: add support for SOCKET_WRAPPER_IPV4_NETWORK=10.53.57.0
https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6799f13f5f34f6feabeb08573da8c4c04ccc70a8 Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 23 09:47:32 2020 +0100 Bump version to 1.2.4 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit a984d2e5142b788aab8bf0dc158a063295eb8bcb Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 23 09:14:06 2020 +0100 Rename CHANGELOG Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit e7a70b862f497b262350e9e3eee8f458d1ead8fc Author: Andreas Schneider <a...@samba.org> Date: Tue Mar 24 08:44:20 2020 +0100 gitlab-ci: Add ubuntu runner Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 2e862a0bddb19e84bec689929a72260213c2357c Author: Andreas Schneider <a...@samba.org> Date: Tue Mar 24 08:54:59 2020 +0100 gitlab-ci: Remove debian cross mips build This isn't supported by Debian anymore. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 2ba55b1f7f4d476ef7ba85f3f171b6d0881096ab Author: Andreas Schneider <a...@samba.org> Date: Tue Mar 24 08:53:55 2020 +0100 tests: Fix a compile warning on Ubuntu Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 43578b9a28184086cbdef4a257db808e2992b162 Author: Andreas Schneider <a...@samba.org> Date: Mon Mar 23 09:13:20 2020 +0100 tests: Fix a coverty warning in echo_srv CID #288875 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci.yml | 44 +++++++++++++++++---------------------- ChangeLog => CHANGELOG | 5 +++++ CMakeLists.txt | 17 ++++++++------- tests/echo_srv.c | 4 +++- tests/test_fork_thread_deadlock.c | 4 +++- 5 files changed, 40 insertions(+), 34 deletions(-) rename ChangeLog => CHANGELOG (93%) Changeset truncated at 500 lines: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66855ca..a28377d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: CENTOS7_BUILD: buildenv-centos7 TUMBLEWEED_BUILD: buildenv-tumbleweed MINGW_BUILD: buildenv-mingw - DEBIAN_CROSS_BUILD: buildenv-debian-cross + UBUNTU_BUILD: buildenv-ubuntu centos7/x86_64: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS7_BUILD @@ -130,30 +130,6 @@ freebsd/x86_64: paths: - obj/ -.Debian.cross.template: &Debian_cross_template - stage: test - image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_CROSS_BUILD - script: - - build=$(dpkg-architecture -qDEB_HOST_GNU_TYPE) - - host="${CI_JOB_NAME#*.cross.}" - - mkdir -p obj && cd obj && cmake - -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-Debian-mips.cmake - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DUNIT_TESTING=ON .. && make -j$(nproc) && - ctest --output-on-failure - tags: - - shared - except: - - tags - artifacts: - expire_in: 1 week - when: on_failure - paths: - - obj/ - -Debian.cross.mips-linux-gnu: - <<: *Debian_cross_template - tumbleweed/x86_64/gcc: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$TUMBLEWEED_BUILD script: @@ -249,3 +225,21 @@ tumbleweed/helgrind: when: on_failure paths: - obj/ + +ubuntu/x86_64: + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$UBUNTU_BUILD + script: + - mkdir -p obj && cd obj && cmake + -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DPICKY_DEVELOPER=ON + -DUNIT_TESTING=ON .. && + make -j$(nproc) && ctest --output-on-failure + tags: + - shared + except: + - tags + artifacts: + expire_in: 1 week + when: on_failure + paths: + - obj/ diff --git a/ChangeLog b/CHANGELOG similarity index 93% rename from ChangeLog rename to CHANGELOG index 04a4245..bdb152d 100644 --- a/ChangeLog +++ b/CHANGELOG @@ -1,6 +1,11 @@ ChangeLog ========== +version 1.2.4 (released 2020-03-24) + * Added support for 10.53.57.0 network + * Added _{socket,close,connect,...} symbols on FreeBSD + * Fixed interaction with resolv_wrapper on FreeBSD + version 1.2.3 (released 2019-03-21) * Fixed missing NULL check for socket_wrapper_dir() * Fixes building in Samba source tree diff --git a/CMakeLists.txt b/CMakeLists.txt index ef14e57..db799ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,20 +11,23 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") include(DefineCMakeDefaults) include(DefineCompilerFlags) -project(socket_wrapper VERSION 1.2.3 LANGUAGES C) +project(socket_wrapper VERSION 1.2.4 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) -# SOVERSION scheme: CURRENT.AGE.REVISION +# SOVERSION scheme: MAJOR.MINOR.PATCH # If there was an incompatible interface change: -# Increment CURRENT. Set AGE and REVISION to 0 +# Increment MAJOR. Set MINOR and PATCH to 0 # If there was a compatible interface change: -# Increment AGE. Set REVISION to 0 +# Increment MINOR. Set PATCH to 0 # If the source code was changed, but there were no interface changes: -# Increment REVISION. -set(LIBRARY_VERSION "0.1.13") -set(LIBRARY_SOVERSION "0") +# Increment PATCH. +set(LIBRARY_VERSION_MAJOR 0) +set(LIBRARY_VERSION_MINOR 1) +set(LIBRARY_VERSION_PATCH 14) +set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") +set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR}) # add definitions include(DefinePlatformDefaults) diff --git a/tests/echo_srv.c b/tests/echo_srv.c index 01e3325..93778f2 100644 --- a/tests/echo_srv.c +++ b/tests/echo_srv.c @@ -920,7 +920,9 @@ int main(int argc, char **argv) } echo(sock, &opts); - close(sock); + if (sock >= 0) { + close(sock); + } if (opts.daemon && opts.pidfile != NULL) { unlink(opts.pidfile); diff --git a/tests/test_fork_thread_deadlock.c b/tests/test_fork_thread_deadlock.c index 7d4d4a7..de54d1e 100644 --- a/tests/test_fork_thread_deadlock.c +++ b/tests/test_fork_thread_deadlock.c @@ -45,8 +45,10 @@ static void test_swrap_signal_handler(int signum) { + ssize_t w; fprintf(stderr, "PID: %u, SIGNUM: %d\n", (unsigned int)getpid(), signum); - write(1, "DEADLOCK?\n", 10); + w = write(1, "DEADLOCK?\n", 10); + fprintf(stderr, "WRITE: %zu\n", w); } static void test_swrap_fork_pthread(void **state) -- Socket Wrapper Repository