Browse Source

Imported Upstream version 8.11.0

upstream upstream/8.11.0
Michael Biebl 8 years ago
parent
commit
e03d359a5c
  1. 2
      .tarball-version
  2. 28
      ChangeLog
  3. 97
      Makefile.am
  4. 399
      Makefile.in
  5. 9
      README.md
  6. 29
      action.c
  7. 2
      compat/Makefile.am
  8. 14
      compat/Makefile.in
  9. 40
      compat/strndup.c
  10. 192
      configure
  11. 37
      configure.ac
  12. 2
      contrib/imczmq/Makefile.in
  13. 2
      contrib/imkmsg/Makefile.in
  14. 2
      contrib/imzmq3/Makefile.in
  15. 2
      contrib/mmcount/Makefile.in
  16. 2
      contrib/mmcount/mmcount.c
  17. 2
      contrib/mmrfc5424addhmac/Makefile.in
  18. 2
      contrib/mmsequence/Makefile.in
  19. 2
      contrib/mmsequence/mmsequence.c
  20. 2
      contrib/omczmq/Makefile.in
  21. 2
      contrib/omhiredis/Makefile.in
  22. 2
      contrib/omhttpfs/Makefile.in
  23. 2
      contrib/omrabbitmq/Makefile.in
  24. 2
      contrib/omzmq3/Makefile.in
  25. 2
      contrib/pmaixforwardedfrom/Makefile.in
  26. 2
      contrib/pmcisconames/Makefile.in
  27. 2
      contrib/pmsnare/Makefile.in
  28. 2
      grammar/Makefile.am
  29. 4
      grammar/Makefile.in
  30. 4
      grammar/lexer.c
  31. 4
      grammar/lexer.l
  32. 40
      grammar/rainerscript.c
  33. 2
      plugins/im3195/Makefile.in
  34. 2
      plugins/imdiag/Makefile.in
  35. 2
      plugins/imfile/Makefile.in
  36. 4
      plugins/imfile/imfile.c
  37. 2
      plugins/imgssapi/Makefile.in
  38. 2
      plugins/imjournal/Makefile.in
  39. 6
      plugins/imjournal/imjournal.c
  40. 2
      plugins/imklog/Makefile.in
  41. 2
      plugins/immark/Makefile.in
  42. 2
      plugins/impstats/Makefile.in
  43. 2
      plugins/imptcp/Makefile.in
  44. 2
      plugins/imptcp/imptcp.c
  45. 2
      plugins/imrelp/Makefile.in
  46. 2
      plugins/imrelp/imrelp.c
  47. 2
      plugins/imsolaris/Makefile.in
  48. 2
      plugins/imtcp/Makefile.in
  49. 2
      plugins/imtcp/imtcp.c
  50. 2
      plugins/imudp/Makefile.in
  51. 6
      plugins/imudp/imudp.c
  52. 2
      plugins/imuxsock/Makefile.in
  53. 2
      plugins/imuxsock/imuxsock.c
  54. 2
      plugins/mmanon/Makefile.in
  55. 2
      plugins/mmaudit/Makefile.in
  56. 2
      plugins/mmaudit/mmaudit.c
  57. 2
      plugins/mmexternal/Makefile.in
  58. 2
      plugins/mmfields/Makefile.in
  59. 2
      plugins/mmfields/mmfields.c
  60. 2
      plugins/mmjsonparse/Makefile.in
  61. 4
      plugins/mmjsonparse/mmjsonparse.c
  62. 2
      plugins/mmnormalize/Makefile.in
  63. 2
      plugins/mmnormalize/mmnormalize.c
  64. 2
      plugins/mmpstrucdata/Makefile.in
  65. 2
      plugins/mmpstrucdata/mmpstrucdata.c
  66. 2
      plugins/mmsnmptrapd/Makefile.in
  67. 2
      plugins/mmutf8fix/Makefile.in
  68. 2
      plugins/omelasticsearch/Makefile.in
  69. 2
      plugins/omgssapi/Makefile.in
  70. 2
      plugins/omhdfs/Makefile.in
  71. 2
      plugins/omjournal/Makefile.in
  72. 2
      plugins/omkafka/Makefile.in
  73. 298
      plugins/omkafka/omkafka.c
  74. 2
      plugins/omlibdbi/Makefile.in
  75. 2
      plugins/ommail/Makefile.in
  76. 2
      plugins/ommongodb/Makefile.in
  77. 2
      plugins/ommysql/Makefile.in
  78. 2
      plugins/ompgsql/Makefile.in
  79. 2
      plugins/omprog/Makefile.in
  80. 2
      plugins/omrelp/Makefile.in
  81. 2
      plugins/omruleset/Makefile.in
  82. 2
      plugins/omsnmp/Makefile.in
  83. 2
      plugins/omstdout/Makefile.in
  84. 2
      plugins/omtesting/Makefile.in
  85. 2
      plugins/omudpspoof/Makefile.in
  86. 2
      plugins/omuxsock/Makefile.in
  87. 2
      plugins/pmciscoios/Makefile.in
  88. 2
      plugins/pmciscoios/pmciscoios.c
  89. 2
      plugins/pmlastmsg/Makefile.in
  90. 52
      runtime/Makefile.am
  91. 169
      runtime/Makefile.in
  92. 2
      runtime/cfsysline.c
  93. 0
      runtime/gss-misc.c
  94. 0
      runtime/gss-misc.h
  95. 1
      runtime/librsgt.c
  96. 47
      runtime/librsgt.h
  97. 78
      runtime/librsgt_common.h
  98. 16
      runtime/librsgt_read.c
  99. 911
      runtime/librsksi.c
  100. 399
      runtime/librsksi.h

2
.tarball-version

@ -1 +1 @@
8.10.0
8.11.0

28
ChangeLog

@ -1,4 +1,32 @@
------------------------------------------------------------------------------
Version 8.11.0 [v8-stable] 2015-06-30
- new signature provider for Keyless Signature Infrastructure (KSI) added
- build system: re-enable use of "make distcheck"
- bugfix imfile: regex multiline mode ignored escapeLF option
Thanks to Ciprian Hacman for reporting the problem
closes https://github.com/rsyslog/rsyslog/issues/370
- bugfix omkafka: fixed several concurrency issues, most of them related
to dynamic topics.
Thanks to Janmejay Singh for the patch.
- bugfix: execonlywhenpreviousissuspended did not work correctly
This especially caused problems when an action with this attribute was
configured with an action queue.
- bugfix core engine: ensured global variable atomicity
This could lead to problems in RainerScript, as well as probably in other
areas where global variables are used inside rsyslog. I wouldn't outrule
it could lead to segfaults.
Thanks to Janmejay Singh for the patch.
- bugfix imfile: segfault when using startmsg.regex because of empty log line
closes https://github.com/rsyslog/rsyslog/issues/357
Thanks to Ciprian Hacman for the patch.
- bugfix: build problem on Solaris
Thanks to Dagobert Michelsen for reporting this and getting us up to
speed on the openCWS build farm.
- bugfix: build system strndup was used even if not present
now added compatibility function. This came up on Solaris builds.
Thanks to Dagobert Michelsen for reporting the problem.
closes https://github.com/rsyslog/rsyslog/issues/347
------------------------------------------------------------------------------
Version 8.10.0 [v8-stable] 2015-05-19
- imfile: add capability to process multi-line messages based on regex
input parameter "endmsg.regex" was added for that purpose. The new

97
Makefile.am

@ -3,44 +3,6 @@ pkglib_LTLIBRARIES =
pkgconfigdir = $(libdir)/pkgconfig
if ENABLE_INET
pkglib_LTLIBRARIES += lmtcpsrv.la lmtcpclt.la
#
#
# TCP (stream) server support
#
lmtcpsrv_la_SOURCES = \
tcps_sess.c \
tcps_sess.h \
tcpsrv.c \
tcpsrv.h
lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
lmtcpsrv_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
lmtcpsrv_la_LIBADD =
#
# TCP (stream) client support
#
lmtcpclt_la_SOURCES = \
tcpclt.c \
tcpclt.h
lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
lmtcpclt_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
lmtcpclt_la_LIBADD =
endif # if ENABLE_INET
#
# gssapi support
#
if ENABLE_GSSAPI
pkglib_LTLIBRARIES += lmgssutil.la
lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
lmgssutil_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
lmgssutil_la_LDFLAGS = -module -avoid-version
lmgssutil_la_LIBADD = $(GSS_LIBS)
endif
#
# systemd support
#
@ -289,32 +251,39 @@ SUBDIRS += tests
# temporarily be removed below. The intent behind forcing everthing to compile
# in a make distcheck is so that we detect code that accidently was not updated
# when some global update happened.
DISTCHECK_CONFIGURE_FLAGS= --enable-imfile \
--enable-snmp \
--enable-libdbi \
--enable-mysql \
--enable-relp \
--enable-rsyslogd \
--enable-mail \
--enable-klog \
--enable-diagtools \
--enable-gnutls \
--enable-omstdout \
--enable-pmlastmsg \
--enable-omruleset \
--enable-omprog \
--enable-imdiag \
--enable-imptcp \
--enable-omuxsock \
--enable-impstats \
--enable-memcheck \
--enable-pmaixforwardedfrom \
--enable-pmcisconames \
--enable-pmsnare \
--enable-elasticsearch \
--enable-valgrind \
--enable-testbench \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
DISTCHECK_CONFIGURE_FLAGS= \
--disable-silent-rules \
--disable-testbench
THIS_IS_TEMPORARILY_DISABLED = \
--enable-distcheck-workaround \
--enable-testbench \
--enable-imdiag \
--enable-testbench \
--enable-imfile \
--enable-snmp \
--enable-libdbi \
--enable-mysql \
--enable-relp \
--enable-rsyslogd \
--enable-mail \
--enable-klog \
--enable-diagtools \
--enable-gnutls \
--enable-omstdout \
--enable-pmlastmsg \
--enable-omruleset \
--enable-omprog \
--enable-imptcp \
--enable-omuxsock \
--enable-impstats \
--enable-memcheck \
--enable-pmaixforwardedfrom \
--enable-pmcisconames \
--enable-pmsnare \
--enable-elasticsearch \
--enable-valgrind \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
# temporarily disable these checks for make distcheck 2012-09-06 rgerhards
# --enable-mmsnmptrapd \
# --enable-gssapi_krb5 \

399
Makefile.in

@ -81,70 +81,65 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
sbin_PROGRAMS =
@ENABLE_INET_TRUE@am__append_1 = lmtcpsrv.la lmtcpclt.la
#
# gssapi support
#
@ENABLE_GSSAPI_TRUE@am__append_2 = lmgssutil.la
@ENABLE_RSYSLOGD_TRUE@am__append_3 = tools
@ENABLE_IMKLOG_TRUE@am__append_4 = plugins/imklog
@ENABLE_IMKMSG_TRUE@am__append_5 = contrib/imkmsg
@ENABLE_IMPSTATS_TRUE@am__append_6 = plugins/impstats
@ENABLE_IMSOLARIS_TRUE@am__append_7 = plugins/imsolaris
@ENABLE_GSSAPI_TRUE@am__append_8 = plugins/omgssapi plugins/imgssapi
@ENABLE_RELP_TRUE@am__append_9 = plugins/omrelp plugins/imrelp
@ENABLE_MYSQL_TRUE@am__append_10 = plugins/ommysql
@ENABLE_OMLIBDBI_TRUE@am__append_11 = plugins/omlibdbi
@ENABLE_PGSQL_TRUE@am__append_12 = plugins/ompgsql
@ENABLE_SNMP_TRUE@am__append_13 = plugins/omsnmp
@ENABLE_OMSTDOUT_TRUE@am__append_14 = plugins/omstdout
@ENABLE_PMCISCONAMES_TRUE@am__append_15 = contrib/pmcisconames
@ENABLE_PMCISCOIOS_TRUE@am__append_16 = plugins/pmciscoios
@ENABLE_PMAIXFORWARDEDFROM_TRUE@am__append_17 = contrib/pmaixforwardedfrom
@ENABLE_PMSNARE_TRUE@am__append_18 = contrib/pmsnare
@ENABLE_PMLASTMSG_TRUE@am__append_19 = plugins/pmlastmsg
@ENABLE_OMRULESET_TRUE@am__append_20 = plugins/omruleset
@ENABLE_OMUDPSPOOF_TRUE@am__append_21 = plugins/omudpspoof
@ENABLE_OMMONGODB_TRUE@am__append_22 = plugins/ommongodb
@ENABLE_OMHIREDIS_TRUE@am__append_23 = contrib/omhiredis
@ENABLE_OMZMQ3_TRUE@am__append_24 = contrib/omzmq3
@ENABLE_OMCZMQ_TRUE@am__append_25 = contrib/omczmq
@ENABLE_OMRABBITMQ_TRUE@am__append_26 = contrib/omrabbitmq
@ENABLE_IMZMQ3_TRUE@am__append_27 = contrib/imzmq3
@ENABLE_IMCZMQ_TRUE@am__append_28 = contrib/imczmq
@ENABLE_OMUXSOCK_TRUE@am__append_29 = plugins/omuxsock
@ENABLE_OMHDFS_TRUE@am__append_30 = plugins/omhdfs
@ENABLE_OMJOURNAL_TRUE@am__append_31 = plugins/omjournal
@ENABLE_IMJOURNAL_TRUE@am__append_32 = plugins/imjournal
@ENABLE_ELASTICSEARCH_TRUE@am__append_33 = plugins/omelasticsearch
@ENABLE_MMSNMPTRAPD_TRUE@am__append_34 = plugins/mmsnmptrapd
@ENABLE_IMFILE_TRUE@am__append_35 = plugins/imfile
@ENABLE_IMPTCP_TRUE@am__append_36 = plugins/imptcp
@ENABLE_IMDIAG_TRUE@am__append_37 = plugins/imdiag
@ENABLE_MAIL_TRUE@am__append_38 = plugins/ommail
@ENABLE_OMKAFKA_TRUE@am__append_39 = plugins/omkafka
@ENABLE_OMPROG_TRUE@am__append_40 = plugins/omprog
@ENABLE_RFC3195_TRUE@am__append_41 = plugins/im3195
@ENABLE_MMNORMALIZE_TRUE@am__append_42 = plugins/mmnormalize
@ENABLE_MMJSONPARSE_TRUE@am__append_43 = plugins/mmjsonparse
@ENABLE_MMAUDIT_TRUE@am__append_44 = plugins/mmaudit
@ENABLE_MMANON_TRUE@am__append_45 = plugins/mmanon
@ENABLE_MMUTF8FIX_TRUE@am__append_46 = plugins/mmutf8fix
@ENABLE_MMCOUNT_TRUE@am__append_47 = contrib/mmcount
@ENABLE_MMSEQUENCE_TRUE@am__append_48 = contrib/mmsequence
@ENABLE_MMFIELDS_TRUE@am__append_49 = plugins/mmfields
@ENABLE_MMPSTRUCDATA_TRUE@am__append_50 = plugins/mmpstrucdata
@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_51 = contrib/mmrfc5424addhmac
@ENABLE_RSYSLOGD_TRUE@am__append_1 = tools
@ENABLE_IMKLOG_TRUE@am__append_2 = plugins/imklog
@ENABLE_IMKMSG_TRUE@am__append_3 = contrib/imkmsg
@ENABLE_IMPSTATS_TRUE@am__append_4 = plugins/impstats
@ENABLE_IMSOLARIS_TRUE@am__append_5 = plugins/imsolaris
@ENABLE_GSSAPI_TRUE@am__append_6 = plugins/omgssapi plugins/imgssapi
@ENABLE_RELP_TRUE@am__append_7 = plugins/omrelp plugins/imrelp
@ENABLE_MYSQL_TRUE@am__append_8 = plugins/ommysql
@ENABLE_OMLIBDBI_TRUE@am__append_9 = plugins/omlibdbi
@ENABLE_PGSQL_TRUE@am__append_10 = plugins/ompgsql
@ENABLE_SNMP_TRUE@am__append_11 = plugins/omsnmp
@ENABLE_OMSTDOUT_TRUE@am__append_12 = plugins/omstdout
@ENABLE_PMCISCONAMES_TRUE@am__append_13 = contrib/pmcisconames
@ENABLE_PMCISCOIOS_TRUE@am__append_14 = plugins/pmciscoios
@ENABLE_PMAIXFORWARDEDFROM_TRUE@am__append_15 = contrib/pmaixforwardedfrom
@ENABLE_PMSNARE_TRUE@am__append_16 = contrib/pmsnare
@ENABLE_PMLASTMSG_TRUE@am__append_17 = plugins/pmlastmsg
@ENABLE_OMRULESET_TRUE@am__append_18 = plugins/omruleset
@ENABLE_OMUDPSPOOF_TRUE@am__append_19 = plugins/omudpspoof
@ENABLE_OMMONGODB_TRUE@am__append_20 = plugins/ommongodb
@ENABLE_OMHIREDIS_TRUE@am__append_21 = contrib/omhiredis
@ENABLE_OMZMQ3_TRUE@am__append_22 = contrib/omzmq3
@ENABLE_OMCZMQ_TRUE@am__append_23 = contrib/omczmq
@ENABLE_OMRABBITMQ_TRUE@am__append_24 = contrib/omrabbitmq
@ENABLE_IMZMQ3_TRUE@am__append_25 = contrib/imzmq3
@ENABLE_IMCZMQ_TRUE@am__append_26 = contrib/imczmq
@ENABLE_OMUXSOCK_TRUE@am__append_27 = plugins/omuxsock
@ENABLE_OMHDFS_TRUE@am__append_28 = plugins/omhdfs
@ENABLE_OMJOURNAL_TRUE@am__append_29 = plugins/omjournal
@ENABLE_IMJOURNAL_TRUE@am__append_30 = plugins/imjournal
@ENABLE_ELASTICSEARCH_TRUE@am__append_31 = plugins/omelasticsearch
@ENABLE_MMSNMPTRAPD_TRUE@am__append_32 = plugins/mmsnmptrapd
@ENABLE_IMFILE_TRUE@am__append_33 = plugins/imfile
@ENABLE_IMPTCP_TRUE@am__append_34 = plugins/imptcp
@ENABLE_IMDIAG_TRUE@am__append_35 = plugins/imdiag
@ENABLE_MAIL_TRUE@am__append_36 = plugins/ommail
@ENABLE_OMKAFKA_TRUE@am__append_37 = plugins/omkafka
@ENABLE_OMPROG_TRUE@am__append_38 = plugins/omprog
@ENABLE_RFC3195_TRUE@am__append_39 = plugins/im3195
@ENABLE_MMNORMALIZE_TRUE@am__append_40 = plugins/mmnormalize
@ENABLE_MMJSONPARSE_TRUE@am__append_41 = plugins/mmjsonparse
@ENABLE_MMAUDIT_TRUE@am__append_42 = plugins/mmaudit
@ENABLE_MMANON_TRUE@am__append_43 = plugins/mmanon
@ENABLE_MMUTF8FIX_TRUE@am__append_44 = plugins/mmutf8fix
@ENABLE_MMCOUNT_TRUE@am__append_45 = contrib/mmcount
@ENABLE_MMSEQUENCE_TRUE@am__append_46 = contrib/mmsequence
@ENABLE_MMFIELDS_TRUE@am__append_47 = plugins/mmfields
@ENABLE_MMPSTRUCDATA_TRUE@am__append_48 = plugins/mmpstrucdata
@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_49 = contrib/mmrfc5424addhmac
# omhttpfs
@ENABLE_OMHTTPFS_TRUE@am__append_52 = contrib/omhttpfs
@ENABLE_OMHTTPFS_TRUE@am__append_50 = contrib/omhttpfs
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in depcomp COPYING COPYING.LESSER compile \
config.guess config.sub install-sh missing ylwrap ltmain.sh
$(srcdir)/config.h.in COPYING COPYING.LESSER compile \
config.guess config.sub depcomp install-sh missing ylwrap \
ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
@ -190,38 +185,6 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sbindir)" \
"$(DESTDIR)$(systemdsystemunitdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@ENABLE_GSSAPI_TRUE@lmgssutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__lmgssutil_la_SOURCES_DIST = gss-misc.c gss-misc.h
@ENABLE_GSSAPI_TRUE@am_lmgssutil_la_OBJECTS = \
@ENABLE_GSSAPI_TRUE@ lmgssutil_la-gss-misc.lo
lmgssutil_la_OBJECTS = $(am_lmgssutil_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
lmgssutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(lmgssutil_la_LDFLAGS) $(LDFLAGS) -o $@
@ENABLE_GSSAPI_TRUE@am_lmgssutil_la_rpath = -rpath $(pkglibdir)
lmtcpclt_la_DEPENDENCIES =
am__lmtcpclt_la_SOURCES_DIST = tcpclt.c tcpclt.h
@ENABLE_INET_TRUE@am_lmtcpclt_la_OBJECTS = lmtcpclt_la-tcpclt.lo
lmtcpclt_la_OBJECTS = $(am_lmtcpclt_la_OBJECTS)
lmtcpclt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(lmtcpclt_la_LDFLAGS) $(LDFLAGS) -o $@
@ENABLE_INET_TRUE@am_lmtcpclt_la_rpath = -rpath $(pkglibdir)
lmtcpsrv_la_DEPENDENCIES =
am__lmtcpsrv_la_SOURCES_DIST = tcps_sess.c tcps_sess.h tcpsrv.c \
tcpsrv.h
@ENABLE_INET_TRUE@am_lmtcpsrv_la_OBJECTS = lmtcpsrv_la-tcps_sess.lo \
@ENABLE_INET_TRUE@ lmtcpsrv_la-tcpsrv.lo
lmtcpsrv_la_OBJECTS = $(am_lmtcpsrv_la_OBJECTS)
lmtcpsrv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(lmtcpsrv_la_LDFLAGS) $(LDFLAGS) -o $@
@ENABLE_INET_TRUE@am_lmtcpsrv_la_rpath = -rpath $(pkglibdir)
PROGRAMS = $(sbin_PROGRAMS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@ -235,33 +198,8 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(lmgssutil_la_SOURCES) $(lmtcpclt_la_SOURCES) \
$(lmtcpsrv_la_SOURCES)
DIST_SOURCES = $(am__lmgssutil_la_SOURCES_DIST) \
$(am__lmtcpclt_la_SOURCES_DIST) \
$(am__lmtcpsrv_la_SOURCES_DIST)
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@ -400,6 +338,8 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GT_KSI_CFLAGS = @GT_KSI_CFLAGS@
GT_KSI_LIBS = @GT_KSI_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
@ -554,36 +494,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkglib_LTLIBRARIES = $(am__append_1) $(am__append_2)
pkglib_LTLIBRARIES =
pkgconfigdir = $(libdir)/pkgconfig
#
#
# TCP (stream) server support
#
@ENABLE_INET_TRUE@lmtcpsrv_la_SOURCES = \
@ENABLE_INET_TRUE@ tcps_sess.c \
@ENABLE_INET_TRUE@ tcps_sess.h \
@ENABLE_INET_TRUE@ tcpsrv.c \
@ENABLE_INET_TRUE@ tcpsrv.h
@ENABLE_INET_TRUE@lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
@ENABLE_INET_TRUE@lmtcpsrv_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
@ENABLE_INET_TRUE@lmtcpsrv_la_LIBADD =
#
# TCP (stream) client support
#
@ENABLE_INET_TRUE@lmtcpclt_la_SOURCES = \
@ENABLE_INET_TRUE@ tcpclt.c \
@ENABLE_INET_TRUE@ tcpclt.h
@ENABLE_INET_TRUE@lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
@ENABLE_INET_TRUE@lmtcpclt_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
@ENABLE_INET_TRUE@lmtcpclt_la_LIBADD =
@ENABLE_GSSAPI_TRUE@lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
@ENABLE_GSSAPI_TRUE@lmgssutil_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
@ENABLE_GSSAPI_TRUE@lmgssutil_la_LDFLAGS = -module -avoid-version
@ENABLE_GSSAPI_TRUE@lmgssutil_la_LIBADD = $(GSS_LIBS)
#
# systemd support
@ -615,23 +527,23 @@ EXTRA_DIST = \
# modules that need to be generated first
SUBDIRS = compat runtime grammar . plugins/immark plugins/imuxsock \
plugins/imtcp plugins/imudp plugins/omtesting \
plugins/mmexternal $(am__append_3) $(am__append_4) \
$(am__append_5) $(am__append_6) $(am__append_7) \
$(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
$(am__append_14) $(am__append_15) $(am__append_16) \
$(am__append_17) $(am__append_18) $(am__append_19) \
$(am__append_20) $(am__append_21) $(am__append_22) \
$(am__append_23) $(am__append_24) $(am__append_25) \
$(am__append_26) $(am__append_27) $(am__append_28) \
$(am__append_29) $(am__append_30) $(am__append_31) \
$(am__append_32) $(am__append_33) $(am__append_34) \
$(am__append_35) $(am__append_36) $(am__append_37) \
$(am__append_38) $(am__append_39) $(am__append_40) \
$(am__append_41) $(am__append_42) $(am__append_43) \
$(am__append_44) $(am__append_45) $(am__append_46) \
$(am__append_47) $(am__append_48) $(am__append_49) \
$(am__append_50) $(am__append_51) $(am__append_52) tests
plugins/mmexternal $(am__append_1) $(am__append_2) \
$(am__append_3) $(am__append_4) $(am__append_5) \
$(am__append_6) $(am__append_7) $(am__append_8) \
$(am__append_9) $(am__append_10) $(am__append_11) \
$(am__append_12) $(am__append_13) $(am__append_14) \
$(am__append_15) $(am__append_16) $(am__append_17) \
$(am__append_18) $(am__append_19) $(am__append_20) \
$(am__append_21) $(am__append_22) $(am__append_23) \
$(am__append_24) $(am__append_25) $(am__append_26) \
$(am__append_27) $(am__append_28) $(am__append_29) \
$(am__append_30) $(am__append_31) $(am__append_32) \
$(am__append_33) $(am__append_34) $(am__append_35) \
$(am__append_36) $(am__append_37) $(am__append_38) \
$(am__append_39) $(am__append_40) $(am__append_41) \
$(am__append_42) $(am__append_43) $(am__append_44) \
$(am__append_45) $(am__append_46) $(am__append_47) \
$(am__append_48) $(am__append_49) $(am__append_50) tests
# make sure "make distcheck" tries to build all modules. This means that
# a developer must always have an environment where every supporting library
@ -639,39 +551,45 @@ SUBDIRS = compat runtime grammar . plugins/immark plugins/imuxsock \
# temporarily be removed below. The intent behind forcing everthing to compile
# in a make distcheck is so that we detect code that accidently was not updated
# when some global update happened.
DISTCHECK_CONFIGURE_FLAGS = --enable-imfile \
--enable-snmp \
--enable-libdbi \
--enable-mysql \
--enable-relp \
--enable-rsyslogd \
--enable-mail \
--enable-klog \
--enable-diagtools \
--enable-gnutls \
--enable-omstdout \
--enable-pmlastmsg \
--enable-omruleset \
--enable-omprog \
--enable-imdiag \
--enable-imptcp \
--enable-omuxsock \
--enable-impstats \
--enable-memcheck \
--enable-pmaixforwardedfrom \
--enable-pmcisconames \
--enable-pmsnare \
--enable-elasticsearch \
--enable-valgrind \
--enable-testbench \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
DISTCHECK_CONFIGURE_FLAGS = \
--disable-silent-rules \
--disable-testbench
THIS_IS_TEMPORARILY_DISABLED = \
--enable-distcheck-workaround \
--enable-testbench \
--enable-imdiag \
--enable-testbench \
--enable-imfile \
--enable-snmp \
--enable-libdbi \
--enable-mysql \
--enable-relp \
--enable-rsyslogd \
--enable-mail \
--enable-klog \
--enable-diagtools \
--enable-gnutls \
--enable-omstdout \
--enable-pmlastmsg \
--enable-omruleset \
--enable-omprog \
--enable-imptcp \
--enable-omuxsock \
--enable-impstats \
--enable-memcheck \
--enable-pmaixforwardedfrom \
--enable-pmcisconames \
--enable-pmsnare \
--enable-elasticsearch \
--enable-valgrind \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
ACLOCAL_AMFLAGS = -I m4
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@ -756,15 +674,6 @@ clean-pkglibLTLIBRARIES:
echo rm -f $${locs}; \
rm -f $${locs}; \
}
lmgssutil.la: $(lmgssutil_la_OBJECTS) $(lmgssutil_la_DEPENDENCIES) $(EXTRA_lmgssutil_la_DEPENDENCIES)
$(AM_V_CCLD)$(lmgssutil_la_LINK) $(am_lmgssutil_la_rpath) $(lmgssutil_la_OBJECTS) $(lmgssutil_la_LIBADD) $(LIBS)
lmtcpclt.la: $(lmtcpclt_la_OBJECTS) $(lmtcpclt_la_DEPENDENCIES) $(EXTRA_lmtcpclt_la_DEPENDENCIES)
$(AM_V_CCLD)$(lmtcpclt_la_LINK) $(am_lmtcpclt_la_rpath) $(lmtcpclt_la_OBJECTS) $(lmtcpclt_la_LIBADD) $(LIBS)
lmtcpsrv.la: $(lmtcpsrv_la_OBJECTS) $(lmtcpsrv_la_DEPENDENCIES) $(EXTRA_lmtcpsrv_la_DEPENDENCIES)
$(AM_V_CCLD)$(lmtcpsrv_la_LINK) $(am_lmtcpsrv_la_rpath) $(lmtcpsrv_la_OBJECTS) $(lmtcpsrv_la_LIBADD) $(LIBS)
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
@ -815,69 +724,6 @@ clean-sbinPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmgssutil_la-gss-misc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtcpclt_la-tcpclt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtcpsrv_la-tcps_sess.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtcpsrv_la-tcpsrv.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
lmgssutil_la-gss-misc.lo: gss-misc.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmgssutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lmgssutil_la-gss-misc.lo -MD -MP -MF $(DEPDIR)/lmgssutil_la-gss-misc.Tpo -c -o lmgssutil_la-gss-misc.lo `test -f 'gss-misc.c' || echo '$(srcdir)/'`gss-misc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lmgssutil_la-gss-misc.Tpo $(DEPDIR)/lmgssutil_la-gss-misc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gss-misc.c' object='lmgssutil_la-gss-misc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmgssutil_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lmgssutil_la-gss-misc.lo `test -f 'gss-misc.c' || echo '$(srcdir)/'`gss-misc.c
lmtcpclt_la-tcpclt.lo: tcpclt.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmtcpclt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lmtcpclt_la-tcpclt.lo -MD -MP -MF $(DEPDIR)/lmtcpclt_la-tcpclt.Tpo -c -o lmtcpclt_la-tcpclt.lo `test -f 'tcpclt.c' || echo '$(srcdir)/'`tcpclt.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lmtcpclt_la-tcpclt.Tpo $(DEPDIR)/lmtcpclt_la-tcpclt.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tcpclt.c' object='lmtcpclt_la-tcpclt.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmtcpclt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lmtcpclt_la-tcpclt.lo `test -f 'tcpclt.c' || echo '$(srcdir)/'`tcpclt.c
lmtcpsrv_la-tcps_sess.lo: tcps_sess.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmtcpsrv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lmtcpsrv_la-tcps_sess.lo -MD -MP -MF $(DEPDIR)/lmtcpsrv_la-tcps_sess.Tpo -c -o lmtcpsrv_la-tcps_sess.lo `test -f 'tcps_sess.c' || echo '$(srcdir)/'`tcps_sess.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lmtcpsrv_la-tcps_sess.Tpo $(DEPDIR)/lmtcpsrv_la-tcps_sess.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tcps_sess.c' object='lmtcpsrv_la-tcps_sess.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmtcpsrv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lmtcpsrv_la-tcps_sess.lo `test -f 'tcps_sess.c' || echo '$(srcdir)/'`tcps_sess.c
lmtcpsrv_la-tcpsrv.lo: tcpsrv.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmtcpsrv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lmtcpsrv_la-tcpsrv.lo -MD -MP -MF $(DEPDIR)/lmtcpsrv_la-tcpsrv.Tpo -c -o lmtcpsrv_la-tcpsrv.lo `test -f 'tcpsrv.c' || echo '$(srcdir)/'`tcpsrv.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lmtcpsrv_la-tcpsrv.Tpo $(DEPDIR)/lmtcpsrv_la-tcpsrv.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tcpsrv.c' object='lmtcpsrv_la-tcpsrv.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lmtcpsrv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lmtcpsrv_la-tcpsrv.lo `test -f 'tcpsrv.c' || echo '$(srcdir)/'`tcpsrv.c
mostlyclean-libtool:
-rm -f *.lo
@ -1251,10 +1097,9 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
distclean-am: clean-am distclean-generic distclean-hdr \
distclean-libtool distclean-tags
dvi: dvi-recursive
@ -1299,14 +1144,12 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-recursive
@ -1326,21 +1169,19 @@ uninstall-am: uninstall-nodist_systemdsystemunitDATA \
clean-libtool clean-pkglibLTLIBRARIES clean-sbinPROGRAMS \
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
dist-zip distcheck distclean distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-nodist_systemdsystemunitDATA install-pdf \
install-pdf-am install-pkglibLTLIBRARIES install-ps \
install-ps-am install-sbinPROGRAMS install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am \
uninstall-nodist_systemdsystemunitDATA \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-nodist_systemdsystemunitDATA \
uninstall-pkglibLTLIBRARIES uninstall-sbinPROGRAMS

9
README.md

@ -57,6 +57,15 @@ sudo yum install git valgrind autoconf automake flex bison python-docutils pytho
Ubuntu
~~~~~~
Note: this list is (obviously) incomplete. We intend to complete it as we
have more information and install additional systems.
sudo apt-get install libdbi-dev
openSUSE 13
~~~~~~~~~~~

29
action.c

@ -1291,17 +1291,11 @@ processMsgMain(action_t *__restrict__ const pAction,
{
DEFiRet;
if(pAction->bExecWhenPrevSusp && !pWti->execState.bPrevWasSuspended) {
DBGPRINTF("action %d: NOT executing, as previous action was "
"not suspended\n", pAction->iActionNbr);
FINALIZE;
}
iRet = prepareDoActionParams(pAction, pWti, pMsg, ttNow);
if(pAction->isTransactional) {
pWti->actWrkrInfo[pAction->iActionNbr].pAction = pAction;
DBGPRINTF("action %d is transactional - executing in commit phase\n", pAction->iActionNbr);
DBGPRINTF("action '%s': is transactional - executing in commit phase\n", pAction->pszName);
actionPrepare(pAction, pWti);
iRet = getReturnCode(pAction, pWti);
FINALIZE;
@ -1317,7 +1311,6 @@ finalize_it:
if(pWti->execState.bDoAutoCommit)
iRet = actionCommit(pAction, pWti);
}
pWti->execState.bPrevWasSuspended = (iRet == RS_RET_SUSPENDED || iRet == RS_RET_ACTION_FAILED);
RETiRet;
}
@ -1441,7 +1434,17 @@ doSubmitToActionQ(action_t * const pAction, wti_t * const pWti, msg_t *pMsg)
struct syslogTime ttNow; // TODO: think if we can buffer this in pWti
DEFiRet;
DBGPRINTF("Called action, logging to %s\n", module.GetStateName(pAction->pMod));
DBGPRINTF("action '%s': called, logging to %s (susp %d/%d, direct q %d)\n",
pAction->pszName, module.GetStateName(pAction->pMod),
pAction->bExecWhenPrevSusp, pWti->execState.bPrevWasSuspended,
pAction->pQueue->qType == QUEUETYPE_DIRECT);
if( pAction->bExecWhenPrevSusp
&& !pWti->execState.bPrevWasSuspended) {
DBGPRINTF("action '%s': NOT executing, as previous action was "
"not suspended\n", pAction->pszName);
FINALIZE;
}
STATSCOUNTER_INC(pAction->ctrProcessed, pAction->mutCtrProcessed);
if(pAction->pQueue->qType == QUEUETYPE_DIRECT) {
@ -1450,9 +1453,15 @@ doSubmitToActionQ(action_t * const pAction, wti_t * const pWti, msg_t *pMsg)
} else {/* in this case, we do single submits to the queue.
* TODO: optimize this, we may do at least a multi-submit!
*/
iRet = qqueueEnqMsg(pAction->pQueue, eFLOWCTL_NO_DELAY, pAction->bCopyMsg ? MsgDup(pMsg) : MsgAddRef(pMsg));
iRet = qqueueEnqMsg(pAction->pQueue, eFLOWCTL_NO_DELAY,
pAction->bCopyMsg ? MsgDup(pMsg) : MsgAddRef(pMsg));
}
pWti->execState.bPrevWasSuspended
= (iRet == RS_RET_SUSPENDED || iRet == RS_RET_ACTION_FAILED);
DBGPRINTF("action '%s': set suspended state to %d\n",
pAction->pszName, pWti->execState.bPrevWasSuspended);
finalize_it:
RETiRet;
}

2
compat/Makefile.am

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = compat.la
compat_la_SOURCES = getifaddrs.c ifaddrs.h
compat_la_SOURCES = getifaddrs.c ifaddrs.h strndup.c
compat_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
compat_la_LDFLAGS = -module -avoid-version
compat_la_LIBADD = $(IMUDP_LIBS)

14
compat/Makefile.in

@ -97,7 +97,7 @@ CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
compat_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_compat_la_OBJECTS = compat_la-getifaddrs.lo
am_compat_la_OBJECTS = compat_la-getifaddrs.lo compat_la-strndup.lo
compat_la_OBJECTS = $(am_compat_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -201,6 +201,8 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GT_KSI_CFLAGS = @GT_KSI_CFLAGS@
GT_KSI_LIBS = @GT_KSI_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
@ -356,7 +358,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = compat.la
compat_la_SOURCES = getifaddrs.c ifaddrs.h
compat_la_SOURCES = getifaddrs.c ifaddrs.h strndup.c
compat_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
compat_la_LDFLAGS = -module -avoid-version
compat_la_LIBADD = $(IMUDP_LIBS)
@ -416,6 +418,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat_la-getifaddrs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat_la-strndup.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@ -448,6 +451,13 @@ compat_la-getifaddrs.lo: getifaddrs.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(compat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat_la-getifaddrs.lo `test -f 'getifaddrs.c' || echo '$(srcdir)/'`getifaddrs.c
compat_la-strndup.lo: strndup.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(compat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compat_la-strndup.lo -MD -MP -MF $(DEPDIR)/compat_la-strndup.Tpo -c -o compat_la-strndup.lo `test -f 'strndup.c' || echo '$(srcdir)/'`strndup.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/compat_la-strndup.Tpo $(DEPDIR)/compat_la-strndup.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strndup.c' object='compat_la-strndup.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(compat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compat_la-strndup.lo `test -f 'strndup.c' || echo '$(srcdir)/'`strndup.c
mostlyclean-libtool:
-rm -f *.lo

40
compat/strndup.c

@ -0,0 +1,40 @@
/* compatibility file for systems without strndup.
*
* Copyright 2015 Rainer Gerhards and Adiscon
*
* This file is part of rsyslog.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* -or-
* see COPYING.ASL20 in the source distribution
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "config.h"
#ifndef HAVE_STRNDUP
#include <stdlib.h>
#include <string.h>
char *
strndup(const char *s, size_t n)
{
const size_t len = strlen(s);
if(len <= n)
return strdup(s);
char *const new_s = malloc(len+1);
if(new_s == NULL)
return NULL;
memcpy(new_s, s, len);
new_s[len] = '\0';
return new_s;
}
#endif /* #ifndef HAVE_STRNDUP */

192
configure

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for rsyslog 8.10.0.
# Generated by GNU Autoconf 2.69 for rsyslog 8.11.0.
#
# Report bugs to <rsyslog@lists.adiscon.com>.
#
@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rsyslog'
PACKAGE_TARNAME='rsyslog'
PACKAGE_VERSION='8.10.0'
PACKAGE_STRING='rsyslog 8.10.0'
PACKAGE_VERSION='8.11.0'
PACKAGE_STRING='rsyslog 8.11.0'
PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
PACKAGE_URL=''
@ -637,6 +637,8 @@ am__EXEEXT_TRUE
LTLIBOBJS
RST2MAN
YACC_FOUND
ENABLE_DISTCHECK_WORKAROUND_FALSE
ENABLE_DISTCHECK_WORKAROUND_TRUE
ENABLE_OMHTTPFS_FALSE
ENABLE_OMHTTPFS_TRUE
ENABLE_OMHIREDIS_FALSE
@ -712,6 +714,10 @@ ENABLE_LIBLOGGING_STDLOG_FALSE
ENABLE_LIBLOGGING_STDLOG_TRUE
LIBLOGGING_STDLOG_LIBS
LIBLOGGING_STDLOG_CFLAGS
ENABLE_GT_KSI_FALSE
ENABLE_GT_KSI_TRUE
GT_KSI_LIBS
GT_KSI_CFLAGS
ENABLE_GUARDTIME_FALSE
ENABLE_GUARDTIME_TRUE
GUARDTIME_LIBS
@ -1024,6 +1030,7 @@ enable_mmpstrucdata
enable_mmrfc5424addhmac
enable_relp
enable_guardtime
enable_gt_ksi
enable_liblogging_stdlog
enable_rfc3195
enable_testbench
@ -1055,6 +1062,7 @@ enable_omrabbitmq
enable_omhiredis
enable_omhttpfs
enable_generate_man_pages
enable_distcheck_workaround
'
ac_precious_vars='build_alias
host_alias
@ -1092,6 +1100,8 @@ RELP_CFLAGS
RELP_LIBS
GUARDTIME_CFLAGS
GUARDTIME_LIBS
GT_KSI_CFLAGS
GT_KSI_LIBS
LIBLOGGING_STDLOG_CFLAGS
LIBLOGGING_STDLOG_LIBS
LIBLOGGING_CFLAGS
@ -1644,7 +1654,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures rsyslog 8.10.0 to adapt to many kinds of systems.
\`configure' configures rsyslog 8.11.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1714,7 +1724,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of rsyslog 8.10.0:";;
short | recursive ) echo "Configuration of rsyslog 8.11.0:";;
esac
cat <<\_ACEOF
@ -1791,6 +1801,8 @@ Optional Features:
--enable-relp Enable RELP support [default=no]
--enable-guardtime Enable log file signing support (via GuardTime)
[default=no]
--enable-gt-ksi Enable log file signing support via GuardTime KSI
[default=no]
--enable-liblogging-stdlog
Enable liblogging-stdlog support [default=yes]
--enable-rfc3195 Enable RFC3195 support [default=no]
@ -1824,6 +1836,10 @@ Optional Features:
--enable-omhttpfs Compiles omhttpfs template module [default=no]
--enable-generate-man-pages
Generate man pages from source [default=no]
--enable-distcheck-workaround
enable to use make distcheck by disabling some tests
that do not support the distcheck environment
[default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -1897,6 +1913,9 @@ Some influential environment variables:
C compiler flags for GUARDTIME, overriding pkg-config
GUARDTIME_LIBS
linker flags for GUARDTIME, overriding pkg-config
GT_KSI_CFLAGS
C compiler flags for GT_KSI, overriding pkg-config
GT_KSI_LIBS linker flags for GT_KSI, overriding pkg-config
LIBLOGGING_STDLOG_CFLAGS
C compiler flags for LIBLOGGING_STDLOG, overriding pkg-config
LIBLOGGING_STDLOG_LIBS
@ -1986,7 +2005,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rsyslog configure 8.10.0
rsyslog configure 8.11.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2566,7 +2585,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by rsyslog $as_me 8.10.0, which was
It was created by rsyslog $as_me 8.11.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3429,7 +3448,7 @@ fi
# Define the identity of the package.
PACKAGE='rsyslog'
VERSION='8.10.0'
VERSION='8.11.0'
cat >>confdefs.h <<_ACEOF
@ -18472,9 +18491,9 @@ fi
RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
if test "$GCC" = "yes"; then
RSRT_CFLAGS="$RSRT_CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute"
if $CC -Werror=implicit-function-declaration -x c -c /dev/null 2>/dev/null; then
if $CC -Werror=implicit-function-declaration -x c -c /dev/null -o /dev/null 2>/dev/null; then
RSRT_CFLAGS="$RSRT_CFLAGS -Werror=implicit-function-declaration"
elif $CC -Werror-implicit-function-declaration -x c -c /dev/null 2>/dev/null; then
elif $CC -Werror-implicit-function-declaration -x c -c /dev/null -o /dev/null 2>/dev/null; then
RSRT_CFLAGS="$RSRT_CFLAGS -Werror-implicit-function-declaration"
fi
@ -19320,6 +19339,122 @@ fi
# GuardTime KSI support
# Check whether --enable-gt-ksi was given.
if test "${enable_gt_ksi+set}" = set; then :
enableval=$enable_gt_ksi; case "${enableval}" in
yes) enable_gt_ksi="yes" ;;
no) enable_gt_ksi="no" ;;
*) as_fn_error $? "bad value ${enableval} for --enable-gt-ksi" "$LINENO" 5 ;;
esac
else
enable_gt_ksi=no
fi
if test "x$enable_gt_ksi" = "xyes"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GT_KSI" >&5
$as_echo_n "checking for GT_KSI... " >&6; }
if test -n "$GT_KSI_CFLAGS"; then
pkg_cv_GT_KSI_CFLAGS="$GT_KSI_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libksi >= 3.2.2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libksi >= 3.2.2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GT_KSI_CFLAGS=`$PKG_CONFIG --cflags "libksi >= 3.2.2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$GT_KSI_LIBS"; then
pkg_cv_GT_KSI_LIBS="$GT_KSI_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libksi >= 3.2.2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libksi >= 3.2.2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GT_KSI_LIBS=`$PKG_CONFIG --libs "libksi >= 3.2.2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
GT_KSI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libksi >= 3.2.2.0" 2>&1`
else
GT_KSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libksi >= 3.2.2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GT_KSI_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (libksi >= 3.2.2.0) were not met:
$GT_KSI_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables GT_KSI_CFLAGS
and GT_KSI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables GT_KSI_CFLAGS
and GT_KSI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
GT_KSI_CFLAGS=$pkg_cv_GT_KSI_CFLAGS
GT_KSI_LIBS=$pkg_cv_GT_KSI_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
fi
if test x$enable_gt_ksi = xyes; then
ENABLE_GT_KSI_TRUE=
ENABLE_GT_KSI_FALSE='#'
else
ENABLE_GT_KSI_TRUE='#'
ENABLE_GT_KSI_FALSE=
fi
# liblogging-stdlog support
# Check whether --enable-liblogging-stdlog was given.
if test "${enable_liblogging_stdlog+set}" = set; then :
@ -21535,6 +21670,30 @@ fi
# This provides a work-around to use "make distcheck" by disabling
# some tests that do have problems with the distcheck environment.
# Check whether --enable-distcheck-workaround was given.
if test "${enable_distcheck_workaround+set}" = set; then :
enableval=$enable_distcheck_workaround; case "${enableval}" in
yes) enable_distcheck_workaround="yes" ;;
no) enable_distcheck_workaround="no" ;;
*) as_fn_error $? "bad value ${enableval} for --enable-distcheck_workaround" "$LINENO" 5 ;;
esac
else
enable_distcheck_workaround="no"
fi
if test x$enable_distcheck_workaround = xyes; then
ENABLE_DISTCHECK_WORKAROUND_TRUE=
ENABLE_DISTCHECK_WORKAROUND_FALSE='#'
else
ENABLE_DISTCHECK_WORKAROUND_TRUE='#'
ENABLE_DISTCHECK_WORKAROUND_FALSE=
fi
# Running from git source?
in_git_src=no
if test -d "$srcdir"/.git && ! test -f "$srcdir"/.tarball-version; then :
@ -21957,6 +22116,10 @@ if test -z "${ENABLE_GUARDTIME_TRUE}" && test -z "${ENABLE_GUARDTIME_FALSE}"; th
as_fn_error $? "conditional \"ENABLE_GUARDTIME\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_GT_KSI_TRUE}" && test -z "${ENABLE_GT_KSI_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_GT_KSI\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_LIBLOGGING_STDLOG_TRUE}" && test -z "${ENABLE_LIBLOGGING_STDLOG_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_LIBLOGGING_STDLOG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -22077,6 +22240,10 @@ if test -z "${ENABLE_OMHTTPFS_TRUE}" && test -z "${ENABLE_OMHTTPFS_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_OMHTTPFS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_DISTCHECK_WORKAROUND_TRUE}" && test -z "${ENABLE_DISTCHECK_WORKAROUND_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_DISTCHECK_WORKAROUND\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@ -22474,7 +22641,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by rsyslog $as_me 8.10.0, which was
This file was extended by rsyslog $as_me 8.11.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -22540,7 +22707,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
rsyslog config.status 8.10.0
rsyslog config.status 8.11.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -24381,6 +24548,7 @@ echo " have to generate man pages: $have_to_generate_man_pages"
echo " Unlimited select() support enabled: $enable_unlimited_select"
echo " uuid support enabled: $enable_uuid"
echo " Log file signing support: $enable_guardtime"
echo " Log file signing support via KSI: $enable_gt_ksi"
echo " Log file encryption support: $enable_libgcrypt"
echo " anonymization support enabled: $enable_mmanon"
echo " message counting support enabled: $enable_mmcount"

37
configure.ac

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([rsyslog],[8.10.0],[rsyslog@lists.adiscon.com])
AC_INIT([rsyslog],[8.11.0],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE([subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@ -818,9 +818,9 @@ AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
if test "$GCC" = "yes"; then
RSRT_CFLAGS="$RSRT_CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute"
if $CC -Werror=implicit-function-declaration -x c -c /dev/null 2>/dev/null; then
if $CC -Werror=implicit-function-declaration -x c -c /dev/null -o /dev/null 2>/dev/null; then
RSRT_CFLAGS="$RSRT_CFLAGS -Werror=implicit-function-declaration"
elif $CC -Werror-implicit-function-declaration -x c -c /dev/null 2>/dev/null; then
elif $CC -Werror-implicit-function-declaration -x c -c /dev/null -o /dev/null 2>/dev/null; then
RSRT_CFLAGS="$RSRT_CFLAGS -Werror-implicit-function-declaration"
fi
@ -1093,6 +1093,22 @@ fi
AM_CONDITIONAL(ENABLE_GUARDTIME, test x$enable_guardtime = xyes)
# GuardTime KSI support
AC_ARG_ENABLE(gt-ksi,
[AS_HELP_STRING([--enable-gt-ksi],[Enable log file signing support via GuardTime KSI @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_gt_ksi="yes" ;;
no) enable_gt_ksi="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-gt-ksi) ;;
esac],
[enable_gt_ksi=no]
)
if test "x$enable_gt_ksi" = "xyes"; then
PKG_CHECK_MODULES(GT_KSI, libksi >= 3.2.2.0)
fi
AM_CONDITIONAL(ENABLE_GT_KSI, test x$enable_gt_ksi = xyes)
# liblogging-stdlog support
AC_ARG_ENABLE(liblogging-stdlog,
[AS_HELP_STRING([--enable-liblogging-stdlog],[Enable liblogging-stdlog support @<:@default=yes@:>@])],
@ -1592,6 +1608,20 @@ AC_ARG_ENABLE(generate-man-pages,
)
# This provides a work-around to use "make distcheck" by disabling
# some tests that do have problems with the distcheck environment.
AC_ARG_ENABLE(distcheck-workaround,
[AS_HELP_STRING([--enable-distcheck-workaround],[enable to use make distcheck by disabling some tests that do not support the distcheck environment @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_distcheck_workaround="yes" ;;
no) enable_distcheck_workaround="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-distcheck_workaround) ;;
esac],
[enable_distcheck_workaround="no"]
)
AM_CONDITIONAL(ENABLE_DISTCHECK_WORKAROUND, test x$enable_distcheck_workaround = xyes)
# Running from git source?
in_git_src=no
AS_IF([test -d "$srcdir"/.git && ! test -f "$srcdir"/.tarball-version], [in_git_src=yes])
@ -1701,6 +1731,7 @@ echo " have to generate man pages: $have_to_generate_man_pages"
echo " Unlimited select() support enabled: $enable_unlimited_select"
echo " uuid support enabled: $enable_uuid"
echo " Log file signing support: $enable_guardtime"
echo " Log file signing support via KSI: $enable_gt_ksi"
echo " Log file encryption support: $enable_libgcrypt"
echo " anonymization support enabled: $enable_mmanon"