Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package log4shib for openSUSE:Factory checked in at 2021-10-23 00:51:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4shib (Old) and /work/SRC/openSUSE:Factory/.log4shib.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "log4shib" Sat Oct 23 00:51:26 2021 rev:7 rq:926941 version:2.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/log4shib/log4shib.changes 2021-07-21 19:07:52.095446661 +0200 +++ /work/SRC/openSUSE:Factory/.log4shib.new.1890/log4shib.changes 2021-10-23 00:52:09.465152641 +0200 @@ -1,0 +2,5 @@ +Fri Oct 22 10:50:20 UTC 2021 - Danilo Spinella <[email protected]> + +- Update to version 2.0.1 + +------------------------------------------------------------------- Old: ---- log4shib-2.0.0.tar.gz log4shib-2.0.0.tar.gz.asc New: ---- log4shib-2.0.1.tar.gz log4shib-2.0.1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4shib.spec ++++++ --- /var/tmp/diff_new_pack.Iszyf1/_old 2021-10-23 00:52:10.389153049 +0200 +++ /var/tmp/diff_new_pack.Iszyf1/_new 2021-10-23 00:52:10.389153049 +0200 @@ -19,7 +19,7 @@ %define libvers 2 %define pkgdocdir %{_docdir}/%{name} Name: log4shib -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: Log for C++, Shibboleth Edition License: LGPL-2.1-only ++++++ log4shib-2.0.0.tar.gz -> log4shib-2.0.1.tar.gz ++++++ ++++ 13733 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/Portfile new/log4shib-2.0.1/Portfile --- old/log4shib-2.0.0/Portfile 2018-07-06 20:40:22.000000000 +0200 +++ new/log4shib-2.0.1/Portfile 2021-10-19 17:02:17.000000000 +0200 @@ -1,7 +1,7 @@ PortSystem 1.0 name log4shib -version 2.0.0 +version 2.0.1 categories sysutils shibboleth devel maintainers snc scantor description configurable logging for C++, fork of log4cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/configure.ac new/log4shib-2.0.1/configure.ac --- old/log4shib-2.0.0/configure.ac 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/configure.ac 2021-10-19 16:58:14.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(log4shib, 2.0.0) +AC_INIT(log4shib, 2.0.1) # autoconf 2.50 or higher to rebuild aclocal.m4, because the # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro. @@ -11,7 +11,7 @@ # ? :+1 : ? == just some internal changes, nothing breaks but might work # better # CURRENT : REVISION : AGE -LT_VERSION=2:0:0 +LT_VERSION=2:1:0 AC_SUBST(LT_VERSION) @@ -31,18 +31,15 @@ AC_CANONICAL_HOST AC_ARG_ENABLE(debug, - AS_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]), + AS_HELP_STRING(--enable-debug, [Produce debug variant (Default = no)]), enable_debug=$enableval, enable_debug=no) if test "$enable_debug" = "yes" ; then - AM_CFLAGS="-g -D_DEBUG" - AM_CXXFLAGS="-g -D_DEBUG" -else - AM_CFLAGS="-O2 -DNDEBUG" - AM_CXXFLAGS="-O2 -DNDEBUG" + AM_CFLAGS="-D_DEBUG" + AM_CXXFLAGS="-D_DEBUG" fi -AM_PROG_LIBTOOL +LT_INIT([disable-static]) AC_PROG_INSTALL AC_PROG_MAKE_SET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/include/config.h.in new/log4shib-2.0.1/include/config.h.in --- old/log4shib-2.0.0/include/config.h.in 2018-07-06 20:39:58.000000000 +0200 +++ new/log4shib-2.0.1/include/config.h.in 2021-10-19 17:02:45.000000000 +0200 @@ -30,9 +30,6 @@ /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* define if the compiler implements namespaces */ #undef HAVE_NAMESPACES @@ -54,6 +51,9 @@ /* define if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -106,7 +106,9 @@ your system. */ #undef PTHREAD_CREATE_JOINABLE -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* define if pthread library is available */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/include/log4shib/Category.hh new/log4shib-2.0.1/include/log4shib/Category.hh --- old/log4shib-2.0.0/include/log4shib/Category.hh 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/include/log4shib/Category.hh 2021-10-19 16:41:26.000000000 +0200 @@ -111,8 +111,7 @@ * @exception std::invalid_argument if the caller tries to set * Priority::NOTSET on the Root Category. **/ - virtual void setPriority(Priority::Value priority) - throw(std::invalid_argument); + virtual void setPriority(Priority::Value priority); /** * Returns the assigned Priority, if any, for this Category. @@ -145,8 +144,7 @@ * @param appender The Appender to wich this category has to log. * @exception std::invalid_argument if the appender is NULL. **/ - virtual void addAppender(Appender* appender) - throw(std::invalid_argument); + virtual void addAppender(Appender* appender); /** * Adds an Appender for this Category. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/include/log4shib/PatternLayout.hh new/log4shib-2.0.1/include/log4shib/PatternLayout.hh --- old/log4shib-2.0.0/include/log4shib/PatternLayout.hh 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/include/log4shib/PatternLayout.hh 2021-10-19 16:41:26.000000000 +0200 @@ -79,8 +79,7 @@ @param conversionPattern the conversion pattern @exception ConfigureFailure if the pattern is invalid **/ - virtual void setConversionPattern(const std::string& conversionPattern) - throw(ConfigureFailure); + virtual void setConversionPattern(const std::string& conversionPattern); virtual std::string getConversionPattern() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/include/log4shib/Priority.hh new/log4shib-2.0.1/include/log4shib/Priority.hh --- old/log4shib-2.0.0/include/log4shib/Priority.hh 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/include/log4shib/Priority.hh 2021-10-19 16:41:26.000000000 +0200 @@ -102,8 +102,7 @@ * @throw std::invalid_argument if the priorityName does not * correspond with a known Priority name or a number **/ - static Value getPriorityValue(const std::string& priorityName) - throw(std::invalid_argument); + static Value getPriorityValue(const std::string& priorityName); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/include/log4shib/PropertyConfigurator.hh new/log4shib-2.0.1/include/log4shib/PropertyConfigurator.hh --- old/log4shib-2.0.0/include/log4shib/PropertyConfigurator.hh 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/include/log4shib/PropertyConfigurator.hh 2021-10-19 16:41:26.000000000 +0200 @@ -45,7 +45,7 @@ **/ class LOG4SHIB_EXPORT PropertyConfigurator { public: - static void configure(const std::string& initFileName) throw (ConfigureFailure); + static void configure(const std::string& initFileName); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/include/log4shib/SimpleConfigurator.hh new/log4shib-2.0.1/include/log4shib/SimpleConfigurator.hh --- old/log4shib-2.0.0/include/log4shib/SimpleConfigurator.hh 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/include/log4shib/SimpleConfigurator.hh 2021-10-19 16:41:26.000000000 +0200 @@ -34,7 +34,7 @@ * @exception ConfigureFailure if the method encountered a read or * syntax error. **/ - static void configure(const std::string& initFileName) throw (ConfigureFailure); + static void configure(const std::string& initFileName); /** * Configure log4shib with the configuration in the given file. @@ -45,7 +45,8 @@ * @exception ConfigureFailure if the method encountered a read or * syntax error. **/ - static void configure(std::istream& initFile) throw (ConfigureFailure); }; + static void configure(std::istream& initFile); + }; } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/include/log4shib/config-win32.h new/log4shib-2.0.1/include/log4shib/config-win32.h --- old/log4shib-2.0.0/include/log4shib/config-win32.h 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/include/log4shib/config-win32.h 2021-10-19 16:59:40.000000000 +0200 @@ -64,7 +64,7 @@ /* Version number of package */ #ifndef LOG4SHIB_VERSION -#define LOG4SHIB_VERSION "1.0.10" +#define LOG4SHIB_VERSION "2.0.1" #endif /* define if the compiler implements namespaces */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/log4shib.spec new/log4shib-2.0.1/log4shib.spec --- old/log4shib-2.0.0/log4shib.spec 2018-07-06 20:40:22.000000000 +0200 +++ new/log4shib-2.0.1/log4shib.spec 2021-10-19 17:02:17.000000000 +0200 @@ -1,11 +1,11 @@ Name: log4shib -Version: 2.0.0 +Version: 2.0.1 Release: 1 Summary: Log for C++, Shibboleth Edition License: LGPL Group: Development/Libraries Vendor: Shibboleth Consortium -URL: http://shibboleth.net/downloads/log4shib/2.0.0 +URL: http://shibboleth.net/downloads/log4shib/2.0.1 Source: %name-%version.tar.bz2 BuildRoot: %_tmppath/%name-%version-root BuildRequires: gcc-c++ pkgconfig @@ -14,6 +14,10 @@ BuildRequires: redhat-rpm-config %endif +%if 0%{?rhel} >= 8 || 0%{?centos_version} >= 800 +BuildRequires: gdb +%endif + %if "%{_vendor}" == "suse" %define pkgdocdir %{_docdir}/%{name} %else @@ -66,18 +70,14 @@ %clean [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT -%ifnos solaris2.8 solaris2.9 solaris2.10 -%post -n liblog4shib1 -p /sbin/ldconfig -%endif +%post -n liblog4shib2 -p /sbin/ldconfig %post -n liblog4shib-devel if test "x$RPM_INSTALL_PREFIX0" != "x" ; then %{__perl} -pi -e"s|^prefix=\"[^\"]*\"|prefix=\"$RPM_INSTALL_PREFIX0\"|" $RPM_INSTALL_PREFIX0/bin/log4shib-config fi -%ifnos solaris2.8 solaris2.9 solaris2.10 %postun -n liblog4shib2 -p /sbin/ldconfig -%endif %files -n liblog4shib2 %defattr(-,root,root,755) @@ -94,6 +94,10 @@ %doc %{pkgdocdir} %changelog +* Fri Sep 27 2019 Scott Cantor <[email protected]> - 2.0.0-2 +- Remove old Solaris exclusions +- Add CentOS 8 gdb dependency + * Mon Jun 25 2018 Scott Cantor <[email protected]> - 2.0.0-1 - Bump version - Switch to bzipped source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/log4shib.spec.in new/log4shib-2.0.1/log4shib.spec.in --- old/log4shib-2.0.0/log4shib.spec.in 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/log4shib.spec.in 2021-10-19 15:38:00.000000000 +0200 @@ -14,6 +14,10 @@ BuildRequires: redhat-rpm-config %endif +%if 0%{?rhel} >= 8 || 0%{?centos_version} >= 800 +BuildRequires: gdb +%endif + %if "%{_vendor}" == "suse" %define pkgdocdir %{_docdir}/%{name} %else @@ -66,18 +70,14 @@ %clean [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT -%ifnos solaris2.8 solaris2.9 solaris2.10 -%post -n lib@PACKAGE_NAME@1 -p /sbin/ldconfig -%endif +%post -n lib@PACKAGE_NAME@2 -p /sbin/ldconfig %post -n lib@PACKAGE_NAME@-devel if test "x$RPM_INSTALL_PREFIX0" != "x" ; then %{__perl} -pi -e"s|^prefix=\"[^\"]*\"|prefix=\"$RPM_INSTALL_PREFIX0\"|" $RPM_INSTALL_PREFIX0/bin/@PACKAGE_NAME@-config fi -%ifnos solaris2.8 solaris2.9 solaris2.10 %postun -n lib@PACKAGE_NAME@2 -p /sbin/ldconfig -%endif %files -n lib@PACKAGE_NAME@2 %defattr(-,root,root,755) @@ -94,6 +94,10 @@ %doc %{pkgdocdir} %changelog +* Fri Sep 27 2019 Scott Cantor <[email protected]> - 2.0.0-2 +- Remove old Solaris exclusions +- Add CentOS 8 gdb dependency + * Mon Jun 25 2018 Scott Cantor <[email protected]> - 2.0.0-1 - Bump version - Switch to bzipped source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/m4/ax_pthread.m4 new/log4shib-2.0.1/m4/ax_pthread.m4 --- old/log4shib-2.0.0/m4/ax_pthread.m4 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/m4/ax_pthread.m4 2021-10-19 16:58:42.000000000 +0200 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html +# https://www.gnu.org/software/autoconf-archive/ax_pthread.html # =========================================================================== # # SYNOPSIS @@ -14,20 +14,24 @@ # flags that are needed. (The user can also force certain compiler # flags/libs to be tested by setting these environment variables.) # -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) +# Also sets PTHREAD_CC and PTHREAD_CXX to any special C compiler that is +# needed for multi-threaded programs (defaults to the value of CC +# respectively CXX otherwise). (This is necessary on e.g. AIX to use the +# special cc_r/CC_r compiler alias.) # # NOTE: You are assumed to not only compile your program with these flags, # but also to link with them as well. For example, you might link with # $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS +# $PTHREAD_CXX $CXXFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS # # If you are only building threaded programs, you may wish to use these # variables in your default LIBS, CFLAGS, and CC: # # LIBS="$PTHREAD_LIBS $LIBS" # CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" # CC="$PTHREAD_CC" +# CXX="$PTHREAD_CXX" # # In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant # has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to @@ -55,6 +59,7 @@ # # Copyright (c) 2008 Steven G. Johnson <[email protected]> # Copyright (c) 2011 Daniel Richard G. <[email protected]> +# Copyright (c) 2019 Marc Stevens <[email protected]> # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -67,7 +72,7 @@ # Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. +# with this program. If not, see <https://www.gnu.org/licenses/>. # # As a special exception, the respective Autoconf Macro's copyright owner # gives unlimited permission to copy, distribute and modify the configure @@ -82,7 +87,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 23 +#serial 31 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) AC_DEFUN([AX_PTHREAD], [ @@ -104,6 +109,7 @@ ax_pthread_save_CFLAGS="$CFLAGS" ax_pthread_save_LIBS="$LIBS" AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) + AS_IF([test "x$PTHREAD_CXX" != "x"], [CXX="$PTHREAD_CXX"]) CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LIBS="$PTHREAD_LIBS $LIBS" AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) @@ -123,10 +129,12 @@ # (e.g. DEC) have both -lpthread and -lpthreads, where one of the # libraries is broken (non-POSIX). -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. +# Create a list of thread flags to try. Items with a "," contain both +# C compiler flags (before ",") and linker flags (after ","). Other items +# starting with a "-" are C compiler flags, and remaining items are +# library names, except for "none" which indicates that we try without +# any flags at all, and "pthread-config" which is a program returning +# the flags for the Pth emulation library. ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" @@ -194,14 +202,47 @@ # that too in a future libc.) So we'll check first for the # standard Solaris way of linking pthreads (-mt -lpthread). - ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" + ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags" ;; esac +# Are we compiling with Clang? + +AC_CACHE_CHECK([whether $CC is Clang], + [ax_cv_PTHREAD_CLANG], + [ax_cv_PTHREAD_CLANG=no + # Note that Autoconf sets GCC=yes for Clang as well as GCC + if test "x$GCC" = "xyes"; then + AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], + [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ +# if defined(__clang__) && defined(__llvm__) + AX_PTHREAD_CC_IS_CLANG +# endif + ], + [ax_cv_PTHREAD_CLANG=yes]) + fi + ]) +ax_pthread_clang="$ax_cv_PTHREAD_CLANG" + + # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) +# Note that for GCC and Clang -pthread generally implies -lpthread, +# except when -nostdlib is passed. +# This is problematic using libtool to build C++ shared libraries with pthread: +# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460 +# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333 +# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555 +# To solve this, first try -pthread together with -lpthread for GCC + AS_IF([test "x$GCC" = "xyes"], - [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"]) + [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"]) + +# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first + +AS_IF([test "x$ax_pthread_clang" = "xyes"], + [ax_pthread_flags="-pthread,-lpthread -pthread"]) + # The presence of a feature test macro requesting re-entrant function # definitions is, on some systems, a strong hint that pthreads support is @@ -224,25 +265,86 @@ [ax_pthread_check_cond=0], [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"]) -# Are we compiling with Clang? -AC_CACHE_CHECK([whether $CC is Clang], - [ax_cv_PTHREAD_CLANG], - [ax_cv_PTHREAD_CLANG=no - # Note that Autoconf sets GCC=yes for Clang as well as GCC - if test "x$GCC" = "xyes"; then - AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], - [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ -# if defined(__clang__) && defined(__llvm__) - AX_PTHREAD_CC_IS_CLANG -# endif - ], - [ax_cv_PTHREAD_CLANG=yes]) - fi - ]) -ax_pthread_clang="$ax_cv_PTHREAD_CLANG" +if test "x$ax_pthread_ok" = "xno"; then +for ax_pthread_try_flag in $ax_pthread_flags; do + + case $ax_pthread_try_flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + *,*) + PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"` + PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"` + AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"]) + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) + PTHREAD_CFLAGS="$ax_pthread_try_flag" + ;; + + pthread-config) + AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) + AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) + PTHREAD_LIBS="-l$ax_pthread_try_flag" + ;; + esac + + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> +# if $ax_pthread_check_cond +# error "$ax_pthread_check_macro must be defined" +# endif + static void *some_global = NULL; + static void routine(void *a) + { + /* To avoid any unused-parameter or + unused-but-set-parameter warning. */ + some_global = a; + } + static void *start_routine(void *a) { return a; }], + [pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */])], + [ax_pthread_ok=yes], + []) + + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" + + AC_MSG_RESULT([$ax_pthread_ok]) + AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi -ax_pthread_clang_warning=no # Clang needs special handling, because older versions handle the -pthread # option in a rather... idiosyncratic way @@ -261,11 +363,6 @@ # -pthread does define _REENTRANT, and while the Darwin headers # ignore this macro, third-party headers might not.) - PTHREAD_CFLAGS="-pthread" - PTHREAD_LIBS= - - ax_pthread_ok=yes - # However, older versions of Clang make a point of warning the user # that, in an invocation where only linking and no compilation is # taking place, the -pthread option has no effect ("argument unused @@ -294,7 +391,7 @@ # step ax_pthread_save_ac_link="$ac_link" ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' - ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` + ax_pthread_link_step=`AS_ECHO(["$ac_link"]) | sed "$ax_pthread_sed"` ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" ax_pthread_save_CFLAGS="$CFLAGS" for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do @@ -320,78 +417,7 @@ fi # $ax_pthread_clang = yes -if test "x$ax_pthread_ok" = "xno"; then -for ax_pthread_try_flag in $ax_pthread_flags; do - - case $ax_pthread_try_flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -mt,pthread) - AC_MSG_CHECKING([whether pthreads work with -mt -lpthread]) - PTHREAD_CFLAGS="-mt" - PTHREAD_LIBS="-lpthread" - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) - PTHREAD_CFLAGS="$ax_pthread_try_flag" - ;; - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) - PTHREAD_LIBS="-l$ax_pthread_try_flag" - ;; - esac - - ax_pthread_save_CFLAGS="$CFLAGS" - ax_pthread_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> -# if $ax_pthread_check_cond -# error "$ax_pthread_check_macro must be defined" -# endif - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - CFLAGS="$ax_pthread_save_CFLAGS" - LIBS="$ax_pthread_save_LIBS" - - AC_MSG_RESULT([$ax_pthread_ok]) - AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi # Various other checks: if test "x$ax_pthread_ok" = "xyes"; then @@ -438,7 +464,8 @@ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], [ax_cv_PTHREAD_PRIO_INHERIT], [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], - [[int i = PTHREAD_PRIO_INHERIT;]])], + [[int i = PTHREAD_PRIO_INHERIT; + return i;]])], [ax_cv_PTHREAD_PRIO_INHERIT=yes], [ax_cv_PTHREAD_PRIO_INHERIT=no]) ]) @@ -460,18 +487,28 @@ [#handle absolute path differently from PATH based program lookup AS_CASE(["x$CC"], [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) + [ + AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"]) + AS_IF([test "x${CXX}" != "x"], [AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])]) + ], + [ + AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC]) + AS_IF([test "x${CXX}" != "x"], [AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])]) + ] + ) + ]) ;; esac fi fi test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" +test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" AC_SUBST([PTHREAD_LIBS]) AC_SUBST([PTHREAD_CFLAGS]) AC_SUBST([PTHREAD_CC]) +AC_SUBST([PTHREAD_CXX]) # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test "x$ax_pthread_ok" = "xyes"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/msvc15/log4shibDLL/log4shibDLL.rc new/log4shib-2.0.1/msvc15/log4shibDLL/log4shibDLL.rc --- old/log4shib-2.0.0/msvc15/log4shibDLL/log4shibDLL.rc 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/msvc15/log4shibDLL/log4shibDLL.rc 2021-10-19 17:00:24.000000000 +0200 @@ -10,8 +10,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,0 - PRODUCTVERSION 2,0,0,0 + FILEVERSION 2,0,1,0 + PRODUCTVERSION 2,0,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -30,9 +30,9 @@ VALUE "CompanyName", "Shibboleth Consortium\0" VALUE "ContributingAuthors", "Cedric Le Goater, Marc Welz, others. See documentation for complete list\0" VALUE "FileDescription", "Log library for C++ DLL\0" - VALUE "FileVersion", "2.0.0\0" + VALUE "FileVersion", "2.0.1\0" VALUE "InternalName", "log4shib\0" - VALUE "LegalCopyright", "Copyright ?? 2000-2018 the Log4cpp Project, others\0" + VALUE "LegalCopyright", "Copyright ?? 2000-2021 the Log4cpp Project, others\0" VALUE "LegalTrademarks", "\0" #ifdef _DEBUG VALUE "OriginalFilename", "log4shib2_0D.dll\0" @@ -41,7 +41,7 @@ #endif VALUE "PrivateBuild", "\0" VALUE "ProductName", "Log library for C++\0" - VALUE "ProductVersion", "2.0.0\0" + VALUE "ProductVersion", "2.0.1\0" VALUE "SpecialBuild", "\0" END END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/src/Category.cpp new/log4shib-2.0.1/src/Category.cpp --- old/log4shib-2.0.0/src/Category.cpp 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/src/Category.cpp 2021-10-19 16:41:26.000000000 +0200 @@ -68,8 +68,7 @@ return _priority; } - void Category::setPriority(Priority::Value priority) - throw(std::invalid_argument) { + void Category::setPriority(Priority::Value priority) { if ((priority < Priority::NOTSET) || (getParent() != NULL)) { _priority = priority; } else { @@ -91,8 +90,7 @@ return c->getPriority(); } - void Category::addAppender(Appender* appender) - throw(std::invalid_argument) { + void Category::addAppender(Appender* appender) { if (appender) { threading::ScopedLock lock(_appenderSetMutex); { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/src/PatternLayout.cpp new/log4shib-2.0.1/src/PatternLayout.cpp --- old/log4shib-2.0.0/src/PatternLayout.cpp 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/src/PatternLayout.cpp 2021-10-19 16:41:26.000000000 +0200 @@ -280,7 +280,7 @@ _conversionPattern = ""; } - void PatternLayout::setConversionPattern(const std::string& conversionPattern) throw(ConfigureFailure) { + void PatternLayout::setConversionPattern(const std::string& conversionPattern) { #ifdef LOG4SHIB_HAVE_SSTREAM std::istringstream conversionStream(conversionPattern); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/src/Priority.cpp new/log4shib-2.0.1/src/Priority.cpp --- old/log4shib-2.0.0/src/Priority.cpp 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/src/Priority.cpp 2021-10-19 16:41:26.000000000 +0200 @@ -27,8 +27,7 @@ return names[((priority < 0) || (priority > 8)) ? 8 : priority]; } - Priority::Value Priority::getPriorityValue(const std::string& priorityName) - throw(std::invalid_argument) { + Priority::Value Priority::getPriorityValue(const std::string& priorityName) { Priority::Value value = -1; for (unsigned int i = 0; i < 10; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/src/PropertyConfigurator.cpp new/log4shib-2.0.1/src/PropertyConfigurator.cpp --- old/log4shib-2.0.0/src/PropertyConfigurator.cpp 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/src/PropertyConfigurator.cpp 2021-10-19 16:41:26.000000000 +0200 @@ -11,7 +11,7 @@ namespace log4shib { - void PropertyConfigurator::configure(const std::string& initFileName) throw (ConfigureFailure) { + void PropertyConfigurator::configure(const std::string& initFileName) { PropertyConfiguratorImpl configurator; configurator.doConfigure(initFileName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/src/PropertyConfiguratorImpl.cpp new/log4shib-2.0.1/src/PropertyConfiguratorImpl.cpp --- old/log4shib-2.0.0/src/PropertyConfiguratorImpl.cpp 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/src/PropertyConfiguratorImpl.cpp 2021-10-19 16:41:26.000000000 +0200 @@ -62,7 +62,7 @@ PropertyConfiguratorImpl::~PropertyConfiguratorImpl() { } - void PropertyConfiguratorImpl::doConfigure(const std::string& initFileName) throw (ConfigureFailure) { + void PropertyConfiguratorImpl::doConfigure(const std::string& initFileName) { std::ifstream initFile(initFileName.c_str()); if (!initFile) { @@ -73,7 +73,7 @@ } - void PropertyConfiguratorImpl::doConfigure(std::istream& in) throw (ConfigureFailure) { + void PropertyConfiguratorImpl::doConfigure(std::istream& in) { // parse the file to get all of the configuration _properties.load(in); @@ -89,7 +89,7 @@ } } - void PropertyConfiguratorImpl::instantiateAllAppenders() throw(ConfigureFailure) { + void PropertyConfiguratorImpl::instantiateAllAppenders() { std::string currentAppender; std::string prefix("appender"); @@ -131,7 +131,7 @@ } } - void PropertyConfiguratorImpl::configureCategory(const std::string& categoryName) throw (ConfigureFailure) { + void PropertyConfiguratorImpl::configureCategory(const std::string& categoryName) { // start by reading the "rootCategory" key std::string tempCatName = (categoryName == "rootCategory") ? categoryName : "category." + categoryName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/src/PropertyConfiguratorImpl.hh new/log4shib-2.0.1/src/PropertyConfiguratorImpl.hh --- old/log4shib-2.0.0/src/PropertyConfiguratorImpl.hh 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/src/PropertyConfiguratorImpl.hh 2021-10-19 16:41:26.000000000 +0200 @@ -28,10 +28,8 @@ PropertyConfiguratorImpl(); virtual ~PropertyConfiguratorImpl(); - virtual void doConfigure(const std::string& initFileName) - throw (ConfigureFailure); - virtual void doConfigure(std::istream& in) - throw (ConfigureFailure); + virtual void doConfigure(const std::string& initFileName); + virtual void doConfigure(std::istream& in); protected: /** @@ -42,7 +40,7 @@ The name 'rootCategory' refers to the root Category. throw ConfigureFailure **/ - void configureCategory(const std::string& categoryname) throw (ConfigureFailure); + void configureCategory(const std::string& categoryname); /** * Get a list of categories for which we should do the configuration. This simply @@ -51,7 +49,7 @@ */ void getCategories(std::vector<std::string>& categories) const; - void instantiateAllAppenders() throw(ConfigureFailure); + void instantiateAllAppenders(); /** * Intantiate and configure the appender referred to by the given name. This method searches the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/log4shib-2.0.0/src/SimpleConfigurator.cpp new/log4shib-2.0.1/src/SimpleConfigurator.cpp --- old/log4shib-2.0.0/src/SimpleConfigurator.cpp 2018-07-06 20:39:40.000000000 +0200 +++ new/log4shib-2.0.1/src/SimpleConfigurator.cpp 2021-10-19 16:41:26.000000000 +0200 @@ -42,7 +42,7 @@ namespace log4shib { - void SimpleConfigurator::configure(const std::string& initFileName) throw (ConfigureFailure) { + void SimpleConfigurator::configure(const std::string& initFileName) { std::ifstream initFile(initFileName.c_str()); if (!initFile) { @@ -52,7 +52,7 @@ configure(initFile); } - void SimpleConfigurator::configure(std::istream& initFile) throw (ConfigureFailure) { + void SimpleConfigurator::configure(std::istream& initFile) { std::string nextCommand; std::string categoryName;
