From a2b4a8ac920434afc11d55a447a121a1236409e1 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sun, 24 Nov 2013 10:14:16 +0100
Subject: prepare for upcoming liblognorm 1.0.0 release

The new liblognorm relase has an incompatible API, so
we cannot use it to compile this version of rsyslog.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ee3394b5..2fc51a67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -920,7 +920,7 @@ AC_ARG_ENABLE(mmnormalize,
 )
 if test "x$enable_mmnormalize" = "xyes"; then
 	PKG_CHECK_MODULES(LIBEE, libee >= 0.4.0)
-	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 0.3.1)
+	PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 0.3.1 lognorm < 1.0.0)
 fi
 AM_CONDITIONAL(ENABLE_MMNORMALIZE, test x$enable_mmnormalize = xyes)
 
-- 
cgit v1.2.3


From 54f41ae512ddd5c5555bcbfa49da56a72d94ad9f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 27 Nov 2013 17:47:10 +0100
Subject: doc: remove some implementation details

---
 doc/lookup_tables.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lookup_tables.html b/doc/lookup_tables.html
index d72810f1..4ef5d59d 100644
--- a/doc/lookup_tables.html
+++ b/doc/lookup_tables.html
@@ -190,8 +190,8 @@ be sufficiently secured, e.g. via TLS mutual auth.
 
 <h2>Implementation Details</h2>
 <p>The lookup table functionality is implemented via highly efficient algorithms.
-The string lookup is based on a parse tree and has O(1) time complexity. The array
-lookup is also O(1). In case of sparseArray, we have O(log n).
+The string lookup has O(log n) time complexity. The array
+lookup is O(1). In case of sparseArray, we have O(log n).
 <p>To preserve space and, more important, increase cache hit performance, equal
 data values are only stored once, no matter how often a lookup index points to them.
 <p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>]
-- 
cgit v1.2.3