diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 12:13:01 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 12:13:01 +0200 |
commit | 8cd291a0c9eab23fa020d6560715a32c3370f78b (patch) | |
tree | e89b794ccedbae3c46aa406f29fc5ce7a7f915b7 | |
parent | aba8792c8a82ef52a3188ee7295e501ca21dae3b (diff) | |
parent | 7aa30acc744ae53aab2a0b2e3d1a1b0081d9e393 (diff) | |
download | rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.tar.gz rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.tar.xz rsyslog-8cd291a0c9eab23fa020d6560715a32c3370f78b.zip |
Merge branch 'v4-stable' into v4-beta
Conflicts:
ChangeLog
runtime/msg.c
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | tests/Makefile.am | 4 |
4 files changed, 29 insertions, 3 deletions
@@ -101,6 +101,22 @@ Version 4.5.0 [DEVEL] (rgerhards), 2009-07-02 This could lead to timestamps written in the wrong format, but not to an abort --------------------------------------------------------------------------- +Version 4.4.1 [v4-stable] (rgerhards), 2009-08-?? +- features requiring Java are automatically disabled if Java is not + present (thanks to Michael Biebl for his help!) +- bugfix: invalid double-quoted PRI, among others in outgoing messages + This causes grief with all receivers. + Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=147 +- bugfix: Java testing tools were required, even if testbench was disabled + This resulted in build errors if no Java was present on the build system, + even though none of the selected option actually required Java. + (I forgot to backport a similar fix to newer releases). +- bugfix (backport): omfwd segfault + Note that the orginal (higher version) patch states this happens only + when debugging mode is turned on. That statement is wrong: if debug + mode is turned off, the message is not being emitted, but the division + by zero in the actual parameters still happens. +--------------------------------------------------------------------------- Version 4.4.0 [v4-stable] (rgerhards), 2009-08-21 - bugfix: stderr/stdout were not closed to be able to emit error messages, but this caused ssh sessions to hang. Now we close them after the diff --git a/Makefile.am b/Makefile.am index 8a130655..a050e95e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,6 @@ sbin_PROGRAMS = pkglib_LTLIBRARIES = - if ENABLE_INET pkglib_LTLIBRARIES += lmtcpsrv.la lmtcpclt.la # diff --git a/configure.ac b/configure.ac index ab0c3a33..19d738eb 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,12 @@ AC_CONFIG_HEADERS([config.h]) AC_GNU_SOURCE +# check for Java compiler +AC_CHECK_PROG(HAVE_JAVAC, [javac], [yes]) +if test x"$HAVE_JAVAC" = x"yes"; then + AC_MSG_WARN([no javac found, disabling features depending on it]) +fi + # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O @@ -690,6 +696,11 @@ AC_ARG_ENABLE(testbench, esac], [enable_testbench=yes] ) +if test "$enable_testbench" = "yes"; then + if test x$HAVE_JAVAC = x; then + enable_testbench='no' + fi +fi AM_CONDITIONAL(ENABLE_TESTBENCH, test x$enable_testbench = xyes) diff --git a/tests/Makefile.am b/tests/Makefile.am index c50b7cd6..c5deaa47 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,14 +20,14 @@ TESTS += omod-if-array.sh \ fieldtest.sh endif +check_JAVA = DiagTalker.java + endif # if ENABLE_TESTBENCH TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ DISTCLEANFILES=rsyslog.pid '$(abs_top_builddir)'/DiagTalker.class test_files = testbench.h runtime-dummy.c -check_JAVA = DiagTalker.java - EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ validation-run.sh \ testsuites/invalid.conf \ |