commit log4cpp for openSUSE:Factory
Hello community, here is the log from the commit of package log4cpp for openSUSE:Factory checked in at 2016-10-18 10:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4cpp (Old) and /work/SRC/openSUSE:Factory/.log4cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "log4cpp" Changes: -------- --- /work/SRC/openSUSE:Factory/log4cpp/log4cpp.changes 2016-07-12 23:51:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.log4cpp.new/log4cpp.changes 2016-10-18 10:39:57.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Oct 10 15:33:28 UTC 2016 - adam.majer@suse.de + +- update to version 1.1.2rc3 + + fix std::terminate() call on bad category name component count + in PatternLayout + + fix std::terminate() call on bad root category priority name + in config file + + remove RollingFileAppend prints log name to std::cout +- fix_sle11_build.patch: fix building on SLE11 + +------------------------------------------------------------------- Old: ---- log4cpp-1.1.2rc2.tar.gz New: ---- fix_sle11_build.patch log4cpp-1.1.2rc3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4cpp.spec ++++++ --- /var/tmp/diff_new_pack.aLAZ0J/_old 2016-10-18 10:39:59.000000000 +0200 +++ /var/tmp/diff_new_pack.aLAZ0J/_new 2016-10-18 10:39:59.000000000 +0200 @@ -17,13 +17,19 @@ Name: log4cpp -Version: 1.1.2~rc2 +%if 0%{suse_version} >= 1310 +Version: 1.1.2~rc3 Release: 0 +%else +Version: 1.1.2 +Release: 0 +%endif Summary: C++ logging library License: LGPL-2.1 Group: Development/Languages/C and C++ Url: http://log4cpp.sourceforge.net/ -Source: %{name}-1.1.2rc2.tar.gz +Source: %{name}-1.1.2rc3.tar.gz +Patch1: fix_sle11_build.patch BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -63,6 +69,7 @@ %prep %setup -q -n %{name} +%patch1 -p1 %build %configure --enable-doxygen --disable-static ++++++ fix_sle11_build.patch ++++++ Summary: Remove extra ; that prevents building on SLE11 Index: log4cpp/src/Appender.cpp =================================================================== --- log4cpp.orig/src/Appender.cpp +++ log4cpp/src/Appender.cpp @@ -18,11 +18,11 @@ namespace log4cpp { Appender::AppenderMapStorage::AppenderMapStorage() { _allAppenders = new AppenderMap(); - }; + } Appender::AppenderMapStorage::~AppenderMapStorage() { _deleteAllAppenders(); delete _allAppenders; - }; + } Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer() { if (appenders_nifty_counter++ == 0) { ++++++ log4cpp-1.1.2rc2.tar.gz -> log4cpp-1.1.2rc3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/log4cpp/src/PatternLayout.cpp new/log4cpp/src/PatternLayout.cpp --- old/log4cpp/src/PatternLayout.cpp 2016-04-29 09:39:26.000000000 +0200 +++ new/log4cpp/src/PatternLayout.cpp 2016-08-02 20:54:24.000000000 +0200 @@ -88,6 +88,9 @@ } begin++; } + if (begin == std::string::npos) { + begin = 0; + } out << event.categoryName.substr(begin); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/log4cpp/src/PropertyConfiguratorImpl.cpp new/log4cpp/src/PropertyConfiguratorImpl.cpp --- old/log4cpp/src/PropertyConfiguratorImpl.cpp 2016-04-29 09:39:26.000000000 +0200 +++ new/log4cpp/src/PropertyConfiguratorImpl.cpp 2016-08-02 20:54:24.000000000 +0200 @@ -166,7 +166,12 @@ } } - category.setPriority(priority); + try { + category.setPriority(priority); + } catch (std::invalid_argument& e) { + throw ConfigureFailure(std::string(e.what()) + + " for category '" + categoryName + "'"); + } bool additive = _properties.getBool("additivity." + categoryName, true); category.setAdditivity(additive); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/log4cpp/src/RollingFileAppender.cpp new/log4cpp/src/RollingFileAppender.cpp --- old/log4cpp/src/RollingFileAppender.cpp 2016-04-29 09:39:26.000000000 +0200 +++ new/log4cpp/src/RollingFileAppender.cpp 2016-08-02 20:54:24.000000000 +0200 @@ -65,7 +65,7 @@ filename_stream << _fileName << "." << std::setw( _maxBackupIndexWidth ) << std::setfill( '0' ) << _maxBackupIndex << std::ends; // remove the very last (oldest) file std::string last_log_filename = filename_stream.str(); - std::cout << last_log_filename << std::endl; + // std::cout << last_log_filename << std::endl; // removed by request on sf.net #140 ::remove(last_log_filename.c_str()); // rename each existing file to the consequent one
participants (1)
-
root@hilbert.suse.de