Hello community,
here is the log from the commit of package librelp for openSUSE:Factory checked in at 2014-04-30 15:06:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/librelp (Old)
and /work/SRC/openSUSE:Factory/.librelp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librelp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/librelp/librelp.changes 2014-03-22 09:08:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.librelp.new/librelp.changes 2014-04-30 15:06:42.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Apr 29 17:07:46 UTC 2014 - andreas.stieger@gmx.de
+
+- update to 1.2.7
+ - bugfix: librelp was incompatible with C++ without a real reason
+ - bugfix: potential misadressing in wildcard match
+ - bugfix: always last wildcard match was reported, not first
+- contains changes from 1.2.6
+ - report error when preparing for non-anon TLS and this is
+ unsupported
+
+-------------------------------------------------------------------
Old:
----
librelp-1.2.5.tar.gz
New:
----
librelp-1.2.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ librelp.spec ++++++
--- /var/tmp/diff_new_pack.Kj9bF2/_old 2014-04-30 15:06:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Kj9bF2/_new 2014-04-30 15:06:43.000000000 +0200
@@ -16,17 +16,17 @@
#
-Name: librelp
%define library_name librelp0
-Version: 1.2.5
+Name: librelp
+Version: 1.2.7
Release: 0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url: http://www.librelp.com/
-Source: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz
Summary: A reliable logging library
License: GPL-3.0+
Group: Development/Libraries/C and C++
+Url: http://www.librelp.com/
+Source: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz
BuildRequires: pkgconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?sles_version} && 0%{?sles_version} <= 11
BuildRequires: libgnutls-devel >= 2.0.0
%else
@@ -53,17 +53,11 @@
provide ample opportunity to extend the protocol without affecting existing
applications.
-
-Authors:
---------
- Rainer Gerhards
-
-
-%package -n %library_name
+%package -n %{library_name}
Summary: A reliable logging library
Group: Development/Libraries/C and C++
-%description -n %library_name
+%description -n %{library_name}
librelp is an easy to use library for the RELP protocol. RELP in turn provides
reliable event logging over the network (and consequently RELP stands for
Reliable Event Logging Protocol). RELP was initiated by Rainer Gerhards after
@@ -83,15 +77,10 @@
provide ample opportunity to extend the protocol without affecting existing
applications.
-
-Authors:
---------
- Rainer Gerhards
-
%package devel
-Requires: %{library_name} = %{version}
Summary: A reliable logging library
Group: Development/Libraries/C and C++
+Requires: %{library_name} = %{version}
Requires: libgnutls-devel >= 1.4.0
%description devel
@@ -114,11 +103,6 @@
provide ample opportunity to extend the protocol without affecting existing
applications.
-
-Authors:
---------
- Rainer Gerhards
-
%prep
%setup -q
@@ -127,8 +111,8 @@
make %{?_smp_mflags}
%install
-%makeinstall
-%{__rm} %{buildroot}%{_libdir}/librelp.la
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+rm %{buildroot}%{_libdir}/librelp.la
%post -n %{library_name} -p /sbin/ldconfig
++++++ librelp-1.2.5.tar.gz -> librelp-1.2.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/ChangeLog new/librelp-1.2.7/ChangeLog
--- old/librelp-1.2.5/ChangeLog 2014-03-20 14:23:37.000000000 +0100
+++ new/librelp-1.2.7/ChangeLog 2014-04-28 17:59:02.000000000 +0200
@@ -1,4 +1,22 @@
----------------------------------------------------------------------
+Version 1.2.7 - 2014-04-29
+- bugfix: librelp was incompatible with C++ without a real reason
+ Thanks to Ivan Kryak for the patch
+- bugfix: potential misadressing in wildcard match
+ see: https://github.com/rsyslog/librelp/pull/3
+ Thanks to Sebastian Schmidt for the patch.
+- bugfix: always last wildcard match was reported, not first
+ see: https://github.com/rsyslog/librelp/pull/4
+ Thanks to Sebastian Schmidt for the patch.
+----------------------------------------------------------------------
+Version 1.2.6 - 2014-03-20
+- report error when preparing for non-anon TLS and this is unsupported
+ The error is reported when the processes own certificate is set,
+ which also turns off anon TLS. We now check if TLS AUTH is supported
+ and, if not, return an error. This enables better error tracking
+ in the client, as otherwise the problem is reported much later
+ or even not at all (in the case of a relp server).
+----------------------------------------------------------------------
Version 1.2.5 - 2014-03-20
- permit to use anonymous TLS on platforms where GnuTLS misses
certificate verification function. This permits to use at least
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/configure new/librelp-1.2.7/configure
--- old/librelp-1.2.5/configure 2014-03-20 14:24:38.000000000 +0100
+++ new/librelp-1.2.7/configure 2014-04-28 17:59:19.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for librelp 1.2.5.
+# Generated by GNU Autoconf 2.69 for librelp 1.2.7.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='librelp'
PACKAGE_TARNAME='librelp'
-PACKAGE_VERSION='1.2.5'
-PACKAGE_STRING='librelp 1.2.5'
+PACKAGE_VERSION='1.2.7'
+PACKAGE_STRING='librelp 1.2.7'
PACKAGE_BUGREPORT='rgerhards@adiscon.com'
PACKAGE_URL=''
@@ -1323,7 +1323,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.2.5 to adapt to many kinds of systems.
+\`configure' configures librelp 1.2.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1393,7 +1393,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of librelp 1.2.5:";;
+ short | recursive ) echo "Configuration of librelp 1.2.7:";;
esac
cat <<\_ACEOF
@@ -1508,7 +1508,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-librelp configure 1.2.5
+librelp configure 1.2.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2034,7 +2034,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.2.5, which was
+It was created by librelp $as_me 1.2.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2897,7 +2897,7 @@
# Define the identity of the package.
PACKAGE='librelp'
- VERSION='1.2.5'
+ VERSION='1.2.7'
cat >>confdefs.h <<_ACEOF
@@ -2970,7 +2970,7 @@
# Define the identity of the package.
PACKAGE='librelp'
- VERSION='1.2.5'
+ VERSION='1.2.7'
cat >>confdefs.h <<_ACEOF
@@ -13321,7 +13321,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.2.5, which was
+This file was extended by librelp $as_me 1.2.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13387,7 +13387,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.2.5
+librelp config.status 1.2.7
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.2.5/configure.ac new/librelp-1.2.7/configure.ac
--- old/librelp-1.2.5/configure.ac 2014-03-20 14:21:44.000000000 +0100
+++ new/librelp-1.2.7/configure.ac 2014-04-28 17:58:53.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([librelp], [1.2.5], [rgerhards@adiscon.com])
+AC_INIT([librelp], [1.2.7], [rgerhards@adiscon.com])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/librelp.h new/librelp-1.2.7/src/librelp.h
--- old/librelp-1.2.5/src/librelp.h 2014-03-20 09:02:05.000000000 +0100
+++ new/librelp-1.2.7/src/librelp.h 2014-04-28 17:52:11.000000000 +0200
@@ -50,7 +50,6 @@
typedef struct relpSendbuf_s relpSendbuf_t;
typedef struct relpOffers_s relpOffers_t;
typedef struct relpOffer_s relpOffer_t;
-typedef enum relpCmdEnaState_e relpCmdEnaState_t;
/* IDs of librelp objects */
typedef enum relpObjID_e {
@@ -85,6 +84,7 @@
eRelpCmdState_Disabled = 5 /**< feature can NOT be used (set during open handshake) */
};
+typedef enum relpCmdEnaState_e relpCmdEnaState_t;
/* macro to assert we are dealing with the right relp object */
#ifdef NDEBUG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/relpsrv.c new/librelp-1.2.7/src/relpsrv.c
--- old/librelp-1.2.5/src/relpsrv.c 2014-03-14 08:02:16.000000000 +0100
+++ new/librelp-1.2.7/src/relpsrv.c 2014-03-24 15:03:33.000000000 +0100
@@ -349,11 +349,11 @@
CHKRet(relpTcpEnableTLSZip(pTcp));
}
relpTcpSetDHBits(pTcp, pThis->dhBits);
- relpTcpSetGnuTLSPriString(pTcp, pThis->pristring);
- relpTcpSetAuthMode(pTcp, pThis->authmode);
- relpTcpSetCACert(pTcp, pThis->caCertFile);
- relpTcpSetOwnCert(pTcp, pThis->ownCertFile);
- relpTcpSetPrivKey(pTcp, pThis->privKey);
+ CHKRet(relpTcpSetGnuTLSPriString(pTcp, pThis->pristring));
+ CHKRet(relpTcpSetAuthMode(pTcp, pThis->authmode));
+ CHKRet(relpTcpSetCACert(pTcp, pThis->caCertFile));
+ CHKRet(relpTcpSetOwnCert(pTcp, pThis->ownCertFile));
+ CHKRet(relpTcpSetPrivKey(pTcp, pThis->privKey));
CHKRet(relpTcpSetPermittedPeers(pTcp, &(pThis->permittedPeers)));
}
CHKRet(relpTcpLstnInit(pTcp, (pThis->pLstnPort == NULL) ? (unsigned char*) RELP_DFLT_PORT : pThis->pLstnPort, pThis->ai_family));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librelp-1.2.5/src/tcp.c new/librelp-1.2.7/src/tcp.c
--- old/librelp-1.2.5/src/tcp.c 2014-03-20 09:02:05.000000000 +0100
+++ new/librelp-1.2.7/src/tcp.c 2014-04-22 15:33:25.000000000 +0200
@@ -482,8 +482,12 @@
if(cert == NULL) {
pThis->privKeyFile = NULL;
} else {
- if((pThis->privKeyFile = strdup(cert)) == NULL)
- ABORT_FINALIZE(RELP_RET_OUT_OF_MEMORY);
+# ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION
+ if((pThis->privKeyFile = strdup(cert)) == NULL)
+ ABORT_FINALIZE(RELP_RET_OUT_OF_MEMORY);
+# else
+ ABORT_FINALIZE(RELP_RET_ERR_NO_TLS_AUTH);
+# endif
}
finalize_it:
LEAVE_RELPFUNC;
@@ -1015,7 +1019,7 @@
* empty. That happens frequently if the domain root (e.g. "example.com.")
* is properly given.
*/
- if(pWildcard->wildcardType == tcpPEER_WILDCARD_EMPTY_COMPONENT)
+ if(pWildcard != NULL && pWildcard->wildcardType == tcpPEER_WILDCARD_EMPTY_COMPONENT)
pWildcard = pWildcard->pNext;
if(pWildcard != NULL) {
@@ -1049,6 +1053,8 @@
} else {
relpTcpChkOnePeerWildcard(pThis->permittedPeers.peer[i].wildcardRoot,
peername, pbFoundPositiveMatch);
+ if (*pbFoundPositiveMatch)
+ break;
}
}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org