Hello community, here is the log from the commit of package yder for openSUSE:Factory checked in at 2019-07-23 22:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yder (Old) and /work/SRC/openSUSE:Factory/.yder.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yder" Tue Jul 23 22:35:55 2019 rev:5 rq:717663 version:1.4.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yder/yder.changes 2019-07-08 15:11:43.775385649 +0200 +++ /work/SRC/openSUSE:Factory/.yder.new.4126/yder.changes 2019-07-23 22:35:56.182989227 +0200 @@ -1,0 +2,9 @@ +Fri Jul 12 21:03:56 UTC 2019 - Martin Hauke <[email protected]> + +- Update to version 1.4.7 + * Clean build process + * Clean static variables if error initializing logs with file +- Drop not longer needed patch: + * yder-fix-build.patch + +------------------------------------------------------------------- Old: ---- yder-1.4.6.tar.gz yder-fix-build.patch New: ---- yder-1.4.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yder.spec ++++++ --- /var/tmp/diff_new_pack.ZZ7Gi3/_old 2019-07-23 22:35:56.762989108 +0200 +++ /var/tmp/diff_new_pack.ZZ7Gi3/_new 2019-07-23 22:35:56.762989108 +0200 @@ -19,14 +19,13 @@ %define sover 1_4 Name: yder -Version: 1.4.6 +Version: 1.4.7 Release: 0 Summary: Logging library written in C License: LGPL-2.1-or-later Group: Development/Languages/C and C++ URL: https://github.com/babelouest/yder Source: https://github.com/babelouest/yder/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: yder-fix-build.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -61,7 +60,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake \ ++++++ yder-1.4.6.tar.gz -> yder-1.4.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/.travis.yml new/yder-1.4.7/.travis.yml --- old/yder-1.4.6/.travis.yml 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/.travis.yml 2019-07-09 16:17:28.000000000 +0200 @@ -5,13 +5,27 @@ language: c addons: apt: - packages: [ libjansson-dev, check, libsubunit-dev, cppcheck ] + packages: [ check, libsubunit-dev, cppcheck, pkg-config ] matrix: include: - - os: linux + - env: LABEL=linux-gcc + os: linux compiler: gcc - - os: linux + - env: LABEL=linux-clang + os: linux compiler: clang + - env: LABEL=osx + os: osx + addons: + homebrew: + packages: + - check + - pkg-config + update: true + script: + - mkdir build && cd build + - cmake -DBUILD_YDER_TESTING=on -DWITH_JOURNALD=off .. + - make test - env: LABEL=cppcheck os: linux script: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/CHANGELOG.md new/yder-1.4.7/CHANGELOG.md --- old/yder-1.4.6/CHANGELOG.md 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/CHANGELOG.md 2019-07-09 16:17:28.000000000 +0200 @@ -1,5 +1,11 @@ # Yder Changelog +## 1.4.7 + +- Fix build for MacOSX (thanks JohnAZoidberg!) +- Clean build process +- Clean static variables if error initializing logs with file + ## 1.4.6 - Fix package dependencies in cmake script diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/CMakeLists.txt new/yder-1.4.7/CMakeLists.txt --- old/yder-1.4.6/CMakeLists.txt 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/CMakeLists.txt 2019-07-09 16:17:28.000000000 +0200 @@ -30,12 +30,12 @@ set(PROJECT_BUGREPORT_PATH "https://github.com/babelouest/yder/issues";) set(LIBRARY_VERSION_MAJOR "1") set(LIBRARY_VERSION_MINOR "4") -set(LIBRARY_VERSION_PATCH "6") +set(LIBRARY_VERSION_PATCH "7") set(PROJECT_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}") -set(ORCANIA_VERSION_REQUIRED "2.0.0") +set(ORCANIA_VERSION_REQUIRED "2.0.1") # cmake modules @@ -80,11 +80,10 @@ if (SYSTEMD_FOUND) set(SYSTEMD_LIBRARIES systemd) include_directories(${SYSTEMD_INCLUDE_DIRS}) - set(DISABLE_JOURNALD OFF) + set(Y_DISABLE_JOURNALD OFF) endif () else() - add_definitions(-DY_DISABLE_JOURNALD) - set(DISABLE_JOURNALD ON) + set(Y_DISABLE_JOURNALD ON) endif () # shared library @@ -101,8 +100,6 @@ set_target_properties(yder PROPERTIES SUFFIX "-${LIBRARY_VERSION_MAJOR}.dll") endif () -target_link_libraries(yder ${LIBS} ${ORCANIA_LIBRARIES} ${SYSTEMD_LIBRARIES}) - # static library option(BUILD_STATIC "Build static library." OFF) @@ -137,6 +134,8 @@ endif () endif () +target_link_libraries(yder ${LIBS} ${ORCANIA_LIBRARIES} ${SYSTEMD_LIBRARIES}) + if (WITH_JOURNALD) set(PKGCONF_REQ "") set(PKGCONF_REQ_PRIVATE "systemd, liborcania") @@ -158,7 +157,7 @@ include(FindCheck) find_package(Check) if (CHECK_FOUND) - if (NOT WIN32) + if (NOT WIN32 AND NOT APPLE) include(FindSubunit) find_package(Subunit REQUIRED) endif () @@ -168,10 +167,16 @@ set(CMAKE_CTEST_COMMAND ctest -V) set(TST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test) - set(LIBS yder ${LIBS} ${CHECK_LIBRARIES}) + set(LIBS yder ${LIBS} ${CHECK_LIBRARIES} ${ORCANIA_LIBRARIES}) if (NOT WIN32) find_package(Threads REQUIRED) - set(LIBS ${LIBS} ${SUBUNIT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m rt) + set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT} m) + endif () + if (NOT APPLE) + set(LIBS ${LIBS} rt) + endif () + if (NOT WIN32 AND NOT APPLE) + set(LIBS ${LIBS} ${SUBUNIT_LIBRARIES}) endif () set(TESTS yder_test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/include/yder-cfg.h.in new/yder-1.4.7/include/yder-cfg.h.in --- old/yder-1.4.6/include/yder-cfg.h.in 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/include/yder-cfg.h.in 2019-07-09 16:17:28.000000000 +0200 @@ -27,6 +27,6 @@ #define _YDER_CFG_H_ #define YDER_VERSION ${PROJECT_VERSION} -#cmakedefine DISABLE_JOURNALD +#cmakedefine Y_DISABLE_JOURNALD #endif /* _YDER_CFG_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/src/Makefile new/yder-1.4.7/src/Makefile --- old/yder-1.4.6/src/Makefile 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/src/Makefile 2019-07-09 16:17:28.000000000 +0200 @@ -33,7 +33,12 @@ CFLAGS+=-c -fPIC -Wall -D_REENTRANT -I$(YDER_INCLUDE) $(ADDITIONALFLAGS) $(CPPFLAGS) LIBS=-lc -lorcania $(ADDITIONALLIBS) OUTPUT=libyder.so -VERSION=1.4.6 +VERSION=1.4.7 + +SONAME = -soname +ifeq ($(shell uname -s),Darwin) + SONAME = -install_name +endif ifndef Y_DISABLE_JOURNALD DISABLE_JOURNALD=0 @@ -50,10 +55,10 @@ @sed -i -e 's/$${PROJECT_VERSION}/$(VERSION)/g' $(CONFIG_FILE) @if [ "$(DISABLE_JOURNALD)" = "1" ]; then \ echo "JOURNALD SUPPORT DISABLED"; \ - sed -i -e 's/\#cmakedefine DISABLE_JOURNALD/\#define Y_DISABLE_JOURNALD/g' $(CONFIG_FILE); \ + sed -i -e 's/\#cmakedefine Y_DISABLE_JOURNALD/\#define Y_DISABLE_JOURNALD/g' $(CONFIG_FILE); \ else \ echo "JOURNALD SUPPORT ENABLED"; \ - sed -i -e 's/\#cmakedefine DISABLE_JOURNALD/\/* #undef Y_DISABLE_JOURNALD *\//g' $(CONFIG_FILE); \ + sed -i -e 's/\#cmakedefine Y_DISABLE_JOURNALD/\/* #undef Y_DISABLE_JOURNALD *\//g' $(CONFIG_FILE); \ fi $(PKGCONFIG_FILE): @@ -70,7 +75,7 @@ @sed -i -e 's/@PKGCONF_REQ_PRIVATE@/$(PKGCONF_REQ_PRIVATE)/g' $(PKGCONFIG_FILE) libyder.so: yder.o - $(CC) -shared -fPIC -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION) yder.o $(LIBS) $(LDFLAGS) + $(CC) -shared -fPIC -Wl,$(SONAME),$(OUTPUT) -o $(OUTPUT).$(VERSION) yder.o $(LIBS) $(LDFLAGS) ln -sf $(OUTPUT).$(VERSION) $(OUTPUT) libyder.a: yder.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/src/yder.c new/yder-1.4.7/src/yder.c --- old/yder-1.4.6/src/yder.c 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/src/yder.c 2019-07-09 16:17:28.000000000 +0200 @@ -221,7 +221,11 @@ if (cur_log_file_path != NULL) { if ((cur_log_file = fopen(cur_log_file_path, "a+")) == NULL) { + fprintf(stderr, "%s - ", cur_log_file_path); perror("Error opening log file"); + cur_log_file_path = NULL; + o_free(cur_app_name); + cur_app_name = NULL; return 0; } } @@ -236,11 +240,12 @@ if (cur_mode & Y_LOG_MODE_SYSLOG) { y_write_log_syslog(cur_app_name, level, message); } - #ifndef Y_DISABLE_JOURNALD +#endif + +#if !defined(_WIN32) && !defined(Y_DISABLE_JOURNALD) if (cur_mode & Y_LOG_MODE_JOURNALD) { y_write_log_journald(cur_app_name, level, message); } - #endif #endif if (cur_mode & Y_LOG_MODE_FILE) { y_write_log_file(cur_app_name, now, cur_log_file, level, message); @@ -266,18 +271,20 @@ */ int y_init_logs(const char * app, const unsigned long init_mode, const unsigned long init_level, const char * init_log_file, const char * message) { #ifdef _WIN32 - if (init_mode & Y_LOG_MODE_SYSLOG) { - perror("syslog mode not supported on your architecture"); - return 0; - } else if (init_mode & Y_LOG_MODE_JOURNALD) { - perror("journald mode not supported on your architecture"); - return 0; - } else { - return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); - } -#else - return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); + if (init_mode & Y_LOG_MODE_SYSLOG) { + perror("syslog mode not supported on your architecture"); + return 0; + } #endif + +#if defined(_WIN32) || defined(Y_DISABLE_JOURNALD) + if (init_mode & Y_LOG_MODE_JOURNALD) { + perror("journald mode not supported on your architecture"); + return 0; + } +#endif + + return y_write_log(app, init_mode, init_level, init_log_file, NULL, NULL, Y_LOG_LEVEL_INFO, message); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/test/Makefile new/yder-1.4.7/test/Makefile --- old/yder-1.4.6/test/Makefile 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/test/Makefile 2019-07-09 16:17:28.000000000 +0200 @@ -23,7 +23,7 @@ CFLAGS+=-Wall -D_REENTRANT -DDEBUG -g -O0 -I$(INCLUDE_LOCATION) $(CPPFLAGS) YDER_LOCATION=../src INCLUDE_LOCATION=../include -LIBS=-lc -lorcania -lyder -lcheck -lpthread -lm -lrt -lsubunit -L$(YDER_LOCATION) +LIBS=-lc -lorcania -lyder $(shell pkg-config --libs check) -L$(YDER_LOCATION) all: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.6/test/yder_test.c new/yder-1.4.7/test/yder_test.c --- old/yder-1.4.6/test/yder_test.c 2019-07-01 01:53:21.000000000 +0200 +++ new/yder-1.4.7/test/yder_test.c 2019-07-09 16:17:28.000000000 +0200 @@ -19,16 +19,44 @@ level = log_level; } -START_TEST(test_yder_init) +START_TEST(test_yder_init_console) { ck_assert_int_eq(y_init_logs("test_yder_console", Y_LOG_MODE_CONSOLE, Y_LOG_LEVEL_DEBUG, NULL, "first test"), 1); y_close_logs(); +} +END_TEST + +START_TEST(test_yder_init_file) +{ ck_assert_int_eq(y_init_logs("test_yder_file", Y_LOG_MODE_FILE, Y_LOG_LEVEL_DEBUG, "/tmp/test.log", "second test"), 1); y_close_logs(); +} +END_TEST + +START_TEST(test_yder_init_syslog) +{ +#ifndef _WIN32 ck_assert_int_eq(y_init_logs("test_yder_syslog", Y_LOG_MODE_SYSLOG, Y_LOG_LEVEL_DEBUG, NULL, "third test"), 1); y_close_logs(); +#else + ck_assert_int_eq(y_init_logs("test_yder_syslog", Y_LOG_MODE_SYSLOG, Y_LOG_LEVEL_DEBUG, NULL, "third test"), 0); +#endif +} +END_TEST + +START_TEST(test_yder_init_journald) +{ +#if !defined(_WIN32) && !defined(Y_DISABLE_JOURNALD) ck_assert_int_eq(y_init_logs("test_yder_journald", Y_LOG_MODE_JOURNALD, Y_LOG_LEVEL_DEBUG, NULL, "fourth test"), 1); y_close_logs(); +#else + ck_assert_int_eq(y_init_logs("test_yder_journald", Y_LOG_MODE_JOURNALD, Y_LOG_LEVEL_DEBUG, NULL, "fourth test"), 0); +#endif +} +END_TEST + +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); } END_TEST @@ -172,7 +200,11 @@ s = suite_create("Yder tests functions"); tc_core = tcase_create("test_yder"); - tcase_add_test(tc_core, test_yder_init); + tcase_add_test(tc_core, test_yder_init_console); + tcase_add_test(tc_core, test_yder_init_file); + 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_callback); tcase_add_test(tc_core, test_yder_level_debug); tcase_add_test(tc_core, test_yder_level_info);
