Merge branch 'beta'

Conflicts:
	ChangeLog
	configure.ac

4 files changed, 35 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 659e9ca3..a855bb1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,14 @@ Version 6.5.0  [devel] 2012-0?-??
   This actually at compile time disables a lot of debug code, resulting
   in some speedup (but serious loss of debugging capabilities)
 ---------------------------------------------------------------------------
-Version 6.3.10  [BETA] 2012-0?-??
+Version 6.3.10  [BETA] 2012-06-04
+- bugfix: delayble source could block action queue, even if there was
+  a disk queue associated with it. The root cause of this problem was
+  that it makes no sense to delay messages once they arrive in the 
+  action queue - the "input" that is being held in that case is the main
+  queue worker, what makes no sense.
+  Thanks to Marcin for alerting us on this problem and providing 
+  instructions to reproduce it.
 - bugfix: invalid free in imptcp could lead to abort during startup
 - bugfix: if debug message could end up in log file when forking
   if rsyslog was set to auto-background (thus fork, the default) and debug
@@ -16,6 +23,11 @@ Version 6.3.10  [BETA] 2012-0?-??
   in behaviour, which is under review. If it causes problems to you,
   please let us know.
   Thanks to Tomas Heinrich for the patch.
+- bugfix: --enable-smcustbindcdr configure directive did not work
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330
+  Thanks to Ultrabug for the patch.
+- bugfix: made rsyslog compile when libestr ist not installed in /usr
+  Thanks to Miloslav Trmač for providing patches and suggestions
 ---------------------------------------------------------------------------
 Version 6.3.9  [BETA] 2012-05-22
 - bugfix: imtcp could cause hang during reception
@@ -189,6 +201,9 @@ Version 6.2.2  [v6-stable], 2012-05-??
   full delayable sources somewhat smarter and permits, assuming sufficient
   timouts, to persist message up to the max queue capacity. Also some nits
   in debug instrumentation have been fixed.
+- bugfix: --enable-smcustbindcdr configure directive did not work
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330
+  Thanks to Ultrabug for the patch.
 ---------------------------------------------------------------------------
 Version 6.2.1  [v6-stable], 2012-05-10
 - change plugin config interface to be compatible with pre-v6.2 system
diff --git a/configure.ac b/configure.ac
index 1f995eb7..589b1715 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.3.8],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.5.0],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -768,11 +768,15 @@ AC_ARG_ENABLE(rsyslogrt,
         [enable_rsyslogrt=yes]
 )
 if test "x$enable_rsyslogrt" = "xyes"; then
-  RSRT_CFLAGS="-I\$(top_srcdir)/runtime -I\$(top_srcdir) -I\$(top_srcdir)/grammar"
-  RSRT_LIBS="\$(top_builddir)/runtime/librsyslog.la"
+  RSRT_CFLAGS1="-I\$(top_srcdir)/runtime -I\$(top_srcdir) -I\$(top_srcdir)/grammar"
+  RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
   #??CNF_LIBS="\$(top_builddir)/grammar/libgrammar.la"
 fi
 AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS)"
+RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS)"
+AC_SUBST(RSRT_CFLAGS1)
+AC_SUBST(RSRT_LIBS1)
 AC_SUBST(RSRT_CFLAGS)
 AC_SUBST(RSRT_LIBS)
 
@@ -1204,16 +1208,16 @@ AM_CONDITIONAL(ENABLE_CUST1, test x$enable_cust1 = xyes)
 
 # A custom strgen that also serves as a sample of how to do
 # SQL-generating strgen's
-AC_ARG_ENABLE(smcustbindcdr,
-        [AS_HELP_STRING([--enable-smcustbindcdr],[Compiles smcustbindcdr module @<:@default=no@:>@])],
+AC_ARG_ENABLE(sm_cust_bindcdr,
+        [AS_HELP_STRING([--enable-sm_cust_bindcdr],[Compiles sm_cust_bindcdr module @<:@default=no@:>@])],
         [case "${enableval}" in
-         yes) enable_smcustbindcdr="yes" ;;
-          no) enable_smcustbindcdr="no" ;;
-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-smcustbindcdr) ;;
+         yes) enable_sm_cust_bindcdr="yes" ;;
+          no) enable_sm_cust_bindcdr="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-sm_cust_bindcdr) ;;
          esac],
-        [enable_smcustbindcdr=no]
+        [enable_sm_cust_bindcdr=no]
 )
-AM_CONDITIONAL(ENABLE_SMCUSTBINDCDR, test x$enable_smcustbindcdr = xyes)
+AM_CONDITIONAL(ENABLE_SMCUSTBINDCDR, test x$enable_sm_cust_bindcdr = xyes)
 
 
 # settings for mmsnmptrapd message modification module
diff --git a/doc/manual.html b/doc/manual.html
index c9021e52..7af5c5eb 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.3.9 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.10 (beta 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
diff --git a/grammar/Makefile.am b/grammar/Makefile.am
index 5911f443..d231bb46 100644
--- a/grammar/Makefile.am
+++ b/grammar/Makefile.am
@@ -13,7 +13,7 @@ libgrammar_la_SOURCES = \
 	grammar.h
 libgrammar_la_CPPFLAGS =  $(RSRT_CFLAGS)
 
-testdriver_SOURCES = testdriver.c libgrammar.la
-testdriver_CPPFLAGS =  $(RSRT_CFLAGS)
-testdriver_LDADD = libgrammar.la
-testdriver_LDFLAGS = -lestr
+#testdriver_SOURCES = testdriver.c libgrammar.la
+#testdriver_CPPFLAGS =  $(RSRT_CFLAGS)
+#testdriver_LDADD = libgrammar.la
+#testdriver_LDFLAGS = -lestr