Hello community, here is the log from the commit of package yder for openSUSE:Factory checked in at 2019-10-08 19:57:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yder (Old) and /work/SRC/openSUSE:Factory/.yder.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yder" Tue Oct 8 19:57:26 2019 rev:6 rq:735821 version:1.4.8 Changes: -------- --- /work/SRC/openSUSE:Factory/yder/yder.changes 2019-07-23 22:35:56.182989227 +0200 +++ /work/SRC/openSUSE:Factory/.yder.new.2352/yder.changes 2019-10-08 19:57:31.580270078 +0200 @@ -1,0 +2,6 @@ +Sat Oct 5 20:34:27 UTC 2019 - Martin Hauke <mar...@gmx.de> + +- Update to versin 1.4.8 + * Avoid running y_init_logs without closing between + +------------------------------------------------------------------- Old: ---- yder-1.4.7.tar.gz New: ---- yder-1.4.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yder.spec ++++++ --- /var/tmp/diff_new_pack.4sY9vl/_old 2019-10-08 19:57:32.444267491 +0200 +++ /var/tmp/diff_new_pack.4sY9vl/_new 2019-10-08 19:57:32.460267443 +0200 @@ -19,7 +19,7 @@ %define sover 1_4 Name: yder -Version: 1.4.7 +Version: 1.4.8 Release: 0 Summary: Logging library written in C License: LGPL-2.1-or-later ++++++ yder-1.4.7.tar.gz -> yder-1.4.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/.github/workflows/main.yml new/yder-1.4.8/.github/workflows/main.yml --- old/yder-1.4.7/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yder-1.4.8/.github/workflows/main.yml 2019-09-04 17:41:06.000000000 +0200 @@ -0,0 +1,26 @@ +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: install dependencies + run: | + sudo apt-get update + sudo apt-get install -y cmake pkg-config check libsubunit-dev cppcheck libsystemd-dev + - name: cppcheck + run: cppcheck --force --enable=warning,missingInclude --error-exitcode=1 . + - name: build + run: | + mkdir build + cd build + cmake -DBUILD_YDER_TESTING=on .. + make test package + sudo make install + sudo ldconfig + cd .. + make + make clean check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/.travis.yml new/yder-1.4.8/.travis.yml --- old/yder-1.4.7/.travis.yml 2019-07-09 16:17:28.000000000 +0200 +++ new/yder-1.4.8/.travis.yml 2019-09-04 17:41:06.000000000 +0200 @@ -35,6 +35,7 @@ - cmake -DBUILD_YDER_TESTING=on -DWITH_JOURNALD=off .. - make test package - sudo make install + - sudo ldconfig - cd ../ - make Y_DISABLE_JOURNALD=1 - make check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/CHANGELOG.md new/yder-1.4.8/CHANGELOG.md --- old/yder-1.4.7/CHANGELOG.md 2019-07-09 16:17:28.000000000 +0200 +++ new/yder-1.4.8/CHANGELOG.md 2019-09-04 17:41:06.000000000 +0200 @@ -1,5 +1,9 @@ # Yder Changelog +## 1.4.8 + +- Avoid running `y_init_logs` without closing between + ## 1.4.7 - Fix build for MacOSX (thanks JohnAZoidberg!) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/CMakeLists.txt new/yder-1.4.8/CMakeLists.txt --- old/yder-1.4.7/CMakeLists.txt 2019-07-09 16:17:28.000000000 +0200 +++ new/yder-1.4.8/CMakeLists.txt 2019-09-04 17:41:06.000000000 +0200 @@ -30,7 +30,7 @@ set(PROJECT_BUGREPORT_PATH "https://github.com/babelouest/yder/issues";) set(LIBRARY_VERSION_MAJOR "1") set(LIBRARY_VERSION_MINOR "4") -set(LIBRARY_VERSION_PATCH "7") +set(LIBRARY_VERSION_PATCH "8") set(PROJECT_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/src/Makefile new/yder-1.4.8/src/Makefile --- old/yder-1.4.7/src/Makefile 2019-07-09 16:17:28.000000000 +0200 +++ new/yder-1.4.8/src/Makefile 2019-09-04 17:41:06.000000000 +0200 @@ -30,10 +30,10 @@ PKGCONFIG_FILE=../libyder.pc PKGCONFIG_TEMPLATE=../libyder.pc.in CC=gcc -CFLAGS+=-c -fPIC -Wall -D_REENTRANT -I$(YDER_INCLUDE) $(ADDITIONALFLAGS) $(CPPFLAGS) +CFLAGS+=-c -fPIC -Wall -Werror -Wextra -D_REENTRANT -I$(YDER_INCLUDE) $(ADDITIONALFLAGS) $(CPPFLAGS) LIBS=-lc -lorcania $(ADDITIONALLIBS) OUTPUT=libyder.so -VERSION=1.4.7 +VERSION=1.4.8 SONAME = -soname ifeq ($(shell uname -s),Darwin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/src/yder.c new/yder-1.4.8/src/yder.c --- old/yder-1.4.7/src/yder.c 2019-07-09 16:17:28.000000000 +0200 +++ new/yder-1.4.8/src/yder.c 2019-09-04 17:41:06.000000000 +0200 @@ -212,11 +212,29 @@ } if (init_log_file != NULL) { - cur_log_file_path = init_log_file; + if (cur_log_file_path == NULL) { + cur_log_file_path = init_log_file; + } else { + // Logs have already been initialized, cancel + perror("Error - yder logs already initialized"); + return 0; + } } if (app_name != NULL) { - cur_app_name = o_strdup(app_name); + if (cur_app_name == NULL) { + cur_app_name = o_strdup(app_name); + } else { + // Logs have already been initialized, cancel + perror("Error - yder logs already initialized"); + return 0; + } + } + + if (init_mode == Y_LOG_MODE_FILE && !o_strlen(cur_log_file_path)) { + // Logs have already been initialized, cancel + perror("Error - log file path misssing"); + return 0; } if (cur_log_file_path != NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/test/Makefile new/yder-1.4.8/test/Makefile --- old/yder-1.4.7/test/Makefile 2019-07-09 16:17:28.000000000 +0200 +++ new/yder-1.4.8/test/Makefile 2019-09-04 17:41:06.000000000 +0200 @@ -37,6 +37,9 @@ $(CC) $(CFLAGS) yder_test.c -o yder_test $(LIBS) test_yder_test: libyder.so yder_test - -LD_LIBRARY_PATH=$(YDER_LOCATION):${LD_LIBRARY_PATH} ./yder_test + LD_LIBRARY_PATH=$(YDER_LOCATION):${LD_LIBRARY_PATH} ./yder_test test: test_yder_test + +memcheck: yder_test + LD_LIBRARY_PATH=$(YDER_LOCATION):${LD_LIBRARY_PATH} valgrind --tool=memcheck --leak-check=full --show-leak-kinds=all ./yder_test 2>valgrind.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.7/test/yder_test.c new/yder-1.4.8/test/yder_test.c --- old/yder-1.4.7/test/yder_test.c 2019-07-09 16:17:28.000000000 +0200 +++ new/yder-1.4.8/test/yder_test.c 2019-09-04 17:41:06.000000000 +0200 @@ -58,6 +58,8 @@ START_TEST(test_yder_init_error_file) { ck_assert_int_eq(y_init_logs("test_yder_file_fail", Y_LOG_MODE_FILE, Y_LOG_LEVEL_DEBUG, "/nope/nope", "second test"), 0); + ck_assert_int_eq(y_init_logs("test_yder_file_fail", Y_LOG_MODE_FILE, Y_LOG_LEVEL_DEBUG, "", "second test"), 0); + ck_assert_int_eq(y_init_logs("test_yder_file_fail", Y_LOG_MODE_FILE, Y_LOG_LEVEL_DEBUG, NULL, "second test"), 0); } END_TEST @@ -93,6 +95,32 @@ } END_TEST +START_TEST(test_yder_init_multiple_error) +{ + ck_assert_int_eq(y_init_logs("test_yder_console", Y_LOG_MODE_CONSOLE, Y_LOG_LEVEL_DEBUG, NULL, "first test"), 1); + ck_assert_int_eq(y_init_logs("test_yder_console", Y_LOG_MODE_CONSOLE, Y_LOG_LEVEL_DEBUG, NULL, "first test"), 0); + y_close_logs(); +} +END_TEST + +START_TEST(test_yder_init_multiple_ok) +{ + ck_assert_int_eq(y_init_logs("test_yder_console", Y_LOG_MODE_CONSOLE, Y_LOG_LEVEL_DEBUG, NULL, "first test"), 1); + ck_assert_int_eq(y_close_logs(), 1); + ck_assert_int_eq(y_init_logs("test_yder_console", Y_LOG_MODE_CONSOLE, Y_LOG_LEVEL_DEBUG, NULL, "first test"), 1); + ck_assert_int_eq(y_close_logs(), 1); +} +END_TEST + +START_TEST(test_yder_init_close_multiple) +{ + ck_assert_int_eq(y_close_logs(), 1); + ck_assert_int_eq(y_init_logs("test_yder_console", Y_LOG_MODE_CONSOLE, Y_LOG_LEVEL_DEBUG, NULL, "first test"), 1); + ck_assert_int_eq(y_close_logs(), 1); + ck_assert_int_eq(y_close_logs(), 1); +} +END_TEST + START_TEST(test_yder_level_debug) { ck_assert_int_eq(y_init_logs("test_yder_level_debug", Y_LOG_MODE_CALLBACK, Y_LOG_LEVEL_DEBUG, NULL, "test_yder_level_debug"), 1); @@ -205,6 +233,9 @@ tcase_add_test(tc_core, test_yder_init_syslog); tcase_add_test(tc_core, test_yder_init_journald); tcase_add_test(tc_core, test_yder_init_error_file); + tcase_add_test(tc_core, test_yder_init_multiple_error); + tcase_add_test(tc_core, test_yder_init_multiple_ok); + tcase_add_test(tc_core, test_yder_init_close_multiple); tcase_add_test(tc_core, test_yder_callback); tcase_add_test(tc_core, test_yder_level_debug); tcase_add_test(tc_core, test_yder_level_info);
