Browse Source

New upstream version 8.29.0

upstream upstream/8.29.0
Michael Biebl 5 years ago
parent
commit
af60e62676
  1. 2
      .tarball-version
  2. 168
      ChangeLog
  3. 4
      Makefile.am
  4. 123
      Makefile.in
  5. 2
      compat/Makefile.in
  6. 330
      configure
  7. 52
      configure.ac
  8. 2
      contrib/imczmq/Makefile.in
  9. 2
      contrib/imkmsg/Makefile.in
  10. 2
      contrib/imzmq3/Makefile.in
  11. 2
      contrib/mmcount/Makefile.in
  12. 2
      contrib/mmgrok/Makefile.in
  13. 2
      contrib/mmrfc5424addhmac/Makefile.in
  14. 2
      contrib/mmsequence/Makefile.in
  15. 2
      contrib/omamqp1/Makefile.in
  16. 2
      contrib/omczmq/Makefile.in
  17. 2
      contrib/omhiredis/Makefile.in
  18. 2
      contrib/omhttpfs/Makefile.in
  19. 2
      contrib/omrabbitmq/Makefile.in
  20. 2
      contrib/omtcl/Makefile.in
  21. 2
      contrib/omzmq3/Makefile.in
  22. 2
      contrib/pmaixforwardedfrom/Makefile.in
  23. 2
      contrib/pmcisconames/Makefile.in
  24. 2
      contrib/pmpanngfw/Makefile.in
  25. 2
      contrib/pmsnare/Makefile.in
  26. 6
      contrib/pmsnare/pmsnare.c
  27. 2
      grammar/Makefile.in
  28. 2
      plugins/im3195/Makefile.in
  29. 2
      plugins/imdiag/Makefile.in
  30. 2
      plugins/imfile/Makefile.in
  31. 19
      plugins/imfile/imfile.c
  32. 2
      plugins/imgssapi/Makefile.in
  33. 2
      plugins/imjournal/Makefile.in
  34. 2
      plugins/imkafka/Makefile.in
  35. 2
      plugins/imklog/Makefile.in
  36. 4
      plugins/imklog/bsd.c
  37. 4
      plugins/imklog/imklog.c
  38. 2
      plugins/imklog/imklog.h
  39. 2
      plugins/immark/Makefile.in
  40. 2
      plugins/impstats/Makefile.in
  41. 82
      plugins/impstats/impstats.c
  42. 2
      plugins/imptcp/Makefile.in
  43. 116
      plugins/imptcp/imptcp.c
  44. 2
      plugins/imrelp/Makefile.in
  45. 26
      plugins/imrelp/imrelp.c
  46. 2
      plugins/imsolaris/Makefile.in
  47. 2
      plugins/imtcp/Makefile.in
  48. 11
      plugins/imtcp/imtcp.c
  49. 2
      plugins/imudp/Makefile.in
  50. 2
      plugins/imudp/imudp.c
  51. 2
      plugins/imuxsock/Makefile.in
  52. 2
      plugins/mmanon/Makefile.in
  53. 2
      plugins/mmaudit/Makefile.in
  54. 2
      plugins/mmdblookup/Makefile.in
  55. 2
      plugins/mmexternal/Makefile.in
  56. 2
      plugins/mmfields/Makefile.in
  57. 2
      plugins/mmjsonparse/Makefile.in
  58. 2
      plugins/mmnormalize/Makefile.in
  59. 2
      plugins/mmpstrucdata/Makefile.in
  60. 2
      plugins/mmrm1stspace/Makefile.in
  61. 2
      plugins/mmsnmptrapd/Makefile.in
  62. 2
      plugins/mmutf8fix/Makefile.in
  63. 2
      plugins/omelasticsearch/Makefile.in
  64. 16
      plugins/omelasticsearch/omelasticsearch.c
  65. 2
      plugins/omgssapi/Makefile.in
  66. 2
      plugins/omhdfs/Makefile.in
  67. 2
      plugins/omjournal/Makefile.in
  68. 2
      plugins/omkafka/Makefile.in
  69. 3
      plugins/omkafka/omkafka.c
  70. 2
      plugins/omlibdbi/Makefile.in
  71. 2
      plugins/ommail/Makefile.in
  72. 2
      plugins/ommongodb/Makefile.in
  73. 2
      plugins/ommysql/Makefile.in
  74. 2
      plugins/ompgsql/Makefile.in
  75. 2
      plugins/omprog/Makefile.in
  76. 2
      plugins/omrelp/Makefile.in
  77. 26
      plugins/omrelp/omrelp.c
  78. 2
      plugins/omruleset/Makefile.in
  79. 2
      plugins/omsnmp/Makefile.in
  80. 2
      plugins/omstdout/Makefile.in
  81. 2
      plugins/omtesting/Makefile.in
  82. 2
      plugins/omudpspoof/Makefile.in
  83. 2
      plugins/omudpspoof/omudpspoof.c
  84. 2
      plugins/omuxsock/Makefile.in
  85. 2
      plugins/pmciscoios/Makefile.in
  86. 2
      plugins/pmlastmsg/Makefile.in
  87. 8
      plugins/pmnormalize/Makefile.am
  88. 753
      plugins/pmnormalize/Makefile.in
  89. 280
      plugins/pmnormalize/pmnormalize.c
  90. 2
      plugins/pmnull/Makefile.in
  91. 15
      runtime/Makefile.am
  92. 85
      runtime/Makefile.in
  93. 52
      runtime/debug.c
  94. 10
      runtime/debug.h
  95. 37
      runtime/glbl.c
  96. 6
      runtime/glbl.h
  97. 1178
      runtime/librsksi.c
  98. 242
      runtime/librsksi.h
  99. 2619
      runtime/librsksi_read.c
  100. 279
      runtime/lmsig_ksi.c

2
.tarball-version

@ -1 +1 @@
8.28.0
8.29.0

168
ChangeLog

@ -1,4 +1,172 @@
------------------------------------------------------------------------------
Version 8.29.0 [v8-stable] 2017-08-08
- imptcp: add experimental parameter "multiline"
This enables a heuristic to support multiline messages on raw tcp syslog
connections.
- imptcp: framing-related error messages now also indicate remote peer
This is the case e.g. for oversize messages.
- imtcp: framing-related error messages now also indicate remote peer
This is the case e.g. for oversize messages.
- imptcp: add session statistics conunter
- session.opened
- session.openfailed
- session.closed
- imtcp: add ability to specify GnuTLS priority string
This permits to set cipher details on a very low level.
- impstats: add new ressoure counter "openfiles"
- pmnormalize: new parser module
Parser module that uses liblognorm to parse incoming messages.
- core/queue: provide informational messages on thread startup and shutdown
This provides better insight into operational state of rsyslog and is useful
in monitoring system health. Note that this causes the emission of messages
not previously seen. They are of syslog.informational priority.
- omfwd/udp: improve error reporting, depricate maxerrormessages parameter
Generally improved udp-related error messages (e.g. they now contain the
socket number, which makes it easier to related them to errors reported by
net.c subsystem).
We also depricated (removed) the "maxerrormessages" configuration parameters.
It provided some very rough rate-limiting capabilities and was introduced
before we had native rate-limiters. The default was that only the first 5
error messages were actually reported. For long-running instances, that
meant that in many cases no errors were ever reported. We now use the default
internal message rate limter, which works far better and ensures that also
long-running instances will be able to emit error messages after prolonged
runtime. In contrast, this also means that users will see more error
messages from rsyslog, but that should actually improve the end user
experience.
- core: add parameters debug.file and debug.whitelist
allows to generate debug log output only of specific files
Background information available at:
https://www.linkedin.com/pulse/improving-rsyslog-debug-output-jan-gerhards
- core/net.c: improve UDP socket creation error messages
- omfwd/udp: add "udp.sendbuf" parameter
- core: make rsyslog internal message rate-limiter configurable
New parameters "internalmsg.ratelimit.interval" and "internalmsg.ratelimit.burst"
have been added.
- omelasticsearch bugfixes and changed ES5 API support:
* avoid 404 during health check
Omleasticsearch responds differently to HTTP HEAD and GET requests and
returns correct state only on GET requests. This patch works around
that ES bug and always does a GET request even when technically a HEAD
request would be sufficient.
* avoid ES5 warnings while sending json
ES5 is generating warnings when sending json without the proper header:
$ curl -i -H "Content-Type: text/json" -XGET 'http://elasticsearch5:9200/' \
-d '{}\n'
HTTP/1.1 200 OK
Warning: 299 Elasticsearch-5.4.3-eed30a8 "Content type detection for rest
requests is deprecated. Specify the content type using the [Content-Type]
header." "Wed, 26 Jul 2017 14:33:28 GMT"
no issue on previous version.
Now, the header is set as application/json. It works for all versions
(tested on ES2 and ES5) we also handle the bulkmode where it should be
set to application/x-ndjson
closes https://github.com/rsyslog/rsyslog/issues/1546
* bugfix for memomry leak while writing error file
Thanks to William Dauchy for providing the patches
- imfile bugfix: wildcard detection issue on path wildcards
Wildcards mode was not properly detected when wildcards
were only used in a directory name on startup.
This caused imfile not to create a propper dynamic filewatch.
closes: https://github.com/rsyslog/rsyslog/issues/1672
- omfwd bugfix: always give reason for suspension
In many cases, no error message were emitted when omfwd
went into action suspension, which was confusing for end
users. This patch enables explicit error messages in all
those cases.
closes https://github.com/rsyslog/rsyslog/issues/782
- omfwd bugfix: configured compression level was not properly used
Thanks to Harshvardhan Shrivastava for the patch.
- imptcp bugfix: potential socket leak on session shutdown
imptcp first tries to remove a to-be-shut-down socket from the
epoll set, and errors out if that does not work. In that case, the
underlying socket will be leaked.
This patch refactors the code; most importantly, it is not necessary
to remove the socket from the epoll set, as this happens automatically
on close. As such, we simply remove that part of the code, which
also removes the root cause of the socket leak.
- omfwd/omudpspoof bugfix: switch udp client sockets to nonblocking mode
On very busy systems, we see "udp send error 11" inside the logs, and the requesting
action is being suspended (and later resumed). During the suspension period (in
default configuration), messages are lost. Error 11 translates to EAGAIN and the
cause of this problem is that the system is running out of UDP buffer space. This
can happen on very busy systems (with busy networks).
It is not an error per se. Doing a short wait will resolve the issue. The real root
cause of the issue is that omfwd uses a nonblocking socket for sending. If it were
blocking, the OS would block until the situation is resolved. The need for a
non-blocking sockets is a purely historical one. In the days of single-threaded
processing (pre v3), everything needed to be done by multiplexing, and blocking was
not permitted. Since then, the engine has dramatically changed. Actions now run on
their own thread(s). As such, there is no longer a hard need to use non-blocking i/o
for sending data. Many other output plugins also do blocking wait (e.g. omelasticsearch).
As such, the real root cause of the trouble is unnecessarily using non-blocking mode,
and consequently the right solution is to change that.
Note that using blocking i/o might change some timeing inside rsyslog, especially
during shutdown. So theoretical there is regression potential in that area. However,
the core is designed to handle that situation (e.g. there is special shutdown code to
handle the blocking case), so this does not stand against the "proper" solution.
This patch applies the change on the rsyslog core level, within net.c. The only
users of the changed functionality are omfwd and omudpspoof. Imudp is unaffected as
it requests server sockets.
Note that according to the sendto() man page, there is a second cause for the EAGAIN
error, this is when the system temporarily runs out of emphermeral ports. It is not
100% clear if this can also happen in the blocking case. However, if so, we can argue
this is a case where we really want the default retry logic. So for the time being,
it is appropriate to not handle EAGAIN in a special case any longer.
closes https://github.com/rsyslog/rsyslog/issues/1665
- imklog: fix permitnonkernelfacility not working
- impstats bugfix: impstats does not handle HUP
If the parameter "log.file" is specified, impstats writes its own
log file. However, HUP is not handled for this file, which makes
the functionality unusable with log rotation. It is also counter-
intuitive for users.
This patch enables correct HUP processing. As a sideline, it also
introduces a generic HUP processing framework for non-action type
of loadable modules.
closes https://github.com/rsyslog/rsyslog/issues/1662
closes https://github.com/rsyslog/rsyslog/issues/1663
- core bugfix: segfault after configuration errors
- core/queue bugfixes:
* Fix behaviour of PersistStateInterval
If PersistStateInterval=1, then each log line read should cause the state file
to be updated, but this was not happening because nRecords was being post-increment.
Thanks to Anthony Howe for the patch.
* potential problem during deserialization
if queue object deserialization fails, invalid memory blocks might be
free'ed.
For more information see https://github.com/rsyslog/rsyslog/pull/1647
Thanks to Derek Smith for the patch.
- core bugfix: messsage garbled after message modification
The MsgDup() function will return a garbled message object under these
conditions: The message was originally created with message length equal or
larger to CONF_RAWMSG_BUFSIZE. This makes rsyslog store the message in
dynamically allocated buffer space. Then, a component reduces the message
size to a size lower than CONGF_RAWMSG_BUFSIZE. A frequent sample is the
parser removing a known-bad LF at the end of the messages. Then, MsgDup is
executed. It checks the message size and finds that it is below
CONF_RAWMSG_BUFSIZE, which make it copy the msg object internal buffer
instead of the dynamically allocated one. That buffer was not written to in
the first place, so unitialized data is copied. Note that no segfault can
happen, as the copied location was properly allocated, just not used in
this processing flow. In the end result, the new message object contains
garbage data. Whenever the new object is used (e.g. in a async ruleset or
action) that garbage will be used. Whenever the old object is accessed,
correct data will be used. Both types of access can happen inside the
same processing flow, which makes the problem appear to be random.
closes https://github.com/rsyslog/rsyslog/issues/1658
- lmsig_ksi: removed pre-KSI_LS12 components
As of GuardTime, the provider, these no longer work due to backend
changes. The lmsig_ksi_ls12 module shall be used instead. This is
available since 8.27.0.
- testbench bugfix: hang in tests if omstdout is not present
Many tests depend on omstdout. Given the fact that omstdout
is really only useful for the testbench (at least that's the intent),
we now require --enable-omstdout if --enable-testbench is given.
The alternative would have been to disable all those tests that
need it, which would have lead to considerable less testbench
coverage.
closes https://github.com/rsyslog/rsyslog/issues/1649
------------------------------------------------------------------------------
Version 8.28.0 [v8-stable] 2017-06-27
- NEW BUILD REQUIREMENT: librelp 1.2.14 (to build relp components)
This was necessary because imrelp requires an API introduced in 1.2.14.

4
Makefile.am

@ -99,6 +99,10 @@ if ENABLE_PMNULL
SUBDIRS += plugins/pmnull
endif
if ENABLE_PMNORMALIZE
SUBDIRS += plugins/pmnormalize
endif
if ENABLE_PMAIXFORWARDEDFROM
SUBDIRS += contrib/pmaixforwardedfrom
endif

123
Makefile.in

@ -106,55 +106,56 @@ sbin_PROGRAMS =
@ENABLE_PMCISCONAMES_TRUE@am__append_13 = contrib/pmcisconames
@ENABLE_PMCISCOIOS_TRUE@am__append_14 = plugins/pmciscoios
@ENABLE_PMNULL_TRUE@am__append_15 = plugins/pmnull
@ENABLE_PMAIXFORWARDEDFROM_TRUE@am__append_16 = contrib/pmaixforwardedfrom
@ENABLE_PMSNARE_TRUE@am__append_17 = contrib/pmsnare
@ENABLE_PMPANNGFW_TRUE@am__append_18 = contrib/pmpanngfw
@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_IMKAFKA_TRUE@am__append_40 = plugins/imkafka
@ENABLE_OMPROG_TRUE@am__append_41 = plugins/omprog
@ENABLE_RFC3195_TRUE@am__append_42 = plugins/im3195
@ENABLE_MMNORMALIZE_TRUE@am__append_43 = plugins/mmnormalize
@ENABLE_MMJSONPARSE_TRUE@am__append_44 = plugins/mmjsonparse
@ENABLE_MMGROK_TRUE@am__append_45 = contrib/mmgrok
@ENABLE_MMAUDIT_TRUE@am__append_46 = plugins/mmaudit
@ENABLE_MMANON_TRUE@am__append_47 = plugins/mmanon
@ENABLE_MMRM1STSPACE_TRUE@am__append_48 = plugins/mmrm1stspace
@ENABLE_MMUTF8FIX_TRUE@am__append_49 = plugins/mmutf8fix
@ENABLE_MMCOUNT_TRUE@am__append_50 = contrib/mmcount
@ENABLE_MMSEQUENCE_TRUE@am__append_51 = contrib/mmsequence
@ENABLE_MMDBLOOKUP_TRUE@am__append_52 = plugins/mmdblookup
@ENABLE_MMFIELDS_TRUE@am__append_53 = plugins/mmfields
@ENABLE_MMPSTRUCDATA_TRUE@am__append_54 = plugins/mmpstrucdata
@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_55 = contrib/mmrfc5424addhmac
@ENABLE_PMNORMALIZE_TRUE@am__append_16 = plugins/pmnormalize
@ENABLE_PMAIXFORWARDEDFROM_TRUE@am__append_17 = contrib/pmaixforwardedfrom
@ENABLE_PMSNARE_TRUE@am__append_18 = contrib/pmsnare
@ENABLE_PMPANNGFW_TRUE@am__append_19 = contrib/pmpanngfw
@ENABLE_PMLASTMSG_TRUE@am__append_20 = plugins/pmlastmsg
@ENABLE_OMRULESET_TRUE@am__append_21 = plugins/omruleset
@ENABLE_OMUDPSPOOF_TRUE@am__append_22 = plugins/omudpspoof
@ENABLE_OMMONGODB_TRUE@am__append_23 = plugins/ommongodb
@ENABLE_OMHIREDIS_TRUE@am__append_24 = contrib/omhiredis
@ENABLE_OMZMQ3_TRUE@am__append_25 = contrib/omzmq3
@ENABLE_OMCZMQ_TRUE@am__append_26 = contrib/omczmq
@ENABLE_OMRABBITMQ_TRUE@am__append_27 = contrib/omrabbitmq
@ENABLE_IMZMQ3_TRUE@am__append_28 = contrib/imzmq3
@ENABLE_IMCZMQ_TRUE@am__append_29 = contrib/imczmq
@ENABLE_OMUXSOCK_TRUE@am__append_30 = plugins/omuxsock
@ENABLE_OMHDFS_TRUE@am__append_31 = plugins/omhdfs
@ENABLE_OMJOURNAL_TRUE@am__append_32 = plugins/omjournal
@ENABLE_IMJOURNAL_TRUE@am__append_33 = plugins/imjournal
@ENABLE_ELASTICSEARCH_TRUE@am__append_34 = plugins/omelasticsearch
@ENABLE_MMSNMPTRAPD_TRUE@am__append_35 = plugins/mmsnmptrapd
@ENABLE_IMFILE_TRUE@am__append_36 = plugins/imfile
@ENABLE_IMPTCP_TRUE@am__append_37 = plugins/imptcp
@ENABLE_IMDIAG_TRUE@am__append_38 = plugins/imdiag
@ENABLE_MAIL_TRUE@am__append_39 = plugins/ommail
@ENABLE_OMKAFKA_TRUE@am__append_40 = plugins/omkafka
@ENABLE_IMKAFKA_TRUE@am__append_41 = plugins/imkafka
@ENABLE_OMPROG_TRUE@am__append_42 = plugins/omprog
@ENABLE_RFC3195_TRUE@am__append_43 = plugins/im3195
@ENABLE_MMNORMALIZE_TRUE@am__append_44 = plugins/mmnormalize
@ENABLE_MMJSONPARSE_TRUE@am__append_45 = plugins/mmjsonparse
@ENABLE_MMGROK_TRUE@am__append_46 = contrib/mmgrok
@ENABLE_MMAUDIT_TRUE@am__append_47 = plugins/mmaudit
@ENABLE_MMANON_TRUE@am__append_48 = plugins/mmanon
@ENABLE_MMRM1STSPACE_TRUE@am__append_49 = plugins/mmrm1stspace
@ENABLE_MMUTF8FIX_TRUE@am__append_50 = plugins/mmutf8fix
@ENABLE_MMCOUNT_TRUE@am__append_51 = contrib/mmcount
@ENABLE_MMSEQUENCE_TRUE@am__append_52 = contrib/mmsequence
@ENABLE_MMDBLOOKUP_TRUE@am__append_53 = plugins/mmdblookup
@ENABLE_MMFIELDS_TRUE@am__append_54 = plugins/mmfields
@ENABLE_MMPSTRUCDATA_TRUE@am__append_55 = plugins/mmpstrucdata
@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_56 = contrib/mmrfc5424addhmac
# omhttpfs
@ENABLE_OMHTTPFS_TRUE@am__append_56 = contrib/omhttpfs
@ENABLE_OMHTTPFS_TRUE@am__append_57 = contrib/omhttpfs
# omamqp1
@ENABLE_OMAMQP1_TRUE@am__append_57 = contrib/omamqp1
@ENABLE_OMAMQP1_TRUE@am__append_58 = contrib/omamqp1
# omtcl
@ENABLE_OMTCL_TRUE@am__append_58 = contrib/omtcl
@ENABLE_OMTCL_TRUE@am__append_59 = contrib/omtcl
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
@ -268,23 +269,25 @@ DIST_SUBDIRS = compat runtime grammar . plugins/immark \
plugins/imgssapi plugins/omrelp plugins/imrelp plugins/ommysql \
plugins/omlibdbi plugins/ompgsql plugins/omsnmp \
plugins/omstdout contrib/pmcisconames plugins/pmciscoios \
plugins/pmnull contrib/pmaixforwardedfrom contrib/pmsnare \
contrib/pmpanngfw plugins/pmlastmsg plugins/omruleset \
plugins/omudpspoof plugins/ommongodb contrib/omhiredis \
contrib/omzmq3 contrib/omczmq contrib/omrabbitmq \
contrib/imzmq3 contrib/imczmq plugins/omuxsock plugins/omhdfs \
plugins/omjournal plugins/imjournal plugins/omelasticsearch \
plugins/mmsnmptrapd plugins/imfile plugins/imptcp \
plugins/imdiag plugins/ommail plugins/omkafka plugins/imkafka \
plugins/omprog plugins/im3195 plugins/mmnormalize \
plugins/mmjsonparse contrib/mmgrok plugins/mmaudit \
plugins/mmanon plugins/mmrm1stspace plugins/mmutf8fix \
contrib/mmcount contrib/mmsequence plugins/mmdblookup \
plugins/mmfields plugins/mmpstrucdata contrib/mmrfc5424addhmac \
contrib/omhttpfs contrib/omamqp1 contrib/omtcl tests
plugins/pmnull plugins/pmnormalize contrib/pmaixforwardedfrom \
contrib/pmsnare contrib/pmpanngfw plugins/pmlastmsg \
plugins/omruleset plugins/omudpspoof plugins/ommongodb \
contrib/omhiredis contrib/omzmq3 contrib/omczmq \
contrib/omrabbitmq contrib/imzmq3 contrib/imczmq \
plugins/omuxsock plugins/omhdfs plugins/omjournal \
plugins/imjournal plugins/omelasticsearch plugins/mmsnmptrapd \
plugins/imfile plugins/imptcp plugins/imdiag plugins/ommail \
plugins/omkafka plugins/imkafka plugins/omprog plugins/im3195 \
plugins/mmnormalize plugins/mmjsonparse contrib/mmgrok \
plugins/mmaudit plugins/mmanon plugins/mmrm1stspace \
plugins/mmutf8fix contrib/mmcount contrib/mmsequence \
plugins/mmdblookup plugins/mmfields plugins/mmpstrucdata \
contrib/mmrfc5424addhmac contrib/omhttpfs contrib/omamqp1 \
contrib/omtcl tests
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
COPYING COPYING.LESSER ChangeLog INSTALL NEWS README compile \
config.guess config.sub install-sh ltmain.sh missing ylwrap
config.guess config.sub depcomp install-sh ltmain.sh missing \
ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@ -363,8 +366,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
@ -592,7 +593,7 @@ SUBDIRS = compat runtime grammar . plugins/immark plugins/imuxsock \
$(am__append_48) $(am__append_49) $(am__append_50) \
$(am__append_51) $(am__append_52) $(am__append_53) \
$(am__append_54) $(am__append_55) $(am__append_56) \
$(am__append_57) $(am__append_58) tests
$(am__append_57) $(am__append_58) $(am__append_59) tests
# make sure "make distcheck" tries to build all modules. This means that
# a developer must always have an environment where every supporting library

2
compat/Makefile.in

@ -214,8 +214,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

330
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.28.0.
# Generated by GNU Autoconf 2.69 for rsyslog 8.29.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.28.0'
PACKAGE_STRING='rsyslog 8.28.0'
PACKAGE_VERSION='8.29.0'
PACKAGE_STRING='rsyslog 8.29.0'
PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
PACKAGE_URL=''
@ -704,6 +704,8 @@ ENABLE_PMSNARE_FALSE
ENABLE_PMSNARE_TRUE
ENABLE_PMAIXFORWARDEDFROM_FALSE
ENABLE_PMAIXFORWARDEDFROM_TRUE
ENABLE_PMNORMALIZE_FALSE
ENABLE_PMNORMALIZE_TRUE
ENABLE_PMNULL_FALSE
ENABLE_PMNULL_TRUE
ENABLE_PMCISCOIOS_FALSE
@ -714,6 +716,8 @@ ENABLE_PMLASTMSG_FALSE
ENABLE_PMLASTMSG_TRUE
ENABLE_OMJOURNAL_FALSE
ENABLE_OMJOURNAL_TRUE
ENABLE_TESTBENCH_FALSE
ENABLE_TESTBENCH_TRUE
ENABLE_OMSTDOUT_FALSE
ENABLE_OMSTDOUT_TRUE
UDPSPOOF_LIBS
@ -733,8 +737,6 @@ ENABLE_IMFILE_TRUE
HAVE_VALGRIND_FALSE
HAVE_VALGRIND_TRUE
VALGRIND
ENABLE_TESTBENCH_FALSE
ENABLE_TESTBENCH_TRUE
ENABLE_IP_FALSE
ENABLE_IP_TRUE
IP
@ -750,10 +752,6 @@ ENABLE_KSI_LS12_FALSE
ENABLE_KSI_LS12_TRUE
GT_KSI_LS12_LIBS
GT_KSI_LS12_CFLAGS
ENABLE_GT_KSI_FALSE
ENABLE_GT_KSI_TRUE
GT_KSI_LIBS
GT_KSI_CFLAGS
ENABLE_GUARDTIME_FALSE
ENABLE_GUARDTIME_TRUE
GUARDTIME_LIBS
@ -1097,7 +1095,6 @@ enable_mmrfc5424addhmac
enable_relp
enable_omrelp_default_port
enable_guardtime
enable_gt_ksi
enable_ksi_ls12
enable_liblogging_stdlog
enable_rfc3195
@ -1115,6 +1112,7 @@ enable_pmlastmsg
enable_pmcisconames
enable_pmciscoios
enable_pmnull
enable_pmnormalize
enable_pmaixforwardedfrom
enable_pmsnare
enable_pmpanngfw
@ -1176,8 +1174,6 @@ RELP_CFLAGS
RELP_LIBS
GUARDTIME_CFLAGS
GUARDTIME_LIBS
GT_KSI_CFLAGS
GT_KSI_LIBS
GT_KSI_LS12_CFLAGS
GT_KSI_LS12_LIBS
LIBLOGGING_STDLOG_CFLAGS
@ -1748,7 +1744,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.28.0 to adapt to many kinds of systems.
\`configure' configures rsyslog 8.29.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1819,7 +1815,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of rsyslog 8.28.0:";;
short | recursive ) echo "Configuration of rsyslog 8.29.0:";;
esac
cat <<\_ACEOF
@ -1906,8 +1902,6 @@ Optional Features:
set omrelp default port [default=514]
--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-ksi-ls12 Enable log file signing support via GuardTime KSI
LS12 [default=no]
--enable-liblogging-stdlog
@ -1926,6 +1920,7 @@ Optional Features:
--enable-pmcisconames Compiles cisconames parser module [default=no]
--enable-pmciscoios Compiles ciscoios parser module [default=no]
--enable-pmnull Compiles null parser module [default=no]
--enable-pmnormalize Compiles normalizer parser module [default=no]
--enable-pmaixforwardedfrom
Compiles aixforwardedfrom parser module [default=no]
--enable-pmsnare Compiles snare parser module [default=no]
@ -2035,9 +2030,6 @@ 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
GT_KSI_LS12_CFLAGS
C compiler flags for GT_KSI_LS12, overriding pkg-config
GT_KSI_LS12_LIBS
@ -2141,7 +2133,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rsyslog configure 8.28.0
rsyslog configure 8.29.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2721,7 +2713,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.28.0, which was
It was created by rsyslog $as_me 8.29.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -3616,7 +3608,7 @@ fi
# Define the identity of the package.
PACKAGE='rsyslog'
VERSION='8.28.0'
VERSION='8.29.0'
cat >>confdefs.h <<_ACEOF
@ -20879,212 +20871,6 @@ 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.4.0.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libksi >= 3.4.0.2") 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.4.0.2" 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.4.0.2\""; } >&5
($PKG_CONFIG --exists --print-errors "libksi >= 3.4.0.2") 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.4.0.2" 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.4.0.2" 2>&1`
else
GT_KSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libksi >= 3.4.0.2" 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.4.0.2) 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
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.5.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libksi < 3.5.0.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.5.0.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.5.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libksi < 3.5.0.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.5.0.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.5.0.0" 2>&1`
else
GT_KSI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libksi < 3.5.0.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.5.0.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
# GuardTime KSI LOGSIG 12 support
# Check whether --enable-ksi-ls12 was given.
@ -21502,20 +21288,6 @@ else
fi
if test x$enable_testbench = xyes; then
ENABLE_TESTBENCH_TRUE=
ENABLE_TESTBENCH_FALSE='#'
else
ENABLE_TESTBENCH_TRUE='#'
ENABLE_TESTBENCH_FALSE=
fi
if test "x$enable_testbench" = "xyes"; then
if test "x$enable_imdiag" != "xyes"; then
as_fn_error $? "\"--enable-testbench requires --enable-imdiag\"" "$LINENO" 5
fi
fi
# valgrind-testbench
@ -21820,6 +21592,24 @@ else
fi
if test x$enable_testbench = xyes; then
ENABLE_TESTBENCH_TRUE=
ENABLE_TESTBENCH_FALSE='#'
else
ENABLE_TESTBENCH_TRUE='#'
ENABLE_TESTBENCH_FALSE=
fi
if test "x$enable_testbench" = "xyes"; then
if test "x$enable_imdiag" != "xyes"; then
as_fn_error $? "\"--enable-testbench requires --enable-imdiag\"" "$LINENO" 5
fi
if test "x$enable_omstdout" != "xyes"; then
as_fn_error $? "\"--enable-testbench requires --enable-omstdout\"" "$LINENO" 5
fi
fi
# settings for omjournal
# Check whether --enable-omjournal was given.
if test "${enable_omjournal+set}" = set; then :
@ -22192,6 +21982,29 @@ fi
# settings for pmnormalize
# Check whether --enable-pmnormalize was given.
if test "${enable_pmnormalize+set}" = set; then :
enableval=$enable_pmnormalize; case "${enableval}" in
yes) enable_pmnormalize="yes" ;;
no) enable_pmnormalize="no" ;;
*) as_fn_error $? "bad value ${enableval} for --enable-pmnormalize" "$LINENO" 5 ;;
esac
else
enable_pmnormalize=no
fi
if test x$enable_pmnormalize = xyes; then
ENABLE_PMNORMALIZE_TRUE=
ENABLE_PMNORMALIZE_FALSE='#'
else
ENABLE_PMNORMALIZE_TRUE='#'
ENABLE_PMNORMALIZE_FALSE=
fi
# settings for pmaixforwardedfrom
# Check whether --enable-pmaixforwardedfrom was given.
if test "${enable_pmaixforwardedfrom+set}" = set; then :
@ -23494,7 +23307,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 23497 "configure" */
/* #line 23310 "configure" */
public class Test {
}
EOF
@ -23669,7 +23482,7 @@ EOF
if $UUDECODE Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 23672: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: 23485: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
@ -23786,7 +23599,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 23789 "configure" */
/* #line 23602 "configure" */
public class Test {
}
EOF
@ -23821,7 +23634,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
/* [#]line 23824 "configure" */
/* [#]line 23637 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@ -25532,7 +25345,7 @@ if test "x$have_to_generate_man_pages" = "xyes" && test "x$RST2MAN" = "xfalse";
fi
ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile plugins/imudp/Makefile plugins/imtcp/Makefile plugins/im3195/Makefile plugins/imgssapi/Makefile plugins/imuxsock/Makefile plugins/imjournal/Makefile plugins/immark/Makefile plugins/imklog/Makefile plugins/omhdfs/Makefile plugins/omkafka/Makefile plugins/omprog/Makefile plugins/mmexternal/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmciscoios/Makefile plugins/pmnull/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imkafka/Makefile plugins/omtesting/Makefile plugins/omgssapi/Makefile plugins/ommysql/Makefile plugins/ompgsql/Makefile plugins/omrelp/Makefile plugins/omlibdbi/Makefile plugins/ommail/Makefile plugins/omsnmp/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/mmrm1stspace/Makefile plugins/mmutf8fix/Makefile plugins/mmfields/Makefile plugins/mmpstrucdata/Makefile plugins/omelasticsearch/Makefile plugins/mmsnmptrapd/Makefile plugins/pmlastmsg/Makefile plugins/mmdblookup/Makefile contrib/pmsnare/Makefile contrib/pmpanngfw/Makefile contrib/pmaixforwardedfrom/Makefile contrib/omhiredis/Makefile contrib/omrabbitmq/Makefile contrib/imkmsg/Makefile contrib/mmgrok/Makefile contrib/mmcount/Makefile contrib/omzmq3/Makefile contrib/omczmq/Makefile contrib/imzmq3/Makefile contrib/imczmq/Makefile contrib/mmsequence/Makefile contrib/mmrfc5424addhmac/Makefile contrib/pmcisconames/Makefile contrib/omhttpfs/Makefile contrib/omamqp1/Makefile contrib/omtcl/Makefile tests/Makefile"
ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile plugins/imudp/Makefile plugins/imtcp/Makefile plugins/im3195/Makefile plugins/imgssapi/Makefile plugins/imuxsock/Makefile plugins/imjournal/Makefile plugins/immark/Makefile plugins/imklog/Makefile plugins/omhdfs/Makefile plugins/omkafka/Makefile plugins/omprog/Makefile plugins/mmexternal/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmciscoios/Makefile plugins/pmnull/Makefile plugins/pmnormalize/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imkafka/Makefile plugins/omtesting/Makefile plugins/omgssapi/Makefile plugins/ommysql/Makefile plugins/ompgsql/Makefile plugins/omrelp/Makefile plugins/omlibdbi/Makefile plugins/ommail/Makefile plugins/omsnmp/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/mmrm1stspace/Makefile plugins/mmutf8fix/Makefile plugins/mmfields/Makefile plugins/mmpstrucdata/Makefile plugins/omelasticsearch/Makefile plugins/mmsnmptrapd/Makefile plugins/pmlastmsg/Makefile plugins/mmdblookup/Makefile contrib/pmsnare/Makefile contrib/pmpanngfw/Makefile contrib/pmaixforwardedfrom/Makefile contrib/omhiredis/Makefile contrib/omrabbitmq/Makefile contrib/imkmsg/Makefile contrib/mmgrok/Makefile contrib/mmcount/Makefile contrib/omzmq3/Makefile contrib/omczmq/Makefile contrib/imzmq3/Makefile contrib/imczmq/Makefile contrib/mmsequence/Makefile contrib/mmrfc5424addhmac/Makefile contrib/pmcisconames/Makefile contrib/omhttpfs/Makefile contrib/omamqp1/Makefile contrib/omtcl/Makefile tests/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -25871,10 +25684,6 @@ 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_KSI_LS12_TRUE}" && test -z "${ENABLE_KSI_LS12_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_KSI_LS12\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -25891,10 +25700,6 @@ if test -z "${ENABLE_IP_TRUE}" && test -z "${ENABLE_IP_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_IP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_TESTBENCH_TRUE}" && test -z "${ENABLE_TESTBENCH_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_TESTBENCH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_VALGRIND_TRUE}" && test -z "${HAVE_VALGRIND_FALSE}"; then
as_fn_error $? "conditional \"HAVE_VALGRIND\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -25927,6 +25732,10 @@ if test -z "${ENABLE_OMSTDOUT_TRUE}" && test -z "${ENABLE_OMSTDOUT_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_OMSTDOUT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_TESTBENCH_TRUE}" && test -z "${ENABLE_TESTBENCH_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_TESTBENCH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_OMJOURNAL_TRUE}" && test -z "${ENABLE_OMJOURNAL_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_OMJOURNAL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -25947,6 +25756,10 @@ if test -z "${ENABLE_PMNULL_TRUE}" && test -z "${ENABLE_PMNULL_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_PMNULL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_PMNORMALIZE_TRUE}" && test -z "${ENABLE_PMNORMALIZE_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_PMNORMALIZE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_PMAIXFORWARDEDFROM_TRUE}" && test -z "${ENABLE_PMAIXFORWARDEDFROM_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_PMAIXFORWARDEDFROM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -26436,7 +26249,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.28.0, which was
This file was extended by rsyslog $as_me 8.29.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -26502,7 +26315,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.28.0
rsyslog config.status 8.29.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -26938,6 +26751,7 @@ do
"plugins/omjournal/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/omjournal/Makefile" ;;
"plugins/pmciscoios/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/pmciscoios/Makefile" ;;
"plugins/pmnull/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/pmnull/Makefile" ;;
"plugins/pmnormalize/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/pmnormalize/Makefile" ;;
"plugins/omruleset/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/omruleset/Makefile" ;;
"plugins/omuxsock/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/omuxsock/Makefile" ;;
"plugins/imfile/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imfile/Makefile" ;;
@ -28270,7 +28084,6 @@ 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 signing support via KSI LS12: $enable_ksi_ls12"
echo " Log file encryption support: $enable_libgcrypt"
echo " anonymization support enabled: $enable_mmanon"
@ -28316,6 +28129,7 @@ echo " pmlastmsg module will be compiled: $enable_pmlastmsg"
echo " pmcisconames module will be compiled: $enable_pmcisconames"
echo " pmciscoios module will be compiled: $enable_pmciscoios"
echo " pmnull module will be compiled: $enable_pmnull"
echo " pmnormalize module will be compiled: $enable_pmnormalize"
echo " pmaixforwardedfrom module w.be compiled: $enable_pmaixforwardedfrom"
echo " pmsnare module will be compiled: $enable_pmsnare"
echo " pmpanngfw module will be compiled: $enable_pmpanngfw"

52
configure.ac

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([rsyslog],[8.28.0],[rsyslog@lists.adiscon.com])
AC_INIT([rsyslog],[8.29.0],[rsyslog@lists.adiscon.com])
# AIXPORT START: Detect the underlying OS
unamestr=$(uname)
@ -1278,22 +1278,6 @@ 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.4.0.2)
PKG_CHECK_MODULES(GT_KSI, libksi < 3.5.0.0)
fi
AM_CONDITIONAL(ENABLE_GT_KSI, test x$enable_gt_ksi = xyes)
# GuardTime KSI LOGSIG 12 support
AC_ARG_ENABLE(ksi-ls12,
@ -1362,13 +1346,6 @@ if test "x${IP}" = "xno"; then
fi
AM_CONDITIONAL(ENABLE_IP, test "x${IP}" = "xyes")
AM_CONDITIONAL(ENABLE_TESTBENCH, test x$enable_testbench = xyes)
if test "x$enable_testbench" = "xyes"; then
if test "x$enable_imdiag" != "xyes"; then
AC_MSG_ERROR("--enable-testbench requires --enable-imdiag")
fi
fi
# valgrind-testbench
AC_ARG_WITH([valgrind_testbench],
@ -1499,6 +1476,17 @@ AC_ARG_ENABLE(omstdout,
)
AM_CONDITIONAL(ENABLE_OMSTDOUT, test x$enable_omstdout = xyes)
AM_CONDITIONAL(ENABLE_TESTBENCH, test x$enable_testbench = xyes)
if test "x$enable_testbench" = "xyes"; then
if test "x$enable_imdiag" != "xyes"; then
AC_MSG_ERROR("--enable-testbench requires --enable-imdiag")
fi
if test "x$enable_omstdout" != "xyes"; then
AC_MSG_ERROR("--enable-testbench requires --enable-omstdout")
fi
fi
# settings for omjournal
AC_ARG_ENABLE(omjournal,
[AS_HELP_STRING([--enable-omjournal],[Compiles omjournal @<:@default=no@:>@])],
@ -1569,6 +1557,19 @@ AC_ARG_ENABLE(pmnull,
AM_CONDITIONAL(ENABLE_PMNULL, test x$enable_pmnull = xyes)
# settings for pmnormalize
AC_ARG_ENABLE(pmnormalize,
[AS_HELP_STRING([--enable-pmnormalize],[Compiles normalizer parser module @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_pmnormalize="yes" ;;
no) enable_pmnormalize="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-pmnormalize) ;;
esac],
[enable_pmnormalize=no]
)
AM_CONDITIONAL(ENABLE_PMNORMALIZE, test x$enable_pmnormalize = xyes)
# settings for pmaixforwardedfrom
AC_ARG_ENABLE(pmaixforwardedfrom,
[AS_HELP_STRING([--enable-pmaixforwardedfrom],[Compiles aixforwardedfrom parser module @<:@default=no@:>@])],
@ -2071,6 +2072,7 @@ AC_CONFIG_FILES([Makefile \
plugins/omjournal/Makefile \
plugins/pmciscoios/Makefile \
plugins/pmnull/Makefile \
plugins/pmnormalize/Makefile \
plugins/omruleset/Makefile \
plugins/omuxsock/Makefile \
plugins/imfile/Makefile \
@ -2135,7 +2137,6 @@ 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 signing support via KSI LS12: $enable_ksi_ls12"
echo " Log file encryption support: $enable_libgcrypt"
echo " anonymization support enabled: $enable_mmanon"
@ -2181,6 +2182,7 @@ echo " pmlastmsg module will be compiled: $enable_pmlastmsg"
echo " pmcisconames module will be compiled: $enable_pmcisconames"
echo " pmciscoios module will be compiled: $enable_pmciscoios"
echo " pmnull module will be compiled: $enable_pmnull"
echo " pmnormalize module will be compiled: $enable_pmnormalize"
echo " pmaixforwardedfrom module w.be compiled: $enable_pmaixforwardedfrom"
echo " pmsnare module will be compiled: $enable_pmsnare"
echo " pmpanngfw module will be compiled: $enable_pmpanngfw"

2
contrib/imczmq/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/imkmsg/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/imzmq3/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/mmcount/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/mmgrok/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/mmrfc5424addhmac/Makefile.in

@ -243,8 +243,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/mmsequence/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/omamqp1/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/omczmq/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/omhiredis/Makefile.in

@ -242,8 +242,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/omhttpfs/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/omrabbitmq/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/omtcl/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/omzmq3/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/pmaixforwardedfrom/Makefile.in

@ -242,8 +242,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/pmcisconames/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/pmpanngfw/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
contrib/pmsnare/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

6
contrib/pmsnare/pmsnare.c

@ -286,7 +286,8 @@ CODESTARTparse2
*
* - Find out if the first separator is a tab.
* - If it is, see if the second word is one of our expected tags.
* - If so, flag as Snare and replace the first tab with space so that hostname and syslog tag are going to be parsed properly
* - If so, flag as Snare and replace the first tab with space so that
* hostname and syslog tag are going to be parsed properly
* - Else not a snare message, abort.
* - Else assume valid 3164 timestamp, move over to the syslog tag.
* - See if syslog header is followed by tab and one of our expected tags.
@ -351,7 +352,8 @@ CODESTARTparse2
*/
/* go back to the beginning of the message */
lenMsg = pMsg->iLenRawMsg - pMsg->offAfterPRI; /* offAfterPRI is already the number of PRI chars (do not add one!) */
lenMsg = pMsg->iLenRawMsg - pMsg->offAfterPRI;
/* offAfterPRI is already the number of PRI chars (do not add one!) */
p2parse = pMsg->pszRawMsg + pMsg->offAfterPRI;
/* skip over timestamp and space (15 chars + space). */

2
grammar/Makefile.in

@ -228,8 +228,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
plugins/im3195/Makefile.in

@ -241,8 +241,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
plugins/imdiag/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

2
plugins/imfile/Makefile.in

@ -240,8 +240,6 @@ 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@
GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@

19
plugins/imfile/imfile.c

@ -747,14 +747,15 @@ pollFile(lstn_t *pLstn, int *pbHadFileData)
if(pLstn->startRegex == NULL) {
CHKiRet(strm.ReadLine(pLstn->pStrm, &pCStr, pLstn->readMode, pLstn->escapeLF, pLstn->trimLineOverBytes));
} else {
CHKiRet(strmReadMultiLine(pLstn->pStrm, &pCStr, &pLstn->end_preg, pLstn->escapeLF, pLstn->discardTruncatedMsg, pLstn->msgDiscardingError));
CHKiRet(strmReadMultiLine(pLstn->pStrm, &pCStr, &pLstn->end_preg,
pLstn->escapeLF, pLstn->discardTruncatedMsg, pLstn->msgDiscardingError));
}
++nProcessed;
if(pbHadFileData != NULL)
*pbHadFileData = 1; /* this is just a flag, so set it and forget it */
CHKiRet(enqLine(pLstn, pCStr)); /* process line */
rsCStrDestruct(&pCStr); /* discard string (must be done by us!) */
if(pLstn->iPersistStateInterval > 0 && pLstn->nRecords++ >= pLstn->iPersistStateInterval) {
if(pLstn->iPersistStateInterval > 0 && ++pLstn->nRecords >= pLstn->iPersistStateInterval) {
persistStrmState(pLstn);
pLstn->nRecords = 0;
}
@ -1052,6 +1053,9 @@ addListner(instanceConf_t *inst)
sbool hasWildcard;
hasWildcard = containsGlobWildcard((char*)inst->pszFileBaseName);
DBGPRINTF("imfile: addListner file '%s', wildcard detected: %s\n",
inst->pszFileBaseName, (hasWildcard ? "TRUE" : "FALSE"));
if(hasWildcard) {
if(runModConf->opMode == OPMODE_POLLING) {
errmsg.LogError(0, RS_RET_IMFILE_WILDCARD,
@ -1715,6 +1719,8 @@ in_setupDirWatch(const int dirIdx)
memcpy(dirnametrunc, dirs[dirIdx].dirName, dirnamelen); /* Copy mem */
hasWildcard = containsGlobWildcard(dirnametrunc);
DBGPRINTF("imfile: in_setupDirWatch dir '%s', wildcard detected: %s\n",
dirnametrunc, (hasWildcard ? "TRUE" : "FALSE"));
if(hasWildcard) {
/* Set NULL Byte to FIRST wildcard occurrence */
psztmp = strchr(dirnametrunc, '*');