preparing for 1.12.0 releasev1-12-0

3 files changed, 9 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index aa762ddd..cde34906 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 ---------------------------------------------------------------------------
-Version 1.12.0 (RGer), 2005-10-20
+Version 1.12.0 (RGer), 2005-10-26
 - moved to a multi-threaded design. single-threading is still optionally
-  available
+  available. Multi-threading is experimental!
 - fixed a potential race condition. In the original code, marking was done
   by an alarm handler, which could lead to all sorts of bad things. This
   has been changed now. See comments in syslogd.c/domark() for details.
@@ -10,7 +10,7 @@ Version 1.12.0 (RGer), 2005-10-20
   none occurs once rsyslogd has started up. Even in unusual conditions
   (like low-memory conditions) rsyslogd somehow remains active. Of course,
   it might loose a message or two, but at least it does not abort and it
-  can also recover when the condition no longer persist.
+  can also recover when the condition no longer persists.
 - fixed a bug that could cause loss of the last message received
   immediately before rsyslogd was terminated.
 - added comments on thread-safety of global variables in syslogd.c
diff --git a/freebsd/Makefile b/freebsd/Makefile
index 30c0eef6..810a4e44 100644
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -32,7 +32,10 @@ FEATURE_REGEXP=1
 FEATURE_RFC3195=0
 
 # Enable multithreading via pthreads (very experimental!)
-FEATURE_PTHREADS=1
+# Current thread code causes grief with signal handlers under
+# BSD - chances are extremely high rsyslogd will dump core if
+# enabled under BSD!
+FEATURE_PTHREADS=0
 
 # Enable debug mode (much slower code)
 FEATURE_DEBUG=0
diff --git a/linux/Makefile b/linux/Makefile
index 0d341184..5ea4d1e7 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -31,13 +31,13 @@ FEATURE_DB=0
 FEATURE_REGEXP=1
 
 # Enable RFC 3195 support (REQUIRES LIBLOGGING 0.6.0 or above!)
-FEATURE_RFC3195=1
+FEATURE_RFC3195=0
 
 # Enable multithreading via pthreads (very experimental!)
 FEATURE_PTHREADS=1
 
 # Enable debug mode (much slower code)
-FEATURE_DEBUG=1
+FEATURE_DEBUG=0
 
 # The following defines tell us where liblogging is located. This
 # is only needed if we build with RFC 3195 support. By default,