Hello community, here is the log from the commit of package librelp for openSUSE:Factory checked in at 2020-12-05 20:35:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librelp (Old) and /work/SRC/openSUSE:Factory/.librelp.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librelp" Sat Dec 5 20:35:35 2020 rev:41 rq:853094 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2020-11-02 09:36:52.473407332 +0100 +++ /work/SRC/openSUSE:Factory/.librelp.new.5913/librelp.changes 2020-12-05 20:35:44.170620702 +0100 @@ -1,0 +2,6 @@ +Sun Nov 29 20:55:01 UTC 2020 - Andreas Stieger <andreas.stie...@gmx.de> + +- librelp 1.9.0: + * openssl bugfix: preprocessor check for tlsconfigcmd code + +------------------------------------------------------------------- Old: ---- librelp-1.8.0.tar.gz New: ---- librelp-1.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librelp.spec ++++++ --- /var/tmp/diff_new_pack.1NwilG/_old 2020-12-05 20:35:44.802621343 +0100 +++ /var/tmp/diff_new_pack.1NwilG/_new 2020-12-05 20:35:44.802621343 +0100 @@ -18,7 +18,7 @@ %define library_name librelp0 Name: librelp -Version: 1.8.0 +Version: 1.9.0 Release: 0 Summary: A reliable logging library License: GPL-3.0-or-later ++++++ librelp-1.8.0.tar.gz -> librelp-1.9.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/ChangeLog new/librelp-1.9.0/ChangeLog --- old/librelp-1.8.0/ChangeLog 2020-09-29 09:02:57.000000000 +0200 +++ new/librelp-1.9.0/ChangeLog 2020-11-20 08:34:10.000000000 +0100 @@ -1,4 +1,15 @@ ---------------------------------------------------------------------- +Version 1.9.0 - 2020-11-24 +- openssl bugfix: preprocessor check for tlsconfigcmd code + tls config commands no is compiled for OpenSSL 1.0.2. + closes: https://github.com/rsyslog/librelp/issues/221 +- solaris compatibility fix: add strndup compatibility code + On some platforms, strndup() is not present. However, it was used + in "tlsconfigcmd" command processing. This bug was unlikely to + trigger as the platforms in question had either non-appropriate + openssl library versions or were affected by the openssl version + check bug (see above). +---------------------------------------------------------------------- Version 1.8.0 - 2020-09-29 - gnutls "bugfix": handle receives who break connection on close Some TLS servers don't reply to graceful shutdown requests "for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/config.h.in new/librelp-1.9.0/config.h.in --- old/librelp-1.8.0/config.h.in 2020-09-29 09:05:02.000000000 +0200 +++ new/librelp-1.9.0/config.h.in 2020-11-20 08:34:36.000000000 +0100 @@ -49,6 +49,9 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + /* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ #undef HAVE_STRUCT_SOCKADDR_SA_LEN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/configure new/librelp-1.9.0/configure --- old/librelp-1.8.0/configure 2020-09-29 09:04:55.000000000 +0200 +++ new/librelp-1.9.0/configure 2020-11-20 08:34:28.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for librelp 1.8.0. +# Generated by GNU Autoconf 2.69 for librelp 1.9.0. # # Report bugs to <rgerha...@adiscon.com>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='librelp' PACKAGE_TARNAME='librelp' -PACKAGE_VERSION='1.8.0' -PACKAGE_STRING='librelp 1.8.0' +PACKAGE_VERSION='1.9.0' +PACKAGE_STRING='librelp 1.9.0' PACKAGE_BUGREPORT='rgerha...@adiscon.com' PACKAGE_URL='' @@ -1378,7 +1378,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures librelp 1.8.0 to adapt to many kinds of systems. +\`configure' configures librelp 1.9.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1449,7 +1449,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of librelp 1.8.0:";; + short | recursive ) echo "Configuration of librelp 1.9.0:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -librelp configure 1.8.0 +librelp configure 1.9.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2105,7 +2105,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by librelp $as_me 1.8.0, which was +It was created by librelp $as_me 1.9.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2971,7 +2971,7 @@ # Define the identity of the package. PACKAGE='librelp' - VERSION='1.8.0' + VERSION='1.9.0' cat >>confdefs.h <<_ACEOF @@ -14443,7 +14443,7 @@ _ACEOF -for ac_func in strerror_r strdup epoll_create epoll_create1 +for ac_func in strerror_r strdup strndup epoll_create epoll_create1 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -15540,7 +15540,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by librelp $as_me 1.8.0, which was +This file was extended by librelp $as_me 1.9.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15606,7 +15606,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -librelp config.status 1.8.0 +librelp config.status 1.9.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/configure.ac new/librelp-1.9.0/configure.ac --- old/librelp-1.8.0/configure.ac 2020-09-29 09:02:47.000000000 +0200 +++ new/librelp-1.9.0/configure.ac 2020-11-20 08:33:46.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([librelp], [1.8.0], [rgerha...@adiscon.com]) +AC_INIT([librelp], [1.9.0], [rgerha...@adiscon.com]) # change to the one below if Travis has a timeout #AM_INIT_AUTOMAKE([subdir-objects serial-tests]) @@ -123,7 +123,7 @@ AC_FUNC_SELECT_ARGTYPES AC_FUNC_STRERROR_R AC_TYPE_SIGNAL -AC_CHECK_FUNCS([strerror_r strdup epoll_create epoll_create1]) +AC_CHECK_FUNCS([strerror_r strdup strndup epoll_create epoll_create1]) # enable TLS (may not be possible on platforms with too-old GnuTLS) AC_ARG_ENABLE(tls, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/src/Makefile.am new/librelp-1.9.0/src/Makefile.am --- old/librelp-1.8.0/src/Makefile.am 2020-08-24 14:03:43.000000000 +0200 +++ new/librelp-1.9.0/src/Makefile.am 2020-11-19 12:54:12.000000000 +0100 @@ -44,7 +44,8 @@ cclose.c \ cserverclose.c \ dbllinklist.h \ - cmdif.h + cmdif.h \ + compat/strndup.c librelp_la_CPPFLAGS = $(AM_CLFAGS) $(PTHREADS_CFLAGS) $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) $(WARN_CFLAGS) librelp_la_LIBADD = $(rt_libs) $(GNUTLS_LIBS) $(OPENSSL_LIBS) # info on version-info: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/src/Makefile.in new/librelp-1.9.0/src/Makefile.in --- old/librelp-1.8.0/src/Makefile.in 2020-09-29 09:04:55.000000000 +0200 +++ new/librelp-1.9.0/src/Makefile.in 2020-11-20 08:34:29.000000000 +0100 @@ -135,12 +135,14 @@ am__DEPENDENCIES_1 = librelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am__dirstamp = $(am__leading_dot)dirstamp am_librelp_la_OBJECTS = librelp_la-relp.lo librelp_la-relpsess.lo \ librelp_la-relpframe.lo librelp_la-tcp.lo librelp_la-sendq.lo \ librelp_la-sendbuf.lo librelp_la-offers.lo \ librelp_la-relpclt.lo librelp_la-relpsrv.lo \ librelp_la-scsyslog.lo librelp_la-scrsp.lo librelp_la-copen.lo \ - librelp_la-cclose.lo librelp_la-cserverclose.lo + librelp_la-cclose.lo librelp_la-cserverclose.lo \ + compat/librelp_la-strndup.lo librelp_la_OBJECTS = $(am_librelp_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -382,7 +384,8 @@ cclose.c \ cserverclose.c \ dbllinklist.h \ - cmdif.h + cmdif.h \ + compat/strndup.c librelp_la_CPPFLAGS = $(AM_CLFAGS) $(PTHREADS_CFLAGS) $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) $(WARN_CFLAGS) librelp_la_LIBADD = $(rt_libs) $(GNUTLS_LIBS) $(OPENSSL_LIBS) @@ -458,12 +461,22 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } +compat/$(am__dirstamp): + @$(MKDIR_P) compat + @: > compat/$(am__dirstamp) +compat/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) compat/$(DEPDIR) + @: > compat/$(DEPDIR)/$(am__dirstamp) +compat/librelp_la-strndup.lo: compat/$(am__dirstamp) \ + compat/$(DEPDIR)/$(am__dirstamp) librelp.la: $(librelp_la_OBJECTS) $(librelp_la_DEPENDENCIES) $(EXTRA_librelp_la_DEPENDENCIES) $(AM_V_CCLD)$(librelp_la_LINK) -rpath $(libdir) $(librelp_la_OBJECTS) $(librelp_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f compat/*.$(OBJEXT) + -rm -f compat/*.lo distclean-compile: -rm -f *.tab.c @@ -482,6 +495,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librelp_la-sendbuf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librelp_la-sendq.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librelp_la-tcp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/librelp_la-strndup.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -605,11 +619,19 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(librelp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o librelp_la-cserverclose.lo `test -f 'cserverclose.c' || echo '$(srcdir)/'`cserverclose.c +compat/librelp_la-strndup.lo: compat/strndup.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(librelp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat/librelp_la-strndup.lo -MD -MP -MF compat/$(DEPDIR)/librelp_la-strndup.Tpo -c -o compat/librelp_la-strndup.lo `test -f 'compat/strndup.c' || echo '$(srcdir)/'`compat/strndup.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) compat/$(DEPDIR)/librelp_la-strndup.Tpo compat/$(DEPDIR)/librelp_la-strndup.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='compat/strndup.c' object='compat/librelp_la-strndup.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(librelp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat/librelp_la-strndup.lo `test -f 'compat/strndup.c' || echo '$(srcdir)/'`compat/strndup.c + mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs + -rm -rf compat/.libs compat/_libs install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -747,6 +769,8 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f compat/$(DEPDIR)/$(am__dirstamp) + -rm -f compat/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -757,7 +781,7 @@ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) compat/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -803,7 +827,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) compat/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/src/compat/strndup.c new/librelp-1.9.0/src/compat/strndup.c --- old/librelp-1.8.0/src/compat/strndup.c 1970-01-01 01:00:00.000000000 +0100 +++ new/librelp-1.9.0/src/compat/strndup.c 2020-11-19 12:54:12.000000000 +0100 @@ -0,0 +1,47 @@ +/* compatibility file for systems without strndup. + * + * Copyright 2015 Rainer Gerhards and Adiscon + * + * This file is part of rsyslog. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "config.h" +#ifndef HAVE_STRNDUP + + +#include <stdlib.h> +#include <string.h> + +extern char *strndup(const char *s, size_t n); + +char * +strndup(const char *s, size_t n) +{ + const size_t len = strlen(s); + char *new_s; + if(len <= n) + return strdup(s); + new_s = malloc(n+1); + if(new_s == NULL) + return NULL; + memcpy(new_s, s, n); + new_s[n] = '\0'; + return new_s; +} +#else +/* ISO C forbids an empty translation unit */ +static __attribute__((unused)) void dummystrndup(void) {} +#endif /* #ifndef HAVE_STRNDUP */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/src/relp.h new/librelp-1.9.0/src/relp.h --- old/librelp-1.8.0/src/relp.h 2020-08-25 09:13:45.000000000 +0200 +++ new/librelp-1.9.0/src/relp.h 2020-11-19 12:54:12.000000000 +0100 @@ -235,4 +235,14 @@ const char *eobj, relpRetVal ecode, const char *fmt, ...); const char * _relpEngine_strerror_r(const int errnum, char *buf, const size_t buflen); +/* here we add some stuff from the compatibility layer. A separate include + * would be cleaner, but would potentially require changes all over the + * place. So doing it here is better. The respective replacement + * functions should usually be found under ./compat -- rgerhards, 2015-05-20 + * - Function copied from rsyslog -- alorbach, 2020-11-13 + */ +#ifndef HAVE_STRNDUP +char * strndup(const char *s, size_t n); +#endif + #endif /* #ifndef RELP_H_INCLUDED */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/src/tcp.c new/librelp-1.9.0/src/tcp.c --- old/librelp-1.8.0/src/tcp.c 2020-09-29 09:01:33.000000000 +0200 +++ new/librelp-1.9.0/src/tcp.c 2020-11-19 12:54:12.000000000 +0100 @@ -1630,7 +1630,7 @@ } else { pThis->pEngine->dbgprint((char*)"relpTcpSetSslConfCmd_ossl: set to '%s'\n", tlsConfigCmd); char errmsg[1424]; -#if OPENSSL_VERSION_NUMBER >= 0x10020000L && !defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) char *pCurrentPos; char *pNextPos; char *pszCmd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/tests/test-framework.sh new/librelp-1.9.0/tests/test-framework.sh --- old/librelp-1.8.0/tests/test-framework.sh 2020-09-29 09:01:33.000000000 +0200 +++ new/librelp-1.9.0/tests/test-framework.sh 2020-11-19 12:54:12.000000000 +0100 @@ -129,7 +129,7 @@ grep $3 "$EXPECTED" $FILE_TO_CHECK > /dev/null if [ $? -ne 0 ]; then if [ "$check_only" == "yes" ]; then - printf 'check_output did not yet succeed in %s (check_only set)\n', $FILE_TO_CHECK + printf 'check_output did not yet succeed for "%s" in "%s" (check_only set)\n', "$EXPECTED", "$FILE_TO_CHECK" return 1 fi printf "\nFAIL: expected message not found. Expected:\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.8.0/tests/tls-basic-tlscommand.sh new/librelp-1.9.0/tests/tls-basic-tlscommand.sh --- old/librelp-1.8.0/tests/tls-basic-tlscommand.sh 2020-09-29 09:01:33.000000000 +0200 +++ new/librelp-1.9.0/tests/tls-basic-tlscommand.sh 2020-11-19 12:54:12.000000000 +0100 @@ -29,7 +29,7 @@ exit 77 else # Try "handshake failed" first - check_output --check-only "handshake failed" $TESTDIR/$errorlog + check_output --check-only "handshake fail" $TESTDIR/$errorlog ret=$? if [ $ret != 0 ]; then check_output "wrong version number" $TESTDIR/$errorlog _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
