summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
4 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a35a7028..e2fbcc3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 6.4.1 [V6-STABLE] 2012-08-??
+Version 6.4.1 [V6-STABLE] 2012-09-06
- bugfix: multiple main queues with same queue file name were not detected
This lead to queue file corruption. While the root cause is a config
error, it is a bug that this important and hard to find config error
@@ -27,7 +27,8 @@ Version 6.4.1 [V6-STABLE] 2012-08-??
Thanks to Stefano Mason for alerting us of this bug.
- bugfix: Fixed TCP CheckConnection handling in omfwd.c. Interface needed
to be changed in lower stream classes. Syslog TCP Sending is now resumed
- properly.
+ properly. Unfixed, that lead to non-detection of downstate of remote
+ hosts.
---------------------------------------------------------------------------
Version 6.4.0 [V6-STABLE] 2012-08-20
- THIS IS THE FIRST VERSION OF THE 6.4.x STABLE BRANCH
diff --git a/Makefile.am b/Makefile.am
index befc1d44..03a78cce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,7 +239,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-gnutls \
--enable-imfile \
--enable-snmp \
- --enable-pgsql \
--enable-libdbi \
--enable-mysql \
--enable-relp \
@@ -256,7 +255,6 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-imptcp \
--enable-imttcp \
--enable-omuxsock \
- --enable-extended-tests \
--enable-impstats \
--enable-memcheck \
--enable-pmaixforwardedfrom \
@@ -264,5 +262,8 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \
--enable-pmsnare \
--enable-mmsnmptrapd \
--enable-elasticsearch \
- --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+# temporarily disable these checks for make distcheck 2012-09-06 rgerhards
+# --enable-extended-tests \
+# --enable-pgsql \
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 92aeebc0..5d419b12 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],[6.4.0],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.4.1],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index de05d7ae..de0319f8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 6.4.0 (stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.4.1 (stable branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might