Merge branch 'v4.3.2' (v4-beta) into v4-stablev4.4.0

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/Makefile.am

1 files changed, 156 insertions, 56 deletions

diff --git a/configure.ac b/configure.ac
index 608ca15b..6be11b0d 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],[4.2.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[4.4.0],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([ChangeLog])
 AC_CONFIG_MACRO_DIR([m4])
@@ -144,6 +144,7 @@ AC_ARG_WITH(moddirs,
 AM_CONDITIONAL(WITH_MODDIRS, test x$moddirs != x)
 AC_SUBST(moddirs)
 
+
 # Large file support
 AC_ARG_ENABLE(largefile,
         [AS_HELP_STRING([--enable-largefile],[Enable large file support @<:@default=yes@:>@])],
@@ -158,6 +159,7 @@ if test "$enable_largefile" = "no"; then
         AC_DEFINE(NOLARGEFILE, 1, [Defined when large file support is disabled.])
 fi
 
+
 # Regular expressions
 AC_ARG_ENABLE(regexp,
         [AS_HELP_STRING([--enable-regexp],[Enable regular expressions support @<:@default=yes@:>@])],
@@ -173,6 +175,7 @@ if test "$enable_regexp" = "yes"; then
         AC_DEFINE(FEATURE_REGEXP, 1, [Regular expressions support enabled.])
 fi
 
+
 # zlib compression
 AC_ARG_ENABLE(zlib,
         [AS_HELP_STRING([--enable-zlib],[Enable zlib compression  support @<:@default=yes@:>@])],
@@ -193,17 +196,18 @@ if test "$enable_zlib" = "yes"; then
 	fi
 fi
 
+
 #gssapi
 AC_ARG_ENABLE(gssapi_krb5,
 	[AS_HELP_STRING([--enable-gssapi-krb5],[Enable GSSAPI Kerberos 5 support @<:@default=no@:>@])],
         [case "${enableval}" in
-         yes) want_gssapi_krb5="yes" ;;
-          no) want_gssapi_krb5="no" ;;
+         yes) enable_gssapi_krb5="yes" ;;
+          no) enable_gssapi_krb5="no" ;;
            *) AC_MSG_ERROR(bad value ${enableval} for --enable-gssapi-krb5) ;;
          esac],
-	[want_gssapi_krb5=no]
+	[enable_gssapi_krb5=no]
 )
-if test $want_gssapi_krb5 = yes; then
+if test $enable_gssapi_krb5 = yes; then
 	AC_CHECK_LIB(gssapi_krb5, gss_acquire_cred, [
 		AC_CHECK_HEADER(gssapi/gssapi.h, [
 			AC_DEFINE(USE_GSSAPI,,
@@ -213,7 +217,8 @@ if test $want_gssapi_krb5 = yes; then
 		])
 	])
 fi
-AM_CONDITIONAL(ENABLE_GSSAPI, test x$want_gssapi_krb5 = xyes)
+AM_CONDITIONAL(ENABLE_GSSAPI, test x$enable_gssapi_krb5 = xyes)
+
 
 # multithreading via pthreads
 AC_ARG_ENABLE(pthreads,
@@ -255,6 +260,7 @@ if test "x$enable_pthreads" != "xno"; then
   )
 fi
 
+
 # klog
 AC_ARG_ENABLE(klog,
         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],
@@ -269,6 +275,7 @@ AM_CONDITIONAL(ENABLE_IMKLOG, test x$enable_klog = xyes)
 AM_CONDITIONAL(ENABLE_IMKLOG_BSD, test x$os_type = xbsd)
 AM_CONDITIONAL(ENABLE_IMKLOG_LINUX, test x$os_type = xlinux)
 
+
 #
 # SYSLOG_UNIXAF
 #
@@ -289,6 +296,7 @@ AC_ARG_ENABLE([unix],
     AC_DEFINE([SYSLOG_UNIXAF], [1], [Description])
   ])
 
+
 # inet
 AC_ARG_ENABLE(inet,
         [AS_HELP_STRING([--enable-inet],[Enable networking support @<:@default=yes@:>@])],
@@ -304,6 +312,7 @@ if test "$enable_inet" = "yes"; then
         AC_DEFINE(SYSLOG_INET, 1, [network support is integrated.])
 fi
 
+
 #
 # The following define determines whether the package adheres to the
 # file system standard.
@@ -325,6 +334,7 @@ AC_ARG_ENABLE([fsstnd],
     AC_DEFINE([FSSTND], [1], [Description])
   ])
 
+
 # debug
 AC_ARG_ENABLE(debug,
         [AS_HELP_STRING([--enable-debug],[Enable debug mode @<:@default=no@:>@])],
@@ -342,6 +352,7 @@ if test "$enable_debug" = "no"; then
         AC_DEFINE(NDEBUG, 1, [Defined if debug mode is disabled.])
 fi
 
+
 # runtime instrumentation
 AC_ARG_ENABLE(rtinst,
         [AS_HELP_STRING([--enable-rtinst],[Enable runtime instrumentation mode @<:@default=no@:>@])],
@@ -356,6 +367,7 @@ if test "$enable_rtinst" = "yes"; then
         AC_DEFINE(RTINST, 1, [Defined if runtime instrumentation mode is enabled.])
 fi
 
+
 # valgrind
 AC_ARG_ENABLE(valgrind,
         [AS_HELP_STRING([--enable-valgrind],[Enable valgrind support settings @<:@default=no@:>@])],
@@ -453,6 +465,40 @@ AC_SUBST(PGSQL_CFLAGS)
 AC_SUBST(PGSQL_LIBS)
 
 
+# oracle (OCI) support
+AC_ARG_ENABLE(oracle,
+	[AS_HELP_STRING([--enable-oracle],[Enable native Oracle database support @<:@default=no@:>@])],
+	[case "${enableval}" in
+	 yes) enable_oracle="yes" ;;
+	 no) enable_oracle="no" ;;
+	 *) AC_MSG_ERROR(bad value ${enableval} for --enable-oracle) ;;
+	 esac],
+	[enable_oracle=no]
+)
+if test "x$enable_oracle" = "xyes"; then
+    AC_CHECK_PROG(
+	[HAVE_ORACLE_CONFIG],
+	[oracle-instantclient-config],
+	[yes],,,
+	)
+    if test "x${HAVE_ORACLE_CONFIG}" != "xyes"; then
+	AC_MSG_FAILURE([oracle-instantclient-config not found in PATH])
+    fi
+    AC_CHECK_LIB(
+	[occi],
+	[OCIEnvCreate],
+	[ORACLE_CFLAGS="`oracle-instantclient-config --cflags`"
+	ORACLE_LIBS="`oracle-instantclient-config --libs`"
+	],
+	[AC_MSG_FAILURE([Oracle (OCI) libraray is missing])],
+	[`oracle-instantclient-config --libs --cflags`]
+	)
+fi
+AM_CONDITIONAL(ENABLE_ORACLE, test x$enable_oracle = xyes)
+AC_SUBST(ORACLE_CFLAGS)
+AC_SUBST(ORACLE_LIBS)
+
+
 # libdbi support
 AC_ARG_ENABLE(libdbi,
         [AS_HELP_STRING([--enable-libdbi],[Enable libdbi database support @<:@default=no@:>@])],
@@ -613,6 +659,7 @@ AM_CONDITIONAL(ENABLE_RELP, test x$enable_relp = xyes)
 AC_SUBST(RELP_CFLAGS)
 AC_SUBST(RELP_LIBS)
 
+
 # RFC 3195 support
 AC_ARG_ENABLE(rfc3195,
         [AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])],
@@ -631,7 +678,21 @@ AC_SUBST(LIBLOGGING_CFLAGS)
 AC_SUBST(LIBLOGGING_LIBS)
 
 
-# settings for the file input module;
+# enable/disable the testbench (e.g. because some important parts
+# are missing)
+AC_ARG_ENABLE(testbench,
+        [AS_HELP_STRING([--enable-testbench],[file input module enabled @<:@default=yes@:>@])],
+        [case "${enableval}" in
+         yes) enable_testbench="yes" ;;
+          no) enable_testbench="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-testbench) ;;
+         esac],
+        [enable_testbench=yes]
+)
+AM_CONDITIONAL(ENABLE_TESTBENCH, test x$enable_testbench = xyes)
+
+
+# settings for the file input module
 AC_ARG_ENABLE(imfile,
         [AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])],
         [case "${enableval}" in
@@ -641,13 +702,49 @@ AC_ARG_ENABLE(imfile,
          esac],
         [enable_imfile=no]
 )
-#
-# you may want to do some library checks here - see snmp, mysql, pgsql modules
-# for samples
-#
 AM_CONDITIONAL(ENABLE_IMFILE, test x$enable_imfile = xyes)
 
 
+# settings for the omprog output module
+AC_ARG_ENABLE(omprog,
+        [AS_HELP_STRING([--enable-omprog],[Compiles omprog module @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_omprog="yes" ;;
+          no) enable_omprog="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omprog) ;;
+         esac],
+        [enable_omprog=no]
+)
+AM_CONDITIONAL(ENABLE_OMPROG, test x$enable_omprog = xyes)
+
+
+# settings for omstdout
+AC_ARG_ENABLE(omstdout,
+        [AS_HELP_STRING([--enable-omstdout],[Compiles stdout module @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_omstdout="yes" ;;
+          no) enable_omstdout="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omstdout) ;;
+         esac],
+        [enable_omstdout=no]
+)
+AM_CONDITIONAL(ENABLE_OMSTDOUT, test x$enable_omstdout = xyes)
+
+# This provides a vehicle to integrate custom modules, that are not
+# part of rsyslog, into the build process. It is named cust1, so that
+# additional such modules can easily be added.
+AC_ARG_ENABLE(cust1,
+        [AS_HELP_STRING([--enable-cust1],[Compiles stdout module @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_cust1="yes" ;;
+          no) enable_cust1="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-cust1) ;;
+         esac],
+        [enable_cust1=no]
+)
+AM_CONDITIONAL(ENABLE_CUST1, test x$enable_cust1 = xyes)
+
+
 # settings for the template input module; copy and modify this code
 # if you intend to add your own module. Be sure to replace imtemplate
 # by the actual name of your module.
@@ -665,7 +762,7 @@ AC_ARG_ENABLE(imtemplate,
 # for samples
 #
 AM_CONDITIONAL(ENABLE_IMTEMPLATE, test x$enable_imtemplate = xyes)
-# end of copy template - be sure to serach for imtemplate to find everything!
+# end of copy template - be sure to search for imtemplate to find everything!
 
 
 # settings for the template output module; copy and modify this code
@@ -685,29 +782,15 @@ AC_ARG_ENABLE(omtemplate,
 # for samples
 #
 AM_CONDITIONAL(ENABLE_OMTEMPLATE, test x$enable_omtemplate = xyes)
-# end of copy template - be sure to serach for omtemplate to find everything!
+# end of copy template - be sure to search for omtemplate to find everything!
 
 
-# settings for omstdout
-# note that "make check" fails, if omstdout is not enabled (thus we enable
-# it by default).
-AC_ARG_ENABLE(omstdout,
-        [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=yes@:>@])],
-        [case "${enableval}" in
-         yes) enable_omstdout="yes" ;;
-          no) enable_omstdout="no" ;;
-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omstdout) ;;
-         esac],
-        [enable_omstdout=no]
-)
-#
-# you may want to do some library checks here - see snmp, mysql, pgsql modules
-# for samples
-#
-AM_CONDITIONAL(ENABLE_OMSTDOUT, test x$enable_omstdout = xyes)
+SHAVE_INIT
 
 
 AC_CONFIG_FILES([Makefile \
+		shave \
+		shave-libtool \
 		runtime/Makefile \
 		tools/Makefile \
 		doc/Makefile \
@@ -720,6 +803,7 @@ AC_CONFIG_FILES([Makefile \
 		plugins/imklog/Makefile \
 		plugins/imtemplate/Makefile \
 		plugins/omtemplate/Makefile \
+		plugins/omprog/Makefile \
 		plugins/omstdout/Makefile \
 		plugins/imfile/Makefile \
 		plugins/imrelp/Makefile \
@@ -732,35 +816,51 @@ AC_CONFIG_FILES([Makefile \
 		plugins/omlibdbi/Makefile \
 		plugins/ommail/Makefile \
 		plugins/omsnmp/Makefile \
+		plugins/omoracle/Makefile \
+		plugins/cust1/Makefile \
 		tests/Makefile])
 AC_OUTPUT
 
 echo "****************************************************"
 echo "rsyslog will be compiled with the following settings:"
 echo
-echo "Multithreading support enabled:           $enable_pthreads"
-echo "Klog functionality enabled:               $enable_klog ($os_type)"
-echo "Regular expressions support enabled:      $enable_regexp"
-echo "Zlib compression support enabled:         $enable_zlib"
-echo "MySql support enabled:                    $enable_mysql"
-echo "libdbi support enabled:                   $enable_libdbi"
-echo "PostgreSQL support enabled:               $enable_pgsql"
-echo "SNMP support enabled:                     $enable_snmp"
-echo "Mail support enabled:                     $enable_mail"
-echo "RELP support enabled:                     $enable_relp"
-echo "imdiag enabled:                           $enable_imdiag"
-echo "file input module enabled:                $enable_imfile"
-echo "input template module will be compiled:   $enable_imtemplate"
-echo "output template module will be compiled:  $enable_omtemplate"
-echo "omstdout module will be compiled:         $enable_omstdout"
-echo "Large file support enabled:               $enable_largefile"
-echo "Networking support enabled:               $enable_inet"
-echo "GnuTLS network stream driver enabled:     $enable_gnutls"
-echo "Enable GSSAPI Kerberos 5 support:         $want_gssapi_krb5"
-echo "Debug mode enabled:                       $enable_debug"
-echo "Runtime Instrumentation enabled:          $enable_rtinst"
-echo "Diagnostic tools enabled:                 $enable_diagtools"
-echo "valgrind support settings enabled:        $enable_valgrind"
-echo "rsyslog runtime will be built:            $enable_rsyslogrt"
-echo "rsyslogd will be built:                   $enable_rsyslogd"
-
+echo "    Multithreading support enabled:           $enable_pthreads"
+echo "    Large file support enabled:               $enable_largefile"
+echo "    Networking support enabled:               $enable_inet"
+echo "    Regular expressions support enabled:      $enable_regexp"
+echo "    Zlib compression support enabled:         $enable_zlib"
+echo "    rsyslog runtime will be built:            $enable_rsyslogrt"
+echo "    rsyslogd will be built:                   $enable_rsyslogd"
+echo "    custom module 1 will be built:            $enable_cust1"
+echo
+echo "---{ input plugins }---"
+echo "    Klog functionality enabled:               $enable_klog ($os_type)"
+echo "    imdiag enabled:                           $enable_imdiag"
+echo "    file input module enabled:                $enable_imfile"
+echo "    input template module will be compiled:   $enable_imtemplate"
+echo
+echo "---{ output plugins }---"
+echo "    Mail support enabled:                     $enable_mail"
+echo "    omprog module will be compiled:           $enable_omprog"
+echo "    omstdout module will be compiled:         $enable_omstdout"
+echo "    output template module will be compiled:  $enable_omtemplate"
+echo
+echo "---{ database support }---"
+echo "    MySql support enabled:                    $enable_mysql"
+echo "    libdbi support enabled:                   $enable_libdbi"
+echo "    PostgreSQL support enabled:               $enable_pgsql"
+echo "    Oracle (OCI) support enabled:             $enable_oracle"
+echo
+echo "---{ protocol support }---"
+echo "    GnuTLS network stream driver enabled:     $enable_gnutls"
+echo "    GSSAPI Kerberos 5 support enabled:        $enable_gssapi_krb5"
+echo "    RELP support enabled:                     $enable_relp"
+echo "    SNMP support enabled:                     $enable_snmp"
+echo
+echo "---{ debugging support }---"
+echo "    Testbench enabled:                        $enable_testbench"
+echo "    Debug mode enabled:                       $enable_debug"
+echo "    Runtime Instrumentation enabled:          $enable_rtinst"
+echo "    Diagnostic tools enabled:                 $enable_diagtools"
+echo "    Valgrind support settings enabled:        $enable_valgrind"
+echo