From 538543f6d0d4f279301bccf9a9c05ea6a02230a4 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 2 Jul 2009 15:40:47 +0200 Subject: preparing for 3.22.1 --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a608b77..7e4d492f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 3.22.1 [v3-stable] (rgerhards), 2009-04-?? +Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty set of files (e.g. *.conf, where none such files existed) thanks to Michael Biebl for reporting this bug diff --git a/configure.ac b/configure.ac index 9f7e27a0..9a6afd42 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[3.22.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.22.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/manual.html b/doc/manual.html index 4626992d..42ee5a8d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the novice user. And as we know what enterprise users really need, there is also professional rsyslog support available directly from the source!

-

This documentation is for version 3.22.0 (v3-stable branch) of rsyslog. +

This documentation is for version 3.22.1 (v3-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit From 89e18de662ef563e58eb04f51f2966efcd4c3fab Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 13 Jul 2009 14:24:16 +0200 Subject: bugfix: sending syslog messages with zip compression did not work --- ChangeLog | 3 +++ tools/omfwd.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e4d492f..6f3cbccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? +- bugfix: sending syslog messages with zip compression did not work +--------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty set of files (e.g. *.conf, where none such files existed) diff --git a/tools/omfwd.c b/tools/omfwd.c index e62f84b7..b6565dd1 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -411,11 +411,11 @@ CODESTARTdoAction */ if(pData->compressionLevel && (l > MIN_SIZE_FOR_COMPRESS)) { Bytef *out; - uLongf destLen = sizeof(out) / sizeof(Bytef); + teste das hier! uLongf destLen = iMaxLine + iMaxLine/100 +12; /* recommended value from zlib doc */ uLong srcLen = l; int ret; /* TODO: optimize malloc sequence? -- rgerhards, 2008-09-02 */ - CHKmalloc(out = (Bytef*) malloc(iMaxLine + iMaxLine/100 + 12)); + CHKmalloc(out = (Bytef*) malloc(destlen)); out[0] = 'z'; out[1] = '\0'; ret = compress2((Bytef*) out+1, &destLen, (Bytef*) psz, -- cgit From e27b56f0b75d90d8086b4b7a69c36991485b1078 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 13 Jul 2009 14:56:29 +0200 Subject: better configure error message if mysql-devel is missing --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9a6afd42..987a8fb9 100644 --- a/configure.ac +++ b/configure.ac @@ -392,7 +392,7 @@ if test "x$enable_mysql" = "xyes"; then [yes],,, ) if test "x${HAVE_MYSQL_CONFIG}" != "xyes"; then - AC_MSG_FAILURE([mysql_config not found in PATH]) + AC_MSG_FAILURE([mysql_config not found in PATH - usually a package named mysql-dev, libmysql-dev or similar, is missing - install it to fix this issue]) fi AC_CHECK_LIB( [mysqlclient], -- cgit From ef9722ec87c8a7ddb2d499c1e7863475d8790a94 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 13 Jul 2009 15:44:09 +0200 Subject: fix compile error in zip sender patch ... at least I was smart enough to remind me that I did not do one test ;) That reminder was the compiler error. Now removed and test done ;) [simple things tend to work, lol] --- tools/omfwd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/omfwd.c b/tools/omfwd.c index b6565dd1..eb023344 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -411,11 +411,11 @@ CODESTARTdoAction */ if(pData->compressionLevel && (l > MIN_SIZE_FOR_COMPRESS)) { Bytef *out; - teste das hier! uLongf destLen = iMaxLine + iMaxLine/100 +12; /* recommended value from zlib doc */ + uLongf destLen = iMaxLine + iMaxLine/100 +12; /* recommended value from zlib doc */ uLong srcLen = l; int ret; /* TODO: optimize malloc sequence? -- rgerhards, 2008-09-02 */ - CHKmalloc(out = (Bytef*) malloc(destlen)); + CHKmalloc(out = (Bytef*) malloc(destLen)); out[0] = 'z'; out[1] = '\0'; ret = compress2((Bytef*) out+1, &destLen, (Bytef*) psz, -- cgit