diff --git a/.gitignore b/.gitignore
index 8a7cc6e..de3df7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/rsyslog-7.4.7.tar.gz
+SOURCES/rsyslog-8.24.0.tar.gz
+SOURCES/rsyslog-doc-8.24.0.tar.gz
diff --git a/.rsyslog.metadata b/.rsyslog.metadata
index 2ba55fe..289264b 100644
--- a/.rsyslog.metadata
+++ b/.rsyslog.metadata
@@ -1 +1,2 @@
-f4d6c60572bf661c7a7ea6a0f5e221e5a0fbf65a SOURCES/rsyslog-7.4.7.tar.gz
+615ee5b47ca4c3a28de3c8ee4477c721c20f31aa SOURCES/rsyslog-8.24.0.tar.gz
+c0bbe5466738ac97575e0301cf26f0ec45d77b20 SOURCES/rsyslog-doc-8.24.0.tar.gz
diff --git a/SOURCES/rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch b/SOURCES/rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
deleted file mode 100644
index 6fbe502..0000000
--- a/SOURCES/rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up rsyslog-7.2.1/runtime/msg.c.orig rsyslog-7.2.1/runtime/msg.c
---- rsyslog-7.2.1/runtime/msg.c.orig 2012-10-29 11:33:30.000000000 +0100
-+++ rsyslog-7.2.1/runtime/msg.c 2012-11-14 08:58:20.235584832 +0100
-@@ -3752,6 +3752,22 @@
- RETiRet;
- }
-
-+static rsRetVal
-+jsonMergeNonOverwrite(struct json_object *existing, struct json_object *json)
-+{
-+ DEFiRet;
-+ struct json_object_iter it;
-+
-+ json_object_object_foreachC(existing, it) {
-+ json_object_object_add(json, it.key, json_object_get(it.val));
-+ }
-+
-+ CHKiRet(jsonMerge(existing, json));
-+
-+finalize_it:
-+ RETiRet;
-+}
-+
- /* find a JSON structure element (field or container doesn't matter). */
- rsRetVal
- jsonFind(msg_t *pM, es_str_t *propName, struct json_object **jsonres)
-@@ -3795,7 +3811,7 @@
- if(pM->json == NULL)
- pM->json = json;
- else
-- CHKiRet(jsonMerge(pM->json, json));
-+ CHKiRet(jsonMergeNonOverwrite(pM->json, json));
- } else {
- if(pM->json == NULL) {
- /* now we need a root obj */
-@@ -3808,7 +3824,7 @@
- json_object_object_add(parent, (char*)leaf, json);
- } else {
- if(json_object_get_type(json) == json_type_object) {
-- CHKiRet(jsonMerge(pM->json, json));
-+ CHKiRet(jsonMergeNonOverwrite(pM->json, json));
- } else {
- //dbgprintf("AAAA: leafnode already exists, type is %d, update with %d\n", (int)json_object_get_type(leafnode), (int)json_object_get_type(json));
- /* TODO: improve the code below, however, the current
diff --git a/SOURCES/rsyslog-7.2.2-manpage-dbg-mode.patch b/SOURCES/rsyslog-7.2.2-manpage-dbg-mode.patch
deleted file mode 100644
index 4a15907..0000000
--- a/SOURCES/rsyslog-7.2.2-manpage-dbg-mode.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up rsyslog-7.2.2/tools/rsyslogd.8.orig rsyslog-7.2.2/tools/rsyslogd.8
---- rsyslog-7.2.2/tools/rsyslogd.8.orig 2012-11-20 16:31:26.530284950 +0100
-+++ rsyslog-7.2.2/tools/rsyslogd.8 2012-11-20 16:31:34.172188889 +0100
-@@ -131,11 +131,7 @@ syntax errors are reported. Please note
- technical and orignally targeted towards developers.
- .TP
- .B "\-d"
--Turns on debug mode. Using this the daemon will not proceed a
--.BR fork (2)
--to set itself in the background, but opposite to that stay in the
--foreground and write much debug information on the current tty. See the
--DEBUGGING section for more information.
-+Turns on debug mode. See the DEBUGGING section for more information.
- .TP
- .BI "\-f " "config file"
- Specify an alternative configuration file instead of
-@@ -294,11 +290,17 @@ be prevented by using GSS-API authentica
- to think about syslog network security before enabling it.
- .LP
- .SH DEBUGGING
--When debugging is turned on using
-+When debugging is turned on using the
- .B "\-d"
--option then
-+option,
- .B rsyslogd
--will be very verbose by writing much of what it does on stdout.
-+produces debugging information according to the
-+.B RSYSLOG_DEBUG
-+environment variable and the signals received. When run in foreground,
-+the information is written to stdout. An additional output file can be
-+specified using the
-+.B RSYSLOG_DEBUGLOG
-+environment variable.
- .SH FILES
- .PD 0
- .TP
-@@ -325,10 +327,17 @@ is specified during compilation (e.g. /u
- .SH ENVIRONMENT
- .TP
- .B RSYSLOG_DEBUG
--Controls runtime debug support.It contains an option string with the
-+Controls runtime debug support. It contains an option string with the
- following options possible (all are case insensitive):
-
- .RS
-+.IP Debug
-+Turns on debugging and prevents forking. This is processed earlier
-+in the startup than command line options (i.e. -d) and as such
-+enables earlier debugging output. Mutually exclusive with DebugOnDemand.
-+.IP DebugOnDemand
-+Enables debugging but turns off debug output. The output can be toggled
-+by sending SIGUSR1. Mutually exclusive with Debug.
- .IP LogFuncFlow
- Print out the logical flow of functions (entering and exiting them)
- .IP FileTrace
diff --git a/SOURCES/rsyslog-7.4.1-sd-service.patch b/SOURCES/rsyslog-7.4.1-sd-service.patch
deleted file mode 100644
index a9de3a3..0000000
--- a/SOURCES/rsyslog-7.4.1-sd-service.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up rsyslog-7.4.1/rsyslog.service.in.orig rsyslog-7.4.1/rsyslog.service.in
---- rsyslog-7.4.1/rsyslog.service.in.orig 2013-06-17 15:28:54.430023493 +0200
-+++ rsyslog-7.4.1/rsyslog.service.in 2013-06-17 15:30:05.874378084 +0200
-@@ -4,7 +4,10 @@ Requires=syslog.socket
-
- [Service]
- Type=notify
--ExecStart=@sbindir@/rsyslogd -n
-+EnvironmentFile=-/etc/sysconfig/rsyslog
-+ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
-+Restart=on-failure
-+UMask=0066
- StandardOutput=null
-
- [Install]
diff --git a/SOURCES/rsyslog-7.4.7-bz1030044-remove-ads.patch b/SOURCES/rsyslog-7.4.7-bz1030044-remove-ads.patch
deleted file mode 100644
index cdbcf0e..0000000
--- a/SOURCES/rsyslog-7.4.7-bz1030044-remove-ads.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From 79e4e43bcadb0fb520240c655f529874f305f786 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Thu, 14 Nov 2013 15:14:08 +0100
-Subject: [PATCH] Remove references to Google ads from html documentation
-
----
- doc/rsyslog_secure_tls.html | 13 -------------
- doc/tls_cert_ca.html | 13 -------------
- doc/tls_cert_client.html | 13 -------------
- doc/tls_cert_errmsgs.html | 13 -------------
- doc/tls_cert_machine.html | 13 -------------
- doc/tls_cert_scenario.html | 13 -------------
- doc/tls_cert_server.html | 13 -------------
- doc/tls_cert_summary.html | 13 -------------
- doc/tls_cert_udp_relay.html | 13 -------------
- 9 files changed, 117 deletions(-)
-
-diff --git a/doc/rsyslog_secure_tls.html b/doc/rsyslog_secure_tls.html
-index b15e5a4..0bef2b3 100644
---- a/doc/rsyslog_secure_tls.html
-+++ b/doc/rsyslog_secure_tls.html
-@@ -38,19 +38,6 @@ below. Do not blame us if it doesn't provide what you need ;)</p>
- </ul>
- <p>Our secrity goals are achived via public/private key security. As such, it is
- vital that private keys are well protected and not accessible to third parties.
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- If private keys have become known to third parties, the system does not provide
- any security at all. Also, our solution bases on X.509 certificates and a (very
- limited) chain of trust. We have one instance (the CA) that issues all machine
-diff --git a/doc/tls_cert_ca.html b/doc/tls_cert_ca.html
-index 2cae404..f366462 100644
---- a/doc/tls_cert_ca.html
-+++ b/doc/tls_cert_ca.html
-@@ -23,19 +23,6 @@ Gerhards</a> (2008-06-17)</i></small></p>
- maintained by a trustworthy person (or group) and approves the indentities of
- all machines. It does so by issuing their certificates. In a small setup, the
- administrator can provide the CA function. What is important is the the CA's
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- private key is well-protocted and machine certificates are only issued if it is
- know they are valid (in a single-admin case that means the admin should not
- issue certificates to anyone else except himself).</p>
-diff --git a/doc/tls_cert_client.html b/doc/tls_cert_client.html
-index dbe7961..53596fc 100644
---- a/doc/tls_cert_client.html
-+++ b/doc/tls_cert_client.html
-@@ -25,19 +25,6 @@ example, that meanst turng.example.net). The client check's the server's identit
- talks to it only if it is the expected server. This is a very important step.
- Without it, you would not detect man-in-the-middle attacks or simple malicious servers
- who try to get hold of your valuable log data.
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- <p><center><img src="tls_cert_100.jpg"></center>
- <p>Steps to do:
- <ul>
-diff --git a/doc/tls_cert_errmsgs.html b/doc/tls_cert_errmsgs.html
-index d002174..2943efc 100644
---- a/doc/tls_cert_errmsgs.html
-+++ b/doc/tls_cert_errmsgs.html
-@@ -21,19 +21,6 @@ Gerhards</a> (2008-06-17)</i></small></p>
-
- <h3>Error Messages</h3>
- <p>This page covers error message you may see when setting up
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- <a href="http://www.rsyslog.com">rsyslog</a> with TLS. Please note that many
- of the message stem back to the TLS library being used. In those cases, there is
- not always a good explanation available in rsyslog alone.
-diff --git a/doc/tls_cert_machine.html b/doc/tls_cert_machine.html
-index 095e15c..fe2ee90 100644
---- a/doc/tls_cert_machine.html
-+++ b/doc/tls_cert_machine.html
-@@ -22,19 +22,6 @@ Gerhards</a> (2008-06-18)</i></small></p>
- <p>In this step, we generate certificates for each of the machines. Please note
- that both clients and servers need certificates. The certificate identifies each
- machine to the remote peer. The DNSName specified inside the certificate can
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- be specified inside the $<object>PermittedPeer config statements.
- <p>For now, we assume that a single person (or group) is responsible for the whole
- rsyslog system and thus it is OK if that single person is in posession of all
-diff --git a/doc/tls_cert_scenario.html b/doc/tls_cert_scenario.html
-index 7973532..88c7657 100644
---- a/doc/tls_cert_scenario.html
-+++ b/doc/tls_cert_scenario.html
-@@ -21,19 +21,6 @@ Gerhards</a> (2008-06-17)</i></small></p>
-
- <h3>Sample Scenario</h3>
- <p>We have a quite simple scenario. There is one central syslog server,
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- named central.example.net. These server is being reported to by two Linux
- machines with name zuse.example.net and turing.example.net. Also, there is a
- third client - ada.example.net - which send both its own messages to the central
-diff --git a/doc/tls_cert_server.html b/doc/tls_cert_server.html
-index 9c024bc..b784be1 100644
---- a/doc/tls_cert_server.html
-+++ b/doc/tls_cert_server.html
-@@ -23,19 +23,6 @@ Gerhards</a> (2008-06-18)</i></small></p>
- via TLS protected plain tcp based syslog from those peers that are explicitely permitted
- to send to it. The picture below show our configuration. This step configures
- the server central.example.net.
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- <p><center><img src="tls_cert_100.jpg"></center>
- <p><i><font color="red"><b>Important:</b> Keep in mind that the order of configuration directives
- is very important in rsyslog. As such, the samples given below do only work if the given
-diff --git a/doc/tls_cert_summary.html b/doc/tls_cert_summary.html
-index 8e003bc..95844a8 100644
---- a/doc/tls_cert_summary.html
-+++ b/doc/tls_cert_summary.html
-@@ -20,19 +20,6 @@ Gerhards</a> (2008-07-03)</i></small></p>
-
- <h3>Summary</h3>
- <p>If you followed the steps outlined in this documentation set, you now have
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- a reasonable (for most needs) secure setup for the following environment:
- <center><img src="tls_cert_100.jpg"></center>
- <p>You have learned about the security decisions involved and which we
-diff --git a/doc/tls_cert_udp_relay.html b/doc/tls_cert_udp_relay.html
-index f4740ce..d44689c 100644
---- a/doc/tls_cert_udp_relay.html
-+++ b/doc/tls_cert_udp_relay.html
-@@ -26,19 +26,6 @@ directly to it, because we would like to have TLS protection for its sensitve
- logs. If the router and the syslog relay are on a sufficiently secure private
- network, this setup can be considered reasonable secure. In any case, it is the
- best alternative among the possible configuration scenarios.
--<span style="float: left">
--<script type="text/javascript"><!--
--google_ad_client = "pub-3204610807458280";
--/* rsyslog doc inline */
--google_ad_slot = "5958614527";
--google_ad_width = 125;
--google_ad_height = 125;
--//-->
--</script>
--<script type="text/javascript"
--src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
--</script>
--</span>
- <p><center><img src="tls_cert_100.jpg"></center>
- <p>Steps to do:
- <ul>
---
-1.8.4.3
-
diff --git a/SOURCES/rsyslog-7.4.7-bz1038136-imjournal-message-loss.patch b/SOURCES/rsyslog-7.4.7-bz1038136-imjournal-message-loss.patch
deleted file mode 100644
index 73134f5..0000000
--- a/SOURCES/rsyslog-7.4.7-bz1038136-imjournal-message-loss.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-From effa35d1ae33c1ac825317802b6e970e68f98af2 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Fri, 31 Jan 2014 11:35:55 +0100
-Subject: [PATCH] Improve handling of messages without syslog properties
-
-* Don't drop messages without the MESSAGE field
-* Set default severity for all messages
- Some messages comming from journald don't have the SYSLOG_PRIORITY
- field. These are typically the messages logged through journald's
- native API. Set the default severity for these messages to 'notice'.
-* Set default facility for all messages
- Some messages comming from journald don't have the SYSLOG_FACILITY
- field. These are typically the messages logged through journald's
- native API. Set the default facility for these messages to 'user'.
-* Make default priority configurable
----
- doc/imjournal.html | 16 ++++++
- plugins/imjournal/imjournal.c | 124 +++++++++++++++++++++++++++++++-----------
- 2 files changed, 109 insertions(+), 31 deletions(-)
-
-diff --git a/doc/imjournal.html b/doc/imjournal.html
-index 8f29169..b4d2105 100644
---- a/doc/imjournal.html
-+++ b/doc/imjournal.html
-@@ -69,6 +69,18 @@ journal and read only new messages. This option is only used when there is
- no StateFile to avoid message loss.
- </ul>
-
-+<li><b>DefaultSeverity</b> <severity><br>
-+Some messages comming from journald don't have the SYSLOG_PRIORITY
-+field. These are typically the messages logged through journald's
-+native API. This option specifies the default severity for these
-+messages. Defaults to 'notice'.
-+
-+<li><b>DefaultFacility</b> <facility><br>
-+Some messages comming from journald don't have the SYSLOG_FACILITY
-+field. These are typically the messages logged through journald's
-+native API. This option specifies the default facility for these
-+messages. Defaults to 'user'.
-+
- <b>Caveats/Known Bugs:</b>
- <p>
- <ul>
-@@ -105,6 +117,10 @@ Equivalent to: ratelimit.interval</li>
- Equivalent to: ratelimit.burst</li>
- <li><strong>$ImjournalIgnorePreviousMessages</strong><br>
- Equivalent to: ignorePreviousMessages</li>
-+<li><strong>$ImjournalDefaultSeverity</strong><br>
-+Equivalent to: DefaultSeverity</li>
-+<li><strong>$ImjournalDefaultFacility</strong><br>
-+Equivalent to: DefaultFacility</li>
- </ul>
-
- </body>
-diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index 36c7e04..7d42b84 100755
---- a/plugins/imjournal/imjournal.c
-+++ b/plugins/imjournal/imjournal.c
-@@ -68,15 +68,21 @@ static struct configSettings_s {
- int ratelimitInterval;
- int ratelimitBurst;
- int bIgnorePrevious;
-+ int iDfltSeverity;
-+ int iDfltFacility;
- } cs;
-
-+static rsRetVal facilityHdlr(uchar **pp, void *pVal);
-+
- /* module-global parameters */
- static struct cnfparamdescr modpdescr[] = {
- { "statefile", eCmdHdlrGetWord, 0 },
- { "ratelimit.interval", eCmdHdlrInt, 0 },
- { "ratelimit.burst", eCmdHdlrInt, 0 },
- { "persiststateinterval", eCmdHdlrInt, 0 },
-- { "ignorepreviousmessages", eCmdHdlrBinary, 0 }
-+ { "ignorepreviousmessages", eCmdHdlrBinary, 0 },
-+ { "defaultseverity", eCmdHdlrSeverity, 0 },
-+ { "defaultfacility", eCmdHdlrString, 0 }
- };
- static struct cnfparamblk modpblk =
- { CNFPARAMBLK_VERSION,
-@@ -85,6 +91,8 @@ static struct cnfparamblk modpblk =
- };
-
- #define DFLT_persiststateinterval 10
-+#define DFLT_SEVERITY LOG_PRI(LOG_NOTICE)
-+#define DFLT_FACILITY LOG_FAC(LOG_USER)
-
- static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */
-
-@@ -94,6 +102,37 @@ static prop_t *pLocalHostIP = NULL; /* a pseudo-constant propterty for 127.0.0.1
- static ratelimit_t *ratelimiter = NULL;
- static sd_journal *j;
-
-+/* ugly workaround to handle facility numbers; values
-+ derived from names need to be eight times smaller */
-+static rsRetVal facilityHdlr(uchar **pp, void *pVal)
-+{
-+ DEFiRet;
-+ char *p;
-+
-+ skipWhiteSpace(pp);
-+ p = (char *) *pp;
-+
-+ if (isdigit((int) *p)) {
-+ *((int *) pVal) = (int) strtol(p, (char **) pp, 10);
-+ } else {
-+ int len;
-+ syslogName_t *c;
-+
-+ for (len = 0; p[len] && !isspace((int) p[len]); len++)
-+ /* noop */;
-+ for (c = syslogFacNames; c->c_name; c++) {
-+ if (!strncasecmp(p, (char *) c->c_name, len)) {
-+ *((int *) pVal) = LOG_FAC(c->c_val);
-+ break;
-+ }
-+ }
-+ *pp += len;
-+ }
-+
-+ RETiRet;
-+}
-+
-+
- /* enqueue the the journal message into the message queue.
- * The provided msg string is not freed - thus must be done
- * by the caller.
-@@ -158,7 +197,6 @@ readjournal() {
- const void *get;
- const void *pidget;
- char *parse;
-- char *get2;
- size_t length;
- size_t pidlength;
-
-@@ -170,45 +208,52 @@ readjournal() {
-
- long prefixlen = 0;
-
-- int priority = 0;
-- int facility = 0;
-+ int severity = cs.iDfltSeverity;
-+ int facility = cs.iDfltFacility;
-
- /* Get message text */
- if (sd_journal_get_data(j, "MESSAGE", &get, &length) < 0) {
-- logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar *)"log message from journal doesn't have MESSAGE", 0);
-- iRet = RS_RET_OK;
-- goto ret;
-- }
-- message = strndup(get+8, length-8);
-- if (message == NULL) {
-- iRet = RS_RET_OUT_OF_MEMORY;
-- goto ret;
-+ message = strdup("");
-+ } else {
-+ message = strndup(get+8, length-8);
-+ if (message == NULL) {
-+ iRet = RS_RET_OUT_OF_MEMORY;
-+ goto ret;
-+ }
- }
-
-- /* Get message priority */
-+ /* Get message severity ("priority" in journald's terminology) */
- if (sd_journal_get_data(j, "PRIORITY", &get, &length) >= 0) {
-- get2 = strndup(get, length);
-- priority = ((char *)get2)[9] - '0';
-- free (get2);
-+ if (length == 10) {
-+ severity = ((char *)get)[9] - '0';
-+ if (severity < 0 || 7 < severity) {
-+ dbgprintf("The value of the 'PRIORITY' field is "
-+ "out of bounds: %d, resetting\n", severity);
-+ severity = cs.iDfltSeverity;
-+ }
-+ } else {
-+ dbgprintf("The value of the 'PRIORITY' field has an "
-+ "unexpected length: %d\n", length);
-+ }
- }
-
- /* Get syslog facility */
- if (sd_journal_get_data(j, "SYSLOG_FACILITY", &get, &length) >= 0) {
-- get2 = strndup(get, length);
-- char f = ((char *)get2)[16];
-- if (f >= '0' && f <= '9') {
-- facility += f - '0';
-- }
-- f = ((char *)get2)[17];
-- if (f >= '0' && f <= '9') {
-- facility *= 10;
-- facility += (f - '0');
-+ if (length == 17 || length == 18) {
-+ facility = ((char *)get)[16] - '0';
-+ if (length == 18) {
-+ facility *= 10;
-+ facility += ((char *)get)[17] - '0';
-+ }
-+ if (facility < 0 || 23 < facility) {
-+ dbgprintf("The value of the 'FACILITY' field is "
-+ "out of bounds: %d, resetting\n", facility);
-+ facility = cs.iDfltFacility;
-+ }
-+ } else {
-+ dbgprintf("The value of the 'FACILITY' field has an "
-+ "unexpected length: %d\n", length);
- }
-- free (get2);
-- } else {
-- /* message is missing facility -> internal systemd journal msg, drop */
-- iRet = RS_RET_OK;
-- goto free_message;
- }
-
- /* Get message identifier, client pid and add ':' */
-@@ -349,7 +394,7 @@ readjournal() {
- }
-
- /* submit message */
-- enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, priority, &tv, json);
-+ enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json);
-
- finalize_it:
- free(sys_iden_help);
-@@ -569,6 +614,8 @@ CODESTARTbeginCnfLoad
- cs.stateFile = NULL;
- cs.ratelimitBurst = 20000;
- cs.ratelimitInterval = 600;
-+ cs.iDfltSeverity = DFLT_SEVERITY;
-+ cs.iDfltFacility = DFLT_FACILITY;
- ENDbeginCnfLoad
-
-
-@@ -657,6 +704,17 @@ CODESTARTsetModCnf
- cs.ratelimitInterval = (int) pvals[i].val.d.n;
- } else if (!strcmp(modpblk.descr[i].name, "ignorepreviousmessages")) {
- cs.bIgnorePrevious = (int) pvals[i].val.d.n;
-+ } else if (!strcmp(modpblk.descr[i].name, "defaultseverity")) {
-+ cs.iDfltSeverity = (int) pvals[i].val.d.n;
-+ } else if (!strcmp(modpblk.descr[i].name, "defaultfacility")) {
-+ /* ugly workaround to handle facility numbers; values
-+ derived from names need to be eight times smaller */
-+
-+ char *fac, *p;
-+
-+ fac = p = es_str2cstr(pvals[i].val.d.estr, NULL);
-+ facilityHdlr((uchar **) &p, (void *) &cs.iDfltFacility);
-+ free(fac);
- } else {
- dbgprintf("imjournal: program error, non-handled "
- "param '%s' in beginCnfLoad\n", modpblk.descr[i].name);
-@@ -710,6 +768,10 @@ CODEmodInit_QueryRegCFSLineHdlr
- NULL, &cs.stateFile, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalignorepreviousmessages", 0, eCmdHdlrBinary,
- NULL, &cs.bIgnorePrevious, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaultseverity", 0, eCmdHdlrSeverity,
-+ NULL, &cs.iDfltSeverity, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaultfacility", 0, eCmdHdlrCustomHandler,
-+ facilityHdlr, &cs.iDfltFacility, STD_LOADABLE_MODULE_ID));
-
-
- ENDmodInit
---
-1.8.4.3
-
diff --git a/SOURCES/rsyslog-7.4.7-bz1052266-dont-link-libee.patch b/SOURCES/rsyslog-7.4.7-bz1052266-dont-link-libee.patch
deleted file mode 100644
index 9babd75..0000000
--- a/SOURCES/rsyslog-7.4.7-bz1052266-dont-link-libee.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur rsyslog-7.4.7.bck2014-01-20.1/runtime/Makefile.am rsyslog-7.4.7.bck2014-01-20/runtime/Makefile.am
---- rsyslog-7.4.7.bck2014-01-20.1/runtime/Makefile.am 2014-01-20 13:00:47.922000000 -0500
-+++ rsyslog-7.4.7.bck2014-01-20/runtime/Makefile.am 2014-01-20 12:57:44.048000000 -0500
-@@ -102,8 +102,8 @@
- librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
- endif
- #librsyslog_la_LDFLAGS = -module -avoid-version
--librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
--librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
-+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
-+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
-
- #
- # regular expression support
-diff -ur rsyslog-7.4.7.bck2014-01-20.1/runtime/Makefile.in rsyslog-7.4.7.bck2014-01-20/runtime/Makefile.in
---- rsyslog-7.4.7.bck2014-01-20.1/runtime/Makefile.in 2014-01-20 13:00:47.924000000 -0500
-+++ rsyslog-7.4.7.bck2014-01-20/runtime/Makefile.in 2014-01-20 12:57:44.050000000 -0500
-@@ -650,19 +650,17 @@
- @WITH_MODDIRS_FALSE@librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS \
- @WITH_MODDIRS_FALSE@ -D_PATH_MODDIR=\"$(pkglibdir)/\" \
- @WITH_MODDIRS_FALSE@ -I\$(top_srcdir) -I\$(top_srcdir)/grammar \
--@WITH_MODDIRS_FALSE@ $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) \
--@WITH_MODDIRS_FALSE@ $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) \
--@WITH_MODDIRS_FALSE@ -I\$(top_srcdir)/tools
-+@WITH_MODDIRS_FALSE@ $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \
-+@WITH_MODDIRS_FALSE@ $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
- # the files with ../ we need to work on - so that they either become part of the
- # runtime or will no longer be needed. -- rgerhards, 2008-06-13
- #
- #librsyslog_la_LDFLAGS = -module -avoid-version
- @WITH_MODDIRS_TRUE@librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS \
- @WITH_MODDIRS_TRUE@ -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" \
--@WITH_MODDIRS_TRUE@ $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) \
--@WITH_MODDIRS_TRUE@ $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) \
--@WITH_MODDIRS_TRUE@ -I\$(top_srcdir)/tools
--librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
-+@WITH_MODDIRS_TRUE@ $(PTHREADS_CFLAGS) $(LIBUUID_CFLAGS) \
-+@WITH_MODDIRS_TRUE@ $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
-+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
- @ENABLE_REGEXP_TRUE@lmregexp_la_SOURCES = regexp.c regexp.h
- @ENABLE_REGEXP_TRUE@lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
- @ENABLE_REGEXP_TRUE@lmregexp_la_LDFLAGS = -module -avoid-version
diff --git a/SOURCES/rsyslog-7.4.7-bz1054171-omjournal-warning.patch b/SOURCES/rsyslog-7.4.7-bz1054171-omjournal-warning.patch
deleted file mode 100644
index 6d4a18a..0000000
--- a/SOURCES/rsyslog-7.4.7-bz1054171-omjournal-warning.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e921bfe82068a1767311181ad7f4c78ed86e2577 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Thu, 16 Jan 2014 11:43:55 +0100
-Subject: [PATCH] bugfix: invert the logic for issuing a warning
-
----
- plugins/omjournal/omjournal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/omjournal/omjournal.c b/plugins/omjournal/omjournal.c
-index 160c369..937d277 100644
---- a/plugins/omjournal/omjournal.c
-+++ b/plugins/omjournal/omjournal.c
-@@ -153,7 +153,7 @@ ENDdoAction
- BEGINparseSelectorAct
- CODESTARTparseSelectorAct
- CODE_STD_STRING_REQUESTparseSelectorAct(1)
-- if(strncmp((char*) p, ":omjournal:", sizeof(":omjournal:") - 1)) {
-+ if(!strncmp((char*) p, ":omjournal:", sizeof(":omjournal:") - 1)) {
- errmsg.LogError(0, RS_RET_LEGA_ACT_NOT_SUPPORTED,
- "omjournal supports only v6+ config format, use: "
- "action(type=\"omjournal\" ...)");
---
-1.8.4.3
-
diff --git a/SOURCES/rsyslog-7.4.7-bz1142373-cve-2014-3634.patch b/SOURCES/rsyslog-7.4.7-bz1142373-cve-2014-3634.patch
deleted file mode 100644
index 7dfbf65..0000000
--- a/SOURCES/rsyslog-7.4.7-bz1142373-cve-2014-3634.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From 0d7a31540b25b2942ae35dd3c62d9ee33020a157 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Tue, 7 Oct 2014 10:24:06 +0200
-Subject: [PATCH] fix CVE-2014-3634
-
-See the following links for details:
-https://access.redhat.com/security/cve/CVE-2014-3634
-http://www.rsyslog.com/remote-syslog-pri-vulnerability/
----
- grammar/rainerscript.h | 4 +--
- runtime/msg.c | 33 ++++++++++++++++---------
- runtime/parser.c | 13 ++++++----
- runtime/rsyslog.h | 66 ++++++++++++++++++++++++++++++++++++++++---------
- runtime/srutils.c | 1 +
- runtime/syslogd-types.h | 3 ---
- 6 files changed, 88 insertions(+), 32 deletions(-)
-
-diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h
-index 0657330..52050e4 100644
---- a/grammar/rainerscript.h
-+++ b/grammar/rainerscript.h
-@@ -7,8 +7,8 @@
- #include <regex.h>
- #include "typedefs.h"
-
--
--#define LOG_NFACILITIES 24 /* current number of syslog facilities */
-+#define LOG_NFACILITIES 24+1 /* This is a dupe from rsyslog.h, but we can't include it as
-+ I don't know how to get hold of that damn off64_t data type... */
- #define CNFFUNC_MAX_ARGS 32
- /**< maximum number of arguments that any function can have (among
- * others, this is used to size data structures).
-diff --git a/runtime/msg.c b/runtime/msg.c
-index 10ecf48..abb58c9 100644
---- a/runtime/msg.c
-+++ b/runtime/msg.c
-@@ -90,7 +90,7 @@ static char *two_digits[100] = {
- static struct {
- uchar *pszName;
- short lenName;
--} syslog_pri_names[192] = {
-+} syslog_pri_names[200] = {
- { UCHAR_CONSTANT("0"), 3},
- { UCHAR_CONSTANT("1"), 3},
- { UCHAR_CONSTANT("2"), 3},
-@@ -282,22 +282,30 @@ static struct {
- { UCHAR_CONSTANT("188"), 5},
- { UCHAR_CONSTANT("189"), 5},
- { UCHAR_CONSTANT("190"), 5},
-- { UCHAR_CONSTANT("191"), 5}
-+ { UCHAR_CONSTANT("191"), 5},
-+ { UCHAR_CONSTANT("192"), 5},
-+ { UCHAR_CONSTANT("193"), 5},
-+ { UCHAR_CONSTANT("194"), 5},
-+ { UCHAR_CONSTANT("195"), 5},
-+ { UCHAR_CONSTANT("196"), 5},
-+ { UCHAR_CONSTANT("197"), 5},
-+ { UCHAR_CONSTANT("198"), 5},
-+ { UCHAR_CONSTANT("199"), 5},
- };
- static char hexdigit[16] =
- {'0', '1', '2', '3', '4', '5', '6', '7', '8',
- '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
- /*syslog facility names (as of RFC5424) */
--static char *syslog_fac_names[24] = { "kern", "user", "mail", "daemon", "auth", "syslog", "lpr",
-+static char *syslog_fac_names[LOG_NFACILITIES] = { "kern", "user", "mail", "daemon", "auth", "syslog", "lpr",
- "news", "uucp", "cron", "authpriv", "ftp", "ntp", "audit",
- "alert", "clock", "local0", "local1", "local2", "local3",
-- "local4", "local5", "local6", "local7" };
-+ "local4", "local5", "local6", "local7", "invld" };
- /* length of the facility names string (for optimizatiions) */
--static short len_syslog_fac_names[24] = { 4, 4, 4, 6, 4, 6, 3,
-+static short len_syslog_fac_names[LOG_NFACILITIES] = { 4, 4, 4, 6, 4, 6, 3,
- 4, 4, 4, 8, 3, 3, 5,
- 5, 5, 6, 6, 6, 6,
-- 6, 6, 6, 6 };
-+ 6, 6, 6, 6, 5 };
-
- /* table of severity names (in numerical order)*/
- static char *syslog_severity_names[8] = { "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug" };
-@@ -307,8 +315,8 @@ static short len_syslog_severity_names[8] = { 5, 5, 4, 3, 7, 6, 4, 5 };
- * and facility values to a numerical string... -- rgerhars, 2009-06-17
- */
-
--static char *syslog_number_names[24] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14",
-- "15", "16", "17", "18", "19", "20", "21", "22", "23" };
-+static char *syslog_number_names[LOG_NFACILITIES] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14",
-+ "15", "16", "17", "18", "19", "20", "21", "22", "23", "24" };
-
- /* global variables */
- #if defined(HAVE_MALLOC_TRIM) && !defined(HAVE_ATOMIC_BUILTINS)
-@@ -678,8 +686,8 @@ static inline rsRetVal msgBaseConstruct(msg_t **ppThis)
- pM->flowCtlType = 0;
- pM->bParseSuccess = 0;
- pM->iRefCount = 1;
-- pM->iSeverity = -1;
-- pM->iFacility = -1;
-+ pM->iSeverity = LOG_DEBUG;
-+ pM->iFacility = LOG_INVLD;
- pM->iLenPROGNAME = -1;
- pM->offAfterPRI = 0;
- pM->offMSG = -1;
-@@ -1499,7 +1507,10 @@ uchar *getMSG(msg_t *pM)
- /* Get PRI value as integer */
- static int getPRIi(msg_t *pM)
- {
-- return (pM->iFacility << 3) + (pM->iSeverity);
-+ unsigned pri = (pM->iFacility << 3) + (pM->iSeverity);
-+ if(pri > LOG_MAXPRI)
-+ pri = LOG_PRI_INVLD;
-+ return pri;
- }
-
-
-diff --git a/runtime/parser.c b/runtime/parser.c
-index 74b28f4..e708b33 100644
---- a/runtime/parser.c
-+++ b/runtime/parser.c
-@@ -444,7 +444,7 @@ finalize_it:
- static inline rsRetVal
- ParsePRI(msg_t *pMsg)
- {
-- int pri;
-+ unsigned pri;
- uchar *msg;
- int lenMsg;
- DEFiRet;
-@@ -463,13 +463,16 @@ ParsePRI(msg_t *pMsg)
- * but it offers us performance...
- */
- pri = 0;
-- while(--lenMsg > 0 && isdigit((int) *++msg)) {
-+ while(--lenMsg > 0 && isdigit((int) *++msg) && pri <= LOG_MAXPRI) {
- pri = 10 * pri + (*msg - '0');
- }
-- if(*msg == '>')
-+ if(*msg == '>') {
- ++msg;
-- if(pri & ~(LOG_FACMASK|LOG_PRIMASK))
-- pri = DEFUPRI;
-+ } else {
-+ pri = LOG_PRI_INVLD;
-+ }
-+ if(pri > LOG_MAXPRI)
-+ pri = LOG_PRI_INVLD;
- }
- pMsg->iFacility = LOG_FAC(pri);
- pMsg->iSeverity = LOG_PRI(pri);
-diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
-index e62ba86..37c4b1b 100644
---- a/runtime/rsyslog.h
-+++ b/runtime/rsyslog.h
-@@ -76,19 +76,63 @@
- * # End Config Settings # *
- * ############################################################# */
-
--/* portability: not all platforms have these defines, so we
-- * define them here if they are missing. -- rgerhards, 2008-03-04
-+/* make sure we uses consistent macros, no matter what the
-+ * platform gives us.
- */
--#ifndef LOG_MAKEPRI
--# define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri))
--#endif
--#ifndef LOG_PRI
--# define LOG_PRI(p) ((p) & LOG_PRIMASK)
--#endif
--#ifndef LOG_FAC
--# define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3)
--#endif
-+#define LOG_NFACILITIES 24+1 /* plus one for our special "invld" facility! */
-+#define LOG_MAXPRI 191 /* highest supported valid PRI value --> RFC3164, RFC5424 */
-+#undef LOG_MAKEPRI
-+#define LOG_PRI_INVLD (LOG_INVLD|LOG_DEBUG) /* PRI is invalid --> special "invld.=debug" PRI code (rsyslog-specific) */
-+
-+#define LOG_EMERG 0 /* system is unusable */
-+#define LOG_ALERT 1 /* action must be taken immediately */
-+#define LOG_CRIT 2 /* critical conditions */
-+#define LOG_ERR 3 /* error conditions */
-+#define LOG_WARNING 4 /* warning conditions */
-+#define LOG_NOTICE 5 /* normal but significant condition */
-+#define LOG_INFO 6 /* informational */
-+#define LOG_DEBUG 7 /* debug-level messages */
-+
-+#define LOG_KERN (0<<3) /* kernel messages */
-+#define LOG_USER (1<<3) /* random user-level messages */
-+#define LOG_MAIL (2<<3) /* mail system */
-+#define LOG_DAEMON (3<<3) /* system daemons */
-+#define LOG_AUTH (4<<3) /* security/authorization messages */
-+#define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */
-+#define LOG_LPR (6<<3) /* line printer subsystem */
-+#define LOG_NEWS (7<<3) /* network news subsystem */
-+#define LOG_UUCP (8<<3) /* UUCP subsystem */
-+#define LOG_CRON (9<<3) /* clock daemon */
-+#define LOG_AUTHPRIV (10<<3) /* security/authorization messages (private) */
-+#define LOG_FTP (11<<3) /* ftp daemon */
-+#define LOG_LOCAL0 (16<<3) /* reserved for local use */
-+#define LOG_LOCAL1 (17<<3) /* reserved for local use */
-+#define LOG_LOCAL2 (18<<3) /* reserved for local use */
-+#define LOG_LOCAL3 (19<<3) /* reserved for local use */
-+#define LOG_LOCAL4 (20<<3) /* reserved for local use */
-+#define LOG_LOCAL5 (21<<3) /* reserved for local use */
-+#define LOG_LOCAL6 (22<<3) /* reserved for local use */
-+#define LOG_LOCAL7 (23<<3) /* reserved for local use */
-+#define LOG_FAC_INVLD 24
-+#define LOG_INVLD (LOG_FAC_INVLD<<3) /* invalid facility/PRI code */
-+
-+/* we need to use a function to avoid side-effects. This MUST guard
-+ * against invalid facility values. rgerhards, 2014-09-16
-+ */
-+static inline int pri2fac(const int pri)
-+{
-+ unsigned fac = pri >> 3;
-+ return (fac > 23) ? LOG_FAC_INVLD : fac;
-+}
-+
-+#define LOG_FAC(x) pri2fac(x)
-+
-+static inline int pri2sev(const int pri)
-+{
-+ return pri & 0x07;
-+}
-
-+#define LOG_PRI(x) pri2sev(x)
-
- /* the rsyslog core provides information about present feature to plugins
- * asking it. Below are feature-test macros which must be used to query
-diff --git a/runtime/srutils.c b/runtime/srutils.c
-index 6a509b4..4f9f6c1 100644
---- a/runtime/srutils.c
-+++ b/runtime/srutils.c
-@@ -103,6 +103,7 @@ syslogName_t syslogFacNames[] = {
- {"local5", LOG_LOCAL5},
- {"local6", LOG_LOCAL6},
- {"local7", LOG_LOCAL7},
-+ {"invld", LOG_INVLD},
- {NULL, -1},
- };
-
-diff --git a/runtime/syslogd-types.h b/runtime/syslogd-types.h
-index 6947a11..8aee425 100644
---- a/runtime/syslogd-types.h
-+++ b/runtime/syslogd-types.h
-@@ -27,9 +27,6 @@
-
- #include "stringbuf.h"
- #include <sys/param.h>
--#if HAVE_SYSLOG_H
--#include <syslog.h>
--#endif
-
- /* we use RSTRUE/FALSE to prevent name claches with other packages */
- #define RSFALSE 0
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-bz1254511-ppc64le_bug.patch b/SOURCES/rsyslog-7.4.7-bz1254511-ppc64le_bug.patch
deleted file mode 100644
index ee9cbf2..0000000
--- a/SOURCES/rsyslog-7.4.7-bz1254511-ppc64le_bug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up ./config.guess.ppc64le_bug ./config.guess
---- ./config.guess.ppc64le_bug 2015-08-18 16:19:31.354030831 +0200
-+++ ./config.guess 2015-08-18 16:20:38.573473606 +0200
-@@ -972,6 +972,9 @@ EOF
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
-+ ppc64le:Linux:*:*)
-+ echo powerpc64le-unknown-linux-gnu
-+ exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
diff --git a/SOURCES/rsyslog-7.4.7-numeric-uid.patch b/SOURCES/rsyslog-7.4.7-numeric-uid.patch
deleted file mode 100644
index c9f8310..0000000
--- a/SOURCES/rsyslog-7.4.7-numeric-uid.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 032fcabdb7f3fc515d8155f48751271535df7b8e Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Thu, 5 Dec 2013 19:46:51 +0100
-Subject: [PATCH] Add directives for numerically specifying GIDs/UIDs
-
-The already present directives (FileOwner, FileGroup, DirOwner,
-DirGroup) translate names to numerical IDs, which depends on the user
-information being available during rsyslog's startup. This can fail if
-the information is obtained over a network or from a service such as
-SSSD. The new directives provide a way to specify the numerical IDs
-directly and bypass the lookup.
----
- doc/omfile.html | 12 ++++++++++++
- doc/rsyslog_conf_global.html | 4 ++++
- tools/omfile.c | 16 ++++++++++++++++
- 3 files changed, 32 insertions(+)
-
-diff --git a/doc/omfile.html b/doc/omfile.html
-index 0f64f26..5f839fe 100644
---- a/doc/omfile.html
-+++ b/doc/omfile.html
-@@ -53,15 +53,27 @@
- <li><strong>DirOwner </strong><br>
- Set the file owner for directories newly created. Please note that this setting does not affect the owner of directories already existing. The parameter is a user name, for which the userid is obtained by rsyslogd during startup processing. Interim changes to the user mapping are not detected.<br></li><br>
-
-+ <li><strong>DirOwnerNum </strong><br>
-+ Set the file owner for directories newly created. Please note that this setting does not affect the owner of directories already existing. The parameter is a numerical ID, which is used regardless of whether the user actually exists. This can be useful if the user mapping is not available to rsyslog during startup.<br></li><br>
-+
- <li><strong>DirGroup </strong><br>
- Set the group for directories newly created. Please note that this setting does not affect the group of directories already existing. The parameter is a group name, for which the groupid is obtained by rsyslogd on during startup processing. Interim changes to the user mapping are not detected.<br></li><br>
-
-+ <li><strong>DirGroupNum </strong><br>
-+ Set the group for directories newly created. Please note that this setting does not affect the group of directories already existing. The parameter is a numerical ID, which is used regardless of whether the group actually exists. This can be useful if the group mapping is not available to rsyslog during startup.<br></li><br>
-+
- <li><strong>FileOwner </strong><br>
- Set the file owner for files newly created. Please note that this setting does not affect the owner of files already existing. The parameter is a user name, for which the userid is obtained by rsyslogd during startup processing. Interim changes to the user mapping are not detected.<br></li><br>
-
-+ <li><strong>FileOwnerNum </strong><br>
-+ Set the file owner for files newly created. Please note that this setting does not affect the owner of files already existing. The parameter is a numerical ID, which which is used regardless of whether the user actually exists. This can be useful if the user mapping is not available to rsyslog during startup.<br></li><br>
-+
- <li><strong>FileGroup </strong><br>
- Set the group for files newly created. Please note that this setting does not affect the group of files already existing. The parameter is a group name, for which the groupid is obtained by rsyslogd during startup processing. Interim changes to the user mapping are not detected.<br></li><br>
-
-+ <li><strong>$FileGroupNum </strong><br>
-+ Set the group for files newly created. Please note that this setting does not affect the group of files already existing. The parameter is a numerical ID, which is used regardless of whether the group actually exists. This can be useful if the group mapping is not available to rsyslog during startup.<br></li><br>
-+
- <li><strong>DirCreateMode </strong>[defaul 0700]<br>
- This is the same as $FileCreateMode, but for directories automatically generated.<br></li><br>
-
-diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html
-index e48ed6d..b9a2ba2 100644
---- a/doc/rsyslog_conf_global.html
-+++ b/doc/rsyslog_conf_global.html
-@@ -136,7 +136,9 @@ our paper on <a href="multi_ruleset.html">using multiple rule sets in rsyslog</a
- <li><a href="omfile.html"><b>$CreateDirs</b></a> [<b>on</b>/off] - create directories on an as-needed basis</li>
- <li><a href="omfile.html"><b>$DirCreateMode</b></a></li>
- <li><a href="omfile.html"><b>$DirGroup</b></a></li>
-+<li><a href="omfile.html"><b>$DirGroupNum</b></a></li>
- <li><a href="omfile.html"><b>$DirOwner</b></a></li>
-+<li><a href="omfile.html"><b>$DirOwnerNum</b></a></li>
- <li><a href="rsconf1_dropmsgswithmaliciousdnsptrrecords.html"><b>$DropMsgsWithMaliciousDnsPTRRecords</b></a></li>
- <li><a href="rsconf1_droptrailinglfonreception.html"><b>$DropTrailingLFOnReception</b></a></li>
- <li><a href="omfile.html"><b>$DynaFileCacheSize</b></a></li>
-@@ -148,7 +150,9 @@ our paper on <a href="multi_ruleset.html">using multiple rule sets in rsyslog</a
- <li><a href="omfile.html"><b>$FailOnChownFailure</b></a></li>
- <li><a href="omfile.html"><b>$FileCreateMode</b></a></li>
- <li><a href="omfile.html"><b>$FileGroup</b></a></li>
-+<li><a href="omfile.html"><b>$FileGroupNum</b></a></li>
- <li><a href="omfile.html"><b>$FileOwner</b></a></li>
-+<li><a href="omfile.html"><b>$FileOwnerNum</b></a></li>
- <li><a href="rsconf1_generateconfiggraph.html"><b>$GenerateConfigGraph</b></a></li>
- <li><a href="rsconf1_gssforwardservicename.html"><b>$GssForwardServiceName</b></a></li>
- <li><a href="rsconf1_gsslistenservicename.html"><b>$GssListenServiceName</b></a></li>
-diff --git a/tools/omfile.c b/tools/omfile.c
-index 3dca347..fd14cb5 100644
---- a/tools/omfile.c
-+++ b/tools/omfile.c
-@@ -233,9 +233,13 @@ static struct cnfparamdescr actpdescr[] = {
- { "flushontxend", eCmdHdlrBinary, 0 }, /* legacy: omfileflushontxend */
- { "iobuffersize", eCmdHdlrSize, 0 }, /* legacy: omfileiobuffersize */
- { "dirowner", eCmdHdlrUID, 0 }, /* legacy: dirowner */
-+ { "dirownernum", eCmdHdlrInt, 0 }, /* legacy: dirownernum */
- { "dirgroup", eCmdHdlrGID, 0 }, /* legacy: dirgroup */
-+ { "dirgroupnum", eCmdHdlrInt, 0 }, /* legacy: dirgroupnum */
- { "fileowner", eCmdHdlrUID, 0 }, /* legacy: fileowner */
-+ { "fileownernum", eCmdHdlrInt, 0 }, /* legacy: fileownernum */
- { "filegroup", eCmdHdlrGID, 0 }, /* legacy: filegroup */
-+ { "filegroupnum", eCmdHdlrInt, 0 }, /* legacy: filegroupnum */
- { "dircreatemode", eCmdHdlrFileCreateMode, 0 }, /* legacy: dircreatemode */
- { "filecreatemode", eCmdHdlrFileCreateMode, 0 }, /* legacy: filecreatemode */
- { "failonchownfailure", eCmdHdlrBinary, 0 }, /* legacy: failonchownfailure */
-@@ -1139,12 +1143,20 @@ CODESTARTnewActInst
- pData->iIOBufSize = (int) pvals[i].val.d.n;
- } else if(!strcmp(actpblk.descr[i].name, "dirowner")) {
- pData->dirUID = (int) pvals[i].val.d.n;
-+ } else if(!strcmp(actpblk.descr[i].name, "dirownernum")) {
-+ pData->dirUID = (int) pvals[i].val.d.n;
- } else if(!strcmp(actpblk.descr[i].name, "dirgroup")) {
- pData->dirGID = (int) pvals[i].val.d.n;
-+ } else if(!strcmp(actpblk.descr[i].name, "dirgroupnum")) {
-+ pData->dirGID = (int) pvals[i].val.d.n;
- } else if(!strcmp(actpblk.descr[i].name, "fileowner")) {
- pData->fileUID = (int) pvals[i].val.d.n;
-+ } else if(!strcmp(actpblk.descr[i].name, "fileownernum")) {
-+ pData->fileUID = (int) pvals[i].val.d.n;
- } else if(!strcmp(actpblk.descr[i].name, "filegroup")) {
- pData->fileGID = (int) pvals[i].val.d.n;
-+ } else if(!strcmp(actpblk.descr[i].name, "filegroupnum")) {
-+ pData->fileGID = (int) pvals[i].val.d.n;
- } else if(!strcmp(actpblk.descr[i].name, "dircreatemode")) {
- pData->fDirCreateMode = (int) pvals[i].val.d.n;
- } else if(!strcmp(actpblk.descr[i].name, "filecreatemode")) {
-@@ -1377,9 +1389,13 @@ INITLegCnfVars
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"omfileflushontxend", 0, eCmdHdlrBinary, NULL, &cs.bFlushOnTXEnd, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"omfileiobuffersize", 0, eCmdHdlrSize, NULL, &cs.iIOBufSize, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"dirowner", 0, eCmdHdlrUID, NULL, &cs.dirUID, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"dirownernum", 0, eCmdHdlrInt, NULL, &cs.dirUID, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"dirgroup", 0, eCmdHdlrGID, NULL, &cs.dirGID, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"dirgroupnum", 0, eCmdHdlrInt, NULL, &cs.dirGID, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"fileowner", 0, eCmdHdlrUID, NULL, &cs.fileUID, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"fileownernum", 0, eCmdHdlrInt, NULL, &cs.fileUID, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"filegroup", 0, eCmdHdlrGID, NULL, &cs.fileGID, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"filegroupnum", 0, eCmdHdlrInt, NULL, &cs.fileGID, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"dircreatemode", 0, eCmdHdlrFileCreateMode, NULL, &cs.fDirCreateMode, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"filecreatemode", 0, eCmdHdlrFileCreateMode, NULL, &cs.fCreateMode, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"createdirs", 0, eCmdHdlrBinary, NULL, &cs.bCreateDirs, STD_LOADABLE_MODULE_ID));
---
-1.8.4.3
-
diff --git a/SOURCES/rsyslog-7.4.7-omelasticsearch-atomic-inst.patch b/SOURCES/rsyslog-7.4.7-omelasticsearch-atomic-inst.patch
deleted file mode 100644
index a553cf8..0000000
--- a/SOURCES/rsyslog-7.4.7-omelasticsearch-atomic-inst.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c1cae8d67c58d723bff0d6c47b9991d24289e209 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Sun, 12 Jan 2014 22:10:00 +0100
-Subject: [PATCH] bugfix: omelasticsearch did not compile on platforms without
- atomic instructions
-
-Adapted from from http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=16207e3d55ac6bb15af6d50791d2c7462816de57
----
- plugins/omelasticsearch/omelasticsearch.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c
-index b82968d..cc3c203 100644
---- a/plugins/omelasticsearch/omelasticsearch.c
-+++ b/plugins/omelasticsearch/omelasticsearch.c
-@@ -608,7 +608,7 @@ curlPost(instanceData *pData, uchar *message, int msglen, uchar **tpls, int nmsg
- case CURLE_COULDNT_RESOLVE_PROXY:
- case CURLE_COULDNT_CONNECT:
- case CURLE_WRITE_ERROR:
-- STATSCOUNTER_INC(indexHTTPReqFail, mutHTTPReqFail);
-+ STATSCOUNTER_INC(indexHTTPReqFail, mutIndexHTTPReqFail);
- indexHTTPFail += nmsgs;
- DBGPRINTF("omelasticsearch: we are suspending ourselfs due "
- "to failure %lld of curl_easy_perform()\n",
-@@ -1001,16 +1001,16 @@ CODEmodInit_QueryRegCFSLineHdlr
- /* support statistics gathering */
- CHKiRet(statsobj.Construct(&indexStats));
- CHKiRet(statsobj.SetName(indexStats, (uchar *)"omelasticsearch"));
-- STATSCOUNTER_INIT(indexSubmit, mutCtrIndexSubmit);
-+ STATSCOUNTER_INIT(indexSubmit, mutIndexSubmit);
- CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"submitted",
- ctrType_IntCtr, &indexSubmit));
-- STATSCOUNTER_INIT(indexHTTPFail, mutCtrIndexHTTPFail);
-+ STATSCOUNTER_INIT(indexHTTPFail, mutIndexHTTPFail);
- CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.http",
- ctrType_IntCtr, &indexHTTPFail));
-- STATSCOUNTER_INIT(indexHTTPReqFail, mutCtrIndexHTTPReqFail);
-+ STATSCOUNTER_INIT(indexHTTPReqFail, mutIndexHTTPReqFail);
- CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.httprequests",
- ctrType_IntCtr, &indexHTTPReqFail));
-- STATSCOUNTER_INIT(indexESFail, mutCtrIndexESFail);
-+ STATSCOUNTER_INIT(indexESFail, mutIndexESFail);
- CHKiRet(statsobj.AddCounter(indexStats, (uchar *)"failed.es",
- ctrType_IntCtr, &indexESFail));
- CHKiRet(statsobj.ConstructFinalize(indexStats));
---
-1.8.4.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1078878-division-by-zero.patch b/SOURCES/rsyslog-7.4.7-rhbz1078878-division-by-zero.patch
deleted file mode 100644
index 834452e..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1078878-division-by-zero.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0e95414ab2705649cea323115a618b558c30397f Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Wed, 2 Jul 2014 17:01:09 +0200
-Subject: [PATCH] bugfix: prevent division by zero
-
-The result is set to 0 in that case. Might be better to do something
-else in the future, but at least it'll stop crashing for now.
----
- grammar/rainerscript.c | 29 +++++++++++++++++++++++++----
- 1 file changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
-index 25d9c9a..c3365b1 100644
---- a/grammar/rainerscript.c
-+++ b/grammar/rainerscript.c
-@@ -1560,6 +1560,17 @@ evalStrArrayCmp(es_str_t *estr_l, struct cnfarray* ar, int cmpop)
- ret->d.n = var2Number(&l, &convok_l) x var2Number(&r, &convok_r); \
- FREE_BOTH_RET
-
-+#define COMP_NUM_BINOP_DIV(x) \
-+ cnfexprEval(expr->l, &l, usrptr); \
-+ cnfexprEval(expr->r, &r, usrptr); \
-+ ret->datatype = 'N'; \
-+ if((ret->d.n = var2Number(&r, &convok_r)) == 0) { \
-+ /* division by zero */ \
-+ } else { \
-+ ret->d.n = var2Number(&l, &convok_l) x ret->d.n; \
-+ } \
-+ FREE_BOTH_RET
-+
- /* NOTE: array as right-hand argument MUST be handled by user */
- #define PREP_TWO_STRINGS \
- cnfexprEval(expr->l, &l, usrptr); \
-@@ -1965,10 +1976,10 @@ cnfexprEval(struct cnfexpr *expr, struct var *ret, void* usrptr)
- COMP_NUM_BINOP(*);
- break;
- case '/':
-- COMP_NUM_BINOP(/);
-+ COMP_NUM_BINOP_DIV(/);
- break;
- case '%':
-- COMP_NUM_BINOP(%);
-+ COMP_NUM_BINOP_DIV(%);
- break;
- case 'M':
- cnfexprEval(expr->r, &r, usrptr);
-@@ -2907,13 +2918,23 @@ cnfexprOptimize(struct cnfexpr *expr)
- case '/':
- if(getConstNumber(expr, &ln, &rn)) {
- expr->nodetype = 'N';
-- ((struct cnfnumval*)expr)->val = ln / rn;
-+ if(rn == 0) {
-+ /* division by zero */
-+ ((struct cnfnumval*)expr)->val = 0;
-+ } else {
-+ ((struct cnfnumval*)expr)->val = ln / rn;
-+ }
- }
- break;
- case '%':
- if(getConstNumber(expr, &ln, &rn)) {
- expr->nodetype = 'N';
-- ((struct cnfnumval*)expr)->val = ln % rn;
-+ if(rn == 0) {
-+ /* division by zero */
-+ ((struct cnfnumval*)expr)->val = 0;
-+ } else {
-+ ((struct cnfnumval*)expr)->val = ln % rn;
-+ }
- }
- break;
- case CMP_NE:
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1101602-imjournal-zero-bytes.patch b/SOURCES/rsyslog-7.4.7-rhbz1101602-imjournal-zero-bytes.patch
deleted file mode 100644
index c73d8c5..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1101602-imjournal-zero-bytes.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 3d7abc2131bcf4dd2dc21428ea2c7fee6dd7be94 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Fri, 1 Aug 2014 13:58:10 +0200
-Subject: [PATCH] imjournal: escape zero bytes in fields' values
-
----
- plugins/imjournal/imjournal.c | 86 +++++++++++++++++++++++--------------------
- 1 file changed, 46 insertions(+), 40 deletions(-)
-
-diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index b0b034c..b6910e8 100755
---- a/plugins/imjournal/imjournal.c
-+++ b/plugins/imjournal/imjournal.c
-@@ -135,6 +135,31 @@ static rsRetVal facilityHdlr(uchar **pp, void *pVal)
- }
-
-
-+/* Currently just replaces '\0' with ' '. Not doing so would cause
-+ * the value to be truncated. New space is allocated for the resulting
-+ * string.
-+ */
-+static rsRetVal
-+sanitizeValue(const char *in, size_t len, char **out)
-+{
-+ char *buf, *p;
-+ DEFiRet;
-+
-+ CHKmalloc(p = buf = malloc(len + 1));
-+ memcpy(buf, in, len);
-+ buf[len] = '\0';
-+
-+ while ((p = memchr(p, '\0', len + buf - p)) != NULL) {
-+ *p++ = ' ';
-+ }
-+
-+ *out = buf;
-+
-+finalize_it:
-+ RETiRet;
-+}
-+
-+
- /* enqueue the the journal message into the message queue.
- * The provided msg string is not freed - thus must be done
- * by the caller.
-@@ -195,10 +220,9 @@ readjournal() {
- int r;
-
- /* Information from messages */
-- char *message;
-- char *sys_pid;
-+ char *message = NULL;
- char *sys_iden;
-- char *sys_iden_help;
-+ char *sys_iden_help = NULL;
-
- const void *get;
- const void *pidget;
-@@ -208,8 +232,6 @@ readjournal() {
-
- const void *equal_sign;
- struct json_object *jval;
-- char *data;
-- char *name;
- size_t l;
-
- long prefixlen = 0;
-@@ -221,11 +243,7 @@ readjournal() {
- if (sd_journal_get_data(j, "MESSAGE", &get, &length) < 0) {
- message = strdup("");
- } else {
-- message = strndup(get+8, length-8);
-- if (message == NULL) {
-- iRet = RS_RET_OUT_OF_MEMORY;
-- goto ret;
-- }
-+ CHKiRet(sanitizeValue(((const char *)get) + 8, length - 8, &message));
- }
-
- /* Get message severity ("priority" in journald's terminology) */
-@@ -264,43 +282,36 @@ readjournal() {
-
- /* Get message identifier, client pid and add ':' */
- if (sd_journal_get_data(j, "SYSLOG_IDENTIFIER", &get, &length) >= 0) {
-- sys_iden = strndup(get+18, length-18);
-+ CHKiRet(sanitizeValue(((const char *)get) + 18, length - 18, &sys_iden));
- } else {
-- sys_iden = strdup("journal");
-- }
-- if (sys_iden == NULL) {
-- iRet = RS_RET_OUT_OF_MEMORY;
-- goto free_message;
-+ CHKmalloc(sys_iden = strdup("journal"));
- }
-
- if (sd_journal_get_data(j, "SYSLOG_PID", &pidget, &pidlength) >= 0) {
-- sys_pid = strndup(pidget+11, pidlength-11);
-- if (sys_pid == NULL) {
-- iRet = RS_RET_OUT_OF_MEMORY;
-+ char *sys_pid;
-+
-+ CHKiRet_Hdlr(sanitizeValue(((const char *)pidget) + 11, pidlength - 11, &sys_pid)) {
- free (sys_iden);
-- goto free_message;
-+ FINALIZE;
- }
-- } else {
-- sys_pid = NULL;
-- }
--
-- if (sys_pid) {
- r = asprintf(&sys_iden_help, "%s[%s]:", sys_iden, sys_pid);
-+ free (sys_pid);
- } else {
- r = asprintf(&sys_iden_help, "%s:", sys_iden);
- }
-
- free (sys_iden);
-- free (sys_pid);
-
- if (-1 == r) {
-- iRet = RS_RET_OUT_OF_MEMORY;
-- goto finalize_it;
-+ ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
- }
-
- json = json_object_new_object();
-
- SD_JOURNAL_FOREACH_DATA(j, get, l) {
-+ char *data;
-+ char *name;
-+
- /* locate equal sign, this is always present */
- equal_sign = memchr(get, '=', l);
-
-@@ -372,18 +383,13 @@ readjournal() {
- break;
- }
-
-- if (name == NULL) {
-- iRet = RS_RET_OUT_OF_MEMORY;
-- goto ret;
-- }
-+ CHKmalloc(name);
-
- prefixlen++; /* remove '=' */
-
-- data = strndup(get + prefixlen, l - prefixlen);
-- if (data == NULL) {
-- iRet = RS_RET_OUT_OF_MEMORY;
-+ CHKiRet_Hdlr(sanitizeValue(((const char *)get) + prefixlen, l - prefixlen, &data)) {
- free (name);
-- goto ret;
-+ FINALIZE;
- }
-
- /* and save them to json object */
-@@ -403,10 +409,10 @@ readjournal() {
- enqMsg((uchar *)message, (uchar *) sys_iden_help, facility, severity, &tv, json);
-
- finalize_it:
-- free(sys_iden_help);
--free_message:
-- free(message);
--ret:
-+ if (sys_iden_help != NULL)
-+ free(sys_iden_help);
-+ if (message != NULL)
-+ free(message);
- RETiRet;
- }
-
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1143846-clarify-SysSock.Use.patch b/SOURCES/rsyslog-7.4.7-rhbz1143846-clarify-SysSock.Use.patch
deleted file mode 100644
index 19762fd..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1143846-clarify-SysSock.Use.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9ee4d67c9c833e746ec8b2e5abff03a184eb6b4c Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Tue, 21 Jul 2015 17:50:22 +0200
-Subject: [PATCH] Clarify usage of the SysSock.Use option
-
----
- doc/imuxsock.html | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/imuxsock.html b/doc/imuxsock.html
-index 123771f..c70f720 100644
---- a/doc/imuxsock.html
-+++ b/doc/imuxsock.html
-@@ -71,8 +71,8 @@ is no reason to receive messages from ourselfs. This setting is vital
- when writing messages to the Linux journal. See <a href="omjournal.html">omjournal</a>
- module documentation for a more in-depth description.
- </li>
--<li><b>SysSock.Use</b> (imuxsock) [on/<b>off</b>]
--do NOT listen for the local log socket. This is most useful if you run multiple
-+<li><b>SysSock.Use</b> (imuxsock) [<b>on</b>/off]
-+Listen on the local log socket. This is most useful if you run multiple
- instances of rsyslogd where only one shall handle the system log socket.
- </li>
- <li><b>SysSock.Name</b> <name-of-socket>
-@@ -259,7 +259,7 @@ the default of "127.0.0.1" is used.
- <li><b>$InputUnixListenSocketUseSysTimeStamp</b> [<b>on</b>/off] equivalent to: UseSysTimeStamp .<br>
- <li><b>$SystemLogSocketIgnoreMsgTimestamp</b> [<b>on</b>/off]<br>
- equivalent to: SysSock.IgnoreTimestamp.</li>
--<li><b>$OmitLocalLogging</b> (imuxsock) [on/<b>off</b>] equivalent to: SysSock.Use</li>
-+<li><b>$OmitLocalLogging</b> (imuxsock) [on/<b>off</b>] - The <b>inverse</b> of: SysSock.Use.</li>
- <li><b>$SystemLogSocketName</b> <name-of-socket> equivalent to: SysSock.Name</li>
- <li><b>$SystemLogFlowControl</b> [on/<b>off</b>] - equivalent to: SysSock.FlowControl.</li>
- <li><b>$SystemLogUsePIDFromSystem</b> [on/<b>off</b>] - equivalent to: SysSock.UsePIDFromSystem.
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1146237-mmutf8fix.patch b/SOURCES/rsyslog-7.4.7-rhbz1146237-mmutf8fix.patch
deleted file mode 100644
index a6a4a32..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1146237-mmutf8fix.patch
+++ /dev/null
@@ -1,1380 +0,0 @@
-Backport of the mmutf8fix module from upstream
-
-8929d2f mmutf8fix: new module to fix invalid UTF-8 sequences
-554fc84 mmutf8fix: now supports native UTF-8 multibyte sequence handling
-666d301 mmutf8fix: stricter UTF-8 checking
-97bda43 bugfix: mmutf8fix did not properly handle invalid UTF-8 at END of message
-2517719 mmutf8fix: compile problem & potential misadressing at end of message
-d322a9d bugfix: mmutf8fix did not detect two invalid sequences
-b03d66c silence may be uninitialized warnings where there is already a guard test.
-41e2001 re-enable some compiler warnings that should be dealt with
-fcdbdb1 fix some clang static analyzer violations
-
-diff --git a/Makefile.in b/Makefile.in
-index 840fe49..6da9e19 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -86,8 +86,9 @@ sbin_PROGRAMS =
- @ENABLE_MMAUDIT_TRUE@am__append_43 = plugins/mmaudit
- @ENABLE_MMANON_TRUE@am__append_44 = plugins/mmanon
- @ENABLE_MMCOUNT_TRUE@am__append_45 = plugins/mmcount
--@ENABLE_ORACLE_TRUE@am__append_46 = plugins/omoracle
--@ENABLE_GUI_TRUE@am__append_47 = java
-+@ENABLE_MMUTF8FIX_TRUE@am__append_46 = plugins/mmutf8fix
-+@ENABLE_ORACLE_TRUE@am__append_47 = plugins/omoracle
-+@ENABLE_GUI_TRUE@am__append_48 = java
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-@@ -232,7 +233,8 @@ DIST_SUBDIRS = doc compat runtime grammar . plugins/immark \
- plugins/imptcp plugins/imttcp plugins/imdiag plugins/ommail \
- plugins/omprog plugins/im3195 plugins/mmnormalize \
- plugins/mmjsonparse plugins/mmaudit plugins/mmanon \
-- plugins/mmcount plugins/omoracle java tests
-+ plugins/mmcount plugins/omoracle java tests \
-+ plugins/mmutf8fix
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -533,7 +535,8 @@ SUBDIRS = doc compat runtime grammar . plugins/immark plugins/imuxsock \
- $(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) tests
-+ $(am__append_46) $(am__append_47) $(am__append_48) \
-+ tests
-
- # make sure "make distcheck" tries to build all modules. This means that
- # a developer must always have an environment where every supporting library
-# diff --git a/Makefile.am b/Makefile.am
-# index 567b876..5714d1f 100644
-# --- a/Makefile.am
-# +++ b/Makefile.am
-# @@ -241,6 +241,10 @@ if ENABLE_MMANON
-# SUBDIRS += plugins/mmanon
-# endif
-#
-# +if ENABLE_MMUTF8FIX
-# +SUBDIRS += plugins/mmutf8fix
-# +endif
-# +
-# if ENABLE_ORACLE
-# SUBDIRS += plugins/omoracle
-# endif
-diff --git a/configure b/configure
-index c346e52..59fcb1a 100755
---- a/configure
-+++ b/configure
-@@ -692,6 +692,8 @@ ENABLE_RELP_FALSE
- RELP_CFLAGS
- ENABLE_MMCOUNT_FALSE
- ENABLE_MMCOUNT_TRUE
-+ENABLE_MMUTF8FIX_FALSE
-+ENABLE_MMUTF8FIX_TRUE
- ENABLE_MMANON_FALSE
- ENABLE_MMANON_TRUE
- ENABLE_MMAUDIT_FALSE
-@@ -980,6 +982,7 @@ enable_mmnormalize
- enable_mmaudit
- enable_mmanon
- enable_mmcount
-+enable_mmutf8fix
- enable_relp
- enable_guardtime
- enable_cached_man_pages
-@@ -1726,6 +1729,7 @@ Optional Features:
- --enable-mmaudit Enable building mmaudit support [default=no]
- --enable-mmanon Enable building mmanon support [default=no]
- --enable-mmcount Enable message counting [default=no]
-+ --enable-mmutf8fix Enable building mmutf8fix support [default=no]
- --enable-relp Enable RELP support [default=no]
- --enable-guardtime Enable log file signing support (via GuardTime)
- [default=no]
-@@ -18338,6 +18342,29 @@ fi
-
-
-
-+# mmutf8fix
-+# Check whether --enable-mmutf8fix was given.
-+if test "${enable_mmutf8fix+set}" = set; then :
-+ enableval=$enable_mmutf8fix; case "${enableval}" in
-+ yes) enable_mmutf8fix="yes" ;;
-+ no) enable_mmutf8fix="no" ;;
-+ *) as_fn_error $? "bad value ${enableval} for --enable-mmutf8fix" "$LINENO" 5 ;;
-+ esac
-+else
-+ enable_mmutf8fix=no
-+
-+fi
-+
-+ if test x$enable_mmutf8fix = xyes; then
-+ ENABLE_MMUTF8FIX_TRUE=
-+ ENABLE_MMUTF8FIX_FALSE='#'
-+else
-+ ENABLE_MMUTF8FIX_TRUE='#'
-+ ENABLE_MMUTF8FIX_FALSE=
-+fi
-+
-+
-+
- # RELP support
- # Check whether --enable-relp was given.
- if test "${enable_relp+set}" = set; then :
-@@ -20001,7 +20028,7 @@ fi
-
- # END HIREDIS SUPPORT
-
--ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile doc/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/imkmsg/Makefile plugins/omhdfs/Makefile plugins/omprog/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmrfc3164sd/Makefile plugins/pmlastmsg/Makefile plugins/pmcisconames/Makefile plugins/pmsnare/Makefile plugins/pmaixforwardedfrom/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/imttcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imzmq3/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/omoracle/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/omhiredis/Makefile plugins/omzmq3/Makefile plugins/omrabbitmq/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/omelasticsearch/Makefile plugins/sm_cust_bindcdr/Makefile plugins/mmsnmptrapd/Makefile plugins/mmcount/Makefile java/Makefile tests/Makefile"
-+ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile doc/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/imkmsg/Makefile plugins/omhdfs/Makefile plugins/omprog/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmrfc3164sd/Makefile plugins/pmlastmsg/Makefile plugins/pmcisconames/Makefile plugins/pmsnare/Makefile plugins/pmaixforwardedfrom/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/imttcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imzmq3/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/omoracle/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/omhiredis/Makefile plugins/omzmq3/Makefile plugins/omrabbitmq/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/mmutf8fix/Makefile plugins/omelasticsearch/Makefile plugins/sm_cust_bindcdr/Makefile plugins/mmsnmptrapd/Makefile plugins/mmcount/Makefile java/Makefile tests/Makefile"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -20272,6 +20229,10 @@ if test -z "${ENABLE_MMANON_TRUE}" && test -z "${ENABLE_MMANON_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_MMCOUNT\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${ENABLE_MMUTF8FIX_TRUE}" && test -z "${ENABLE_MMUTF8FIX_FALSE}"; then
-+ as_fn_error $? "conditional \"ENABLE_MMUTF8FIX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${ENABLE_RELP_TRUE}" && test -z "${ENABLE_RELP_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_RELP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -21324,6 +21355,7 @@ do
- "plugins/mmjsonparse/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mmjsonparse/Makefile" ;;
- "plugins/mmaudit/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mmaudit/Makefile" ;;
- "plugins/mmanon/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mmanon/Makefile" ;;
-+ "plugins/mmutf8fix/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mmutf8fix/Makefile" ;;
- "plugins/omelasticsearch/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/omelasticsearch/Makefile" ;;
- "plugins/sm_cust_bindcdr/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sm_cust_bindcdr/Makefile" ;;
- "plugins/mmsnmptrapd/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mmsnmptrapd/Makefile" ;;
-@@ -22744,6 +22776,7 @@ echo " mmnormalize module will be compiled: $enable_mmnormalize"
- echo " mmjsonparse module will be compiled: $enable_mmjsonparse"
- echo " mmjaduit module will be compiled: $enable_mmaudit"
- echo " mmsnmptrapd module will be compiled: $enable_mmsnmptrapd"
-+echo " mmutf8fix enabled: $enable_mmutf8fix"
- echo
- echo "---{ strgen modules }---"
- echo " sm_cust_bindcdr module will be compiled: $enable_sm_cust_bindcdr"
-# diff --git a/configure.ac b/configure.ac
-# index 123ed7e..5425897 100644
-# --- a/configure.ac
-# +++ b/configure.ac
-# @@ -964,6 +964,19 @@ AC_ARG_ENABLE(mmanon,
-# AM_CONDITIONAL(ENABLE_MMANON, test x$enable_mmanon = xyes)
-#
-#
-# +# mmutf8fix
-# +AC_ARG_ENABLE(mmutf8fix,
-# + [AS_HELP_STRING([--enable-mmutf8fix],[Enable building mmutf8fix support @<:@default=no@:>@])],
-# + [case "${enableval}" in
-# + yes) enable_mmutf8fix="yes" ;;
-# + no) enable_mmutf8fix="no" ;;
-# + *) AC_MSG_ERROR(bad value ${enableval} for --enable-mmutf8fix) ;;
-# + esac],
-# + [enable_mmutf8fix=no]
-# +)
-# +AM_CONDITIONAL(ENABLE_MMUTF8FIX, test x$enable_mmutf8fix = xyes)
-# +
-# +
-# # RELP support
-# AC_ARG_ENABLE(relp,
-# [AS_HELP_STRING([--enable-relp],[Enable RELP support @<:@default=no@:>@])],
-# @@ -1480,6 +1493,7 @@ AC_CONFIG_FILES([Makefile \
-# plugins/mmjsonparse/Makefile \
-# plugins/mmaudit/Makefile \
-# plugins/mmanon/Makefile \
-# + plugins/mmutf8fix/Makefile \
-# plugins/omelasticsearch/Makefile \
-# plugins/sm_cust_bindcdr/Makefile \
-# plugins/mmsnmptrapd/Makefile \
-# @@ -1541,6 +1555,7 @@ echo " mmnormalize module will be compiled: $enable_mmnormalize"
-# echo " mmjsonparse module will be compiled: $enable_mmjsonparse"
-# echo " mmjaduit module will be compiled: $enable_mmaudit"
-# echo " mmsnmptrapd module will be compiled: $enable_mmsnmptrapd"
-# +echo " mmutf8fix enabled: $enable_mmutf8fix"
-# echo
-# echo "---{ strgen modules }---"
-# echo " sm_cust_bindcdr module will be compiled: $enable_sm_cust_bindcdr"
-diff --git a/doc/mmutf8fix.html b/doc/mmutf8fix.html
-new file mode 100644
-index 0000000..f7be26d
---- /dev/null
-+++ b/doc/mmutf8fix.html
-@@ -0,0 +1,96 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-+<html><head>
-+<meta http-equiv="Content-Language" content="en">
-+<title>Fix invalid UTF-8 Sequences (mmutf8fix)</title></head>
-+
-+<body>
-+<a href="rsyslog_conf_modules.html">back</a>
-+
-+<h1>Fix invalid UTF-8 Sequences (mmutf8fix)</h1>
-+<p><b>Module Name: mmutf8fix</b></p>
-+<p><b>Author: </b>Rainer Gerhards <rgerhards@adiscon.com></p>
-+<p><b>Available since</b>: 7.5.4</p>
-+<p><b>Description</b>:</p>
-+<p>The mmutf8fix module permits to fix invalid UTF-8 sequences.
-+Most often, such invalid sequences result from syslog sources sending
-+in non-UTF character sets, e.g. ISO 8859. As syslog does not have a way
-+to convey the character set information, these sequences are not properly
-+handled. While they are typically uncritical with plain text files, they can
-+cause big headache with database sources as well as systems like ElasticSearch.
-+<p>The module supports different "fixing" modes and fixes. The current
-+implementation will always replace invalid bytes with a single US ASCII
-+character. Additional replacement modes will probably be added in the future,
-+depending on user demand. In the longer term
-+it could also be evolved into an any-charset-to-UTF8 converter. But
-+first let's see if it really gets into widespread enough use.
-+
-+<p><b>Proper Usage</b>:</p>
-+<p>Some notes are due for proper use of this module. This is a message modification
-+module utilizing the action interface, which means you call it like an action.
-+This gives great flexibility on the question on when and how to call this module.
-+Note that once it has been called, it actually modifies the message. The original
-+messsage is then no longer available. However, this does <b>not</b> change any
-+properties set, used or extracted before the modification is done.
-+<p>One potential use case is to normalize all messages. This is done by simply calling
-+mmutf8fix right in front of all other actions.
-+<p>If only a specific source (or set of sources) is known to cause problems,
-+mmutf8fix can be conditionally called only on messages from them. This also offers
-+performance benefits. If such multiple sources exists, it probably is a good idea
-+to define different listeners for their incoming traffic, bind them to specific
-+<a href="multi_ruleset.html">ruleset</a> and call mmutf8fix as first action in this
-+ruleset.
-+
-+<p><b>Module Configuration Parameters</b>:</p>
-+<p>Currently none.
-+<p> </p>
-+<p><b>Action Confguration Parameters</b>:</p>
-+<ul>
-+<li><b>mode</b> - <b>utf-8</b>/controlcharacters<br>
-+This sets the basic detection mode.
-+<br>In <b>utf-8</b> mode (the default), proper
-+UTF-8 encoding is checked and bytes which are not proper UTF-8 sequences
-+are acted on. If a proper multi-byte start sequence byte is detected but
-+any of the following bytes is invalid, the whole sequence is replaced by
-+the replacement method. This mode is most useful with non-US-ASCII character
-+sets, which validly includes multibyte sequences. Note that in this mode
-+control characters are NOT being replaced, because they are valid UTF-8.
-+<br>In <b>controlcharacters</b> mode, all bytes which do not represent a
-+printable US-ASCII character (codes 32 to 126) are replaced. Note that this
-+also mangles valid UTF-8 multi-byte sequences, as these are (deliberately) outside
-+of that character range.
-+<li><b>replacementChar</b> - default " " (space), a single character<br>
-+This is the character that invalid sequences are replaced by. Currently, it
-+MUST be a <b>printable</b> US-ASCII character.
-+</ul>
-+
-+<p><b>Caveats/Known Bugs:</b>
-+<ul>
-+<li>overlong UTF-8 encodings are currently not detected in utf-8 mode.
-+</ul>
-+
-+<p><b>Samples:</b></p>
-+<p>In this snippet, we write one file without fixing UTF-8 and another one
-+with the message fixed. Note that once mmutf8fix has run, access to the
-+original message is no longer possible.
-+<p><textarea rows="5" cols="60">module(load="mmutf8fix")
-+action(type="omfile" file="/path/to/non-fixed.log")
-+action(type="mmutf8fix")
-+action(type="omfile" file="/path/to/fixed.log")
-+</textarea>
-+
-+<p>In this sample, we fix only message originating from host 10.0.0.1.
-+<p><textarea rows="5" cols="60">module(load="mmutf8fix")
-+if $fromhost-ip == "10.0.0.1" then
-+ action(type="mmutf8fix")
-+# all other actions here...
-+</textarea>
-+
-+<p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] [<a href="manual.html">manual
-+index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
-+<p><font size="2">This documentation is part of the
-+<a href="http://www.rsyslog.com/">rsyslog</a> project.<br>
-+Copyright © 2013 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and
-+<a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL
-+version 3 or higher.</font></p>
-+
-+</body></html>
-diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html
-index 18d6b8a..aacd44b 100644
---- a/doc/rsyslog_conf_modules.html
-+++ b/doc/rsyslog_conf_modules.html
-@@ -118,6 +118,7 @@ enabled structured log messages.
- <li><a href="mmsnmptrapd.html">mmsnmptrapd</a> - uses information provided by snmptrapd inside
- the tag to correct the original sender system and priority of messages. Implemented via
- the output module interface.
-+<li><a href="mmutf8fix.html">mmutf8fix</a> - used to fix invalid UTF-8 character sequences
- </ul>
-
- <a name="lm"></a><h2>String Generator Modules</h2>
-diff --git a/plugins/mmutf8fix/Makefile.am b/plugins/mmutf8fix/Makefile.am
-new file mode 100644
-index 0000000..2c0f283
---- /dev/null
-+++ b/plugins/mmutf8fix/Makefile.am
-@@ -0,0 +1,8 @@
-+pkglib_LTLIBRARIES = mmutf8fix.la
-+
-+mmutf8fix_la_SOURCES = mmutf8fix.c
-+mmutf8fix_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-+mmutf8fix_la_LDFLAGS = -module -avoid-version
-+mmutf8fix_la_LIBADD =
-+
-+EXTRA_DIST =
-diff --git a/plugins/mmutf8fix/Makefile.in b/plugins/mmutf8fix/Makefile.in
-new file mode 100644
-index 0000000..deadbee
---- /dev/null
-+++ b/plugins/mmutf8fix/Makefile.in
-@@ -0,0 +1,714 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-+
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-+am__make_running_with_option = \
-+ case $${target_option-} in \
-+ ?) ;; \
-+ *) echo "am__make_running_with_option: internal error: invalid" \
-+ "target option '$${target_option-}' specified" >&2; \
-+ exit 1;; \
-+ esac; \
-+ has_opt=no; \
-+ sane_makeflags=$$MAKEFLAGS; \
-+ if $(am__is_gnu_make); then \
-+ sane_makeflags=$$MFLAGS; \
-+ else \
-+ case $$MAKEFLAGS in \
-+ *\\[\ \ ]*) \
-+ bs=\\; \
-+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
-+ esac; \
-+ fi; \
-+ skip_next=no; \
-+ strip_trailopt () \
-+ { \
-+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-+ }; \
-+ for flg in $$sane_makeflags; do \
-+ test $$skip_next = yes && { skip_next=no; continue; }; \
-+ case $$flg in \
-+ *=*|--*) continue;; \
-+ -*I) strip_trailopt 'I'; skip_next=yes;; \
-+ -*I?*) strip_trailopt 'I';; \
-+ -*O) strip_trailopt 'O'; skip_next=yes;; \
-+ -*O?*) strip_trailopt 'O';; \
-+ -*l) strip_trailopt 'l'; skip_next=yes;; \
-+ -*l?*) strip_trailopt 'l';; \
-+ -[dEDm]) skip_next=yes;; \
-+ -[JT]) skip_next=yes;; \
-+ esac; \
-+ case $$flg in \
-+ *$$target_option*) has_opt=yes; break;; \
-+ esac; \
-+ done; \
-+ test $$has_opt = yes
-+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = plugins/mmutf8fix
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+ $(top_srcdir)/depcomp
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
-+ $(top_srcdir)/m4/atomic_operations_64bit.m4 \
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__uninstall_files_from_dir = { \
-+ test -z "$$files" \
-+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-+ $(am__cd) "$$dir" && rm -f $$files; }; \
-+ }
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+mmutf8fix_la_DEPENDENCIES =
-+am_mmutf8fix_la_OBJECTS = mmutf8fix_la-mmutf8fix.lo
-+mmutf8fix_la_OBJECTS = $(am_mmutf8fix_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 =
-+mmutf8fix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(mmutf8fix_la_LDFLAGS) $(LDFLAGS) -o $@
-+AM_V_P = $(am__v_P_@AM_V@)
-+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-+am__v_P_0 = false
-+am__v_P_1 = :
-+AM_V_GEN = $(am__v_GEN_@AM_V@)
-+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo " GEN " $@;
-+am__v_GEN_1 =
-+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@ -I$(top_builddir)
-+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 = $(mmutf8fix_la_SOURCES)
-+DIST_SOURCES = $(mmutf8fix_la_SOURCES)
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
-+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-+# Read a list of newline-separated strings from the standard input,
-+# and print each of them once, without duplicates. Input order is
-+# *not* preserved.
-+am__uniquify_input = $(AWK) '\
-+ BEGIN { nonempty = 0; } \
-+ { items[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in items) print i; }; } \
-+'
-+# Make sure the list of sources is unique. This is necessary because,
-+# e.g., the same source file might be shared among _SOURCES variables
-+# for different programs/libraries.
-+am__define_uniq_tagged_files = \
-+ list='$(am__tagged_files)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | $(am__uniquify_input)`
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMTAR = @AMTAR@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CYGPATH_W = @CYGPATH_W@
-+CZMQ_CFLAGS = @CZMQ_CFLAGS@
-+CZMQ_LIBS = @CZMQ_LIBS@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
-+DL_LIBS = @DL_LIBS@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+FGREP = @FGREP@
-+GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-+GNUTLS_LIBS = @GNUTLS_LIBS@
-+GREP = @GREP@
-+GSS_LIBS = @GSS_LIBS@
-+GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
-+GUARDTIME_LIBS = @GUARDTIME_LIBS@
-+HAVE_LIBGCRYPT_CONFIG = @HAVE_LIBGCRYPT_CONFIG@
-+HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
-+HAVE_ORACLE_CONFIG = @HAVE_ORACLE_CONFIG@
-+HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
-+HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
-+HIREDIS_LIBS = @HIREDIS_LIBS@
-+IMUDP_LIBS = @IMUDP_LIBS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JSON_C_CFLAGS = @JSON_C_CFLAGS@
-+JSON_C_LIBS = @JSON_C_LIBS@
-+LD = @LD@
-+LDFLAGS = @LDFLAGS@
-+LEX = @LEX@
-+LEXLIB = @LEXLIB@
-+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-+LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
-+LIBDBI_LIBS = @LIBDBI_LIBS@
-+LIBEE_CFLAGS = @LIBEE_CFLAGS@
-+LIBEE_LIBS = @LIBEE_LIBS@
-+LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
-+LIBESTR_LIBS = @LIBESTR_LIBS@
-+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-+LIBLOGGING_CFLAGS = @LIBLOGGING_CFLAGS@
-+LIBLOGGING_LIBS = @LIBLOGGING_LIBS@
-+LIBLOGNORM_CFLAGS = @LIBLOGNORM_CFLAGS@
-+LIBLOGNORM_LIBS = @LIBLOGNORM_LIBS@
-+LIBM = @LIBM@
-+LIBMONGO_CLIENT_CFLAGS = @LIBMONGO_CLIENT_CFLAGS@
-+LIBMONGO_CLIENT_LIBS = @LIBMONGO_CLIENT_LIBS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBSYSTEMD_JOURNAL_CFLAGS = @LIBSYSTEMD_JOURNAL_CFLAGS@
-+LIBSYSTEMD_JOURNAL_LIBS = @LIBSYSTEMD_JOURNAL_LIBS@
-+LIBTOOL = @LIBTOOL@
-+LIBUUID_CFLAGS = @LIBUUID_CFLAGS@
-+LIBUUID_LIBS = @LIBUUID_LIBS@
-+LIPO = @LIPO@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
-+MKDIR_P = @MKDIR_P@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+ORACLE_CFLAGS = @ORACLE_CFLAGS@
-+ORACLE_LIBS = @ORACLE_LIBS@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PGSQL_CFLAGS = @PGSQL_CFLAGS@
-+PGSQL_LIBS = @PGSQL_LIBS@
-+PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-+PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
-+PTHREADS_LIBS = @PTHREADS_LIBS@
-+RABBITMQ_CFLAGS = @RABBITMQ_CFLAGS@
-+RABBITMQ_LIBS = @RABBITMQ_LIBS@
-+RANLIB = @RANLIB@
-+RELP_CFLAGS = @RELP_CFLAGS@
-+RELP_LIBS = @RELP_LIBS@
-+RSRT_CFLAGS = @RSRT_CFLAGS@
-+RSRT_CFLAGS1 = @RSRT_CFLAGS1@
-+RSRT_LIBS = @RSRT_LIBS@
-+RSRT_LIBS1 = @RSRT_LIBS1@
-+RST2MAN = @RST2MAN@
-+RT_LIBS = @RT_LIBS@
-+SED = @SED@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SNMP_CFLAGS = @SNMP_CFLAGS@
-+SNMP_LIBS = @SNMP_LIBS@
-+SOL_LIBS = @SOL_LIBS@
-+STRIP = @STRIP@
-+UDPSPOOF_CFLAGS = @UDPSPOOF_CFLAGS@
-+UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
-+VERSION = @VERSION@
-+YACC = @YACC@
-+YFLAGS = @YFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_valgrind = @have_valgrind@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+moddirs = @moddirs@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+systemdsystemunitdir = @systemdsystemunitdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+pkglib_LTLIBRARIES = mmutf8fix.la
-+mmutf8fix_la_SOURCES = mmutf8fix.c
-+mmutf8fix_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-+mmutf8fix_la_LDFLAGS = -module -avoid-version
-+mmutf8fix_la_LIBADD =
-+EXTRA_DIST =
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .lo .o .obj
-+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+ && { if test -f $@; then exit 0; else break; fi; }; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mmutf8fix/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu plugins/mmutf8fix/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+
-+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-+ @$(NORMAL_INSTALL)
-+ @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-+ list2=; for p in $$list; do \
-+ if test -f $$p; then \
-+ list2="$$list2 $$p"; \
-+ else :; fi; \
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
-+ }
-+
-+uninstall-pkglibLTLIBRARIES:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
-+ done
-+
-+clean-pkglibLTLIBRARIES:
-+ -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+ @list='$(pkglib_LTLIBRARIES)'; \
-+ locs=`for p in $$list; do echo $$p; done | \
-+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-+ sort -u`; \
-+ test -z "$$locs" || { \
-+ echo rm -f $${locs}; \
-+ rm -f $${locs}; \
-+ }
-+
-+mmutf8fix.la: $(mmutf8fix_la_OBJECTS) $(mmutf8fix_la_DEPENDENCIES) $(EXTRA_mmutf8fix_la_DEPENDENCIES)
-+ $(AM_V_CCLD)$(mmutf8fix_la_LINK) -rpath $(pkglibdir) $(mmutf8fix_la_OBJECTS) $(mmutf8fix_la_LIBADD) $(LIBS)
-+
-+mostlyclean-compile:
-+ -rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmutf8fix_la-mmutf8fix.Plo@am__quote@
-+
-+.c.o:
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 $@ $<
-+
-+mmutf8fix_la-mmutf8fix.lo: mmutf8fix.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mmutf8fix_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmutf8fix_la-mmutf8fix.lo -MD -MP -MF $(DEPDIR)/mmutf8fix_la-mmutf8fix.Tpo -c -o mmutf8fix_la-mmutf8fix.lo `test -f 'mmutf8fix.c' || echo '$(srcdir)/'`mmutf8fix.c
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mmutf8fix_la-mmutf8fix.Tpo $(DEPDIR)/mmutf8fix_la-mmutf8fix.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mmutf8fix.c' object='mmutf8fix_la-mmutf8fix.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) $(mmutf8fix_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmutf8fix_la-mmutf8fix.lo `test -f 'mmutf8fix.c' || echo '$(srcdir)/'`mmutf8fix.c
-+
-+mostlyclean-libtool:
-+ -rm -f *.lo
-+
-+clean-libtool:
-+ -rm -rf .libs _libs
-+
-+ID: $(am__tagged_files)
-+ $(am__define_uniq_tagged_files); mkid -fID $$unique
-+tags: tags-am
-+TAGS: tags
-+
-+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+ set x; \
-+ here=`pwd`; \
-+ $(am__define_uniq_tagged_files); \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
-+ fi
-+ctags: ctags-am
-+
-+CTAGS: ctags
-+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+ $(am__define_uniq_tagged_files); \
-+ test -z "$(CTAGS_ARGS)$$unique" \
-+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+ $$unique
-+
-+GTAGS:
-+ here=`$(am__cd) $(top_builddir) && pwd` \
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-+cscopelist: cscopelist-am
-+
-+cscopelist-am: $(am__tagged_files)
-+ list='$(am__tagged_files)'; \
-+ case "$(srcdir)" in \
-+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-+ *) sdir=$(subdir)/$(srcdir) ;; \
-+ esac; \
-+ for i in $$list; do \
-+ if test -f "$$i"; then \
-+ echo "$(subdir)/$$i"; \
-+ else \
-+ echo "$$sdir/$$i"; \
-+ fi; \
-+ done >> $(top_builddir)/cscope.files
-+
-+distclean-tags:
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+ else \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
-+ || exit 1; \
-+ fi; \
-+ done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+ for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+ if test -z '$(STRIP)'; then \
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ install; \
-+ else \
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-+ fi
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+ mostlyclean-am
-+
-+distclean: distclean-am
-+ -rm -rf ./$(DEPDIR)
-+ -rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+ distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+ -rm -rf ./$(DEPDIR)
-+ -rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+ mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-pkglibLTLIBRARIES
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
-+ ctags-am distclean distclean-compile distclean-generic \
-+ distclean-libtool distclean-tags distdir 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-pdf install-pdf-am \
-+ install-pkglibLTLIBRARIES install-ps install-ps-am \
-+ install-strip installcheck installcheck-am installdirs \
-+ 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-pkglibLTLIBRARIES
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff --git a/plugins/mmutf8fix/mmutf8fix.c b/plugins/mmutf8fix/mmutf8fix.c
-new file mode 100644
-index 0000000..8e647f2
---- /dev/null
-+++ b/plugins/mmutf8fix/mmutf8fix.c
-@@ -0,0 +1,328 @@
-+/* mmutf8fix.c
-+ * fix invalid UTF8 sequences. This is begun as a very simple replacer
-+ * of non-control characters, and actually breaks some UTF-8 encoding
-+ * right now. If the module turns out to be useful, it should be enhanced
-+ * to support modes that really detect invalid UTF8. In the longer term
-+ * it could also be evolved into an any-charset-to-UTF8 converter. But
-+ * first let's see if it really gets into widespread enough use.
-+ *
-+ * Copyright 2013 Adiscon GmbH.
-+ *
-+ * 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"
-+#include "rsyslog.h"
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <assert.h>
-+#include <signal.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <stdint.h>
-+#include "conf.h"
-+#include "syslogd-types.h"
-+#include "srUtils.h"
-+#include "template.h"
-+#include "module-template.h"
-+#include "errmsg.h"
-+
-+MODULE_TYPE_OUTPUT
-+MODULE_TYPE_NOKEEP
-+MODULE_CNFNAME("mmutf8fix")
-+
-+
-+DEFobjCurrIf(errmsg);
-+DEF_OMOD_STATIC_DATA
-+
-+/* define operation modes we have */
-+#define MODE_CC 0 /* just fix control characters */
-+#define MODE_UTF8 1 /* do real UTF-8 fixing */
-+
-+/* config variables */
-+typedef struct _instanceData {
-+ uchar replChar;
-+ uint8_t mode; /* operations mode */
-+} instanceData;
-+
-+struct modConfData_s {
-+ rsconf_t *pConf; /* our overall config object */
-+};
-+static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
-+static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current exec process */
-+
-+
-+/* tables for interfacing with the v6 config system */
-+/* action (instance) parameters */
-+static struct cnfparamdescr actpdescr[] = {
-+ { "mode", eCmdHdlrGetWord, 0 },
-+ { "replacementchar", eCmdHdlrGetChar, 0 }
-+};
-+static struct cnfparamblk actpblk =
-+ { CNFPARAMBLK_VERSION,
-+ sizeof(actpdescr)/sizeof(struct cnfparamdescr),
-+ actpdescr
-+ };
-+
-+BEGINbeginCnfLoad
-+CODESTARTbeginCnfLoad
-+ loadModConf = pModConf;
-+ pModConf->pConf = pConf;
-+ENDbeginCnfLoad
-+
-+BEGINendCnfLoad
-+CODESTARTendCnfLoad
-+ENDendCnfLoad
-+
-+BEGINcheckCnf
-+CODESTARTcheckCnf
-+ENDcheckCnf
-+
-+BEGINactivateCnf
-+CODESTARTactivateCnf
-+ runModConf = pModConf;
-+ENDactivateCnf
-+
-+BEGINfreeCnf
-+CODESTARTfreeCnf
-+ENDfreeCnf
-+
-+
-+BEGINcreateInstance
-+CODESTARTcreateInstance
-+ENDcreateInstance
-+
-+
-+BEGINisCompatibleWithFeature
-+CODESTARTisCompatibleWithFeature
-+ENDisCompatibleWithFeature
-+
-+
-+BEGINfreeInstance
-+CODESTARTfreeInstance
-+ENDfreeInstance
-+
-+
-+static inline void
-+setInstParamDefaults(instanceData *pData)
-+{
-+ pData->mode = MODE_UTF8;
-+ pData->replChar = ' ';
-+}
-+
-+BEGINnewActInst
-+ struct cnfparamvals *pvals;
-+ int i;
-+CODESTARTnewActInst
-+ DBGPRINTF("newActInst (mmutf8fix)\n");
-+ if((pvals = nvlstGetParams(lst, &actpblk, NULL)) == NULL) {
-+ ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
-+ }
-+
-+ CODE_STD_STRING_REQUESTnewActInst(1)
-+ CHKiRet(OMSRsetEntry(*ppOMSR, 0, NULL, OMSR_TPL_AS_MSG));
-+ CHKiRet(createInstance(&pData));
-+ setInstParamDefaults(pData);
-+
-+ for(i = 0 ; i < actpblk.nParams ; ++i) {
-+ if(!pvals[i].bUsed)
-+ continue;
-+ if(!strcmp(actpblk.descr[i].name, "mode")) {
-+ if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"utf-8",
-+ sizeof("utf-8")-1)) {
-+ pData->mode = MODE_UTF8;
-+ } else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"controlcharacters",
-+ sizeof("controlcharacters")-1)) {
-+ pData->mode = MODE_CC;
-+ } else {
-+ char *cstr = es_str2cstr(pvals[i].val.d.estr, NULL);
-+ errmsg.LogError(0, RS_RET_INVLD_MODE,
-+ "mmutf8fix: invalid mode '%s' - ignored",
-+ cstr);
-+ free(cstr);
-+ }
-+ } else if(!strcmp(actpblk.descr[i].name, "replacementchar")) {
-+ pData->replChar = es_getBufAddr(pvals[i].val.d.estr)[0];
-+ } else {
-+ dbgprintf("mmutf8fix: program error, non-handled "
-+ "param '%s'\n", actpblk.descr[i].name);
-+ }
-+ }
-+
-+CODE_STD_FINALIZERnewActInst
-+ cnfparamvalsDestruct(pvals, &actpblk);
-+ENDnewActInst
-+
-+
-+BEGINdbgPrintInstInfo
-+CODESTARTdbgPrintInstInfo
-+ENDdbgPrintInstInfo
-+
-+
-+BEGINtryResume
-+CODESTARTtryResume
-+ENDtryResume
-+
-+
-+static inline void
-+doCC(instanceData *pData, uchar *msg, int lenMsg)
-+{
-+ int i;
-+
-+ for(i = 0 ; i < lenMsg ; ++i) {
-+ if(msg[i] < 32 || msg[i] > 126) {
-+ msg[i] = pData->replChar;
-+ }
-+ }
-+}
-+
-+/* fix an invalid multibyte sequence */
-+static inline void
-+fixInvldMBSeq(instanceData *pData, uchar *msg, int lenMsg, int strtIdx, int *endIdx, int8_t seqLen)
-+{
-+ int i;
-+
-+ /* startIdx and seqLen always set if bytesLeft is set,
-+ which is required before this function is called */
-+ *endIdx = strtIdx + seqLen;
-+ if(*endIdx > lenMsg)
-+ *endIdx = lenMsg;
-+ for(i = strtIdx ; i < *endIdx ; ++i)
-+ msg[i] = pData->replChar;
-+}
-+
-+static inline void
-+doUTF8(instanceData *pData, uchar *msg, int lenMsg)
-+{
-+ uchar c;
-+ int8_t seqLen = 0, bytesLeft = 0;
-+ uint32_t codepoint;
-+ int strtIdx = 0, endIdx = 0;
-+ int i;
-+
-+ for(i = 0 ; i < lenMsg ; ++i) {
-+ c = msg[i];
-+ if(bytesLeft) {
-+ if((c & 0xc0) != 0x80) {
-+ /* sequence invalid, invalidate all bytes
-+ startIdx is always set if bytesLeft is set */
-+ fixInvldMBSeq(pData, msg, lenMsg, strtIdx, &endIdx,
-+ seqLen);
-+ i = endIdx - 1;
-+ bytesLeft = 0;
-+ } else {
-+ codepoint = (codepoint << 6) | (c & 0x3f);
-+ --bytesLeft;
-+ if(bytesLeft == 0) {
-+ /* too-large codepoint? */
-+ if(codepoint > 0x10FFFF) {
-+ /* sequence invalid, invalidate all bytes
-+ startIdx is always set if bytesLeft is set */
-+ fixInvldMBSeq(pData, msg, lenMsg,
-+ strtIdx, &endIdx,
-+ seqLen);
-+ }
-+ }
-+ }
-+ } else {
-+ if((c & 0x80) == 0) {
-+ /* 1-byte sequence, US-ASCII */
-+ ; /* nothing to do, all well */
-+ } else if((c & 0xe0) == 0xc0) {
-+ /* 2-byte sequence */
-+ /* 0xc0 and 0xc1 are illegal */
-+ if(c == 0xc0 || c == 0xc1) {
-+ msg[i] = pData->replChar;
-+ } else {
-+ strtIdx = i;
-+ seqLen = bytesLeft = 1;
-+ codepoint = c & 0x1f;
-+ }
-+ } else if((c & 0xf0) == 0xe0) {
-+ /* 3-byte sequence */
-+ strtIdx = i;
-+ seqLen = bytesLeft = 2;
-+ codepoint = c & 0x0f;
-+ } else if((c & 0xf8) == 0xf0) {
-+ /* 4-byte sequence */
-+ strtIdx = i;
-+ seqLen = bytesLeft = 3;
-+ codepoint = c & 0x07;
-+ } else { /* invalid (5&6 byte forbidden by RFC3629) */
-+ msg[i] = pData->replChar;
-+ }
-+ if(i+bytesLeft >= lenMsg) {
-+ int dummy = lenMsg;
-+ /* invalid, as rest of message cannot contain full char */
-+ fixInvldMBSeq(pData, msg, lenMsg, strtIdx, &dummy, seqLen);
-+ i = lenMsg - 1;
-+ }
-+ }
-+ }
-+}
-+
-+BEGINdoAction
-+ msg_t *pMsg;
-+ uchar *msg;
-+ int lenMsg;
-+CODESTARTdoAction
-+ pMsg = (msg_t*) ppString[0];
-+ lenMsg = getMSGLen(pMsg);
-+ msg = getMSG(pMsg);
-+ if(pData->mode == MODE_CC) {
-+ doCC(pData, msg, lenMsg);
-+ } else {
-+ doUTF8(pData, msg, lenMsg);
-+ }
-+ENDdoAction
-+
-+
-+BEGINparseSelectorAct
-+CODESTARTparseSelectorAct
-+CODE_STD_STRING_REQUESTparseSelectorAct(1)
-+ if(strncmp((char*) p, ":mmutf8fix:", sizeof(":mmutf8fix:") - 1)) {
-+ errmsg.LogError(0, RS_RET_LEGA_ACT_NOT_SUPPORTED,
-+ "mmutf8fix supports only v6+ config format, use: "
-+ "action(type=\"mmutf8fix\" ...)");
-+ }
-+ ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED);
-+CODE_STD_FINALIZERparseSelectorAct
-+ENDparseSelectorAct
-+
-+
-+BEGINmodExit
-+CODESTARTmodExit
-+ objRelease(errmsg, CORE_COMPONENT);
-+ENDmodExit
-+
-+
-+BEGINqueryEtryPt
-+CODESTARTqueryEtryPt
-+CODEqueryEtryPt_STD_OMOD_QUERIES
-+CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES
-+CODEqueryEtryPt_STD_CONF2_QUERIES
-+ENDqueryEtryPt
-+
-+
-+BEGINmodInit()
-+CODESTARTmodInit
-+ *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
-+CODEmodInit_QueryRegCFSLineHdlr
-+ DBGPRINTF("mmutf8fix: module compiled with rsyslog version %s.\n", VERSION);
-+ CHKiRet(objUse(errmsg, CORE_COMPONENT));
-+ENDmodInit
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1151037-add-mmcount.patch b/SOURCES/rsyslog-7.4.7-rhbz1151037-add-mmcount.patch
deleted file mode 100644
index dbb6ce1..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1151037-add-mmcount.patch
+++ /dev/null
@@ -1,1179 +0,0 @@
-diff -Npru a/Makefile.in b/Makefile.in
---- a/Makefile.in 2015-07-07 15:45:08.144516940 +0200
-+++ b/Makefile.in 2015-07-07 15:42:47.027059036 +0200
-@@ -85,8 +85,9 @@ sbin_PROGRAMS =
- @ENABLE_MMJSONPARSE_TRUE@am__append_42 = plugins/mmjsonparse
- @ENABLE_MMAUDIT_TRUE@am__append_43 = plugins/mmaudit
- @ENABLE_MMANON_TRUE@am__append_44 = plugins/mmanon
--@ENABLE_ORACLE_TRUE@am__append_45 = plugins/omoracle
--@ENABLE_GUI_TRUE@am__append_46 = java
-+@ENABLE_MMCOUNT_TRUE@am__append_45 = plugins/mmcount
-+@ENABLE_ORACLE_TRUE@am__append_46 = plugins/omoracle
-+@ENABLE_GUI_TRUE@am__append_47 = java
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-@@ -231,7 +232,7 @@ DIST_SUBDIRS = doc compat runtime gramma
- plugins/imptcp plugins/imttcp plugins/imdiag plugins/ommail \
- plugins/omprog plugins/im3195 plugins/mmnormalize \
- plugins/mmjsonparse plugins/mmaudit plugins/mmanon \
-- plugins/omoracle java tests
-+ plugins/mmcount plugins/omoracle java tests
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -532,7 +533,7 @@ SUBDIRS = doc compat runtime grammar . p
- $(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) tests
-+ $(am__append_46) $(am__append_47) tests
-
- # make sure "make distcheck" tries to build all modules. This means that
- # a developer must always have an environment where every supporting library
-diff -Npru a/configure b/configure
---- a/configure 2015-07-07 15:45:08.149516991 +0200
-+++ b/configure 2015-07-07 15:42:47.036059129 +0200
-@@ -690,6 +690,8 @@ ENABLE_RELP_FALSE
- ENABLE_RELP_TRUE
- RELP_LIBS
- RELP_CFLAGS
-+ENABLE_MMCOUNT_FALSE
-+ENABLE_MMCOUNT_TRUE
- ENABLE_MMANON_FALSE
- ENABLE_MMANON_TRUE
- ENABLE_MMAUDIT_FALSE
-@@ -977,6 +979,7 @@ enable_mmnormalize
- enable_mmjsonparse
- enable_mmaudit
- enable_mmanon
-+enable_mmcount
- enable_relp
- enable_guardtime
- enable_cached_man_pages
-@@ -1722,6 +1725,7 @@ Optional Features:
- --enable-mmjsonparse Enable building mmjsonparse support [default=no]
- --enable-mmaudit Enable building mmaudit support [default=no]
- --enable-mmanon Enable building mmanon support [default=no]
-+ --enable-mmcount Enable message counting [default=no]
- --enable-relp Enable RELP support [default=no]
- --enable-guardtime Enable log file signing support (via GuardTime)
- [default=no]
-@@ -18311,6 +18315,29 @@ fi
-
-
-
-+# mmcount
-+# Check whether --enable-mmcount was given.
-+if test "${enable_mmcount+set}" = set; then :
-+ enableval=$enable_mmcount; case "${enableval}" in
-+ yes) enable_mmcount="yes" ;;
-+ no) enable_mmcount="no" ;;
-+ *) as_fn_error $? "bad value ${enableval} for --enable-mmcount" "$LINENO" 5 ;;
-+ esac
-+else
-+ enable_mmcount=no
-+
-+fi
-+
-+ if test x$enable_mmcount = xyes; then
-+ ENABLE_MMCOUNT_TRUE=
-+ ENABLE_MMCOUNT_FALSE='#'
-+else
-+ ENABLE_MMCOUNT_TRUE='#'
-+ ENABLE_MMCOUNT_FALSE=
-+fi
-+
-+
-+
- # RELP support
- # Check whether --enable-relp was given.
- if test "${enable_relp+set}" = set; then :
-@@ -19974,7 +20001,7 @@ fi
-
- # END HIREDIS SUPPORT
-
--ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile doc/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/imkmsg/Makefile plugins/omhdfs/Makefile plugins/omprog/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmrfc3164sd/Makefile plugins/pmlastmsg/Makefile plugins/pmcisconames/Makefile plugins/pmsnare/Makefile plugins/pmaixforwardedfrom/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/imttcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imzmq3/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/omoracle/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/omhiredis/Makefile plugins/omzmq3/Makefile plugins/omrabbitmq/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/omelasticsearch/Makefile plugins/sm_cust_bindcdr/Makefile plugins/mmsnmptrapd/Makefile java/Makefile tests/Makefile"
-+ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile doc/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/imkmsg/Makefile plugins/omhdfs/Makefile plugins/omprog/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmrfc3164sd/Makefile plugins/pmlastmsg/Makefile plugins/pmcisconames/Makefile plugins/pmsnare/Makefile plugins/pmaixforwardedfrom/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/imttcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imzmq3/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/omoracle/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/omhiredis/Makefile plugins/omzmq3/Makefile plugins/omrabbitmq/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/omelasticsearch/Makefile plugins/sm_cust_bindcdr/Makefile plugins/mmsnmptrapd/Makefile plugins/mmcount/Makefile java/Makefile tests/Makefile"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -20241,6 +20291,10 @@ if test -z "${ENABLE_MMANON_TRUE}" && te
- as_fn_error $? "conditional \"ENABLE_MMANON\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${ENABLE_MMCOUNT_TRUE}" && test -z "${ENABLE_MMCOUNT_FALSE}"; then
-+ as_fn_error $? "conditional \"ENABLE_MMCOUNT\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${ENABLE_RELP_TRUE}" && test -z "${ENABLE_RELP_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_RELP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -21296,6 +21327,7 @@ do
- "plugins/omelasticsearch/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/omelasticsearch/Makefile" ;;
- "plugins/sm_cust_bindcdr/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sm_cust_bindcdr/Makefile" ;;
- "plugins/mmsnmptrapd/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mmsnmptrapd/Makefile" ;;
-+ "plugins/mmcount/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mmcount/Makefile" ;;
- "java/Makefile") CONFIG_FILES="$CONFIG_FILES java/Makefile" ;;
- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-
-@@ -22673,6 +22705,7 @@ echo " uuid support enabled:
- echo " Log file signing support: $enable_guardtime"
- echo " Log file encryption support: $enable_libgcrypt"
- echo " anonymization support enabled: $enable_mmanon"
-+echo " message counting support enabled: $enable_mmcount"
- echo
- echo "---{ input plugins }---"
- echo " Klog functionality enabled: $enable_klog ($os_type)"
-diff -Npru a/plugins/mmcount/Makefile.in b/plugins/mmcount/Makefile.in
---- a/plugins/mmcount/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/mmcount/Makefile.in 2015-07-07 15:42:47.057059346 +0200
-@@ -0,0 +1,702 @@
-+# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-+
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-+am__make_running_with_option = \
-+ case $${target_option-} in \
-+ ?) ;; \
-+ *) echo "am__make_running_with_option: internal error: invalid" \
-+ "target option '$${target_option-}' specified" >&2; \
-+ exit 1;; \
-+ esac; \
-+ has_opt=no; \
-+ sane_makeflags=$$MAKEFLAGS; \
-+ if $(am__is_gnu_make); then \
-+ sane_makeflags=$$MFLAGS; \
-+ else \
-+ case $$MAKEFLAGS in \
-+ *\\[\ \ ]*) \
-+ bs=\\; \
-+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
-+ esac; \
-+ fi; \
-+ skip_next=no; \
-+ strip_trailopt () \
-+ { \
-+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-+ }; \
-+ for flg in $$sane_makeflags; do \
-+ test $$skip_next = yes && { skip_next=no; continue; }; \
-+ case $$flg in \
-+ *=*|--*) continue;; \
-+ -*I) strip_trailopt 'I'; skip_next=yes;; \
-+ -*I?*) strip_trailopt 'I';; \
-+ -*O) strip_trailopt 'O'; skip_next=yes;; \
-+ -*O?*) strip_trailopt 'O';; \
-+ -*l) strip_trailopt 'l'; skip_next=yes;; \
-+ -*l?*) strip_trailopt 'l';; \
-+ -[dEDm]) skip_next=yes;; \
-+ -[JT]) skip_next=yes;; \
-+ esac; \
-+ case $$flg in \
-+ *$$target_option*) has_opt=yes; break;; \
-+ esac; \
-+ done; \
-+ test $$has_opt = yes
-+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = plugins/mmcount
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+ $(top_srcdir)/depcomp
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
-+ $(top_srcdir)/m4/atomic_operations_64bit.m4 \
-+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__uninstall_files_from_dir = { \
-+ test -z "$$files" \
-+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-+ $(am__cd) "$$dir" && rm -f $$files; }; \
-+ }
-+am__installdirs = "$(DESTDIR)$(pkglibdir)"
-+LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+mmcount_la_DEPENDENCIES =
-+am_mmcount_la_OBJECTS = mmcount_la-mmcount.lo
-+mmcount_la_OBJECTS = $(am_mmcount_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 =
-+mmcount_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(mmcount_la_LDFLAGS) $(LDFLAGS) -o $@
-+AM_V_P = $(am__v_P_@AM_V@)
-+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-+am__v_P_0 = false
-+am__v_P_1 = :
-+AM_V_GEN = $(am__v_GEN_@AM_V@)
-+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo " GEN " $@;
-+am__v_GEN_1 =
-+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@ -I$(top_builddir)
-+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 = $(mmcount_la_SOURCES)
-+DIST_SOURCES = $(mmcount_la_SOURCES)
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
-+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-+# Read a list of newline-separated strings from the standard input,
-+# and print each of them once, without duplicates. Input order is
-+# *not* preserved.
-+am__uniquify_input = $(AWK) '\
-+ BEGIN { nonempty = 0; } \
-+ { items[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in items) print i; }; } \
-+'
-+# Make sure the list of sources is unique. This is necessary because,
-+# e.g., the same source file might be shared among _SOURCES variables
-+# for different programs/libraries.
-+am__define_uniq_tagged_files = \
-+ list='$(am__tagged_files)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | $(am__uniquify_input)`
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMTAR = @AMTAR@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CYGPATH_W = @CYGPATH_W@
-+CZMQ_CFLAGS = @CZMQ_CFLAGS@
-+CZMQ_LIBS = @CZMQ_LIBS@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
-+DL_LIBS = @DL_LIBS@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+FGREP = @FGREP@
-+GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
-+GNUTLS_LIBS = @GNUTLS_LIBS@
-+GREP = @GREP@
-+GSS_LIBS = @GSS_LIBS@
-+GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
-+GUARDTIME_LIBS = @GUARDTIME_LIBS@
-+HAVE_LIBGCRYPT_CONFIG = @HAVE_LIBGCRYPT_CONFIG@
-+HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
-+HAVE_ORACLE_CONFIG = @HAVE_ORACLE_CONFIG@
-+HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
-+HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
-+HIREDIS_LIBS = @HIREDIS_LIBS@
-+IMUDP_LIBS = @IMUDP_LIBS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JSON_C_CFLAGS = @JSON_C_CFLAGS@
-+JSON_C_LIBS = @JSON_C_LIBS@
-+LD = @LD@
-+LDFLAGS = @LDFLAGS@
-+LEX = @LEX@
-+LEXLIB = @LEXLIB@
-+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-+LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
-+LIBDBI_LIBS = @LIBDBI_LIBS@
-+LIBEE_CFLAGS = @LIBEE_CFLAGS@
-+LIBEE_LIBS = @LIBEE_LIBS@
-+LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
-+LIBESTR_LIBS = @LIBESTR_LIBS@
-+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-+LIBLOGGING_CFLAGS = @LIBLOGGING_CFLAGS@
-+LIBLOGGING_LIBS = @LIBLOGGING_LIBS@
-+LIBLOGNORM_CFLAGS = @LIBLOGNORM_CFLAGS@
-+LIBLOGNORM_LIBS = @LIBLOGNORM_LIBS@
-+LIBM = @LIBM@
-+LIBMONGO_CLIENT_CFLAGS = @LIBMONGO_CLIENT_CFLAGS@
-+LIBMONGO_CLIENT_LIBS = @LIBMONGO_CLIENT_LIBS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBSYSTEMD_JOURNAL_CFLAGS = @LIBSYSTEMD_JOURNAL_CFLAGS@
-+LIBSYSTEMD_JOURNAL_LIBS = @LIBSYSTEMD_JOURNAL_LIBS@
-+LIBTOOL = @LIBTOOL@
-+LIBUUID_CFLAGS = @LIBUUID_CFLAGS@
-+LIBUUID_LIBS = @LIBUUID_LIBS@
-+LIPO = @LIPO@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
-+MKDIR_P = @MKDIR_P@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+ORACLE_CFLAGS = @ORACLE_CFLAGS@
-+ORACLE_LIBS = @ORACLE_LIBS@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PGSQL_CFLAGS = @PGSQL_CFLAGS@
-+PGSQL_LIBS = @PGSQL_LIBS@
-+PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-+PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
-+PTHREADS_LIBS = @PTHREADS_LIBS@
-+RABBITMQ_CFLAGS = @RABBITMQ_CFLAGS@
-+RABBITMQ_LIBS = @RABBITMQ_LIBS@
-+RANLIB = @RANLIB@
-+RELP_CFLAGS = @RELP_CFLAGS@
-+RELP_LIBS = @RELP_LIBS@
-+RSRT_CFLAGS = @RSRT_CFLAGS@
-+RSRT_CFLAGS1 = @RSRT_CFLAGS1@
-+RSRT_LIBS = @RSRT_LIBS@
-+RSRT_LIBS1 = @RSRT_LIBS1@
-+RST2MAN = @RST2MAN@
-+RT_LIBS = @RT_LIBS@
-+SED = @SED@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SNMP_CFLAGS = @SNMP_CFLAGS@
-+SNMP_LIBS = @SNMP_LIBS@
-+SOL_LIBS = @SOL_LIBS@
-+STRIP = @STRIP@
-+UDPSPOOF_CFLAGS = @UDPSPOOF_CFLAGS@
-+UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
-+VERSION = @VERSION@
-+YACC = @YACC@
-+YFLAGS = @YFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+have_valgrind = @have_valgrind@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+moddirs = @moddirs@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+systemdsystemunitdir = @systemdsystemunitdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+pkglib_LTLIBRARIES = mmcount.la
-+mmcount_la_SOURCES = mmcount.c
-+mmcount_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-+mmcount_la_LDFLAGS = -module -avoid-version
-+mmcount_la_LIBADD =
-+EXTRA_DIST =
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .lo .o .obj
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: $(am__configure_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+
-+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-+ @$(NORMAL_INSTALL)
-+ @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-+ list2=; for p in $$list; do \
-+ if test -f $$p; then \
-+ list2="$$list2 $$p"; \
-+ else :; fi; \
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
-+ }
-+
-+uninstall-pkglibLTLIBRARIES:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
-+ done
-+
-+clean-pkglibLTLIBRARIES:
-+ -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-+ @list='$(pkglib_LTLIBRARIES)'; \
-+ locs=`for p in $$list; do echo $$p; done | \
-+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-+ sort -u`; \
-+ test -z "$$locs" || { \
-+ echo rm -f $${locs}; \
-+ rm -f $${locs}; \
-+ }
-+
-+mmcount.la: $(mmcount_la_OBJECTS) $(mmcount_la_DEPENDENCIES) $(EXTRA_mmcount_la_DEPENDENCIES)
-+ $(AM_V_CCLD)$(mmcount_la_LINK) -rpath $(pkglibdir) $(mmcount_la_OBJECTS) $(mmcount_la_LIBADD) $(LIBS)
-+
-+mostlyclean-compile:
-+ -rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmcount_la-mmcount.Plo@am__quote@
-+
-+.c.o:
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 $@ $<
-+
-+mmcount_la-mmcount.lo: mmcount.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mmcount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmcount_la-mmcount.lo -MD -MP -MF $(DEPDIR)/mmcount_la-mmcount.Tpo -c -o mmcount_la-mmcount.lo `test -f 'mmcount.c' || echo '$(srcdir)/'`mmcount.c
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mmcount_la-mmcount.Tpo $(DEPDIR)/mmcount_la-mmcount.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mmcount.c' object='mmcount_la-mmcount.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) $(mmcount_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmcount_la-mmcount.lo `test -f 'mmcount.c' || echo '$(srcdir)/'`mmcount.c
-+
-+mostlyclean-libtool:
-+ -rm -f *.lo
-+
-+clean-libtool:
-+ -rm -rf .libs _libs
-+
-+ID: $(am__tagged_files)
-+ $(am__define_uniq_tagged_files); mkid -fID $$unique
-+tags: tags-am
-+TAGS: tags
-+
-+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+ set x; \
-+ here=`pwd`; \
-+ $(am__define_uniq_tagged_files); \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
-+ fi
-+ctags: ctags-am
-+
-+CTAGS: ctags
-+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+ $(am__define_uniq_tagged_files); \
-+ test -z "$(CTAGS_ARGS)$$unique" \
-+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+ $$unique
-+
-+GTAGS:
-+ here=`$(am__cd) $(top_builddir) && pwd` \
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-+cscopelist: cscopelist-am
-+
-+cscopelist-am: $(am__tagged_files)
-+ list='$(am__tagged_files)'; \
-+ case "$(srcdir)" in \
-+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-+ *) sdir=$(subdir)/$(srcdir) ;; \
-+ esac; \
-+ for i in $$list; do \
-+ if test -f "$$i"; then \
-+ echo "$(subdir)/$$i"; \
-+ else \
-+ echo "$$sdir/$$i"; \
-+ fi; \
-+ done >> $(top_builddir)/cscope.files
-+
-+distclean-tags:
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+ else \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
-+ || exit 1; \
-+ fi; \
-+ done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+ for dir in "$(DESTDIR)$(pkglibdir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+ if test -z '$(STRIP)'; then \
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ install; \
-+ else \
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-+ fi
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
-+ mostlyclean-am
-+
-+distclean: distclean-am
-+ -rm -rf ./$(DEPDIR)
-+ -rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+ distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am: install-pkglibLTLIBRARIES
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+ -rm -rf ./$(DEPDIR)
-+ -rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+ mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-pkglibLTLIBRARIES
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-+ clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
-+ ctags-am distclean distclean-compile distclean-generic \
-+ distclean-libtool distclean-tags distdir 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-pdf install-pdf-am \
-+ install-pkglibLTLIBRARIES install-ps install-ps-am \
-+ install-strip installcheck installcheck-am installdirs \
-+ 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-pkglibLTLIBRARIES
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Npru a/plugins/mmcount/mmcount.c b/plugins/mmcount/mmcount.c
---- a/plugins/mmcount/mmcount.c 1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/mmcount/mmcount.c 2015-07-07 15:42:47.057059346 +0200
-@@ -0,0 +1,342 @@
-+/* mmcount.c
-+ * count messages by priority or json property of given app-name.
-+ *
-+ * Copyright 2013 Red Hat Inc.
-+ *
-+ * 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"
-+#include "rsyslog.h"
-+#include <stdio.h>
-+#include <stdarg.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <assert.h>
-+#include <signal.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <stdint.h>
-+#include <json.h>
-+#include "conf.h"
-+#include "syslogd-types.h"
-+#include "srUtils.h"
-+#include "template.h"
-+#include "module-template.h"
-+#include "errmsg.h"
-+#include "hashtable.h"
-+
-+#define JSON_COUNT_NAME "!mmcount"
-+#define SEVERITY_COUNT 8
-+
-+MODULE_TYPE_OUTPUT
-+MODULE_TYPE_NOKEEP
-+MODULE_CNFNAME("mmcount")
-+
-+
-+DEFobjCurrIf(errmsg);
-+DEF_OMOD_STATIC_DATA
-+
-+/* config variables */
-+
-+typedef struct _instanceData {
-+ char *pszAppName;
-+ int severity[SEVERITY_COUNT];
-+ char *pszKey;
-+ char *pszValue;
-+ int valueCounter;
-+ struct hashtable *ht;
-+} instanceData;
-+
-+struct modConfData_s {
-+ rsconf_t *pConf; /* our overall config object */
-+};
-+static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
-+static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current exec process */
-+
-+
-+/* tables for interfacing with the v6 config system */
-+/* action (instance) parameters */
-+static struct cnfparamdescr actpdescr[] = {
-+ { "appname", eCmdHdlrGetWord, 0 },
-+ { "key", eCmdHdlrGetWord, 0 },
-+ { "value", eCmdHdlrGetWord, 0 },
-+};
-+static struct cnfparamblk actpblk =
-+ { CNFPARAMBLK_VERSION,
-+ sizeof(actpdescr)/sizeof(struct cnfparamdescr),
-+ actpdescr
-+ };
-+
-+BEGINbeginCnfLoad
-+CODESTARTbeginCnfLoad
-+ loadModConf = pModConf;
-+ pModConf->pConf = pConf;
-+ENDbeginCnfLoad
-+
-+BEGINendCnfLoad
-+CODESTARTendCnfLoad
-+ENDendCnfLoad
-+
-+BEGINcheckCnf
-+CODESTARTcheckCnf
-+ENDcheckCnf
-+
-+BEGINactivateCnf
-+CODESTARTactivateCnf
-+ runModConf = pModConf;
-+ENDactivateCnf
-+
-+BEGINfreeCnf
-+CODESTARTfreeCnf
-+ENDfreeCnf
-+
-+
-+BEGINcreateInstance
-+CODESTARTcreateInstance
-+ENDcreateInstance
-+
-+
-+BEGINisCompatibleWithFeature
-+CODESTARTisCompatibleWithFeature
-+ENDisCompatibleWithFeature
-+
-+
-+BEGINfreeInstance
-+CODESTARTfreeInstance
-+ENDfreeInstance
-+
-+
-+static inline void
-+setInstParamDefaults(instanceData *pData)
-+{
-+ int i;
-+
-+ pData->pszAppName = NULL;
-+ for (i = 0; i < SEVERITY_COUNT; i++)
-+ pData->severity[i] = 0;
-+ pData->pszKey = NULL;
-+ pData->pszValue = NULL;
-+ pData->valueCounter = 0;
-+ pData->ht = NULL;
-+}
-+
-+static unsigned int
-+hash_from_key_fn(void *k)
-+{
-+ return *(unsigned int *)k;
-+}
-+
-+static int
-+key_equals_fn(void *k1, void *k2)
-+{
-+ return (*(unsigned int *)k1 == *(unsigned int *)k2);
-+}
-+
-+BEGINnewActInst
-+ struct cnfparamvals *pvals;
-+ int i;
-+CODESTARTnewActInst
-+ DBGPRINTF("newActInst (mmcount)\n");
-+ if((pvals = nvlstGetParams(lst, &actpblk, NULL)) == NULL) {
-+ ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
-+ }
-+
-+ CODE_STD_STRING_REQUESTnewActInst(1)
-+ CHKiRet(OMSRsetEntry(*ppOMSR, 0, NULL, OMSR_TPL_AS_MSG));
-+ CHKiRet(createInstance(&pData));
-+ setInstParamDefaults(pData);
-+
-+ for(i = 0 ; i < actpblk.nParams ; ++i) {
-+ if(!pvals[i].bUsed)
-+ continue;
-+ if(!strcmp(actpblk.descr[i].name, "appname")) {
-+ pData->pszAppName = es_str2cstr(pvals[i].val.d.estr, NULL);
-+ continue;
-+ }
-+ if(!strcmp(actpblk.descr[i].name, "key")) {
-+ pData->pszKey = es_str2cstr(pvals[i].val.d.estr, NULL);
-+ continue;
-+ }
-+ if(!strcmp(actpblk.descr[i].name, "value")) {
-+ pData->pszValue = es_str2cstr(pvals[i].val.d.estr, NULL);
-+ continue;
-+ }
-+ dbgprintf("mmcount: program error, non-handled "
-+ "param '%s'\n", actpblk.descr[i].name);
-+ }
-+
-+ if(pData->pszAppName == NULL) {
-+ dbgprintf("mmcount: action requires a appname");
-+ ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
-+ }
-+
-+ if(pData->pszKey != NULL && pData->pszValue == NULL) {
-+ if(NULL == (pData->ht = create_hashtable(100, hash_from_key_fn, key_equals_fn, NULL))) {
-+ DBGPRINTF("mmcount: error creating hash table!\n");
-+ ABORT_FINALIZE(RS_RET_ERR);
-+ }
-+ }
-+CODE_STD_FINALIZERnewActInst
-+ cnfparamvalsDestruct(pvals, &actpblk);
-+ENDnewActInst
-+
-+
-+BEGINdbgPrintInstInfo
-+CODESTARTdbgPrintInstInfo
-+ENDdbgPrintInstInfo
-+
-+
-+BEGINtryResume
-+CODESTARTtryResume
-+ENDtryResume
-+
-+static int *
-+getCounter(struct hashtable *ht, char *str) {
-+ unsigned int key;
-+ int *pCounter;
-+ unsigned int *pKey;
-+
-+ /* we dont store str as key, instead we store hash of the str
-+ as key to reduce memory usage */
-+ key = hash_from_string(str);
-+ pCounter = hashtable_search(ht, &key);
-+ if(pCounter) {
-+ return pCounter;
-+ }
-+
-+ /* counter is not found for the str, so add new entry and
-+ return the counter */
-+ if(NULL == (pKey = (unsigned int*)malloc(sizeof(unsigned int)))) {
-+ DBGPRINTF("mmcount: memory allocation for key failed\n");
-+ return NULL;
-+ }
-+ *pKey = key;
-+
-+ if(NULL == (pCounter = (int*)malloc(sizeof(int)))) {
-+ DBGPRINTF("mmcount: memory allocation for value failed\n");
-+ free(pKey);
-+ return NULL;
-+ }
-+ *pCounter = 0;
-+
-+ if(!hashtable_insert(ht, pKey, pCounter)) {
-+ DBGPRINTF("mmcount: inserting element into hashtable failed\n");
-+ free(pKey);
-+ free(pCounter);
-+ return NULL;
-+ }
-+ return pCounter;
-+}
-+
-+BEGINdoAction
-+ msg_t *pMsg;
-+ char *appname;
-+ struct json_object *json = NULL;
-+ es_str_t *estr = NULL;
-+ struct json_object *keyjson = NULL;
-+ char *pszValue;
-+ int *pCounter;
-+CODESTARTdoAction
-+ pMsg = (msg_t*) ppString[0];
-+ appname = getAPPNAME(pMsg, LOCK_MUTEX);
-+
-+ if(0 != strcmp(appname, pData->pszAppName)) {
-+ /* we are not working for this appname. nothing to do */
-+ ABORT_FINALIZE(RS_RET_OK);
-+ }
-+
-+ if(!pData->pszKey) {
-+ /* no key given for count, so we count severity */
-+ if(pMsg->iSeverity < SEVERITY_COUNT) {
-+ pData->severity[pMsg->iSeverity]++;
-+ json = json_object_new_int(pData->severity[pMsg->iSeverity]);
-+ }
-+ ABORT_FINALIZE(RS_RET_OK);
-+ }
-+
-+ /* key is given, so get the property json */
-+ estr = es_newStrFromBuf(pData->pszKey, strlen(pData->pszKey));
-+ if(msgGetCEEPropJSON(pMsg, estr, &keyjson) != RS_RET_OK) {
-+ /* key not found in the message. nothing to do */
-+ ABORT_FINALIZE(RS_RET_OK);
-+ }
-+
-+ /* key found, so get the value */
-+ pszValue = (char*)json_object_get_string(keyjson);
-+
-+ if(pData->pszValue) {
-+ /* value also given for count */
-+ if(!strcmp(pszValue, pData->pszValue)) {
-+ /* count for (value and key and appname) matched */
-+ pData->valueCounter++;
-+ json = json_object_new_int(pData->valueCounter);
-+ }
-+ ABORT_FINALIZE(RS_RET_OK);
-+ }
-+
-+ /* value is not given, so we count for each value of given key */
-+ pCounter = getCounter(pData->ht, pszValue);
-+ if(pCounter) {
-+ (*pCounter)++;
-+ json = json_object_new_int(*pCounter);
-+ }
-+finalize_it:
-+ if(estr) {
-+ es_deleteStr(estr);
-+ }
-+
-+ if(json) {
-+ msgAddJSON(pMsg, (uchar *)JSON_COUNT_NAME, json);
-+ }
-+ENDdoAction
-+
-+
-+BEGINparseSelectorAct
-+CODESTARTparseSelectorAct
-+CODE_STD_STRING_REQUESTparseSelectorAct(1)
-+ if(strncmp((char*) p, ":mmcount:", sizeof(":mmcount:") - 1)) {
-+ errmsg.LogError(0, RS_RET_LEGA_ACT_NOT_SUPPORTED,
-+ "mmcount supports only v6+ config format, use: "
-+ "action(type=\"mmcount\" ...)");
-+ }
-+ ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED);
-+CODE_STD_FINALIZERparseSelectorAct
-+ENDparseSelectorAct
-+
-+
-+BEGINmodExit
-+CODESTARTmodExit
-+ objRelease(errmsg, CORE_COMPONENT);
-+ENDmodExit
-+
-+
-+BEGINqueryEtryPt
-+CODESTARTqueryEtryPt
-+CODEqueryEtryPt_STD_OMOD_QUERIES
-+CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES
-+CODEqueryEtryPt_STD_CONF2_QUERIES
-+ENDqueryEtryPt
-+
-+
-+
-+BEGINmodInit()
-+CODESTARTmodInit
-+ *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
-+CODEmodInit_QueryRegCFSLineHdlr
-+ DBGPRINTF("mmcount: module compiled with rsyslog version %s.\n", VERSION);
-+ CHKiRet(objUse(errmsg, CORE_COMPONENT));
-+ENDmodInit
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1151041-imuxsock-socket-limit.patch b/SOURCES/rsyslog-7.4.7-rhbz1151041-imuxsock-socket-limit.patch
deleted file mode 100644
index 13d9490..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1151041-imuxsock-socket-limit.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-From 85f48d11900ade931cc667750b8dd69e7fa656ef Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Thu, 23 Jul 2015 17:28:50 +0200
-Subject: [PATCH] imuxsock: handle unlimited number of listeners
-
----
- plugins/imuxsock/imuxsock.c | 258 ++++++++++++++++++++++----------------------
- 1 file changed, 130 insertions(+), 128 deletions(-)
-
-diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
-index 8fda133..eca9a34 100644
---- a/plugins/imuxsock/imuxsock.c
-+++ b/plugins/imuxsock/imuxsock.c
-@@ -62,7 +62,6 @@ MODULE_TYPE_NOKEEP
- MODULE_CNFNAME("imuxsock")
-
- /* defines */
--#define MAXFUNIX 50
- #ifndef _PATH_LOG
- #ifdef BSD
- #define _PATH_LOG "/var/run/log"
-@@ -148,7 +147,7 @@ typedef struct lstn_s {
- sbool bUseSysTimeStamp; /* use timestamp from system (instead of from message) */
- sbool bUnlink; /* unlink&re-create socket at start and end of processing */
- } lstn_t;
--static lstn_t listeners[MAXFUNIX];
-+static lstn_t *listeners;
-
- static prop_t *pLocalHostIP = NULL; /* there is only one global IP for all internally-generated messages */
- static prop_t *pInputName = NULL; /* our inputName currently is always "imudp", and this will hold it */
-@@ -360,12 +359,7 @@ finalize_it:
- }
-
-
--/* add an additional listen socket. Socket names are added
-- * until the array is filled up. It is never reset, only at
-- * module unload.
-- * TODO: we should change the array to a list so that we
-- * can support any number of listen socket names.
-- * rgerhards, 2007-12-20
-+/* add an additional listen socket.
- * added capability to specify hostname for socket -- rgerhards, 2008-08-01
- */
- static rsRetVal
-@@ -373,66 +367,70 @@ addListner(instanceConf_t *inst)
- {
- DEFiRet;
-
-- if(nfd < MAXFUNIX) {
-- if(*inst->sockName == ':') {
-- listeners[nfd].bParseHost = 1;
-- } else {
-- listeners[nfd].bParseHost = 0;
-- }
-- if(inst->pLogHostName == NULL) {
-- listeners[nfd].hostName = NULL;
-- } else {
-- CHKiRet(prop.Construct(&(listeners[nfd].hostName)));
-- CHKiRet(prop.SetString(listeners[nfd].hostName, inst->pLogHostName, ustrlen(inst->pLogHostName)));
-- CHKiRet(prop.ConstructFinalize(listeners[nfd].hostName));
-- }
-- if(inst->ratelimitInterval > 0) {
-- if((listeners[nfd].ht = create_hashtable(100, hash_from_key_fn, key_equals_fn,
-- (void(*)(void*))ratelimitDestruct)) == NULL) {
-- /* in this case, we simply turn off rate-limiting */
-- DBGPRINTF("imuxsock: turning off rate limiting because we could not "
-- "create hash table\n");
-- inst->ratelimitInterval = 0;
-- }
-+ if(*inst->sockName == ':') {
-+ listeners[nfd].bParseHost = 1;
-+ } else {
-+ listeners[nfd].bParseHost = 0;
-+ }
-+ if(inst->pLogHostName == NULL) {
-+ listeners[nfd].hostName = NULL;
-+ } else {
-+ CHKiRet(prop.Construct(&(listeners[nfd].hostName)));
-+ CHKiRet(prop.SetString(listeners[nfd].hostName, inst->pLogHostName, ustrlen(inst->pLogHostName)));
-+ CHKiRet(prop.ConstructFinalize(listeners[nfd].hostName));
-+ }
-+ if(inst->ratelimitInterval > 0) {
-+ if((listeners[nfd].ht = create_hashtable(100, hash_from_key_fn, key_equals_fn,
-+ (void(*)(void*))ratelimitDestruct)) == NULL) {
-+ /* in this case, we simply turn off rate-limiting */
-+ DBGPRINTF("imuxsock: turning off rate limiting because we could not "
-+ "create hash table\n");
-+ inst->ratelimitInterval = 0;
- }
-- listeners[nfd].ratelimitInterval = inst->ratelimitInterval;
-- listeners[nfd].ratelimitBurst = inst->ratelimitBurst;
-- listeners[nfd].ratelimitSev = inst->ratelimitSeverity;
-- listeners[nfd].flowCtl = inst->bUseFlowCtl ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY;
-- listeners[nfd].flags = inst->bIgnoreTimestamp ? IGNDATE : NOFLAG;
-- listeners[nfd].bCreatePath = inst->bCreatePath;
-- listeners[nfd].sockName = ustrdup(inst->sockName);
-- listeners[nfd].bUseCreds = (inst->bDiscardOwnMsgs || inst->bWritePid || inst->ratelimitInterval || inst->bAnnotate || inst->bUseSysTimeStamp) ? 1 : 0;
-- listeners[nfd].bAnnotate = inst->bAnnotate;
-- listeners[nfd].bParseTrusted = inst->bParseTrusted;
-- listeners[nfd].bDiscardOwnMsgs = inst->bDiscardOwnMsgs;
-- listeners[nfd].bUnlink = inst->bUnlink;
-- listeners[nfd].bWritePid = inst->bWritePid;
-- listeners[nfd].bUseSysTimeStamp = inst->bUseSysTimeStamp;
-- CHKiRet(ratelimitNew(&listeners[nfd].dflt_ratelimiter, "imuxsock", NULL));
-- ratelimitSetLinuxLike(listeners[nfd].dflt_ratelimiter,
-- listeners[nfd].ratelimitInterval,
-- listeners[nfd].ratelimitBurst);
-- ratelimitSetSeverity(listeners[nfd].dflt_ratelimiter,
-- listeners[nfd].ratelimitSev);
-- nfd++;
- } else {
-- errmsg.LogError(0, NO_ERRCODE, "Out of unix socket name descriptors, ignoring %s\n",
-- inst->sockName);
-+ listeners[nfd].ht = NULL;
- }
-+ listeners[nfd].ratelimitInterval = inst->ratelimitInterval;
-+ listeners[nfd].ratelimitBurst = inst->ratelimitBurst;
-+ listeners[nfd].ratelimitSev = inst->ratelimitSeverity;
-+ listeners[nfd].flowCtl = inst->bUseFlowCtl ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY;
-+ listeners[nfd].flags = inst->bIgnoreTimestamp ? IGNDATE : NOFLAG;
-+ listeners[nfd].bCreatePath = inst->bCreatePath;
-+ listeners[nfd].sockName = ustrdup(inst->sockName);
-+ listeners[nfd].bUseCreds = (inst->bDiscardOwnMsgs || inst->bWritePid || inst->ratelimitInterval || inst->bAnnotate || runModConf->bUseSysTimeStamp) ? 1 : 0;
-+ listeners[nfd].bAnnotate = inst->bAnnotate;
-+ listeners[nfd].bParseTrusted = inst->bParseTrusted;
-+ listeners[nfd].bDiscardOwnMsgs = inst->bDiscardOwnMsgs;
-+ listeners[nfd].bUnlink = inst->bUnlink;
-+ listeners[nfd].bWritePid = inst->bWritePid;
-+ listeners[nfd].bUseSysTimeStamp = inst->bUseSysTimeStamp;
-+ CHKiRet(ratelimitNew(&listeners[nfd].dflt_ratelimiter, "imuxsock", NULL));
-+ ratelimitSetLinuxLike(listeners[nfd].dflt_ratelimiter,
-+ listeners[nfd].ratelimitInterval,
-+ listeners[nfd].ratelimitBurst);
-+ ratelimitSetSeverity(listeners[nfd].dflt_ratelimiter,
-+ listeners[nfd].ratelimitSev);
-+ nfd++;
-
- finalize_it:
- RETiRet;
- }
-
-
--/* discard/Destruct all log sockets except for "socket" 0. Data for it comes from
-- * the constant memory pool - and if not, it is freeed via some other pointer.
-- */
- static rsRetVal discardLogSockets(void)
- {
- int i;
-
-+ /* Check whether the system socket is in use */
-+ if(startIndexUxLocalSockets == 0) {
-+ /* Clean up rate limiting data for the system socket */
-+ if(listeners[0].ht != NULL) {
-+ hashtable_destroy(listeners[0].ht, 1); /* 1 => free all values automatically */
-+ }
-+ ratelimitDestruct(listeners[0].dflt_ratelimiter);
-+ }
-+
-+ /* Clean up all other sockets */
- for (i = 1; i < nfd; i++) {
- if(listeners[i].sockName != NULL) {
- free(listeners[i].sockName);
-@@ -1033,50 +1031,51 @@ activateListeners()
- int actSocks;
- DEFiRet;
-
-- /* first apply some config settings */
--# ifdef OS_SOLARIS
-- /* under solaris, we must NEVER process the local log socket, because
-- * it is implemented there differently. If we used it, we would actually
-- * delete it and render the system partly unusable. So don't do that.
-- * rgerhards, 2010-03-26
-- */
-- startIndexUxLocalSockets = 1;
--# else
-- startIndexUxLocalSockets = runModConf->bOmitLocalLogging ? 1 : 0;
--# endif
-- if(runModConf->pLogSockName != NULL)
-- listeners[0].sockName = runModConf->pLogSockName;
-- else if(sd_booted()) {
-- struct stat st;
-- if(stat(SYSTEMD_PATH_LOG, &st) != -1 && S_ISSOCK(st.st_mode)) {
-- listeners[0].sockName = (uchar*) SYSTEMD_PATH_LOG;
-+ /* Initialize the system socket only if it's in use */
-+ if(startIndexUxLocalSockets == 0) {
-+ /* first apply some config settings */
-+ listeners[0].sockName = UCHAR_CONSTANT(_PATH_LOG);
-+ if(runModConf->pLogSockName != NULL)
-+ listeners[0].sockName = runModConf->pLogSockName;
-+ else if(sd_booted()) {
-+ struct stat st;
-+ if(stat(SYSTEMD_PATH_LOG, &st) != -1 && S_ISSOCK(st.st_mode)) {
-+ listeners[0].sockName = (uchar*) SYSTEMD_PATH_LOG;
-+ }
- }
-- }
-- if(runModConf->ratelimitIntervalSysSock > 0) {
-- if((listeners[0].ht = create_hashtable(100, hash_from_key_fn, key_equals_fn, NULL)) == NULL) {
-- /* in this case, we simply turn of rate-limiting */
-- errmsg.LogError(0, NO_ERRCODE, "imuxsock: turning off rate limiting because we could not "
-- "create hash table\n");
-- runModConf->ratelimitIntervalSysSock = 0;
-+ if(runModConf->ratelimitIntervalSysSock > 0) {
-+ if((listeners[0].ht = create_hashtable(100, hash_from_key_fn, key_equals_fn, NULL)) == NULL) {
-+ /* in this case, we simply turn of rate-limiting */
-+ errmsg.LogError(0, NO_ERRCODE, "imuxsock: turning off rate limiting because we could not "
-+ "create hash table\n");
-+ runModConf->ratelimitIntervalSysSock = 0;
-+ }
-+ } else {
-+ listeners[0].ht = NULL;
- }
-- }
-- listeners[0].ratelimitInterval = runModConf->ratelimitIntervalSysSock;
-- listeners[0].ratelimitBurst = runModConf->ratelimitBurstSysSock;
-- listeners[0].ratelimitSev = runModConf->ratelimitSeveritySysSock;
-- listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs || runModConf->bUseSysTimeStamp) ? 1 : 0;
-- listeners[0].bWritePid = runModConf->bWritePidSysSock;
-- listeners[0].bAnnotate = runModConf->bAnnotateSysSock;
-- listeners[0].bParseTrusted = runModConf->bParseTrusted;
-- listeners[0].bDiscardOwnMsgs = runModConf->bDiscardOwnMsgs;
-- listeners[0].bUnlink = runModConf->bUnlink;
-- listeners[0].bUseSysTimeStamp = runModConf->bUseSysTimeStamp;
-- listeners[0].flags = runModConf->bIgnoreTimestamp ? IGNDATE : NOFLAG;
-- listeners[0].flowCtl = runModConf->bUseFlowCtl ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY;
-- CHKiRet(ratelimitNew(&listeners[0].dflt_ratelimiter, "imuxsock", NULL));
-+ listeners[0].fd = -1;
-+ listeners[0].hostName = NULL;
-+ listeners[0].bParseHost = 0;
-+ listeners[0].bCreatePath = 0;
-+ listeners[0].ratelimitInterval = runModConf->ratelimitIntervalSysSock;
-+ listeners[0].ratelimitBurst = runModConf->ratelimitBurstSysSock;
-+ listeners[0].ratelimitSev = runModConf->ratelimitSeveritySysSock;
-+ listeners[0].bUseCreds = (runModConf->bWritePidSysSock || runModConf->ratelimitIntervalSysSock || runModConf->bAnnotateSysSock || runModConf->bDiscardOwnMsgs || runModConf->bUseSysTimeStamp) ? 1 : 0;
-+ listeners[0].bWritePid = runModConf->bWritePidSysSock;
-+ listeners[0].bAnnotate = runModConf->bAnnotateSysSock;
-+ listeners[0].bParseTrusted = runModConf->bParseTrusted;
-+ listeners[0].bDiscardOwnMsgs = runModConf->bDiscardOwnMsgs;
-+ listeners[0].bUnlink = runModConf->bUnlink;
-+ listeners[0].bUseSysTimeStamp = runModConf->bUseSysTimeStamp;
-+ listeners[0].flags = runModConf->bIgnoreTimestamp ? IGNDATE : NOFLAG;
-+ listeners[0].flowCtl = runModConf->bUseFlowCtl ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY;
-+ CHKiRet(ratelimitNew(&listeners[0].dflt_ratelimiter, "imuxsock", NULL));
-+
- ratelimitSetLinuxLike(listeners[0].dflt_ratelimiter,
-- listeners[0].ratelimitInterval,
-- listeners[0].ratelimitBurst);
-- ratelimitSetSeverity(listeners[0].dflt_ratelimiter,listeners[0].ratelimitSev);
-+ listeners[0].ratelimitInterval,
-+ listeners[0].ratelimitBurst);
-+ ratelimitSetSeverity(listeners[0].dflt_ratelimiter,listeners[0].ratelimitSev);
-+ }
-
- sd_fds = sd_listen_fds(0);
- if(sd_fds < 0) {
-@@ -1286,12 +1284,39 @@ ENDcheckCnf
-
- BEGINactivateCnfPrePrivDrop
- instanceConf_t *inst;
-+ int nLstn;
-+ int i;
- CODESTARTactivateCnfPrePrivDrop
- runModConf = pModConf;
-+# ifdef OS_SOLARIS
-+ /* under solaris, we must NEVER process the local log socket, because
-+ * it is implemented there differently. If we used it, we would actually
-+ * delete it and render the system partly unusable. So don't do that.
-+ * rgerhards, 2010-03-26
-+ */
-+ startIndexUxLocalSockets = 1;
-+# else
-+ startIndexUxLocalSockets = runModConf->bOmitLocalLogging ? 1 : 0;
-+# endif
-+ /* we first calculate the number of listeners so that we can
-+ * appropriately size the listener array.
-+ */
-+ nLstn = 0;
- for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
-- addListner(inst);
-+ ++nLstn;
-+ }
-+ if(nLstn > 0 || startIndexUxLocalSockets == 0) {
-+ DBGPRINTF("imuxsock: allocating memory for %d listeners\n", nLstn);
-+ CHKmalloc(listeners = realloc(listeners, (1+nLstn)*sizeof(lstn_t)));
-+ for(i = 1 ; i < nLstn ; ++i) {
-+ listeners[i].sockName = NULL;
-+ listeners[i].fd = -1;
-+ }
-+ for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
-+ addListner(inst);
-+ }
-+ CHKiRet(activateListeners());
- }
-- CHKiRet(activateListeners());
- finalize_it:
- ENDactivateCnfPrePrivDrop
-
-@@ -1329,6 +1354,11 @@ BEGINrunInput
- #endif
-
- CODESTARTrunInput
-+ CHKmalloc(pReadfds);
-+ if(startIndexUxLocalSockets == 1 && nfd == 1) {
-+ /* No sockets were configured, no reason to run. */
-+ ABORT_FINALIZE(RS_RET_OK);
-+ }
- /* this is an endless loop - it is terminated when the thread is
- * signalled to do so. This, however, is handled by the framework,
- * right into the sleep below.
-@@ -1364,7 +1394,7 @@ CODESTARTrunInput
- if(glbl.GetGlobalInputTermState() == 1)
- break; /* terminate input! */
-
-- for (i = 0; i < nfd && nfds > 0; i++) {
-+ for (i = startIndexUxLocalSockets; i < nfd && nfds > 0; i++) {
- if(glbl.GetGlobalInputTermState() == 1)
- ABORT_FINALIZE(RS_RET_FORCE_TERM); /* terminate input! */
- if ((fd = listeners[i].fd) != -1 && FD_ISSET(fd, pReadfds)) {
-@@ -1419,6 +1449,7 @@ ENDafterRun
-
- BEGINmodExit
- CODESTARTmodExit
-+ free(listeners);
- if(pInputName != NULL)
- prop.Destruct(&pInputName);
-
-@@ -1481,7 +1512,6 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
-
-
- BEGINmodInit()
-- int i;
- CODESTARTmodInit
- *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
- CODEmodInit_QueryRegCFSLineHdlr
-@@ -1511,34 +1541,6 @@ CODEmodInit_QueryRegCFSLineHdlr
- */
- pLocalHostIP = glbl.GetLocalHostIP();
-
-- /* init system log socket settings */
-- listeners[0].flags = IGNDATE;
-- listeners[0].sockName = UCHAR_CONSTANT(_PATH_LOG);
-- listeners[0].hostName = NULL;
-- listeners[0].flowCtl = eFLOWCTL_NO_DELAY;
-- listeners[0].fd = -1;
-- listeners[0].bParseHost = 0;
-- listeners[0].bUseCreds = 0;
-- listeners[0].bAnnotate = 0;
-- listeners[0].bParseTrusted = 0;
-- listeners[0].bDiscardOwnMsgs = 1;
-- listeners[0].bUnlink = 1;
-- listeners[0].bCreatePath = 0;
-- listeners[0].bUseSysTimeStamp = 1;
-- if((listeners[0].ht = create_hashtable(100, hash_from_key_fn, key_equals_fn,
-- (void(*)(void*))ratelimitDestruct)) == NULL) {
-- /* in this case, we simply turn off rate-limiting */
-- DBGPRINTF("imuxsock: turning off rate limiting for system socket "
-- "because we could not create hash table\n");
-- listeners[0].ratelimitInterval = 0;
-- }
--
-- /* initialize socket names */
-- for(i = 1 ; i < MAXFUNIX ; ++i) {
-- listeners[i].sockName = NULL;
-- listeners[i].fd = -1;
-- }
--
- /* register config file handlers */
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputunixlistensocketignoremsgtimestamp", 0, eCmdHdlrBinary,
- NULL, &cs.bIgnoreTimestamp, STD_LOADABLE_MODULE_ID));
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1184402-imuxsock-hostname.patch b/SOURCES/rsyslog-7.4.7-rhbz1184402-imuxsock-hostname.patch
deleted file mode 100644
index 4c4971d..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1184402-imuxsock-hostname.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d989a9a24c5749c9e30ed33a5443cd659f56109e Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Wed, 22 Apr 2015 14:13:34 +0200
-Subject: [PATCH] imuxsock: fix a crash when setting a hostname
-
-Setting a hostname via the legacy directive would lead to a crash
-during shutdown caused by a double-free.
----
- plugins/imuxsock/imuxsock.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
-index eca9a34..90fc49e 100644
---- a/plugins/imuxsock/imuxsock.c
-+++ b/plugins/imuxsock/imuxsock.c
-@@ -350,8 +350,7 @@ static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
- inst->bParseTrusted = cs.bParseTrusted;
- inst->next = NULL;
-
-- /* some legacy conf processing */
-- free(cs.pLogHostName); /* reset hostname for next socket */
-+ /* reset hostname for next socket */
- cs.pLogHostName = NULL;
-
- finalize_it:
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1184410-imuxsock-create-path.patch b/SOURCES/rsyslog-7.4.7-rhbz1184410-imuxsock-create-path.patch
deleted file mode 100644
index 79bd6a1..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1184410-imuxsock-create-path.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From cd5fccc6a3534d06b9a0a4d8c2669c48f9cede6a Mon Sep 17 00:00:00 2001
-From: Andy Goldstein <andy.goldstein@gmail.com>
-Date: Mon, 13 Jan 2014 12:46:54 -0700
-Subject: [PATCH] Fix instance configuration
-
-Correct typo in newInpInst so it uses inppblk instead of modpblk when
-configuring the instance.
----
- plugins/imuxsock/imuxsock.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
-index df504dd..8fda133 100644
---- a/plugins/imuxsock/imuxsock.c
-+++ b/plugins/imuxsock/imuxsock.c
-@@ -1216,31 +1216,31 @@ CODESTARTnewInpInst
- continue;
- if(!strcmp(inppblk.descr[i].name, "socket")) {
- inst->sockName = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
-- } else if(!strcmp(modpblk.descr[i].name, "createpath")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "createpath")) {
- inst->bCreatePath = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "parsetrusted")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "parsetrusted")) {
- inst->bParseTrusted = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "ignoreownmessages")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "ignoreownmessages")) {
- inst->bDiscardOwnMsgs = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "unlink")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "unlink")) {
- inst->bUnlink = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "hostname")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "hostname")) {
- inst->pLogHostName = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
-- } else if(!strcmp(modpblk.descr[i].name, "ignoretimestamp")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "ignoretimestamp")) {
- inst->bIgnoreTimestamp = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "flowcontrol")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "flowcontrol")) {
- inst->bUseFlowCtl = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "usesystimestamp")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "usesystimestamp")) {
- inst->bUseSysTimeStamp = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "annotate")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "annotate")) {
- inst->bAnnotate = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "usepidfromsystem")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "usepidfromsystem")) {
- inst->bWritePid = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "ratelimit.interval")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "ratelimit.interval")) {
- inst->ratelimitInterval = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "ratelimit.burst")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "ratelimit.burst")) {
- inst->ratelimitBurst = (int) pvals[i].val.d.n;
-- } else if(!strcmp(modpblk.descr[i].name, "ratelimit.severity")) {
-+ } else if(!strcmp(inppblk.descr[i].name, "ratelimit.severity")) {
- inst->ratelimitSeverity = (int) pvals[i].val.d.n;
- } else {
- dbgprintf("imuxsock: program error, non-handled "
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1188503-imjournal-default-tag.patch b/SOURCES/rsyslog-7.4.7-rhbz1188503-imjournal-default-tag.patch
deleted file mode 100644
index a87ac18..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1188503-imjournal-default-tag.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 4d68698ecaa4b13927352ce6bff74a0b6767abca Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Fri, 24 Apr 2015 23:51:20 +0200
-Subject: [PATCH] imjournal: enable setting a default message tag
-
----
- plugins/imjournal/imjournal.c | 62 ++++++++++++++++++++++++++++++-------------
- 1 file changed, 43 insertions(+), 19 deletions(-)
-
-diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index b6910e8..cd22c3a 100755
---- a/plugins/imjournal/imjournal.c
-+++ b/plugins/imjournal/imjournal.c
-@@ -72,6 +72,7 @@ static struct configSettings_s {
- int bIgnorePrevious;
- int iDfltSeverity;
- int iDfltFacility;
-+ char *dfltTag;
- } cs;
-
- static rsRetVal facilityHdlr(uchar **pp, void *pVal);
-@@ -84,7 +85,8 @@ static struct cnfparamdescr modpdescr[] = {
- { "persiststateinterval", eCmdHdlrInt, 0 },
- { "ignorepreviousmessages", eCmdHdlrBinary, 0 },
- { "defaultseverity", eCmdHdlrSeverity, 0 },
-- { "defaultfacility", eCmdHdlrString, 0 }
-+ { "defaultfacility", eCmdHdlrString, 0 },
-+ { "defaulttag", eCmdHdlrGetWord, 0 },
- };
- static struct cnfparamblk modpblk =
- { CNFPARAMBLK_VERSION,
-@@ -95,6 +97,7 @@ static struct cnfparamblk modpblk =
- #define DFLT_persiststateinterval 10
- #define DFLT_SEVERITY LOG_PRI(LOG_NOTICE)
- #define DFLT_FACILITY LOG_FAC(LOG_USER)
-+#define DFLT_TAG "journal"
-
- static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */
-
-@@ -183,8 +186,13 @@ enqMsg(uchar *msg, uchar *pszTag, int iFacility, int iSeverity, struct timeval *
- }
- MsgSetFlowControlType(pMsg, eFLOWCTL_LIGHT_DELAY);
- MsgSetInputName(pMsg, pInputName);
-+ /* Recalculating the message length shouldn't cause problems as all
-+ * potential zero-bytes have been escaped in sanitizeValue(). */
- len = strlen((char*)msg);
- MsgSetRawMsg(pMsg, (char*)msg, len);
-+ /* NB: SanitizeMsg() only touches the raw message and its
-+ * length which only contain the msg part. Thus the TAG and
-+ * other fields are not sanitized. */
- if(len > 0)
- parser.SanitizeMsg(pMsg);
- MsgSetMSGoffs(pMsg, 0); /* we do not have a header... */
-@@ -221,7 +229,7 @@ readjournal() {
-
- /* Information from messages */
- char *message = NULL;
-- char *sys_iden;
-+ char *sys_iden = NULL;
- char *sys_iden_help = NULL;
-
- const void *get;
-@@ -283,27 +291,37 @@ readjournal() {
- /* Get message identifier, client pid and add ':' */
- if (sd_journal_get_data(j, "SYSLOG_IDENTIFIER", &get, &length) >= 0) {
- CHKiRet(sanitizeValue(((const char *)get) + 18, length - 18, &sys_iden));
-- } else {
-- CHKmalloc(sys_iden = strdup("journal"));
- }
-
-- if (sd_journal_get_data(j, "SYSLOG_PID", &pidget, &pidlength) >= 0) {
-- char *sys_pid;
-+ if (sys_iden == NULL && !cs.dfltTag[0]) {
-+ /* This is a special case: if no tag was obtained from
-+ * the message and the user has set the default tag to
-+ * an empty string, nothing is inserted.
-+ */
-+ CHKmalloc(sys_iden_help = calloc(1, 1));
-+ } else {
-+ if (sys_iden == NULL) {
-+ /* Use a predefined tag if it can't be obtained from the message */
-+ CHKmalloc(sys_iden = strdup(cs.dfltTag));
-+ }
-+ if (sd_journal_get_data(j, "SYSLOG_PID", &pidget, &pidlength) >= 0) {
-+ char *sys_pid;
-
-- CHKiRet_Hdlr(sanitizeValue(((const char *)pidget) + 11, pidlength - 11, &sys_pid)) {
-- free (sys_iden);
-- FINALIZE;
-+ CHKiRet_Hdlr(sanitizeValue(((const char *)pidget) + 11, pidlength - 11, &sys_pid)) {
-+ free (sys_iden);
-+ FINALIZE;
-+ }
-+ r = asprintf(&sys_iden_help, "%s[%s]:", sys_iden, sys_pid);
-+ free (sys_pid);
-+ } else {
-+ r = asprintf(&sys_iden_help, "%s:", sys_iden);
- }
-- r = asprintf(&sys_iden_help, "%s[%s]:", sys_iden, sys_pid);
-- free (sys_pid);
-- } else {
-- r = asprintf(&sys_iden_help, "%s:", sys_iden);
-- }
-
-- free (sys_iden);
-+ free (sys_iden);
-
-- if (-1 == r) {
-- ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-+ if (-1 == r) {
-+ ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-+ }
- }
-
- json = json_object_new_object();
-@@ -628,11 +646,14 @@ CODESTARTbeginCnfLoad
- cs.ratelimitInterval = 600;
- cs.iDfltSeverity = DFLT_SEVERITY;
- cs.iDfltFacility = DFLT_FACILITY;
-+ cs.dfltTag = NULL;
- ENDbeginCnfLoad
-
-
- BEGINendCnfLoad
- CODESTARTendCnfLoad
-+ if (cs.dfltTag == NULL)
-+ cs.dfltTag = strdup(DFLT_TAG);
- ENDendCnfLoad
-
-
-@@ -648,6 +669,7 @@ ENDactivateCnf
-
- BEGINfreeCnf
- CODESTARTfreeCnf
-+ free(cs.dfltTag);
- ENDfreeCnf
-
- /* open journal */
-@@ -728,6 +750,8 @@ CODESTARTsetModCnf
- fac = p = es_str2cstr(pvals[i].val.d.estr, NULL);
- facilityHdlr((uchar **) &p, (void *) &cs.iDfltFacility);
- free(fac);
-+ } else if (!strcmp(modpblk.descr[i].name, "defaulttag")) {
-+ cs.dfltTag = (char *)es_str2cstr(pvals[i].val.d.estr, NULL);
- } else {
- dbgprintf("imjournal: program error, non-handled "
- "param '%s' in beginCnfLoad\n", modpblk.descr[i].name);
-@@ -786,8 +810,8 @@ CODEmodInit_QueryRegCFSLineHdlr
- NULL, &cs.iDfltSeverity, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaultfacility", 0, eCmdHdlrCustomHandler,
- facilityHdlr, &cs.iDfltFacility, STD_LOADABLE_MODULE_ID));
--
--
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaulttag", 0, eCmdHdlrGetWord,
-+ NULL, &cs.dfltTag, STD_LOADABLE_MODULE_ID));
- ENDmodInit
- /* vim:set ai:
- */
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1202489-path-creation-race.patch b/SOURCES/rsyslog-7.4.7-rhbz1202489-path-creation-race.patch
deleted file mode 100644
index de11ba4..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1202489-path-creation-race.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 625f4b9aacfa7fa226949c8d5a36c298196432ea Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Wed, 8 Jul 2015 17:16:46 +0200
-Subject: [PATCH] Fix race-condition detection in path-creation code
-
-The affected code is used to detect a race condition in between
-testing for the existence of a directory and creating it if it didn't
-exist. The variable tracking the number of attempts wasn't reset for
-subsequent elements in the path, thus limiting the number of
-reattempts to one per the whole path, instead of one per each path
-element.
-
-It appears the detection never actually worked due to wrong error
-checking. errno needs to be checked to determin the reason for the
-failure.
----
- runtime/srutils.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/runtime/srutils.c b/runtime/srutils.c
-index 6a509b4..e66c1cd 100644
---- a/runtime/srutils.c
-+++ b/runtime/srutils.c
-@@ -195,7 +195,6 @@ int makeFileParentDirs(uchar *szFile, size_t lenFile, mode_t mode,
- uchar *p;
- uchar *pszWork;
- size_t len;
-- int err;
- int iTry = 0;
- int bErr = 0;
-
-@@ -210,9 +209,10 @@ int makeFileParentDirs(uchar *szFile, size_t lenFile, mode_t mode,
- if(*p == '/') {
- /* temporarily terminate string, create dir and go on */
- *p = '\0';
-+ iTry = 0;
- again:
- if(access((char*)pszWork, F_OK)) {
-- if((err = mkdir((char*)pszWork, mode)) == 0) {
-+ if(mkdir((char*)pszWork, mode) == 0) {
- if(uid != (uid_t) -1 || gid != (gid_t) -1) {
- /* we need to set owner/group */
- if(chown((char*)pszWork, uid, gid) != 0)
-@@ -223,7 +223,7 @@ again:
- */
- }
- } else {
-- if(err == EEXIST && iTry == 0) {
-+ if(errno == EEXIST && iTry == 0) {
- iTry = 1;
- goto again;
- }
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1214257-maxMessageSize.patch b/SOURCES/rsyslog-7.4.7-rhbz1214257-maxMessageSize.patch
deleted file mode 100644
index 88fa1c6..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1214257-maxMessageSize.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From bbd8c8c7176148702a737b8df62132cd1e078627 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Tue, 13 Jan 2015 09:54:41 +0100
-Subject: [PATCH] bugfixes for maxMessageSize global parameter
-
-closely related, thus done in a single commit:
-
-- bugfix: invalid data size for iMaxLine global property
- It was defined as int, but inside the config system it was declared as
- size type, which uses int64_t. With legacy config statements, this could
- lead to misadressing, which usually meant the another config variable was
- overwritten (depending on memory layout).
- closes https://github.com/rsyslog/rsyslog/issues/205
-
-- bugfix: negative values for maxMessageSize global parameter were permitted
----
- runtime/glbl.c | 43 ++++++++++++++++++++++++++++++++++++-------
- runtime/glbl.h | 7 ++++---
- 2 files changed, 40 insertions(+), 10 deletions(-)
-
-diff --git a/runtime/glbl.c b/runtime/glbl.c
-index c57cedf..bfe0b0e 100644
---- a/runtime/glbl.c
-+++ b/runtime/glbl.c
-@@ -7,7 +7,7 @@
- *
- * Module begun 2008-04-16 by Rainer Gerhards
- *
-- * Copyright 2008-2013 Rainer Gerhards and Adiscon GmbH.
-+ * Copyright 2008-2015 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of the rsyslog runtime library.
- *
-@@ -116,6 +116,12 @@ static struct cnfparamvals *cnfparamvals = NULL;
- * each time a new config load begins (TODO: create interface?)
- */
-
-+static int
-+GetMaxLine(void)
-+{
-+ return(iMaxLine);
-+}
-+
- /* define a macro for the simple properties' set and get functions
- * (which are always the same). This is only suitable for pretty
- * simple cases which require neither checks nor memory allocation.
-@@ -138,7 +144,6 @@ static dataType Get##nameFunc(void) \
- SIMP_PROP(ParseHOSTNAMEandTAG, bParseHOSTNAMEandTAG, int)
- SIMP_PROP(OptimizeUniProc, bOptimizeUniProc, int)
- SIMP_PROP(PreserveFQDN, bPreserveFQDN, int)
--SIMP_PROP(MaxLine, iMaxLine, int)
- SIMP_PROP(DefPFFamily, iDefPFFamily, int) /* note that in the future we may check the family argument */
- SIMP_PROP(DropMalPTRMsgs, bDropMalPTRMsgs, int)
- SIMP_PROP(Option_DisallowWarning, option_DisallowWarning, int)
-@@ -282,6 +287,32 @@ finalize_it:
- }
-
-
-+/* This function is used both by legacy and RainerScript conf. It is a real setter. */
-+static rsRetVal
-+setMaxLine(const int64_t iNew)
-+{
-+ if(iNew < 128) {
-+ errmsg.LogError(0, RS_RET_INVALID_VALUE, "maxMessageSize tried to set "
-+ "to %lld, but cannot be less than 128 - set to 128 "
-+ "instead", (long long) iNew);
-+ iMaxLine = 128;
-+ } else if(iNew > (int64_t) INT_MAX) {
-+ errmsg.LogError(0, RS_RET_INVALID_VALUE, "maxMessageSize larger than "
-+ "INT_MAX (%d) - reduced to INT_MAX", INT_MAX);
-+ iMaxLine = INT_MAX;
-+ } else {
-+ iMaxLine = (int) iNew;
-+ }
-+}
-+
-+static rsRetVal
-+legacySetMaxMessageSize(void __attribute__((unused)) *pVal, int64_t iNew)
-+{
-+ DEFiRet;
-+ iRet = setMaxLine(iNew);
-+ RETiRet;
-+}
-+
- static rsRetVal
- setDebugFile(void __attribute__((unused)) *pVal, uchar *pNewVal)
- {
-@@ -534,10 +565,10 @@ CODESTARTobjQueryInterface(glbl)
- pIf->GetLocalHostIP = GetLocalHostIP;
- pIf->SetGlobalInputTermination = SetGlobalInputTermination;
- pIf->GetGlobalInputTermState = GetGlobalInputTermState;
-+ pIf->GetMaxLine = GetMaxLine;
- #define SIMP_PROP(name) \
- pIf->Get##name = Get##name; \
- pIf->Set##name = Set##name;
-- SIMP_PROP(MaxLine);
- SIMP_PROP(OptimizeUniProc);
- SIMP_PROP(ParseHOSTNAMEandTAG);
- SIMP_PROP(PreserveFQDN);
-@@ -561,7 +592,6 @@ CODESTARTobjQueryInterface(glbl)
- finalize_it:
- ENDobjQueryInterface(glbl)
-
--
- /* Reset config variables to default values.
- * rgerhards, 2008-04-17
- */
-@@ -649,7 +679,7 @@ glblDoneLoadCnf(void)
- "dropmsgswithmaliciousdnsptrrecords")) {
- bDropMalPTRMsgs = (int) cnfparamvals[i].val.d.n;
- } else if(!strcmp(paramblk.descr[i].name, "maxmessagesize")) {
-- iMaxLine = (int) cnfparamvals[i].val.d.n;
-+ setMaxLine(cnfparamvals[i].val.d.n);
- } else {
- dbgprintf("glblDoneLoadCnf: program error, non-handled "
- "param '%s'\n", paramblk.descr[i].name);
-@@ -681,8 +711,7 @@ BEGINAbstractObjClassInit(glbl, 1, OBJ_IS_CORE_MODULE) /* class, version */
- CHKiRet(regCfSysLineHdlr((uchar *)"localhostipif", 0, eCmdHdlrGetWord, setLocalHostIPIF, NULL, NULL));
- CHKiRet(regCfSysLineHdlr((uchar *)"optimizeforuniprocessor", 0, eCmdHdlrBinary, NULL, &bOptimizeUniProc, NULL));
- CHKiRet(regCfSysLineHdlr((uchar *)"preservefqdn", 0, eCmdHdlrBinary, NULL, &bPreserveFQDN, NULL));
-- CHKiRet(regCfSysLineHdlr((uchar *)"maxmessagesize", 0, eCmdHdlrSize,
-- NULL, &iMaxLine, NULL));
-+ CHKiRet(regCfSysLineHdlr((uchar *)"maxmessagesize", 0, eCmdHdlrSize, legacySetMaxMessageSize, NULL, NULL));
- CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL));
-
- INIT_ATOMIC_HELPER_MUT(mutTerminateInputs);
-diff --git a/runtime/glbl.h b/runtime/glbl.h
-index 44171f2..b89e202 100644
---- a/runtime/glbl.h
-+++ b/runtime/glbl.h
-@@ -8,7 +8,7 @@
- * Please note that there currently is no glbl.c file as we do not yet
- * have any implementations.
- *
-- * Copyright 2008-2012 Rainer Gerhards and Adiscon GmbH.
-+ * Copyright 2008-2015 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of the rsyslog runtime library.
- *
-@@ -41,10 +41,10 @@ extern pid_t glbl_ourpid;
- /* interfaces */
- BEGINinterface(glbl) /* name must also be changed in ENDinterface macro! */
- uchar* (*GetWorkDir)(void);
-+ int (*GetMaxLine)(void);
- #define SIMP_PROP(name, dataType) \
- dataType (*Get##name)(void); \
- rsRetVal (*Set##name)(dataType);
-- SIMP_PROP(MaxLine, int)
- SIMP_PROP(OptimizeUniProc, int)
- SIMP_PROP(PreserveFQDN, int)
- SIMP_PROP(DefPFFamily, int)
-@@ -81,9 +81,10 @@ BEGINinterface(glbl) /* name must also be changed in ENDinterface macro! */
- /* next change is v9! */
- /* v8 - 2012-03-21 */
- prop_t* (*GetLocalHostIP)(void);
-+ /* v9 - 2015-01-12 SetMaxLine method removed */
- #undef SIMP_PROP
- ENDinterface(glbl)
--#define glblCURR_IF_VERSION 7 /* increment whenever you change the interface structure! */
-+#define glblCURR_IF_VERSION 9 /* increment whenever you change the interface structure! */
- /* version 2 had PreserveFQDN added - rgerhards, 2008-12-08 */
-
- /* the remaining prototypes */
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1216957-imjournal-ste-file.patch b/SOURCES/rsyslog-7.4.7-rhbz1216957-imjournal-ste-file.patch
deleted file mode 100644
index 6c28db5..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1216957-imjournal-ste-file.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 882f404873ab8410455b17c3e7940e5c645bd143 Mon Sep 17 00:00:00 2001
-From: Max Prokhorov <prokhorov.max@outlook.com>
-Date: Sun, 22 Nov 2015 23:15:27 +0300
-Subject: [PATCH] Fix imjournal state file issues
-
-Derived from upstream:
-
-* commit 64af99a:
- imjournal: Initialize counter outside of while loop
-
-* commit 8a10940:
- bugfix: afterRun entry point not correctly called
-
- The entry point was called at the wrong spot, only when the thread
- had not already terminated by itself. This could cause various
- cleanup to not be done.
-
- closes https://github.com/rsyslog/rsyslog/issues/882
-
-* fix a segfault in imuxsock triggered by 8a10940
----
- plugins/imjournal/imjournal.c | 3 ++-
- plugins/imuxsock/imuxsock.c | 4 ++++
- threads.c | 9 +++++----
- 3 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index 36c7e04..65017c6 100755
---- a/plugins/imjournal/imjournal.c
-+++ b/plugins/imjournal/imjournal.c
-@@ -588,6 +588,7 @@ finalize_it:
- }
-
- BEGINrunInput
-+ int count = 0;
- CODESTARTrunInput
- CHKiRet(ratelimitNew(&ratelimiter, "imjournal", NULL));
- dbgprintf("imjournal: ratelimiting burst %d, interval %d\n", cs.ratelimitBurst,
-@@ -603,7 +604,7 @@ CODESTARTrunInput
- * signalled to do so. This, however, is handled by the framework.
- */
- while (glbl.GetGlobalInputTermState() == 0) {
-- int count = 0, r;
-+ int r;
-
- r = sd_journal_next(j);
- if (r < 0) {
-diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
-index df504dd..f50b912 100644
---- a/plugins/imuxsock/imuxsock.c
-+++ b/plugins/imuxsock/imuxsock.c
-@@ -1419,6 +1419,10 @@ BEGINafterRun
- int i;
- CODESTARTafterRun
- /* do cleanup here */
-+ if(startIndexUxLocalSockets == 1 && nfd == 1) {
-+ /* No sockets were configured, no cleanup needed. */
-+ return RS_RET_OK;
-+ }
- /* Close the UNIX sockets. */
- for (i = 0; i < nfd; i++)
- if (listeners[i].fd != -1)
-diff --git a/threads.c b/threads.c
-index 990733a..a38b18f 100644
---- a/threads.c
-+++ b/threads.c
-@@ -79,6 +79,11 @@ static rsRetVal thrdDestruct(thrdInfo_t *pThis)
- if(pThis->bIsActive == 1) {
- thrdTerminate(pThis);
- }
-+
-+ /* call cleanup function, if any */
-+ if(pThis->pAfterRun != NULL)
-+ pThis->pAfterRun(pThis);
-+
- pthread_mutex_destroy(&pThis->mutThrd);
- pthread_cond_destroy(&pThis->condThrdTerm);
- free(pThis->name);
-@@ -148,10 +153,6 @@ rsRetVal thrdTerminate(thrdInfo_t *pThis)
- }
- pthread_join(pThis->thrdID, NULL); /* wait for input thread to complete */
-
-- /* call cleanup function, if any */
-- if(pThis->pAfterRun != NULL)
-- pThis->pAfterRun(pThis);
--
- RETiRet;
- }
-
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1222746-json-race.patch b/SOURCES/rsyslog-7.4.7-rhbz1222746-json-race.patch
deleted file mode 100644
index 3482839..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1222746-json-race.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From f15dc13cab2814bdf40e909b8325e436ee1f3940 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Thu, 14 Jul 2016 03:41:27 +0200
-Subject: [PATCH] Prevent races in calls to json_object_get_string()
-
----
- runtime/msg.c | 10 ++++++++++
- runtime/msg.h | 1 +
- 2 files changed, 11 insertions(+)
-
-diff --git a/runtime/msg.c b/runtime/msg.c
-index 10ecf48..4c82182 100644
---- a/runtime/msg.c
-+++ b/runtime/msg.c
-@@ -716,6 +716,7 @@ static inline rsRetVal msgBaseConstruct(msg_t **ppThis)
- pM->rcvFrom.pRcvFrom = NULL;
- pM->pRuleset = NULL;
- pM->json = NULL;
-+ pthread_mutex_init(&pM->json_mut, NULL);
- memset(&pM->tRcvdAt, 0, sizeof(pM->tRcvdAt));
- memset(&pM->tTIMESTAMP, 0, sizeof(pM->tTIMESTAMP));
- pM->TAG.pszTAG = NULL;
-@@ -861,6 +862,7 @@ CODESTARTobjDestruct(msg)
- rsCStrDestruct(&pThis->pCSMSGID);
- if(pThis->json != NULL)
- json_object_put(pThis->json);
-+ pthread_mutex_destroy(&pThis->json_mut);
- if(pThis->pszUUID != NULL)
- free(pThis->pszUUID);
- # ifndef HAVE_ATOMIC_BUILTINS
-@@ -1065,7 +1067,9 @@ static rsRetVal MsgSerialize(msg_t *pThis, strm_t *pStrm)
- psz = getRcvFromIP(pThis);
- CHKiRet(obj.SerializeProp(pStrm, UCHAR_CONSTANT("pszRcvFromIP"), PROPTYPE_PSZ, (void*) psz));
- if(pThis->json != NULL) {
-+ pthread_mutex_lock(&pThis->json_mut);
- psz = (uchar*) json_object_get_string(pThis->json);
-+ pthread_mutex_unlock(&pThis->json_mut);
- CHKiRet(obj.SerializeProp(pStrm, UCHAR_CONSTANT("json"), PROPTYPE_PSZ, (void*) psz));
- }
-
-@@ -2546,7 +2550,9 @@ getCEEPropVal(msg_t *pM, es_str_t *propName, uchar **pRes, rs_size_t *buflen, un
- field = json_object_object_get(parent, (char*)leaf);
- }
- if(field != NULL) {
-+ pthread_mutex_lock(&pM->json_mut);
- *pRes = (uchar*) strdup(json_object_get_string(field));
-+ pthread_mutex_unlock(&pM->json_mut);
- *buflen = (int) ustrlen(*pRes);
- *pbMustBeFreed = 1;
- }
-@@ -2985,7 +2991,9 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
- bufLen = 2;
- *pbMustBeFreed = 0;
- } else {
-+ pthread_mutex_lock(&pMsg->json_mut);
- pRes = (uchar*)strdup(json_object_get_string(pMsg->json));
-+ pthread_mutex_unlock(&pMsg->json_mut);
- *pbMustBeFreed = 1;
- }
- break;
-@@ -3686,7 +3694,9 @@ msgGetCEEVarNew(msg_t *pMsg, char *name)
- goto done;
- }
- json = json_object_object_get(parent, (char*)leaf);
-+ pthread_mutex_lock(&pMsg->json_mut);
- val = (char*)json_object_get_string(json);
-+ pthread_mutex_unlock(&pMsg->json_mut);
- estr = es_newStrFromCStr(val, strlen(val));
- done:
- return estr;
-diff --git a/runtime/msg.h b/runtime/msg.h
-index e7babdb..814468d 100644
---- a/runtime/msg.h
-+++ b/runtime/msg.h
-@@ -107,6 +107,7 @@ struct msg {
- struct syslogTime tRcvdAt;/* time the message entered this program */
- struct syslogTime tTIMESTAMP;/* (parsed) value of the timestamp */
- struct json_object *json;
-+ pthread_mutex_t json_mut; /* prevent concurent mutability of the json_object in the msg */
- /* some fixed-size buffers to save malloc()/free() for frequently used fields (from the default templates) */
- uchar szRawMsg[CONF_RAWMSG_BUFSIZE]; /* most messages are small, and these are stored here (without malloc/free!) */
- uchar szHOSTNAME[CONF_HOSTNAME_BUFSIZE];
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1223566-imrelp-multi-ruleset.patch b/SOURCES/rsyslog-7.4.7-rhbz1223566-imrelp-multi-ruleset.patch
deleted file mode 100644
index c4ab077..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1223566-imrelp-multi-ruleset.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From c661a2917d065339e00d7588320a653ba29792ea Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Mon, 27 Jun 2016 20:10:31 +0200
-Subject: [PATCH] Allow multiple rulesets in imrelp
-
-Disable legacy module config directives if new style was used
----
- plugins/imrelp/imrelp.c | 140 ++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 113 insertions(+), 27 deletions(-)
-
-diff --git a/plugins/imrelp/imrelp.c b/plugins/imrelp/imrelp.c
-index 5e0ae55..203e7cb 100644
---- a/plugins/imrelp/imrelp.c
-+++ b/plugins/imrelp/imrelp.c
-@@ -75,6 +75,8 @@ static struct configSettings_s {
- struct instanceConf_s {
- uchar *pszBindPort; /* port to bind to */
- struct instanceConf_s *next;
-+ uchar *pszBindRuleset; /* name of ruleset to bind to */
-+ ruleset_t *pBindRuleset; /* ruleset to bind listener to */
- };
-
-
-@@ -88,9 +90,20 @@ struct modConfData_s {
- static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
- static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current load process */
-
-+/* module-global parameters */
-+static struct cnfparamdescr modpdescr[] = {
-+ { "ruleset", eCmdHdlrGetWord, 0 },
-+};
-+static struct cnfparamblk modpblk =
-+ { CNFPARAMBLK_VERSION,
-+ sizeof(modpdescr)/sizeof(struct cnfparamdescr),
-+ modpdescr
-+ };
-+
- /* input instance parameters */
- static struct cnfparamdescr inppdescr[] = {
-- { "port", eCmdHdlrString, CNFPARAM_REQUIRED }
-+ { "port", eCmdHdlrString, CNFPARAM_REQUIRED },
-+ { "ruleset", eCmdHdlrGetWord, 0 }
- };
- static struct cnfparamblk inppblk =
- { CNFPARAMBLK_VERSION,
-@@ -99,6 +112,9 @@ static struct cnfparamblk inppblk =
- };
-
-
-+#include "im-helper.h" /* must be included AFTER the type definitions! */
-+static int bLegacyCnfModGlobalsPermitted;/* are legacy module-global config parameters permitted? */
-+
-
- /* ------------------------------ callbacks ------------------------------ */
-
-@@ -113,17 +129,18 @@ static struct cnfparamblk inppblk =
- * we will only see the hostname (twice). -- rgerhards, 2009-10-14
- */
- static relpRetVal
--onSyslogRcv(uchar *pHostname, uchar *pIP, uchar *msg, size_t lenMsg)
-+onSyslogRcv(void *pUsr, uchar *pHostname, uchar *pIP, uchar *msg, size_t lenMsg)
- {
- prop_t *pProp = NULL;
- msg_t *pMsg;
-+ instanceConf_t *inst = (instanceConf_t*) pUsr;
- DEFiRet;
-
- CHKiRet(msgConstruct(&pMsg));
- MsgSetInputName(pMsg, pInputName);
- MsgSetRawMsg(pMsg, (char*)msg, lenMsg);
- MsgSetFlowControlType(pMsg, eFLOWCTL_LIGHT_DELAY);
-- MsgSetRuleset(pMsg, runModConf->pBindRuleset);
-+ MsgSetRuleset(pMsg, inst->pBindRuleset);
- pMsg->msgFlags = PARSE_HOSTNAME | NEEDS_PARSING;
-
- /* TODO: optimize this, we can store it inside the session, requires
-@@ -155,6 +172,8 @@ createInstance(instanceConf_t **pinst)
- inst->next = NULL;
-
- inst->pszBindPort = NULL;
-+ inst->pszBindRuleset = NULL;
-+ inst->pBindRuleset = NULL;
-
- /* node created, let's add to config */
- if(loadModConf->tail == NULL) {
-@@ -174,8 +193,10 @@ finalize_it:
- static inline void
- std_checkRuleset_genErrMsg(modConfData_t *modConf, __attribute__((unused)) instanceConf_t *inst)
- {
-- errmsg.LogError(0, NO_ERRCODE, "imrelp: ruleset '%s' not found - "
-- "using default ruleset instead", modConf->pszBindRuleset);
-+ errmsg.LogError(0, NO_ERRCODE, "imrelp[%s]: ruleset '%s' not found - "
-+ "using default ruleset instead",
-+ inst->pszBindPort, inst->pszBindRuleset);
-+
- }
-
-
-@@ -196,6 +217,14 @@ static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
- }
- inst->pszBindPort = pNewVal;
-
-+ if((cs.pszBindRuleset == NULL) || (cs.pszBindRuleset[0] == '\0')) {
-+ inst->pszBindRuleset = NULL;
-+ } else {
-+ CHKmalloc(inst->pszBindRuleset = ustrdup(cs.pszBindRuleset));
-+ }
-+ inst->pBindRuleset = NULL;
-+
-+
- finalize_it:
- RETiRet;
- }
-@@ -205,18 +234,33 @@ static rsRetVal
- addListner(modConfData_t __attribute__((unused)) *modConf, instanceConf_t *inst)
- {
- DEFiRet;
-+ relpSrv_t *pSrv;
-+ int relpRet;
-+
- if(pRelpEngine == NULL) {
- CHKiRet(relpEngineConstruct(&pRelpEngine));
- CHKiRet(relpEngineSetDbgprint(pRelpEngine, dbgprintf));
- CHKiRet(relpEngineSetFamily(pRelpEngine, glbl.GetDefPFFamily()));
- CHKiRet(relpEngineSetEnableCmd(pRelpEngine, (uchar*) "syslog", eRelpCmdState_Required));
-- CHKiRet(relpEngineSetSyslogRcv(pRelpEngine, onSyslogRcv));
-+ CHKiRet(relpEngineSetSyslogRcv2(pRelpEngine, onSyslogRcv));
- if (!glbl.GetDisableDNS()) {
- CHKiRet(relpEngineSetDnsLookupMode(pRelpEngine, 1));
- }
- }
-
-- CHKiRet(relpEngineAddListner(pRelpEngine, inst->pszBindPort));
-+ CHKiRet(relpEngineListnerConstruct(pRelpEngine, &pSrv));
-+ CHKiRet(relpSrvSetLstnPort(pSrv, inst->pszBindPort));
-+
-+ relpSrvSetUsrPtr(pSrv, inst);
-+
-+ relpRet = relpEngineListnerConstructFinalize(pRelpEngine, pSrv);
-+ if(relpRet != RELP_RET_OK) {
-+ errmsg.LogError(0, RS_RET_RELP_ERR,
-+ "imrelp: could not activate relp listner, code %d", relpRet);
-+ ABORT_FINALIZE(RS_RET_RELP_ERR);
-+ }
-+
-+ resetConfigVariables(NULL,NULL);
-
- finalize_it:
- RETiRet;
-@@ -249,6 +293,8 @@ CODESTARTnewInpInst
- continue;
- if(!strcmp(inppblk.descr[i].name, "port")) {
- inst->pszBindPort = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
-+ } else if(!strcmp(inppblk.descr[i].name, "ruleset")) {
-+ inst->pszBindRuleset = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
- } else {
- dbgprintf("imrelp: program error, non-handled "
- "param '%s'\n", inppblk.descr[i].name);
-@@ -264,41 +310,76 @@ BEGINbeginCnfLoad
- CODESTARTbeginCnfLoad
- loadModConf = pModConf;
- pModConf->pConf = pConf;
-+ pModConf->pszBindRuleset = NULL;
- /* init legacy config variables */
- cs.pszBindRuleset = NULL;
-+ bLegacyCnfModGlobalsPermitted = 1;
- ENDbeginCnfLoad
-
-+BEGINsetModCnf
-+ struct cnfparamvals *pvals = NULL;
-+ int i;
-+CODESTARTsetModCnf
-+ pvals = nvlstGetParams(lst, &modpblk, NULL);
-+ if(pvals == NULL) {
-+ errmsg.LogError(0, RS_RET_MISSING_CNFPARAMS, "error processing module "
-+ "config parameters [module(...)]");
-+ ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
-+ }
-+
-+ if(Debug) {
-+ dbgprintf("module (global) param blk for imrelp:\n");
-+ cnfparamsPrint(&modpblk, pvals);
-+ }
-+
-+ for(i = 0 ; i < modpblk.nParams ; ++i) {
-+ if(!pvals[i].bUsed)
-+ continue;
-+ if(!strcmp(modpblk.descr[i].name, "ruleset")) {
-+ loadModConf->pszBindRuleset = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
-+ } else {
-+ dbgprintf("imrelp: program error, non-handled "
-+ "param '%s' in beginCnfLoad\n", modpblk.descr[i].name);
-+ }
-+ }
-+ /* remove all of our legacy module handlers, as they can not used in addition
-+ * the the new-style config method.
-+ */
-+ bLegacyCnfModGlobalsPermitted = 0;
-+finalize_it:
-+ if(pvals != NULL)
-+ cnfparamvalsDestruct(pvals, &modpblk);
-+ENDsetModCnf
-
- BEGINendCnfLoad
- CODESTARTendCnfLoad
-- if((cs.pszBindRuleset == NULL) || (cs.pszBindRuleset[0] == '\0')) {
-- loadModConf->pszBindRuleset = NULL;
-+ if(loadModConf->pszBindRuleset == NULL) {
-+ if((cs.pszBindRuleset == NULL) || (cs.pszBindRuleset[0] == '\0')) {
-+ loadModConf->pszBindRuleset = NULL;
-+ } else {
-+ CHKmalloc(loadModConf->pszBindRuleset = ustrdup(cs.pszBindRuleset));
-+ }
- } else {
-- CHKmalloc(loadModConf->pszBindRuleset = ustrdup(cs.pszBindRuleset));
-+ if((cs.pszBindRuleset != NULL) && (cs.pszBindRuleset[0] != '\0')) {
-+ errmsg.LogError(0, RS_RET_DUP_PARAM, "imrelp: warning: ruleset "
-+ "set via legacy directive ignored");
-+ }
- }
-- loadModConf->pBindRuleset = NULL;
- finalize_it:
- free(cs.pszBindRuleset);
-+ cs.pszBindRuleset = NULL;
- loadModConf = NULL; /* done loading */
- ENDendCnfLoad
-
-
- BEGINcheckCnf
-- rsRetVal localRet;
-- ruleset_t *pRuleset;
-+ instanceConf_t *inst;
- CODESTARTcheckCnf
-- /* we emulate the standard "ruleset query" code provided by the framework
-- * for *instances* (which we can currently not support due to librelp).
-- */
-- if(pModConf->pszBindRuleset == NULL) {
-- pModConf->pBindRuleset = NULL;
-- } else {
-- localRet = ruleset.GetRuleset(pModConf->pConf, &pRuleset, pModConf->pszBindRuleset);
-- if(localRet == RS_RET_NOT_FOUND) {
-- std_checkRuleset_genErrMsg(pModConf, NULL);
-+ for(inst = pModConf->root ; inst != NULL ; inst = inst->next) {
-+ if(inst->pszBindRuleset == NULL && pModConf->pszBindRuleset != NULL) {
-+ CHKmalloc(inst->pszBindRuleset = ustrdup(pModConf->pszBindRuleset));
- }
-- CHKiRet(localRet);
-- pModConf->pBindRuleset = pRuleset;
-+ std_checkRuleset(pModConf, inst);
- }
- finalize_it:
- ENDcheckCnf
-@@ -311,8 +392,10 @@ CODESTARTactivateCnfPrePrivDrop
- for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
- addListner(pModConf, inst);
- }
-- if(pRelpEngine == NULL)
-+ if(pRelpEngine == NULL) {
-+ errmsg.LogError(0, RS_RET_NO_LSTN_DEFINED, "imrelp: no RELP listener defined, module ca n not run.");
- ABORT_FINALIZE(RS_RET_NO_RUN);
-+ }
- finalize_it:
- ENDactivateCnfPrePrivDrop
-
-@@ -326,10 +409,12 @@ BEGINfreeCnf
- CODESTARTfreeCnf
- for(inst = pModConf->root ; inst != NULL ; ) {
- free(inst->pszBindPort);
-+ free(inst->pszBindRuleset);
- del = inst;
- inst = inst->next;
- free(del);
- }
-+ free(pModConf->pszBindRuleset);
- ENDfreeCnf
-
- /* This is used to terminate the plugin. Note that the signal handler blocks
-@@ -420,6 +505,7 @@ CODEqueryEtryPt_STD_IMOD_QUERIES
- CODEqueryEtryPt_STD_CONF2_QUERIES
- CODEqueryEtryPt_STD_CONF2_PREPRIVDROP_QUERIES
- CODEqueryEtryPt_STD_CONF2_IMOD_QUERIES
-+CODEqueryEtryPt_STD_CONF2_setModCnf_QUERIES
- CODEqueryEtryPt_IsCompatibleWithFeature_IF_OMOD_QUERIES
- ENDqueryEtryPt
-
-@@ -437,8 +523,8 @@ CODEmodInit_QueryRegCFSLineHdlr
- CHKiRet(objUse(ruleset, CORE_COMPONENT));
-
- /* register config file handlers */
-- CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputrelpserverbindruleset", 0, eCmdHdlrGetWord,
-- NULL, &cs.pszBindRuleset, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(regCfSysLineHdlr2((uchar*)"inputrelpserverbindruleset", 0, eCmdHdlrGetWord,
-+ NULL, &cs.pszBindRuleset, STD_LOADABLE_MODULE_ID, &bLegacyCnfModGlobalsPermitted));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputrelpserverrun", 0, eCmdHdlrGetWord,
- addInstance, NULL, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1224336-ruleset-crash.patch b/SOURCES/rsyslog-7.4.7-rhbz1224336-ruleset-crash.patch
deleted file mode 100644
index 000d51c..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1224336-ruleset-crash.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 72e7eac21c492fb8a63f486315936dfbd66f9b05 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Fri, 3 Apr 2015 16:41:03 +0200
-Subject: [PATCH] Make llDestroy safe
-
-Keep the destructed list in a consistent state as the provided
-destructor may access the very same list again before llDestroy
-finishes.
-
-The previous approach could actually trigger a segmentation violation
-error for specific scenarios and configurations.
-In one particular case, destructing the list of rulesets lead to
-shutdown of an action DA queue and spooling its messages to disk which
-in turn triggered a search for the ruleset name of the message trought
-the destructed list.
-
-The change probably slightly degrades performace, but that shouldn't
-have an observable effect in the current code base.
----
- runtime/linkedlist.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/runtime/linkedlist.c b/runtime/linkedlist.c
-index 53aace4..df8b19f 100644
---- a/runtime/linkedlist.c
-+++ b/runtime/linkedlist.c
-@@ -90,22 +90,24 @@ rsRetVal llDestroy(linkedList_t *pThis)
- {
- DEFiRet;
- llElt_t *pElt;
-- llElt_t *pEltPrev;
-
- assert(pThis != NULL);
-
- pElt = pThis->pRoot;
- while(pElt != NULL) {
-- pEltPrev = pElt;
-- pElt = pElt->pNext;
-+ /* keep the list structure in a consistent state as
-+ * the destructor bellow may reference it again
-+ */
-+ pThis->pRoot = pElt->pNext;
-+ if(pElt->pNext == NULL)
-+ pThis->pLast = NULL;
-+
- /* we ignore errors during destruction, as we need to try
- * finish the linked list in any case.
- */
-- llDestroyElt(pThis, pEltPrev);
-+ llDestroyElt(pThis, pElt);
-+ pElt = pThis->pRoot;
- }
-- /* now clean up the pointers */
-- pThis->pRoot = NULL;
-- pThis->pLast = NULL;
-
- RETiRet;
- }
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1238713-html-docs.patch b/SOURCES/rsyslog-7.4.7-rhbz1238713-html-docs.patch
deleted file mode 100644
index 8a67345..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1238713-html-docs.patch
+++ /dev/null
@@ -1,432 +0,0 @@
-From 6a1d227e4ee199bea2c8ba5bc01b7ece6da5e75b Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Thu, 23 Jul 2015 11:30:13 +0200
-Subject: [PATCH] Various corrections to the HTML documentation
-
-Provided by Stephen Wadeley.
----
- doc/features.html | 5 +--
- doc/free_support.html | 12 +++---
- doc/history.html | 8 +---
- doc/index.html | 29 +++++++-------
- doc/manual.html | 89 ++++++++++++++++++-------------------------
- doc/rsyslog_conf_actions.html | 2 +-
- doc/troubleshoot.html | 20 +++++-----
- doc/version_naming.html | 8 ++--
- 8 files changed, 76 insertions(+), 97 deletions(-)
-
-diff --git a/doc/features.html b/doc/features.html
-index 626ff65..8fc2802 100644
---- a/doc/features.html
-+++ b/doc/features.html
-@@ -28,7 +28,7 @@ OpenTDS (MS SQL, Sybase), SQLLite, Ingres, Oracle, and mSQL via libdbi,
- a database abstraction layer (almost as good as native)</li>
- <li>native support for <a href="ommail.html">sending
- mail messages</a> (first seen in 3.17.0)</li>
--<li>support for (plain) tcp based syslog - much better
-+<li>support for (plain) TCP based syslog - much better
- reliability</li>
- <li>support for sending and receiving compressed syslog messages</li>
- <li>support for on-demand on-disk spooling of messages that can
-@@ -141,9 +141,6 @@ large number of applications. You may also read my blog post on the
- future of liblogging, which contains interesting information about the <a href="http://rgerhards.blogspot.com/2007/09/where-is-liblogging-heading-to.html">
- future of RFC 3195 in rsyslog</a>.</li>
- </ul>
--<p>To see when each feature was added, see the
--<a href="http://www.rsyslog.com/Topic4.phtml">rsyslog
--change log</a> (online only).</p>
-
- <p>[<a href="manual.html">manual index</a>]
- [<a href="rsyslog_conf.html">rsyslog.conf</a>]
-diff --git a/doc/free_support.html b/doc/free_support.html
-index 182a82c..4e33102 100644
---- a/doc/free_support.html
-+++ b/doc/free_support.html
-@@ -16,16 +16,16 @@ system forward.
- with a solution (but rather a link to this page ;)). I hope this does not offend you. The
- reason is quite simple: If I do personal support, you gain some advantage without
- contributing something back. Think about it: if you ask your question on the public
--forum or mailing list, other with the same problem can you and, most importantly, even
-+forum or mailing list, others with the same problem can help you and, most importantly, even
- years later find your post (and the answer) and get the problem solved. So by
--solving your issue in public, you help create a great community ressource and also
-+solving your issue in public, you help create a great community resources and also
- help your fellow users finding solutions quicker. In the long term, this
- also contributes to improved code because the more questions users can find
- solutions to themselves, the fewer I need to look at.
--<p>But it comes even better: the rsyslog community is much broader than Rainer ;) - there
--are helpful other members hanging around at the public places. They often answer
-+<p>But it becomes even better: the rsyslog community is much broader than Rainer ;) - there
-+are other helpful members hanging around at the public places. They often answer
- questions, so that I do not need to look at them (btw, once again a big "thank you", folks!).
--And, more important, those folks have different background than me. So they often
-+And, more important, those folks have a different background than me. So they often
- either know better how to solve your problem (e.g. because it is distro-specific)
- or they know how to better phrase it (after all, I like abstract terms and concepts ;)).
- So you do yourself a favor if you use the public places.
-@@ -36,7 +36,7 @@ mailing lists, the
- <a href="http://lists.adiscon.net/mailman/listinfo/rsyslog">rsyslog mailing list</a>
- also offers excellent advise.
- <p><b>Don't like to post your question in a public place?</b> Well, then you should
--consider purchasing <a href="professional_support.html">rsyslog professional support</a>.
-+consider purchasing <a href="http://www.rsyslog.com/professional-services/">rsyslog professional support</a>.
- The fees are very low and help fund the project. If you use rsyslog seriously inside
- a corporate environment, there is no excuse for not getting one of the support
- packages ;)
-diff --git a/doc/history.html b/doc/history.html
-index 57b6400..e3c12e3 100644
---- a/doc/history.html
-+++ b/doc/history.html
-@@ -105,7 +105,7 @@ resulting in loadable input modules, now running on a separate thread each.</p><
- <b>January, 2nd 2008</b>, rsyslog 1.21.2 is re-released as rsyslog v2.0.0
- stable. This is a major milestone as far as the stable build is concerned. v3 is
- not yet officially announced. Other than the stable v2 build, v3 will not be
--backwards compatibile (including missing compatibility to stock sysklogd) for
-+backwards compatible (including missing compatibility to stock sysklogd) for
- quite a while. Config file changes are required and some command line options do
- no longer work due to the new design.</p><p>On <span style="font-weight: bold;">January, 31st 2008</span>
- the new massively-multithreaded queue engine was released for the first
-@@ -137,11 +137,7 @@ namely anonymization support, as well as log file signing and
- encryption capabilities.
-
- <p>Be sure to visit Rainer's <a href="http://rgerhards.blogspot.com/">syslog blog</a>
--to get some more insight into the development and futures of rsyslog and syslog in general.
-+to get some more insight into the development and features of rsyslog and syslog in general.
- Don't be shy to post to either the blog or the
- <a href="http://www.rsyslog.com/PNphpBB2.phtml">rsyslog forums</a>.</p>
--<h2>Some useful links</h2>
--<ul>
-- <li><a href="http://www.rsyslog.com/Topic4.phtml">the rsyslog change log</a></li>
--</ul>
- </body></html>
-diff --git a/doc/index.html b/doc/index.html
-index d753e2e..c8172f3 100644
---- a/doc/index.html
-+++ b/doc/index.html
-@@ -6,26 +6,27 @@
- is an enhanced syslogd suitable both for small systems as
- well as large enterprises.</b>
- <p>This page provide a few quick pointers which hopefully make your
--experience with rsyslog a pleasant one. These are
-+experience with rsyslog a pleasant one. These are:
- <ul>
--<li><b>Most importantly, the <a href="manual.html">rsyslog manual</a></b> - this points to locally
-+<li>The <a href="manual.html">rsyslog manual</a> - this points to locally
- installed documentation which exactly matches the version you have installed.
- It is highly suggested to at least briefly look over these files.
--<li>The <a href="http://www.rsyslog.com">rsyslog web site</a> which offers
--probably every information you'll ever need (ok, just kidding...).
--<li>The <a href="http://www.rsyslog.com/status">project status page</a> provides
--information on current releases
--<li>and the <a href="troubleshoot.html">troubleshooting guide</a> hopefully helps if
--things do not immediately work out
-+<li>The <a href="http://www.rsyslog.com">rsyslog web site</a>, which offers
-+information for different versions of rsyslog.
-+<li>The <a href="troubleshoot.html">troubleshooting guide</a> hopefully helps if
-+things do not immediately work out.
- </ul>
- <p>In general, rsyslog supports plain old syslog.conf format, except that the
- config file is now called rsyslog.conf. This should help you get started
--quickly.
--To do the really cool things, though,
--you need to learn a bit about its new features.
-+quickly.</p>
-+<pa>
- The man pages offer a bare minimum of information (and are still quite long). Read the
--<a href="manual.html">html documentation</a> instead.
-+built-in <a href="manual.html">html documentation</a> instead.
- When you change the configuration, remember to restart rsyslogd, because otherwise
--it will not use your new settings (and you'll end up totally puzzled why this great
--config of yours does not even work a bit...;))
-+it will not use your new settings.</p>
-+<p>The built-in <a href="history.html">rsyslog history</a>
-+page is for you if you would like to learn a little more
-+on why there is an rsyslog at all. If you are interested why you should
-+care about rsyslog at all, you may want to read Rainer's essay on "<a href="http://rgerhards.blogspot.com/2007/08/why-does-world-need-another-syslogd.html">why
-+the world needs another syslogd</a>".</p>
- </body></html>
-diff --git a/doc/manual.html b/doc/manual.html
-index f0fffa8..ecf8cae 100644
---- a/doc/manual.html
-+++ b/doc/manual.html
-@@ -2,11 +2,11 @@
- <html><head><title>rsyslog documentation</title></head>
- <body>
- <h1>RSyslog - Documentation</h1>
--<p><b><a href="http://www.rsyslog.com/">Rsyslog</a>
--is an enhanced syslogd
-+<p><a href="http://www.rsyslog.com/">Rsyslog</a>
-+is an enhanced <b>syslogd</b>
- supporting, among others, <a href="rsyslog_mysql.html">MySQL</a>,
- PostgreSQL, <a href="http://wiki.rsyslog.com/index.php/FailoverSyslogServer">failover
--log destinations</a>, syslog/tcp, fine grain output format
-+log destinations</a>, syslog over TCP, fine grain output format
- control, high precision timestamps, queued operations and the ability to filter on any message
- part.</b>
- It is quite compatible to stock sysklogd and can be used as a drop-in
-@@ -16,48 +16,37 @@ relay chains while at the same time being very easy to setup for the
- novice user. And as we know what enterprise users really need, there are
- also <a href="http://www.rsyslog.com/professional-services"> rsyslog
- professional services</a> available directly from the source!</p>
--<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
-+<p>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
- to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
- project goals.</p>
--<p><b>This documentation is for version 7.4.7 (v7.4-stable branch) of rsyslog.</b>
--Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
--to obtain current version information and project status.
--</p><p><b>If you like rsyslog, you might
--want to lend us a helping hand. </b>It doesn't require a lot of
-+<p><b>This documentation is for version 7.4.7 (v7.4-stable branch) of rsyslog.</b> If you use an older
-+version, be sure to use the doc that came with it.</p>
-+<p>If you like rsyslog, you might
-+want to lend us a helping hand. It doesn't require a lot of
- time - even a single mouse click helps. Learn <a href="how2help.html">how to help the rsyslog project</a>.
- Due to popular demand, there is now a <a href="rsyslog_ng_comparison.html">side-by-side comparison
- between rsyslog and syslog-ng</a>.</p>
--<p>If you are upgrading from rsyslog v2 or stock sysklogd,
--<a href="v3compatibility.html">be sure to read the rsyslog v3 compatibility notes</a>,
--and if you are upgrading from v3, read the
--<a href="v4compatibility.html">rsyslog v4 compatibility notes</a>,
--if you upgrade from v4, read the
--<a href="v5compatibility.html">rsyslog v5 compatibility notes</a>, and
--if you upgrade from v5, read the
--<a href="v6compatibility.html">rsyslog v6 compatibility notes</a>.
--if you upgrade from v6, read the
--<a href="v7compatibility.html">rsyslog v7 compatibility notes</a>.
--<p>Rsyslog will work even
--if you do not read the doc, but doing so will definitely improve your experience.</p>
--<p><b>Follow the links below for the</b></p>
-+<p><b>If you are upgrading</b>
- <ul>
--<li><a href="troubleshoot.html">troubleshooting rsyslog problems</a></li>
--<li><a href="rsyslog_conf.html">configuration file format (rsyslog.conf)</a></li>
--<li><a href="http://www.rsyslog.com/tool-regex">a regular expression checker/generator tool for rsyslog</a></li>
--<li> <a href="property_replacer.html">property replacer, an important core component</a></li>
--<li><a href="bugs.html">rsyslog bug list</a></li>
-+<li>from rsyslog v2 or stock sysklogd,
-+<a href="v3compatibility.html">be sure to read the rsyslog v3 compatibility notes</a>,</li>
-+<li>if you are upgrading from v3, read the
-+<a href="v4compatibility.html">rsyslog v4 compatibility notes</a>,</li>
-+<li>if you are upgrading from v4, read the
-+<a href="v5compatibility.html">rsyslog v5 compatibility notes</a>,</li>
-+<li>if you are upgrading from v5, read the
-+<a href="v6compatibility.html">rsyslog v6 compatibility notes</a>, and </li>
-+<li>if you are upgrading from v6, read the
-+<a href="v7compatibility.html">rsyslog v7 compatibility notes</a>.</li>
-+</ul>
-+<p><b>The built-in Docs</b></p>
-+<ul>
-+<li><a href="rsyslog_conf.html">The rsyslog.conf file format and its configuration</a></li>
-+<li><a href="property_replacer.html">property replacer, an important core component</a></li>
- <li><a href="messageparser.html">understanding rsyslog message parsers</a></li>
- <li><a href="generic_design.html">backgrounder on generic syslog application design</a></li>
- <li><a href="modules.html">description of rsyslog modules</a></li>
--<li><a href="rsyslog_packages.html">rsyslog packages</a></li>
--</ul>
--<p><b>To keep current on rsyslog development, follow
--<a href="http://twitter.com/rgerhards">Rainer's twitter feed</a>.</b></p>
--<p><b>We have some in-depth papers on</b></p>
--<ul>
--<li><a href="install.html">installing rsyslog</a></li>
--<li><a href="build_from_repo.html">obtaining rsyslog from the source repository</a></li>
--<li><a href="ipv6.html">rsyslog and IPv6</a> (which is fully supported)</li>
-+<li><a href="ipv6.html">rsyslog and IPv6</a></li>
- <li><a href="rsyslog_secure_tls.html">native TLS encryption for syslog</a></li>
- <li><a href="multi_ruleset.html">using multiple rule sets in rsyslog</a></li>
- <li><a href="rsyslog_stunnel.html">ssl-encrypting syslog with stunnel</a></li>
-@@ -69,36 +58,31 @@ if you do not read the doc, but doing so will definitely improve your experience
- php-syslog-ng with rsyslog</a></li>
- <li><a href="rsyslog_recording_pri.html">recording
- the syslog priority (severity and facility) to the log file</a></li>
--<li><a href="http://www.rsyslog.com/Article19.phtml">preserving
--syslog sender over NAT</a> (online only)</li>
- <li><a href="gssapi.html">an overview and howto of rsyslog gssapi support</a></li>
- <li><a href="debug.html">debug support in rsyslog</a></li>
-+<li><a href="troubleshoot.html">troubleshooting rsyslog problems</a></li>
-+<li><a href="bugs.html">rsyslog bug list</a></li>
- <li>Developer Documentation
- <ul>
-+ <li><a href="rsyslog_packages.html">rsyslog packages</a></li>
-+ <li><a href="install.html">installing rsyslog</a></li>
-+ <li><a href="build_from_repo.html">obtaining rsyslog from the source repository</a></li>
- <li><a href="build_from_repo.html">building rsyslog from the source repository</a></li>
- <li><a href="dev_oplugins.html">writing rsyslog output plugins</a></li>
- <li><a href="dev_queue.html">the rsyslog message queue object (developer's view)</a></li>
- </ul></li>
- </ul>
--<p>Our <a href="history.html">rsyslog history</a>
--page is for you if you would like to learn a little more
--on why there is an rsyslog at all. If you are interested why you should
--care about rsyslog at all, you may want to read Rainer's essay on "<a href="http://rgerhards.blogspot.com/2007/08/why-does-world-need-another-syslogd.html">why
--the world needs another syslogd</a>".</p>
--<p>Documentation is added continuously. Please note that the
--documentation here
--matches only the current version of rsyslog. If you use an older
--version, be sure to use the doc that came with it.</p>
-+
- <p><b>You can also browse the following online resources:</b></p>
- <ul>
-+<li><a href="http://www.rsyslog.com/Article19.phtml">preserving
-+syslog sender over NAT</a></li>
-+<li><a href="http://www.rsyslog.com/tool-regex">a regular expression checker/generator tool for rsyslog</a></li>
- <li>the <a href="http://wiki.rsyslog.com/">rsyslog
- wiki</a>, a community resource which includes <a href="http://wiki.rsyslog.com/index.php/Configuration_Samples">rsyslog configuration examples</a></li>
--<li><a href="http://www.rsyslog.com/module-Static_Docs-view-f-manual.html.phtml">rsyslog
--online documentation (most current version only)</a></li>
-
- <li><a href="http://kb.monitorware.com/rsyslog-f40.html">rsyslog discussion forum - use this for technical support</a></li>
- <li><a href="http://www.rsyslog.com/Topic8.phtml">rsyslog video tutorials</a></li>
--<li><a href="http://www.rsyslog.com/Topic4.phtml">rsyslog change log</a></li>
- <li><a href="http://www.rsyslog.com/Topic3.phtml">rsyslog FAQ</a></li>
- <li><a href="http://www.monitorware.com/en/syslog-enabled-products/">syslog device configuration guide</a> (off-site)</li>
- <li><a href="http://www.rsyslog.com/PNphpBB2.phtml">rsyslog discussion forum - use this for technical support</a></li>
-@@ -111,7 +95,8 @@ may find
- <a href="http://blog.gerhards.net/">blog</a> an
- interesting read (filter on syslog and rsyslog tags).
- Or meet <a href="http://www.facebook.com/people/Rainer-Gerhards/1349393098">Rainer Gerhards at Facebook</a>
--or <a href="https://plus.google.com/112402185904751517878/posts">Google+</a>.
-+or <a href="https://plus.google.com/112402185904751517878/posts">Google+</a>.</p>
-+<pa>
- If you would like to use rsyslog source code inside your open source project, you can do that without
- any restriction as long as your license is GPLv3 compatible. If your license is incompatible to GPLv3,
- you may even be still permitted to use rsyslog source code. However, then you need to look at the way
-@@ -119,5 +104,5 @@ you may even be still permitted to use rsyslog source code. However, then you ne
- <p>Feedback is always welcome, but if you have a support question, please do not
- mail Rainer directly (<a href="free_support.html">why not?</a>) - use the
- <a href="http://lists.adiscon.net/mailman/listinfo/rsyslog">rsyslog mailing list</a>
--or <a href="http://kb.monitorware.com/rsyslog-f40.html">rsyslog formum</a> instead.
-+or <a href="http://kb.monitorware.com/rsyslog-f40.html">rsyslog forum</a> instead.
- </body></html>
-diff --git a/doc/rsyslog_conf_actions.html b/doc/rsyslog_conf_actions.html
-index 50b13a0..c0c29c7 100644
---- a/doc/rsyslog_conf_actions.html
-+++ b/doc/rsyslog_conf_actions.html
-@@ -5,7 +5,7 @@
- <a href="rsyslog_conf.html">back</a>
- <h2>Actions</h2>
- Action object describe what is to be done with a message. They are
--implemented via <a href="rsyslog_conf_modules.html#om">outpout modules</a>.
-+implemented via <a href="rsyslog_conf_modules.html#om">output modules</a>.
- <p>The action object has different parameters:
- <ul>
- <li>those that apply to all actions and are action specific. These
-diff --git a/doc/troubleshoot.html b/doc/troubleshoot.html
-index a0303a2..ef3a4b1 100644
---- a/doc/troubleshoot.html
-+++ b/doc/troubleshoot.html
-@@ -4,8 +4,8 @@
- <h2>troubleshooting rsyslog</h2>
- <p><b>Having trouble with <a href="http://www.rsyslog.com">rsyslog</a>?</b>
- This page provides some tips on where to look for help and what to do
--if you need to ask for assistance. This page is continously being expanded.
--<p>Useful troubleshooting ressources are:
-+if you need to ask for assistance. This page is continuously being expanded.
-+<p>Useful troubleshooting resources are:
- <ul>
- <li>The <a href="http://www.rsyslog.com/doc">rsyslog documentation</a> - note that the online version always covers
- the most recent development version. However, there is a version-specific
-@@ -19,7 +19,7 @@ is a rsyslog-doc package, that often needs to be installed separately.
- <p>A common trouble source are <a href="syslog_parsing.html">ill-formed syslog messages</a>, which
- lead to to all sorts of interesting problems, including malformed hostnames and dates.
- Read the quoted guide to find relief. A common symptom is that the %HOSTNAME% property is
--used for generating dynafile names, but some glibberish shows up. This is caused by the
-+used for generating dynafile names, but some gibberish shows up. This is caused by the
- malformed syslog messages, so be sure to read the
- <a href="syslog_parsing.html">guide</a> if you face that problem. Just let me add that the
- common work-around is to use %FROMHOST% or %FROMHOST-IP% instead. These do not take the
-@@ -28,7 +28,7 @@ the socket layer). Of course, this does not work over NAT or relay chains, where
- only cure is to make sure senders emit well-formed messages.
- <p><b>Configuration Problems</b>
- <p>Rsyslog 3.21.1 and above has been enhanced to support extended configuration checking.
--It offers a special command line switch (-N1) that puts it into "config verfication mode".
-+It offers a special command line switch (-N1) that puts it into "config verification mode".
- In that mode, it interprets and check the configuration file, but does not startup. This
- mode can be used in parallel to a running instance of rsyslogd.
- <p>To enable it, run rsyslog interactively as follows:
-@@ -56,7 +56,7 @@ The mailing list is probably a good place for complex questions.
- </ul>
- <p><b>Debug Log</b>
- <p>If you ask for help, there are chances that we need to ask for an rsyslog debug log.
--The debug log is a detailled report of what rsyslog does during processing. As such, it may
-+The debug log is a detailed report of what rsyslog does during processing. As such, it may
- even be useful for your very own troubleshooting. People have seen things inside their debug
- log that enabled them to find problems they did not see before. So having a look at the
- debug log, even before asking for help, may be useful.
-@@ -89,7 +89,7 @@ meaningless value. <b>Do not delete the lines</b>, as this renders the debug log
- unusable (and makes Rainer quite angry for wasted time, aka significantly reduces the chance
- he will remain motivated to look at your problem ;)). For the same reason, make sure
- whatever you change is changed consistently. Really!
--<p>While most debug log files are moderately large, some can get quite to extremly large.
-+<p>While most debug log files are moderately large, some can get quite to extremely large.
- For those on the larger side, it is a good idea to zip them. If the file is less than
- around 100KiB, it's probably not necessary.
- <p>A good place to post your debug log is at the
-@@ -99,9 +99,9 @@ various common formats, but rejects others for security reasons. The zip, txt, a
- are definitely permitted, so it probably is a good idea to use one of them. For others, please
- simply try and revert to another format if the forum doesn't like what you used.
- <p>
--Please note that all information in your debug file is publically visiable.
-+Please note that all information in your debug file is publicly visible.
- If this is not acceptable for you, you are probably a
--candidate for a <a href="professional_support.html">commercial support contract</a>. Free support
-+candidate for a <a href="http://www.rsyslog.com/professional-services/">commercial support contract</a>. Free support
- comes without any guarantees, include no guarantee on confidentiality
- [aka "we don't want to be sued for work were are not even paid for ;)].
- <b>So if you submit debug logs, do so at your sole risk</b>. By submitting them, you accept
-@@ -115,11 +115,11 @@ you may see a serious problem during deployments in demanding, non-standard, env
- (hopefully not with a stable version, but chances are good you'll run into troubles with
- the development versions).
- <p>Active support from the user base is very important to help us track down those things.
--Most often, serious problems are the result of some memory misadressing. During development,
-+Most often, serious problems are the result of some memory misaddressing. During development,
- we routinely use valgrind, a very well and capable memory debugger. This helps us to create
- pretty clean code. But valgrind can not detect everything, most importantly not code pathes
- that are never executed. So of most use for us is information about aborts and abort locations.
--<p>Unforutnately, faults rooted in adressing errors typically show up only later, so the
-+<p>Unfortunately, faults rooted in addressing errors typically show up only later, so the
- actual abort location is in an unrelated spot. To help track down the original spot,
- <a href="http://www.gnu.org/software/hello/manual/libc/Heap-Consistency-Checking.html">libc
- later than 5.4.23 offers support</a> for finding, and possible temporary relief from it,
-diff --git a/doc/version_naming.html b/doc/version_naming.html
-index 3bfa19b..fe59d19 100644
---- a/doc/version_naming.html
-+++ b/doc/version_naming.html
-@@ -23,7 +23,7 @@ maybe around once a year. A major version increment has important
- implications from the support side: without support contracts, the
- current major version's last stable release and the last stable release
- of the version immediately below it are supported (Adiscon, the rsyslog
--sponsor, offers <a href="professional_support.html">support contracts</a> covering all other versions).</p>
-+sponsor, offers <a href="http://www.rsyslog.com/professional-services/">support contracts</a> covering all other versions).</p>
- <p>The <span style="font-weight: bold;">minor</span> version is
- incremented whenever a non-trivial new feature is planned to be added.
- Triviality of a feature is simply determined by time estimated to
-@@ -57,7 +57,7 @@ more if someone has asked for the feature). So we do not like to wait
- for the original focus feature to be ready (what could take maybe three
- more weeks). As a result, we release the new features. But that version
- will also include partial code of the focus feature. Typically this
--doesn't hurt as long as noone tries to use it (what of course would
-+doesn't hurt as long as no one tries to use it (what of course would
- miserably fail). But still, part of the new code is already in it. When
- we release such a "minor-feature enhanced" but "focus-feature not yet
- completed" version, we need a way to flag it. In current thinking, that
-@@ -85,14 +85,14 @@ the next minor development version while the previous minor version is
- still a -rc because it is not yet considered sufficiently stable.</p><p>Note: <span style="font-weight: bold;">the
- absence of the -devstate part indicates that a release is stable.
- Following the same logic, any release with a -devstate part is unstable.</span></p><p>A quick sample: </p><p>4.0.0
--is the stable release. We begin to implement relp, moving to
-+is the stable release. We begin to implement RELP, moving to
- major.minor to 4.1. While we develop it, someone requests a trivial
- feature, which we implement. We need to release, so we will have
- 4.1.0-mf0. Another new feature is requested, move to 4.1.0-mf2. A first
- version of RELP is implemented: 4.1.0-rc0. A new trivial feature is
- implemented: 4.1.0-rc1. Relp is being enhanced: 4.1.0-rc2. We now feel
- RELP is good enough for the time being and begin to implement TLS on
--plain /Tcp syslog: logical increment to 4.2. Now another new feature in
-+plain TCP syslog: logical increment to 4.2. Now another new feature in
- that tree: 4.2.0-mf0. Note that we now have 4.0.0 (stable) and
- 4.1.0-rc2 and 4.1.0-mf0 (both devel). We find a big bug in RELP coding.
- Two new releases: 4.1.0-rc3, 4.2.0-mf1 (the bug fix acts like a
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1245194-imjournal-ste-file.patch b/SOURCES/rsyslog-7.4.7-rhbz1245194-imjournal-ste-file.patch
deleted file mode 100644
index b8271cb..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1245194-imjournal-ste-file.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From fed69cc7ac1bccb7012a68d954b58c6de9ad75e7 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Sun, 10 Jul 2016 23:46:42 +0200
-Subject: [PATCH] Make state file handling in imjournal more robust
-
----
- plugins/imjournal/imjournal.c | 98 ++++++++++++++++++++++++++++++-------------
- 1 file changed, 70 insertions(+), 28 deletions(-)
-
-diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index f97b745..1ebbd1c 100755
---- a/plugins/imjournal/imjournal.c
-+++ b/plugins/imjournal/imjournal.c
-@@ -70,6 +70,7 @@ static struct configSettings_s {
- int ratelimitInterval;
- int ratelimitBurst;
- int bIgnorePrevious;
-+ int bIgnoreNonValidStatefile;
- int iDfltSeverity;
- int iDfltFacility;
- char *dfltTag;
-@@ -84,6 +85,7 @@ static struct cnfparamdescr modpdescr[] = {
- { "ratelimit.burst", eCmdHdlrInt, 0 },
- { "persiststateinterval", eCmdHdlrInt, 0 },
- { "ignorepreviousmessages", eCmdHdlrBinary, 0 },
-+ { "ignorenonvalidstatefile", eCmdHdlrBinary, 0 },
- { "defaultseverity", eCmdHdlrSeverity, 0 },
- { "defaultfacility", eCmdHdlrString, 0 },
- { "defaulttag", eCmdHdlrGetWord, 0 },
-@@ -441,23 +443,36 @@ static rsRetVal
- persistJournalState () {
- DEFiRet;
- FILE *sf; /* state file */
-+ char tmp_sf[MAXFNAME];
- char *cursor;
- int ret = 0;
-
- /* On success, sd_journal_get_cursor() returns 1 in systemd
- 197 or older and 0 in systemd 198 or newer */
- if ((ret = sd_journal_get_cursor(j, &cursor)) >= 0) {
-- if ((sf = fopen(cs.stateFile, "wb")) != NULL) {
-+ /* we create a temporary name by adding a ".tmp"
-+ * suffix to the end of our state file's name
-+ */
-+ snprintf(tmp_sf, sizeof(tmp_sf), "%s.tmp", cs.stateFile);
-+ if ((sf = fopen(tmp_sf, "wb")) != NULL) {
- if (fprintf(sf, "%s", cursor) < 0) {
- iRet = RS_RET_IO_ERROR;
- }
- fclose(sf);
- free(cursor);
-+ /* change the name of the file to the configured one */
-+ if (iRet == RS_RET_OK && rename(tmp_sf, cs.stateFile) == -1) {
-+ char errStr[256];
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ iRet = RS_RET_IO_ERROR;
-+ errmsg.LogError(0, iRet, "rename() failed: "
-+ "'%s', new path: '%s'\n", errStr, cs.stateFile);
-+ }
- } else {
- char errStr[256];
- rs_strerror_r(errno, errStr, sizeof(errStr));
- errmsg.LogError(0, RS_RET_FOPEN_FAILURE, "fopen() failed: "
-- "'%s', path: '%s'\n", errStr, cs.stateFile);
-+ "'%s', path: '%s'\n", errStr, tmp_sf);
- iRet = RS_RET_FOPEN_FAILURE;
- }
- } else {
-@@ -515,6 +530,35 @@ finalize_it:
- RETiRet;
- }
-
-+/* Seek to the very end of the journal and ignore all older
-+ * messages.
-+ */
-+static rsRetVal
-+skipOldMessages(void)
-+{
-+ DEFiRet;
-+
-+ if (sd_journal_seek_tail(j) < 0) {
-+ char errStr[256];
-+
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ errmsg.LogError(0, RS_RET_ERR,
-+ "sd_journal_seek_tail() failed: '%s'", errStr);
-+ ABORT_FINALIZE(RS_RET_ERR);
-+ }
-+ if (sd_journal_previous(j) < 0) {
-+ char errStr[256];
-+
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ errmsg.LogError(0, RS_RET_ERR,
-+ "sd_journal_previous() failed: '%s'", errStr);
-+ ABORT_FINALIZE(RS_RET_ERR);
-+ }
-+
-+finalize_it:
-+ RETiRet;
-+
-+}
-
- /* This function loads a journal cursor from the state file.
- */
-@@ -546,41 +590,32 @@ loadJournalState()
- errmsg.LogError(0, RS_RET_ERR, "imjournal: "
- "couldn't seek to cursor `%s'\n", readCursor);
- iRet = RS_RET_ERR;
-- goto finalize_it;
-+ } else {
-+ sd_journal_next(j);
- }
-- sd_journal_next(j);
- } else {
- errmsg.LogError(0, RS_RET_IO_ERROR, "imjournal: "
- "fscanf on state file `%s' failed\n", cs.stateFile);
- iRet = RS_RET_IO_ERROR;
-- goto finalize_it;
- }
-+
- fclose(r_sf);
-+
-+ if (iRet != RS_RET_OK && cs.bIgnoreNonValidStatefile) {
-+ /* ignore state file errors */
-+ iRet = RS_RET_OK;
-+ errmsg.LogError(0, NO_ERRCODE,
-+ "imjournal: ignoring invalid state file");
-+ if (cs.bIgnorePrevious) {
-+ skipOldMessages();
-+ }
-+ }
- } else {
- errmsg.LogError(0, RS_RET_FOPEN_FAILURE, "imjournal: "
- "open on state file `%s' failed\n", cs.stateFile);
- }
-- } else {
-- /* when IgnorePrevious, seek to the end of journal */
-- if (cs.bIgnorePrevious) {
-- if (sd_journal_seek_tail(j) < 0) {
-- char errStr[256];
--
-- rs_strerror_r(errno, errStr, sizeof(errStr));
-- errmsg.LogError(0, RS_RET_ERR,
-- "sd_journal_seek_tail() failed: '%s'", errStr);
-- ABORT_FINALIZE(RS_RET_ERR);
-- }
--
-- if (sd_journal_previous(j) < 0) {
-- char errStr[256];
--
-- rs_strerror_r(errno, errStr, sizeof(errStr));
-- errmsg.LogError(0, RS_RET_ERR,
-- "sd_journal_previous() failed: '%s'", errStr);
-- ABORT_FINALIZE(RS_RET_ERR);
-- }
-- }
-+ } else if (cs.bIgnorePrevious) {
-+ skipOldMessages();
- }
-
- finalize_it:
-@@ -598,6 +633,8 @@ CODESTARTrunInput
-
- if (cs.stateFile) {
- CHKiRet(loadJournalState());
-+ } else if (cs.bIgnorePrevious) {
-+ skipOldMessages();
- }
-
- /* this is an endless loop - it is terminated when the thread is
-@@ -641,6 +678,7 @@ BEGINbeginCnfLoad
- CODESTARTbeginCnfLoad
- bLegacyCnfModGlobalsPermitted = 1;
-
-+ cs.bIgnoreNonValidStatefile = 1;
- cs.iPersistStateInterval = DFLT_persiststateinterval;
- cs.stateFile = NULL;
- cs.ratelimitBurst = 20000;
-@@ -739,7 +777,9 @@ CODESTARTsetModCnf
- } else if(!strcmp(modpblk.descr[i].name, "ratelimit.interval")) {
- cs.ratelimitInterval = (int) pvals[i].val.d.n;
- } else if (!strcmp(modpblk.descr[i].name, "ignorepreviousmessages")) {
-- cs.bIgnorePrevious = (int) pvals[i].val.d.n;
-+ cs.bIgnorePrevious = (int) pvals[i].val.d.n;
-+ } else if (!strcmp(modpblk.descr[i].name, "ignorenonvalidstatefile")) {
-+ cs.bIgnoreNonValidStatefile = (int) pvals[i].val.d.n;
- } else if (!strcmp(modpblk.descr[i].name, "defaultseverity")) {
- cs.iDfltSeverity = (int) pvals[i].val.d.n;
- } else if (!strcmp(modpblk.descr[i].name, "defaultfacility")) {
-@@ -806,7 +846,9 @@ CODEmodInit_QueryRegCFSLineHdlr
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalstatefile", 0, eCmdHdlrGetWord,
- NULL, &cs.stateFile, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalignorepreviousmessages", 0, eCmdHdlrBinary,
-- NULL, &cs.bIgnorePrevious, STD_LOADABLE_MODULE_ID));
-+ NULL, &cs.bIgnorePrevious, STD_LOADABLE_MODULE_ID));
-+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalignorenonvalidstatefile", 0, eCmdHdlrBinary,
-+ NULL, &cs.bIgnoreNonValidStatefile, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaultseverity", 0, eCmdHdlrSeverity,
- NULL, &cs.iDfltSeverity, STD_LOADABLE_MODULE_ID));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaultfacility", 0, eCmdHdlrCustomHandler,
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1263853-startup-order.patch b/SOURCES/rsyslog-7.4.7-rhbz1263853-startup-order.patch
deleted file mode 100644
index 65e2551..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1263853-startup-order.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d0e0108bde62119a0b759fe5b88262fa375fc108 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Thu, 7 Jul 2016 01:33:45 +0200
-Subject: [PATCH] Order service start after the network
-
----
- rsyslog.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/rsyslog.service.in b/rsyslog.service.in
-index 8e2d64c..2c44f3b 100644
---- a/rsyslog.service.in
-+++ b/rsyslog.service.in
-@@ -1,6 +1,7 @@
- [Unit]
- Description=System Logging Service
- Requires=syslog.socket
-+After=network.target
-
- [Service]
- Type=notify
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1282687-ruleset-parser-crash.patch b/SOURCES/rsyslog-7.4.7-rhbz1282687-ruleset-parser-crash.patch
deleted file mode 100644
index ba5ca5b..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1282687-ruleset-parser-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c7f33b1edeffc8b7a2da2f7665e45c42f4b4e5db Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Wed, 9 Jul 2014 11:56:18 +0200
-Subject: [PATCH] bugfix: double-free when ruleset() parser parameters were
- used
-
-While unlikely, this could cause stability issues even after the
-config phase.
----
- runtime/ruleset.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runtime/ruleset.c b/runtime/ruleset.c
-index 1afb403..8e8f63b 100644
---- a/runtime/ruleset.c
-+++ b/runtime/ruleset.c
-@@ -993,7 +993,7 @@ rulesetProcessCnf(struct cnfobj *o)
- for(i = 0 ; i < ar->nmemb ; ++i) {
- parserName = (uchar*)es_str2cstr(ar->arr[i], NULL);
- doRulesetAddParser(pRuleset, parserName);
-- free(parserName);
-+ /* note parserName is freed in doRulesetAddParser()! */
- }
- }
-
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1295798-shutdown-delay.patch b/SOURCES/rsyslog-7.4.7-rhbz1295798-shutdown-delay.patch
deleted file mode 100644
index 42ebc13..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1295798-shutdown-delay.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From fde188d9bdd5845f3b1928c2cd61ddf5a541e657 Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Mon, 4 Jul 2016 16:04:51 +0200
-Subject: [PATCH] Fix a race condition in wtp
-
-The shutdown sequence in wtp relies for its operation on signals and
-cancelation cleanup handlers. Previously, trying to shutdown a thread
-that has not yet been properly initialized could lead to a deadlock.
-This change makes wtpStartWrkr() synchronous in regard to the
-initialization of the newly created thread.
-
-Thanks to Rado Sroka for the analysis and an initial patch.
----
- runtime/wtp.c | 13 +++++++++++++
- runtime/wtp.h | 1 +
- 2 files changed, 14 insertions(+)
-
-diff --git a/runtime/wtp.c b/runtime/wtp.c
-index 19151e7..d48a2d7 100644
---- a/runtime/wtp.c
-+++ b/runtime/wtp.c
-@@ -88,6 +88,7 @@ static rsRetVal NotImplementedDummy() { return RS_RET_NOT_IMPLEMENTED; }
- */
- BEGINobjConstruct(wtp) /* be sure to specify the object type also in END macro! */
- pthread_mutex_init(&pThis->mutWtp, NULL);
-+ pthread_cond_init(&pThis->condThrdInitDone, NULL);
- pthread_cond_init(&pThis->condThrdTrm, NULL);
- pthread_attr_init(&pThis->attrThrd);
- /* Set thread scheduling policy to default */
-@@ -155,6 +156,7 @@ CODESTARTobjDestruct(wtp)
-
- /* actual destruction */
- pthread_cond_destroy(&pThis->condThrdTrm);
-+ pthread_cond_destroy(&pThis->condThrdInitDone);
- pthread_mutex_destroy(&pThis->mutWtp);
- pthread_attr_destroy(&pThis->attrThrd);
- DESTROY_ATOMIC_HELPER_MUT(pThis->mutCurNumWrkThrd);
-@@ -385,6 +387,12 @@ wtpWorker(void *arg) /* the arg is actually a wti object, even though we are in
- # endif
-
- pthread_cleanup_push(wtpWrkrExecCancelCleanup, pWti);
-+
-+ /* let the parent know we're done with initialization */
-+ d_pthread_mutex_lock(&pThis->mutWtp);
-+ pthread_cond_broadcast(&pThis->condThrdInitDone);
-+ d_pthread_mutex_unlock(&pThis->mutWtp);
-+
- wtiWorker(pWti);
- pthread_cleanup_pop(0);
- wtpWrkrExecCleanup(pWti);
-@@ -436,6 +444,11 @@ wtpStartWrkr(wtp_t *pThis)
- wtpGetDbgHdr(pThis), iState,
- ATOMIC_FETCH_32BIT(&pThis->iCurNumWrkThrd, &pThis->mutCurNumWrkThrd));
-
-+ /* wait for the new thread to initialize its signal mask and
-+ * cancelation cleanup handler before proceeding
-+ */
-+ d_pthread_cond_wait(&pThis->condThrdInitDone, &pThis->mutWtp);
-+
- finalize_it:
- d_pthread_mutex_unlock(&pThis->mutWtp);
- RETiRet;
-diff --git a/runtime/wtp.h b/runtime/wtp.h
-index 25992f7..63912e6 100644
---- a/runtime/wtp.h
-+++ b/runtime/wtp.h
-@@ -50,6 +50,7 @@ struct wtp_s {
- rsRetVal (*pConsumer)(void *); /* user-supplied consumer function for dewtpd messages */
- /* synchronization variables */
- pthread_mutex_t mutWtp; /* mutex for the wtp's thread management */
-+ pthread_cond_t condThrdInitDone; /* signalled when a new thread is ready for work */
- pthread_cond_t condThrdTrm;/* signalled when threads terminate */
- /* end sync variables */
- /* user objects */
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1303617-imfile-wildcards.patch b/SOURCES/rsyslog-7.4.7-rhbz1303617-imfile-wildcards.patch
deleted file mode 100644
index 7efabbe..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1303617-imfile-wildcards.patch
+++ /dev/null
@@ -1,2211 +0,0 @@
---- ./config.h.in.fix
-+++ ./config.h.in
-@@ -97,6 +97,9 @@
- /* set define */
- #undef HAVE_GLOB_NOMAGIC
-
-+/* Define to 1 if you have the `inotify_init` function. */
-+#undef HAVE_INOTIFY_INIT
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-@@ -265,6 +268,9 @@
- /* Define to 1 if you have the <sys/ioctl.h> header file. */
- #undef HAVE_SYS_IOCTL_H
-
-+/* Define to 1 if you have the <sys/inotify.h> header file. */
-+#undef HAVE_SYS_INOTIFY_H
-+
- /* Define to 1 if you have the <sys/param.h> header file. */
- #undef HAVE_SYS_PARAM_H
-
---- ./configure.fix
-+++ ./configure
-@@ -13958,7 +13958,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>c
-
- fi
-
--for ac_header in arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h
-+for ac_header in arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -15153,7 +15153,7 @@ fi
- done
-
-
--for ac_func in flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setsid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync syscall lseek64
-+for ac_func in flock inotify_init basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setsid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync syscall lseek64
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-
-#diff --git a/configure.ac b/configure.ac
-#index 123ed7e..be5d7f1 100644
-#--- a/configure.ac
-#+++ b/configure.ac
-#@@ -85,7 +85,7 @@ AC_SUBST(DL_LIBS)
-# AC_HEADER_RESOLV
-# AC_HEADER_STDC
-# AC_HEADER_SYS_WAIT
-#-AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h])
-#+AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h sys/inotify.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h])
-#
-# # Checks for typedefs, structures, and compiler characteristics.
-# AC_C_CONST
-#@@ -121,7 +121,7 @@ AC_TYPE_SIGNAL
-# AC_FUNC_STAT
-# AC_FUNC_STRERROR_R
-# AC_FUNC_VPRINTF
-#-AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setsid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync syscall lseek64])
-#+AC_CHECK_FUNCS([flock inotify_init basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setsid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync syscall lseek64])
-#
-# # getifaddrs is in libc (mostly) or in libsocket (eg Solaris 11) or not defined (eg Solaris 10)
-# AC_SEARCH_LIBS([getifaddrs], [socket], [AC_DEFINE(HAVE_GETIFADDRS, [1], [set define])])
-
-diff --git a/doc/imfile.html b/doc/imfile.html
-index a69f62e..4592cde 100644
---- a/doc/imfile.html
-+++ b/doc/imfile.html
-@@ -30,26 +30,74 @@ lines from the previous file can no longer be obtained.</p>
- records the last processed location and continues to work from there
- upon restart. So no data is lost during a restart (except, as noted
- above, if the file is rotated just in this very moment).</p>
--<p>Currently, the file must have a fixed name and location
--(directory). It is planned to add support for dynamically generating
--file names in the future.</p>
--<p>Multiple files may be monitored by specifying
--$InputRunFileMonitor multiple times.
--</p>
-+
-+<b>State Files</b><br>
-+<p>Rsyslog must keep track of which parts of the monitored file
-+are already processed. This is done in so-called “state files”.
-+These files are always created in the rsyslog working directory
-+(configurable via $WorkDirectory).</p>
-+<p>To avoid problems with duplicate state files, rsyslog automatically
-+generates state file names according to the following scheme:</p>
-+<ul class="simple">
-+<li>the string “imfile-state:” is added before the actual file name,
-+which includes the full path</li>
-+<li>the full name is prepended after that string, but all occurrences
-+of “/” are replaced by “-” to facilitate handling of these files</li>
-+</ul>
-+<p>As a concrete example, consider file <code class="docutils literal"><span class="pre">/var/log/applog</span></code> is
-+being monitored. The corresponding state file will be named
-+<code class="docutils literal"><span class="pre">imfile-state:-var-log-applog</span></code>.</p>
-+<p>Note that it is possible to set a fixed state file name via the
-+deprecated “stateFile” parameter. It is suggested to avoid this, as
-+the user must take care of name clashes. Most importantly, if
-+“stateFile” is set for file monitors with wildcards, the <strong>same</strong>
-+state file is used for all occurrences of these files. In short,
-+this will usually not work and cause confusion. Upon startup,
-+rsyslog tries to detect these cases and emit warning messages.
-+However, the detection simply checks for the presence of “*”
-+and as such it will not cover more complex cases.</p>
-+<p>Note that when $WorkDirectory is not set or
-+set to a non-writable location, the state file <strong>will not be generated</strong>.
-+In those cases, the file content will always be completely re-sent by
-+imfile, because the module does not know that it already processed
-+parts of that file.</p>
-+
-+<b>Metadata</b><br>
-+<p>The imfile module supports message metadata. It supports the following
-+data items</p>
-+<ul>
-+<li><p class="first">filename</p>
-+<p>Name of the file where the message originated from. This is most
-+useful when using wildcards inside file monitors, because it then
-+is the only way to know which file the message originated from.
-+The value can be accessed using the %$!metadata!filename% property.</p>
-+</li>
-+</ul>
-+<p>Metadata is only present if enabled. By default it is enabled for
-+input() statements that contain wildcards. For all others, it is
-+disabled by default. It can explicitly be turned on or off via the
-+<em>addMetadata</em> input() parameter, which always overrides the default.</p>
-+</div>
-+
-
- <p><b>Configuration Directives</b>:</p>
- <p><b>Module Directives</b></p>
- <ul>
--<li><span style="font-weight: bold;">PollingInterval
--seconds</span><br>
--This is a global setting. It specifies how often files are to be polled
--for new data. The time specified is in seconds. The <span style="font-weight: bold;">default value</span> is 10
--seconds. Please note that future
--releases of imfile may support per-file polling intervals, but
--currently this is not the case. If multiple PollingInterval
--statements are present in rsyslog.conf, only the last one is used.<br>
-+<li><b>mode</b> (requires v8.1.5+)<br>
-+This specifies if imfile is shall run in inotify ("inotify", <b>default</b>)
-+or polling ("polling") mode. Traditionally, imfile used polling mode, which is much more
-+resource-intense (and slower) than inotify mode. It is suggested that users
-+turn on "polling" mode only if they experience strange problems in inotify mode.
-+In theory, there never should be a reason to enable "polling" mode and later versions
-+will most probably remove that mode.
-+
-+<li><b>PollingInterval</b><br>
-+This setting specifies how often files are to be polled for new data.
-+For obvious reasons, it has effect only if imfile is runnin in polling mode.
-+The time specified is in seconds. The <b>default value</b>
-+is 10 seconds.<br>
- A short poll interval provides more rapid message forwarding, but
--requires more system resources. While it is possible, we stongly
-+requires more system resources. While it is possible, we strongly
- recommend not to set the polling interval to 0 seconds. That will make
- rsyslogd become a CPU hog, taking up considerable resources. It is
- supported, however, for the few very unusual situations where this
-@@ -61,37 +109,31 @@ nothing is left to be processed.</li>
-
- <p><b>Action Directives</b></p>
- <ul>
--<li><strong>(required) File /path/to/file</strong><br>
--The file being monitored. So far, this must be an absolute name (no
--macros or templates)</li>
--<li><span style="font-weight: bold;">(required) Tag
--tag:</span><br>
-+<li><b>File</b> (mandatory)<br>
-+The file to be monitored. This must be an absolute name.</li>
-+
-+<li><b>StateFile</b><br>
-+This is the name of this file’s state file. This parameter should
-+usually <strong>not</strong> be used. Check the section on “State Files” above
-+for more details.</li>
-+
-+<li><b>Tag</b> (mandatory)<br>
- The tag to be used for messages that originate from this file. If you
- would like to see the colon after the tag, you need to specify it here
--(as shown above).</li>
--<li><span style="font-weight: bold;">(required) StateFile
--<name-of-state-file></span><br>
--Rsyslog must keep track of which parts of the to be monitored file it
--already processed. This is done in the state file. This file always is
--created in the rsyslog working directory (configurable via
--$WorkDirectory). Be careful to use unique names for different files
--being monitored. If there are duplicates, all sorts of "interesting"
--things may happen. Rsyslog currently does not check if a name is
--specified multiple times.
--Note that when $WorkDirectory is not set or set to a non-writable
--location, the state file will not be generated.</li>
--<li><span style="font-weight: bold;">Facility
--facility</span><br>
-+(like 'tag="tag:"').</li>
-+
-+<li><b>Facility</b><br>
- The syslog facility to be assigned to lines read. Can be specified in
- textual form (e.g. "local0", "local1", ...) or as numbers (e.g. 128 for
--"local0"). Textual form is suggested. <span style="font-weight: bold;">Default</span> is
--"local0".<span style="font-weight: bold;"></span></li>
--<li><span style="font-weight: bold;">Severity</span><br>
--The
--syslog severity to be assigned to lines read. Can be specified in
-+"local0"). Textual form is suggested. <b>Default</b> is
-+"local0".</li>
-+
-+<li><b>Severity</b><br>
-+The syslog severity to be assigned to lines read. Can be specified in
- textual form (e.g. "info", "warning", ...) or as numbers (e.g. 4 for
--"info"). Textual form is suggested. <span style="font-weight: bold;">Default</span>
-+"info"). Textual form is suggested. <b>Default</b>
- is "notice".</li>
-+
- <li><b>PersistStateInterval</b> [lines]</b><br>
- Specifies how often the state file shall be written when processing the input
- file. The <strong>default</strong> value is 0, which means a new state file is only written when
-@@ -101,20 +143,29 @@ been processed. This setting can be used to guard against message duplication du
- to fatal errors (like power fail). Note that this setting affects imfile
- performance, especially when set to a low value. Frequently writing the state
- file is very time consuming.
-+
- <li><b>ReadMode</b> [mode]</b><br>
- This mode should defined when having multiline messages. The value can range from 0-2 and determines the multiline detection method.
- <br>0 (<strong>default</strong>) - line based (Each line is a new message)
- <br>1 - paragraph (There is a blank line between log messages)
- <br>2 - indented (New log messages start at the beginning of a line. If a line starts with a space it is part of the log message before it)
-+
- <li><b>MaxLinesAtOnce</b> [number]</b>
--<br>
--This is useful if multiple files need to be monitored. If set to 0, each file
--will be fully processed and then processing switches to the next file
--(this was the default in previous versions). If it is set, a maximum of
--[number] lines is processed in sequence for each file, and then the file is
--switched. This provides a kind of mutiplexing the load of multiple files and
--probably leads to a more natural distribution of events when multiple busy files
--are monitored. The <strong>default</strong> is 1024.
-+<dd><p>This is a legacy setting that only is supported in <em>polling</em> mode.
-+In <em>inotify</em> mode, it is fixed at 0 and all attempts to configure
-+a different value will be ignored, but will generate an error
-+message.</p>
-+<p>Please note that future versions of imfile may not support this
-+parameter at all. So it is suggested to not use it.</p>
-+<p>In <em>polling</em> mode, if set to 0, each file will be fully processed and
-+then processing switches to the next file. If it is set to any other
-+value, a maximum of [number] lines is processed in sequence for each file,
-+and then the file is switched. This provides a kind of mutiplexing
-+the load of multiple files and probably leads to a more natural
-+distribution of events when multiple busy files are monitored. For
-+<em>polling</em> mode, the <strong>default</strong> is 10240.</p>
-+</dd></dl>
-+
- <li><b>MaxSubmitAtOnce</b> [number]</b>
- <br>
- This is an expert option. It can be used to set the maximum input batch size that
-@@ -124,17 +175,38 @@ modify this option. If you do not know what this doc here talks about, this is a
- good indication that you should NOT modify the default.
- <li><b>Ruleset</b> <ruleset>
- Binds the listener to a specific <a href="multi_ruleset.html">ruleset</a>.</li>
-+
-+<li><b>deleteStateOnFileDelete [on/off]</b>
-+<dd><p><strong>Default: on</strong></p>
-+<p>This parameter controls if state files are deleted if their associated
-+main file is deleted. Usually, this is a good idea, because otherwise
-+problems would occur if a new file with the same name is created. In
-+that case, imfile would pick up reading from the last position in
-+the <strong>deleted</strong> file, which usually is not what you want.</p>
-+<p>However, there is one situation where not deleting associated state
-+file makes sense: this is the case if a monitored file is modified
-+with an editor (like vi or gedit). Most editors write out modifications
-+by deleting the old file and creating a new now. If the state file
-+would be deleted in that case, all of the file would be reprocessed,
-+something that’s probably not intended in most case. As a side-note,
-+it is strongly suggested <em>not</em> to modify monitored files with
-+editors. In any case, in such a situation, it makes sense to
-+disable state file deletion. That also applies to similar use
-+cases.</p>
-+<p>In general, this parameter should only by set if the users
-+knows exactly why this is required.</p>
-+</dd></dl></li>
-+
-+<li><b>addMetadata [on/off]</b>
-+<dd><p><strong>Default: see intro section on Metadata</strong></p>
-+<p>This is used to turn on or off the addition of metadata to the
-+message object.</p>
-+</dd></dl></li>
-+
- </ul>
-+
- <b>Caveats/Known Bugs:</b>
--<p>So far, only 100 files can be monitored. If more are needed,
--the source needs to be patched. See define MAX_INPUT_FILES in imfile.c</p><p>Powertop
--users may want to notice that imfile utilizes polling. Thus, it is no
--good citizen when it comes to conserving system power consumption. We
--are currently evaluating to move to inotify(). However, there are a
--number of subtle issues, which needs to be worked out first. We will
--make the change as soon as we can. If you can afford it, we recommend
--using a long polling interval in the mean time.
--</p>
-+<p>Currently none.
- <p><b>Sample:</b></p>
- <p>The following sample monitors two files. If you need just one,
- remove the second one. If you need more, add them according to the
-@@ -160,6 +232,11 @@ input(type="imfile" File="/path/to/file2"
-
-
- <p><b>Legacy Configuration Directives</b>:</p>
-+<p>Note: in order to preserve compatibility with previous versions, the
-+LF escaping in multi-line messages is turned off for legacy-configured
-+file monitors (the "escapeLF" input parameter). This can cause serious problems.
-+So it is highly suggested that new deployments use the new input() statement
-+and keep LF escaping turned on.
- <ul>
- <li><strong>$InputFileName /path/to/file</strong><br>
- equivalent to: File </li>
-@@ -194,16 +271,6 @@ equivalent to: MaxLinesAtOnce
- Available in 5.7.5+, 6.1.5+<br>
- equivalent to: Ruleset </li>
- </ul>
--<b>Caveats/Known Bugs:</b>
--<p>So far, only 100 files can be monitored. If more are needed,
--the source needs to be patched. See define MAX_INPUT_FILES in imfile.c</p><p>Powertop
--users may want to notice that imfile utilizes polling. Thus, it is no
--good citizen when it comes to conserving system power consumption. We
--are currently evaluating to move to inotify(). However, there are a
--number of subtle issues, which needs to be worked out first. We will
--make the change as soon as we can. If you can afford it, we recommend
--using a long polling interval in the mean time.
--</p>
- <p><b>Sample:</b></p>
- <p>The following sample monitors two files. If you need just one,
- remove the second one. If you need more, add them according to the
-@@ -234,7 +301,7 @@ $InputFilePollInterval 10
- [<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
- <p><font size="2">This documentation is part of the
- <a href="http://www.rsyslog.com/">rsyslog</a> project.<br>
--Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer
-+Copyright © 2008-2014 by <a href="http://www.gerhards.net/rainer">Rainer
- Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>.
- Released under the GNU GPL version 3 or higher.</font></p>
- </body></html>
-diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
-index 9c824c1..a094f77 100644
---- a/plugins/imfile/imfile.c
-+++ b/plugins/imfile/imfile.c
-@@ -31,6 +31,13 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <pthread.h> /* do NOT remove: will soon be done by the module generation macros */
-+#include <sys/types.h>
-+#include <unistd.h>
-+#include <glob.h>
-+#include <fnmatch.h>
-+#ifdef HAVE_SYS_INOTIFY_H
-+#include <sys/inotify.h>
-+#endif
- #ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
-@@ -70,22 +77,40 @@ static int bLegacyCnfModGlobalsPermitted;/* are legacy module-global config para
- #define NUM_MULTISUB 1024 /* default max number of submits */
- #define DFLT_PollInterval 10
-
--typedef struct fileInfo_s {
-+#define INIT_FILE_TAB_SIZE 4 /* default file table size - is extended as needed, use 2^x value */
-+#define INIT_FILE_IN_DIR_TAB_SIZE 1 /* initial size for "associated files tab" in directory table */
-+#define INIT_WDMAP_TAB_SIZE 1 /* default wdMap table size - is extended as needed, use 2^x value */
-+
-+#define ADD_METADATA_UNSPECIFIED -1
-+
-+/* this structure is used in pure polling mode as well one of the support
-+ * structures for inotify.
-+ */
-+typedef struct lstn_s {
-+ struct lstn_s *next, *prev;
-+ struct lstn_s *masterLstn;/* if dynamic file (via wildcard), this points to the configured
-+ * master entry. For master entries, it is always NULL. Only
-+ * dynamic files can be deleted from the "files" list. */
- uchar *pszFileName;
-+ uchar *pszDirName;
-+ uchar *pszBaseName;
- uchar *pszTag;
- size_t lenTag;
-- uchar *pszStateFile; /* file in which state between runs is to be stored */
-+ uchar *pszStateFile; /* file in which state between runs is to be stored (dynamic if NULL) */
- int iFacility;
- int iSeverity;
- int maxLinesAtOnce;
- int nRecords; /**< How many records did we process before persisting the stream? */
- int iPersistStateInterval; /**< how often should state be persisted? (0=on close only) */
- strm_t *pStrm; /* its stream (NULL if not assigned) */
-+ sbool bRMStateOnDel;
-+ sbool hasWildcard;
- int readMode; /* which mode to use in ReadMulteLine call? */
-+ sbool addMetadata;
- ruleset_t *pRuleset; /* ruleset to bind listener to (use system default if unspecified) */
- ratelimit_t *ratelimiter;
- multi_submit_t multiSub;
--} fileInfo_t;
-+} lstn_t;
-
- static struct configSettings_s {
- uchar *pszFileName;
-@@ -103,6 +128,8 @@ static struct configSettings_s {
-
- struct instanceConf_s {
- uchar *pszFileName;
-+ uchar *pszDirName;
-+ uchar *pszFileBaseName;
- uchar *pszTag;
- uchar *pszStateFile;
- uchar *pszBindRuleset;
-@@ -110,7 +137,9 @@ struct instanceConf_s {
- int iPersistStateInterval;
- int iFacility;
- int iSeverity;
-+ sbool bRMStateOnDel;
- int readMode;
-+ sbool addMetadata;
- int maxLinesAtOnce;
- ruleset_t *pBindRuleset; /* ruleset to bind listener to (use system default if unspecified) */
- struct instanceConf_s *next;
-@@ -118,28 +147,94 @@ struct instanceConf_s {
-
-
- /* forward definitions */
--static rsRetVal persistStrmState(fileInfo_t *pInfo);
-+static rsRetVal persistStrmState(lstn_t *pInfo);
- static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal);
-
-+
-+#define OPMODE_POLLING 0
-+#define OPMODE_INOTIFY 1
-+
- /* config variables */
- struct modConfData_s {
- rsconf_t *pConf; /* our overall config object */
- int iPollInterval; /* number of seconds to sleep when there was no file activity */
- instanceConf_t *root, *tail;
-+ lstn_t *pRootLstn;
-+ lstn_t *pTailLstn;
-+ uint8_t opMode;
- sbool configSetViaV2Method;
- };
- static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
- static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current load process */
-
--static int iFilPtr = 0; /* number of files to be monitored; pointer to next free spot during config */
--#define MAX_INPUT_FILES 100
--static fileInfo_t files[MAX_INPUT_FILES];
-+#if HAVE_INOTIFY_INIT
-+/* support for inotify mode */
-+
-+/* we need to track directories */
-+struct dirInfoFiles_s { /* associated files */
-+ lstn_t *pLstn;
-+ int refcnt; /* due to inotify's async nature, we may have multiple
-+ * references to a single file inside our cache - e.g. when
-+ * inodes are removed, and the file name is re-created BUT another
-+ * process (like rsyslogd ;)) holds open the old inode.
-+ */
-+};
-+typedef struct dirInfoFiles_s dirInfoFiles_t;
-+
-+/* This structure is a dynamic table to track file entries */
-+struct fileTable_s {
-+ dirInfoFiles_t *listeners;
-+ int currMax;
-+ int allocMax;
-+};
-+typedef struct fileTable_s fileTable_t;
-+
-+/* The dirs table (defined below) contains one entry for each directory that
-+ * is to be monitored. For each directory, it contains array which point to
-+ * the associated *active* files as well as *configured* files. Note that
-+ * the configured files may currently not exist, but will be processed
-+ * when they are created.
-+ */
-+struct dirInfo_s {
-+ uchar *dirName;
-+ fileTable_t active; /* associated active files */
-+ fileTable_t configured; /* associated configured files */
-+};
-+typedef struct dirInfo_s dirInfo_t;
-+static dirInfo_t *dirs = NULL;
-+static int allocMaxDirs;
-+static int currMaxDirs;
-+/* the following two macros are used to select the correct file table */
-+#define ACTIVE_FILE 1
-+#define CONFIGURED_FILE 0
-+
-+
-+/* We need to map watch descriptors to our actual objects. Unfortunately, the
-+ * inotify API does not provide us with any cookie, so a simple O(1) algorithm
-+ * cannot be done (what a shame...). We assume that maintaining the array is much
-+ * less often done than looking it up, so we keep the array sorted by watch descripor
-+ * and do a binary search on the wd we get back. This is at least O(log n), which
-+ * is not too bad for the anticipated use case.
-+ */
-+struct wd_map_s {
-+ int wd; /* ascending sort key */
-+ lstn_t *pLstn; /* NULL, if this is a dir entry, otherwise pointer into listener(file) table */
-+ int dirIdx; /* index into dirs table, undefined if pLstn == NULL */
-+};
-+typedef struct wd_map_s wd_map_t;
-+static wd_map_t *wdmap = NULL;
-+static int nWdmap;
-+static int allocMaxWdmap;
-+static int ino_fd; /* fd for inotify calls */
-+
-+#endif /* #if HAVE_INOTIFY_INIT 40 -------------------------------------------------- */
-
- static prop_t *pInputName = NULL; /* there is only one global inputName for all messages generated by this input */
-
- /* module-global parameters */
- static struct cnfparamdescr modpdescr[] = {
-- { "pollinginterval", eCmdHdlrPositiveInt, 0 }
-+ { "pollinginterval", eCmdHdlrPositiveInt, 0 },
-+ { "mode", eCmdHdlrGetWord, 0 }
- };
- static struct cnfparamblk modpblk =
- { CNFPARAMBLK_VERSION,
-@@ -150,7 +245,7 @@ static struct cnfparamblk modpblk =
- /* input instance parameters */
- static struct cnfparamdescr inppdescr[] = {
- { "file", eCmdHdlrString, CNFPARAM_REQUIRED },
-- { "statefile", eCmdHdlrString, CNFPARAM_REQUIRED },
-+ { "statefile", eCmdHdlrString, 0 },
- { "tag", eCmdHdlrString, CNFPARAM_REQUIRED },
- { "severity", eCmdHdlrSeverity, 0 },
- { "facility", eCmdHdlrFacility, 0 },
-@@ -158,7 +253,10 @@ static struct cnfparamdescr inppdescr[] = {
- { "readmode", eCmdHdlrInt, 0 },
- { "maxlinesatonce", eCmdHdlrInt, 0 },
- { "maxsubmitatonce", eCmdHdlrInt, 0 },
-- { "persiststateinterval", eCmdHdlrInt, 0 }
-+ { "removestateondelete", eCmdHdlrBinary, 0 },
-+ { "persiststateinterval", eCmdHdlrInt, 0 },
-+ { "deletestateonfiledelete", eCmdHdlrBinary, 0 },
-+ { "addmetadata", eCmdHdlrBinary, 0 },
- };
- static struct cnfparamblk inppblk =
- { CNFPARAMBLK_VERSION,
-@@ -168,10 +266,171 @@ static struct cnfparamblk inppblk =
-
- #include "im-helper.h" /* must be included AFTER the type definitions! */
-
-+
-+#if HAVE_INOTIFY_INIT
-+/* support for inotify mode */
-+
-+#if 0 /* enable if you need this for debugging */
-+static void
-+dbg_wdmapPrint(char *msg)
-+{
-+ int i;
-+ DBGPRINTF("%s\n", msg);
-+ for(i = 0 ; i < nWdmap ; ++i)
-+ DBGPRINTF("wdmap[%d]: wd: %d, file %d, dir %d\n", i,
-+ wdmap[i].wd, wdmap[i].fIdx, wdmap[i].dirIdx);
-+}
-+#endif
-+
-+static inline rsRetVal
-+wdmapInit(void)
-+{
-+ DEFiRet;
-+ free(wdmap);
-+ CHKmalloc(wdmap = malloc(sizeof(wd_map_t) * INIT_WDMAP_TAB_SIZE));
-+ allocMaxWdmap = INIT_WDMAP_TAB_SIZE;
-+ nWdmap = 0;
-+finalize_it:
-+ RETiRet;
-+}
-+
-+/* looks up a wdmap entry by dirIdx and returns it's index if found
-+ * or -1 if not found.
-+ */
-+static int
-+wdmapLookupListner(lstn_t* pLstn)
-+{
-+ int i = 0;
-+ int wd = -1;
-+ /* Loop through */
-+ for(i = 0 ; i < nWdmap; ++i) {
-+ if (wdmap[i].pLstn == pLstn)
-+ wd = wdmap[i].wd;
-+ }
-+
-+ return wd;
-+}
-+
-+/* compare function for bsearch() */
-+static int
-+wdmap_cmp(const void *k, const void *a)
-+{
-+ int key = *((int*) k);
-+ wd_map_t *etry = (wd_map_t*) a;
-+ if(key < etry->wd)
-+ return -1;
-+ else if(key > etry->wd)
-+ return 1;
-+ else
-+ return 0;
-+}
-+/* looks up a wdmap entry and returns it's index if found
-+ * or -1 if not found.
-+ */
-+static wd_map_t *
-+wdmapLookup(int wd)
-+{
-+ return bsearch(&wd, wdmap, nWdmap, sizeof(wd_map_t), wdmap_cmp);
-+}
-+
-+/* note: we search backwards, as inotify tends to return increasing wd's */
-+static rsRetVal
-+wdmapAdd(int wd, const int dirIdx, lstn_t *const pLstn)
-+{
-+ wd_map_t *newmap;
-+ int newmapsize;
-+ int i;
-+ DEFiRet;
-+
-+ for(i = nWdmap-1 ; i >= 0 && wdmap[i].wd > wd ; --i)
-+ ; /* just scan */
-+ if(i >= 0 && wdmap[i].wd == wd) {
-+ DBGPRINTF("imfile: wd %d already in wdmap!\n", wd);
-+ ABORT_FINALIZE(RS_RET_FILE_ALREADY_IN_TABLE);
-+ }
-+ ++i;
-+ /* i now points to the entry that is to be moved upwards (or end of map) */
-+ if(nWdmap == allocMaxWdmap) {
-+ newmapsize = 2 * allocMaxWdmap;
-+ CHKmalloc(newmap = realloc(wdmap, sizeof(wd_map_t) * newmapsize));
-+ // TODO: handle the error more intelligently? At all possible? -- 2013-10-15
-+ wdmap = newmap;
-+ allocMaxWdmap = newmapsize;
-+ }
-+ if(i < nWdmap) {
-+ /* we need to shift to make room for new entry */
-+ memmove(wdmap + i + 1, wdmap + i, sizeof(wd_map_t) * (nWdmap - i));
-+ }
-+ wdmap[i].wd = wd;
-+ wdmap[i].dirIdx = dirIdx;
-+ wdmap[i].pLstn = pLstn;
-+ ++nWdmap;
-+ DBGPRINTF("imfile: enter into wdmap[%d]: wd %d, dir %d, lstn %s:%s\n",i,wd,dirIdx,
-+ (pLstn == NULL) ? "DIRECTORY" : "FILE",
-+ (pLstn == NULL) ? dirs[dirIdx].dirName : pLstn->pszFileName);
-+
-+finalize_it:
-+ RETiRet;
-+}
-+
-+static rsRetVal
-+wdmapDel(const int wd)
-+{
-+ int i;
-+ DEFiRet;
-+
-+ for(i = 0 ; i < nWdmap && wdmap[i].wd < wd ; ++i)
-+ ; /* just scan */
-+ if(i == nWdmap || wdmap[i].wd != wd) {
-+ DBGPRINTF("imfile: wd %d shall be deleted but not in wdmap!\n", wd);
-+ FINALIZE;
-+ }
-+
-+ if(i < nWdmap-1) {
-+ /* we need to shift to delete it (see comment at wdmap definition) */
-+ memmove(wdmap + i, wdmap + i + 1, sizeof(wd_map_t) * (nWdmap - i - 1));
-+ }
-+ --nWdmap;
-+ DBGPRINTF("imfile: wd %d deleted, was idx %d\n", wd, i);
-+
-+finalize_it:
-+ RETiRet;
-+}
-+
-+#endif /* #if HAVE_INOTIFY_INIT */
-+
-+
-+/* this generates a state file name suitable for the current file. To avoid
-+ * malloc calls, it must be passed a buffer which should be MAXFNAME large.
-+ * Note: the buffer is not necessarily populated ... always ONLY use the
-+ * RETURN VALUE!
-+ */
-+static uchar *
-+getStateFileName(lstn_t *const __restrict__ pLstn,
-+ uchar *const __restrict__ buf,
-+ const size_t lenbuf)
-+{
-+ uchar *ret;
-+ if(pLstn->pszStateFile == NULL) {
-+ snprintf((char*)buf, lenbuf - 1, "imfile-state:%s", pLstn->pszFileName);
-+ buf[lenbuf-1] = '\0'; /* be on the safe side... */
-+ uchar *p = buf;
-+ for( ; *p ; ++p) {
-+ if(*p == '/')
-+ *p = '-';
-+ }
-+ ret = buf;
-+ } else {
-+ ret = pLstn->pszStateFile;
-+ }
-+ return ret;
-+}
-+
-+
- /* enqueue the read file line as a message. The provided string is
- * not freed - thuis must be done by the caller.
- */
--static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine)
-+static rsRetVal enqLine(lstn_t *pLstn, cstr_t *cstrLine)
- {
- DEFiRet;
- msg_t *pMsg;
-@@ -184,14 +443,16 @@ static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine)
- CHKiRet(msgConstruct(&pMsg));
- MsgSetFlowControlType(pMsg, eFLOWCTL_FULL_DELAY);
- MsgSetInputName(pMsg, pInputName);
-- MsgSetRawMsg(pMsg, (char*)rsCStrGetSzStr(cstrLine), cstrLen(cstrLine));
-+ MsgSetRawMsg(pMsg, (char*)rsCStrGetSzStrNoNULL(cstrLine), cstrLen(cstrLine));
- MsgSetMSGoffs(pMsg, 0); /* we do not have a header... */
- MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName()));
-- MsgSetTAG(pMsg, pInfo->pszTag, pInfo->lenTag);
-- pMsg->iFacility = LOG_FAC(pInfo->iFacility);
-- pMsg->iSeverity = LOG_PRI(pInfo->iSeverity);
-- MsgSetRuleset(pMsg, pInfo->pRuleset);
-- ratelimitAddMsg(pInfo->ratelimiter, &pInfo->multiSub, pMsg);
-+ MsgSetTAG(pMsg, pLstn->pszTag, pLstn->lenTag);
-+ pMsg->iFacility = LOG_FAC(pLstn->iFacility);
-+ pMsg->iSeverity = LOG_PRI(pLstn->iSeverity);
-+ MsgSetRuleset(pMsg, pLstn->pRuleset);
-+ if(pLstn->addMetadata)
-+ msgAddMetadata(pMsg, (uchar*)"filename", pLstn->pszFileName);
-+ ratelimitAddMsg(pLstn->ratelimiter, &pLstn->multiSub, pMsg);
- finalize_it:
- RETiRet;
- }
-@@ -201,30 +462,37 @@ finalize_it:
- * if so, reading it in. Processing continues from the last know location.
- */
- static rsRetVal
--openFile(fileInfo_t *pThis)
-+openFile(lstn_t *pLstn)
- {
- DEFiRet;
- strm_t *psSF = NULL;
- uchar pszSFNam[MAXFNAME];
- size_t lenSFNam;
- struct stat stat_buf;
-+ uchar statefile[MAXFNAME];
-
-+ uchar *const statefn = getStateFileName(pLstn, statefile, sizeof(statefile));
-+ DBGPRINTF("imfile: trying to open state for '%s', state file '%s'\n",
-+ pLstn->pszFileName, statefn);
- /* Construct file name */
-- lenSFNam = snprintf((char*)pszSFNam, sizeof(pszSFNam) / sizeof(uchar), "%s/%s",
-- (char*) glbl.GetWorkDir(), (char*)pThis->pszStateFile);
-+ lenSFNam = snprintf((char*)pszSFNam, sizeof(pszSFNam), "%s/%s",
-+ (char*) glbl.GetWorkDir(), (char*)statefn);
-
- /* check if the file exists */
- if(stat((char*) pszSFNam, &stat_buf) == -1) {
- if(errno == ENOENT) {
-- dbgprintf("filemon %p: clean startup, no .si file found\n", pThis);
-+ DBGPRINTF("imfile: clean startup, state file for '%s'\n", pLstn->pszFileName);
- ABORT_FINALIZE(RS_RET_FILE_NOT_FOUND);
- } else {
-- dbgprintf("filemon %p: error %d trying to access .si file\n", pThis, errno);
-+ char errStr[1024];
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ DBGPRINTF("imfile: error trying to access state file for '%s':%s\n",
-+ pLstn->pszFileName, errStr);
- ABORT_FINALIZE(RS_RET_IO_ERROR);
- }
- }
-
-- /* If we reach this point, we have a .si file */
-+ /* If we reach this point, we have a state file */
-
- CHKiRet(strm.Construct(&psSF));
- CHKiRet(strm.SettOperationsMode(psSF, STREAMMODE_READ));
-@@ -233,10 +501,22 @@ openFile(fileInfo_t *pThis)
- CHKiRet(strm.ConstructFinalize(psSF));
-
- /* read back in the object */
-- CHKiRet(obj.Deserialize(&pThis->pStrm, (uchar*) "strm", psSF, NULL, pThis));
-+ CHKiRet(obj.Deserialize(&pLstn->pStrm, (uchar*) "strm", psSF, NULL, pLstn));
-+ DBGPRINTF("imfile: deserialized state file, state file base name '%s', "
-+ "configured base name '%s'\n", pLstn->pStrm->pszFName,
-+ pLstn->pszFileName);
-+ if(ustrcmp(pLstn->pStrm->pszFName, pLstn->pszFileName)) {
-+ errmsg.LogError(0, RS_RET_STATEFILE_WRONG_FNAME, "imfile: state file '%s' "
-+ "contains file name '%s', but is used for file '%s'. State "
-+ "file deleted, starting from begin of file.",
-+ pszSFNam, pLstn->pStrm->pszFName, pLstn->pszFileName);
-+
-+ unlink((char*)pszSFNam);
-+ ABORT_FINALIZE(RS_RET_STATEFILE_WRONG_FNAME);
-+ }
-
-- strm.CheckFileChange(pThis->pStrm);
-- CHKiRet(strm.SeekCurrOffs(pThis->pStrm));
-+ strm.CheckFileChange(pLstn->pStrm);
-+ CHKiRet(strm.SeekCurrOffs(pLstn->pStrm));
-
- /* note: we do not delete the state file, so that the last position remains
- * known even in the case that rsyslogd aborts for some reason (like powerfail)
-@@ -247,13 +527,13 @@ finalize_it:
- strm.Destruct(&psSF);
-
- if(iRet != RS_RET_OK) {
-- if(pThis->pStrm != NULL)
-- strm.Destruct(&pThis->pStrm);
-- CHKiRet(strm.Construct(&pThis->pStrm));
-- CHKiRet(strm.SettOperationsMode(pThis->pStrm, STREAMMODE_READ));
-- CHKiRet(strm.SetsType(pThis->pStrm, STREAMTYPE_FILE_MONITOR));
-- CHKiRet(strm.SetFName(pThis->pStrm, pThis->pszFileName, strlen((char*) pThis->pszFileName)));
-- CHKiRet(strm.ConstructFinalize(pThis->pStrm));
-+ if(pLstn->pStrm != NULL)
-+ strm.Destruct(&pLstn->pStrm);
-+ CHKiRet(strm.Construct(&pLstn->pStrm));
-+ CHKiRet(strm.SettOperationsMode(pLstn->pStrm, STREAMMODE_READ));
-+ CHKiRet(strm.SetsType(pLstn->pStrm, STREAMTYPE_FILE_MONITOR));
-+ CHKiRet(strm.SetFName(pLstn->pStrm, pLstn->pszFileName, strlen((char*) pLstn->pszFileName)));
-+ CHKiRet(strm.ConstructFinalize(pLstn->pStrm));
- }
-
- RETiRet;
-@@ -275,39 +555,38 @@ static void pollFileCancelCleanup(void *pArg)
-
- /* poll a file, need to check file rollover etc. open file if not open */
- #pragma GCC diagnostic ignored "-Wempty-body"
--static rsRetVal pollFile(fileInfo_t *pThis, int *pbHadFileData)
-+static rsRetVal pollFile(lstn_t *pLstn, int *pbHadFileData)
- {
- cstr_t *pCStr = NULL;
-- int nProcessed = 0;
- DEFiRet;
-
-- ASSERT(pbHadFileData != NULL);
--
- /* Note: we must do pthread_cleanup_push() immediately, because the POXIS macros
- * otherwise do not work if I include the _cleanup_pop() inside an if... -- rgerhards, 2008-08-14
- */
- pthread_cleanup_push(pollFileCancelCleanup, &pCStr);
-- if(pThis->pStrm == NULL) {
-- CHKiRet(openFile(pThis)); /* open file */
-+ int nProcessed = 0;
-+ if(pLstn->pStrm == NULL) {
-+ CHKiRet(openFile(pLstn)); /* open file */
- }
-
- /* loop below will be exited when strmReadLine() returns EOF */
- while(glbl.GetGlobalInputTermState() == 0) {
-- if(pThis->maxLinesAtOnce != 0 && nProcessed >= pThis->maxLinesAtOnce)
-+ if(pLstn->maxLinesAtOnce != 0 && nProcessed >= pLstn->maxLinesAtOnce)
- break;
-- CHKiRet(strm.ReadLine(pThis->pStrm, &pCStr, pThis->readMode));
-+ CHKiRet(strm.ReadLine(pLstn->pStrm, &pCStr, pLstn->readMode));
- ++nProcessed;
-- *pbHadFileData = 1; /* this is just a flag, so set it and forget it */
-- CHKiRet(enqLine(pThis, pCStr)); /* process line */
-+ 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(pThis->iPersistStateInterval > 0 && pThis->nRecords++ >= pThis->iPersistStateInterval) {
-- persistStrmState(pThis);
-- pThis->nRecords = 0;
-+ if(pLstn->iPersistStateInterval > 0 && pLstn->nRecords++ >= pLstn->iPersistStateInterval) {
-+ persistStrmState(pLstn);
-+ pLstn->nRecords = 0;
- }
- }
-
- finalize_it:
-- multiSubmitFlush(&pThis->multiSub);
-+ multiSubmitFlush(&pLstn->multiSub);
- pthread_cleanup_pop(0);
-
- if(pCStr != NULL) {
-@@ -338,9 +617,11 @@ createInstance(instanceConf_t **pinst)
- inst->nMultiSub = NUM_MULTISUB;
- inst->iSeverity = 5;
- inst->iFacility = 128;
-- inst->maxLinesAtOnce = 10240;
-+ inst->maxLinesAtOnce = 0;
- inst->iPersistStateInterval = 0;
- inst->readMode = 0;
-+ inst->bRMStateOnDel = 1;
-+ inst->addMetadata = ADD_METADATA_UNSPECIFIED;
-
- /* node created, let's add to config */
- if(loadModConf->tail == NULL) {
-@@ -356,8 +637,94 @@ finalize_it:
- }
-
-
-+/* the basen(ame) buffer must be of size MAXFNAME
-+ * returns the index of the slash in front of basename
-+ */
-+static int
-+getBasename(uchar *const __restrict__ basen, uchar *const __restrict__ path)
-+{
-+ int i;
-+ int found = 0;
-+ const int lenName = ustrlen(path);
-+ for(i = lenName ; i >= 0 ; --i) {
-+ if(path[i] == '/') {
-+ /* found basename component */
-+ found = 1;
-+ if(i == lenName)
-+ basen[0] = '\0';
-+ else {
-+ memcpy(basen, path+i+1, lenName-i);
-+ }
-+ break;
-+ }
-+ }
-+ if (found == 1)
-+ return i;
-+ else {
-+ return -1;
-+ }
-+}
-+
-+/* this function checks instance parameters and does some required pre-processing
-+ * (e.g. split filename in path and actual name)
-+ * Note: we do NOT use dirname()/basename() as they have portability problems.
-+ */
-+static rsRetVal
-+checkInstance(instanceConf_t *inst)
-+{
-+ char dirn[MAXFNAME];
-+ uchar basen[MAXFNAME];
-+ int i;
-+ struct stat sb;
-+ int r;
-+ int eno;
-+ char errStr[512];
-+ DEFiRet;
-+
-+ /* this is primarily for the clang static analyzer, but also
-+ * guards against logic errors in the config handler.
-+ */
-+ if(inst->pszFileName == NULL)
-+ ABORT_FINALIZE(RS_RET_INTERNAL_ERROR);
-+
-+ i = getBasename(basen, inst->pszFileName);
-+ if (i == -1) {
-+ errmsg.LogError(0, RS_RET_CONFIG_ERROR, "imfile: file path '%s' does not include a basename component",
-+ inst->pszFileName);
-+ ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
-+ }
-+
-+ memcpy(dirn, inst->pszFileName, i); /* do not copy slash */
-+ dirn[i] = '\0';
-+ CHKmalloc(inst->pszFileBaseName = (uchar*) strdup((char*)basen));
-+ CHKmalloc(inst->pszDirName = (uchar*) strdup(dirn));
-+
-+ if(dirn[0] == '\0') {
-+ dirn[0] = '/';
-+ dirn[1] = '\0';
-+ }
-+ r = stat(dirn, &sb);
-+ if(r != 0) {
-+ eno = errno;
-+ rs_strerror_r(eno, errStr, sizeof(errStr));
-+ errmsg.LogError(0, RS_RET_CONFIG_ERROR, "imfile warning: directory '%s': %s",
-+ dirn, errStr);
-+ ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
-+ }
-+ if(!S_ISDIR(sb.st_mode)) {
-+ errmsg.LogError(0, RS_RET_CONFIG_ERROR, "imfile warning: configured directory "
-+ "'%s' is NOT a directory", dirn);
-+ ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
-+ }
-+
-+finalize_it:
-+ RETiRet;
-+}
-+
-+
- /* add a new monitor */
--static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
-+static rsRetVal
-+addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
- {
- instanceConf_t *inst;
- DEFiRet;
-@@ -370,10 +737,6 @@ static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
- errmsg.LogError(0, RS_RET_CONFIG_ERROR, "imfile error: no tag value given , file monitor can not be created");
- ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
- }
-- if(cs.pszStateFile == NULL) {
-- errmsg.LogError(0, RS_RET_CONFIG_ERROR, "imfile error: not state file name given, file monitor can not be created");
-- ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
-- }
-
- CHKiRet(createInstance(&inst));
- if((cs.pszBindRuleset == NULL) || (cs.pszBindRuleset[0] == '\0')) {
-@@ -383,12 +746,24 @@ static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
- }
- inst->pszFileName = (uchar*) strdup((char*) cs.pszFileName);
- inst->pszTag = (uchar*) strdup((char*) cs.pszFileTag);
-- inst->pszStateFile = (uchar*) strdup((char*) cs.pszStateFile);
-+ inst->pszStateFile = cs.pszStateFile == NULL ? NULL : (uchar*) strdup((char*) cs.pszStateFile);
- inst->iSeverity = cs.iSeverity;
- inst->iFacility = cs.iFacility;
-- inst->maxLinesAtOnce = cs.maxLinesAtOnce;
-+ if(cs.maxLinesAtOnce) {
-+ if(loadModConf->opMode == OPMODE_INOTIFY) {
-+ errmsg.LogError(0, RS_RET_PARAM_NOT_PERMITTED,
-+ "parameter \"maxLinesAtOnce\" not "
-+ "permited in inotify mode - ignored");
-+ } else {
-+ inst->maxLinesAtOnce = cs.maxLinesAtOnce;
-+ }
-+ }
- inst->iPersistStateInterval = cs.iPersistStateInterval;
- inst->readMode = cs.readMode;
-+ inst->addMetadata = 0;
-+ inst->bRMStateOnDel = 0;
-+
-+ CHKiRet(checkInstance(inst));
-
- /* reset legacy system */
- cs.iPersistStateInterval = 0;
-@@ -400,41 +775,155 @@ finalize_it:
- }
-
-
--/* This function is called when a new listener (monitor) shall be added. */
-+/* This adds a new listener object to the bottom of the list, but
-+ * it does NOT initialize any data members except for the list
-+ * pointers themselves.
-+ */
-+static rsRetVal
-+lstnAdd(lstn_t **newLstn)
-+{
-+ lstn_t *pLstn;
-+ DEFiRet;
-+
-+ CHKmalloc(pLstn = (lstn_t*) MALLOC(sizeof(lstn_t)));
-+ if(runModConf->pRootLstn == NULL) {
-+ runModConf->pRootLstn = pLstn;
-+ pLstn->prev = NULL;
-+ } else {
-+ runModConf->pTailLstn->next = pLstn;
-+ pLstn->prev = runModConf->pTailLstn;
-+ }
-+ runModConf->pTailLstn = pLstn;
-+ pLstn->next = NULL;
-+ *newLstn = pLstn;
-+
-+finalize_it:
-+ RETiRet;
-+}
-+
-+/* delete a listener object */
-+static void
-+lstnDel(lstn_t *pLstn)
-+{
-+ DBGPRINTF("imfile: lstnDel called for %s\n", pLstn->pszFileName);
-+ if(pLstn->pStrm != NULL) { /* stream open? */
-+ persistStrmState(pLstn);
-+ strm.Destruct(&(pLstn->pStrm));
-+ }
-+ ratelimitDestruct(pLstn->ratelimiter);
-+ free(pLstn->multiSub.ppMsgs);
-+ free(pLstn->pszFileName);
-+ free(pLstn->pszTag);
-+ free(pLstn->pszStateFile);
-+ free(pLstn->pszBaseName);
-+
-+ if(pLstn == runModConf->pRootLstn)
-+ runModConf->pRootLstn = pLstn->next;
-+ if(pLstn == runModConf->pTailLstn)
-+ runModConf->pTailLstn = pLstn->prev;
-+ if(pLstn->next != NULL)
-+ pLstn->next->prev = pLstn->prev;
-+ if(pLstn->prev != NULL)
-+ pLstn->prev->next = pLstn->next;
-+ free(pLstn);
-+}
-+
-+/* Duplicate an existing listener. This is called when a new file is to
-+ * be monitored due to wildcard detection. Returns the new pLstn in
-+ * the ppExisting parameter.
-+ */
-+static rsRetVal
-+lstnDup(lstn_t **ppExisting, uchar *const __restrict__ newname)
-+{
-+ DEFiRet;
-+ lstn_t *const existing = *ppExisting;
-+ lstn_t *pThis;
-+
-+ CHKiRet(lstnAdd(&pThis));
-+ pThis->pszDirName = existing->pszDirName; /* read-only */
-+ pThis->pszBaseName = (uchar*)strdup((char*)newname);
-+ if(asprintf((char**)&pThis->pszFileName, "%s/%s", (char*)pThis->pszDirName, (char*)newname) == -1) {
-+ DBGPRINTF("imfile/lstnDup: asprintf failed, malfunction can happen\n");
-+ ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-+ }
-+ pThis->pszTag = (uchar*) strdup((char*) existing->pszTag);
-+ pThis->lenTag = ustrlen(pThis->pszTag);
-+ pThis->pszStateFile = existing->pszStateFile == NULL ? NULL : (uchar*) strdup((char*) existing->pszStateFile);
-+
-+ CHKiRet(ratelimitNew(&pThis->ratelimiter, "imfile", (char*)pThis->pszFileName));
-+ pThis->multiSub.maxElem = existing->multiSub.maxElem;
-+ pThis->multiSub.nElem = 0;
-+ CHKmalloc(pThis->multiSub.ppMsgs = MALLOC(pThis->multiSub.maxElem * sizeof(msg_t*)));
-+ pThis->iSeverity = existing->iSeverity;
-+ pThis->iFacility = existing->iFacility;
-+ pThis->maxLinesAtOnce = existing->maxLinesAtOnce;
-+ pThis->iPersistStateInterval = existing->iPersistStateInterval;
-+ pThis->readMode = existing->readMode;
-+ pThis->bRMStateOnDel = existing->bRMStateOnDel;
-+ pThis->hasWildcard = existing->hasWildcard;
-+ pThis->addMetadata = existing->addMetadata;
-+ pThis->pRuleset = existing->pRuleset;
-+ pThis->nRecords = 0;
-+ pThis->pStrm = NULL;
-+ pThis->masterLstn = existing;
-+ *ppExisting = pThis;
-+finalize_it:
-+ RETiRet;
-+}
-+
-+/* This function is called when a new listener shall be added.
-+ * It also does some late stage error checking on the config
-+ * and reports issues it finds.
-+ */
- static inline rsRetVal
- addListner(instanceConf_t *inst)
- {
- DEFiRet;
-- fileInfo_t *pThis;
--
-- if(iFilPtr < MAX_INPUT_FILES) {
-- pThis = &files[iFilPtr];
-- //TODO: optimize, save strdup?
-- pThis->pszFileName = (uchar*) strdup((char*) inst->pszFileName);
-- pThis->pszTag = (uchar*) strdup((char*) inst->pszTag);
-- pThis->lenTag = ustrlen(pThis->pszTag);
-- pThis->pszStateFile = (uchar*) strdup((char*) inst->pszStateFile);
--
-- CHKiRet(ratelimitNew(&pThis->ratelimiter, "imfile", (char*)inst->pszFileName));
-- CHKmalloc(pThis->multiSub.ppMsgs = MALLOC(inst->nMultiSub * sizeof(msg_t*)));
-- pThis->multiSub.maxElem = inst->nMultiSub;
-- pThis->multiSub.nElem = 0;
-- pThis->iSeverity = inst->iSeverity;
-- pThis->iFacility = inst->iFacility;
-- pThis->maxLinesAtOnce = inst->maxLinesAtOnce;
-- pThis->iPersistStateInterval = inst->iPersistStateInterval;
-- pThis->readMode = inst->readMode;
-- pThis->pRuleset = inst->pBindRuleset;
-- pThis->nRecords = 0;
-- } else {
-- errmsg.LogError(0, RS_RET_OUT_OF_DESRIPTORS,
-- "Too many file monitors configured - ignoring %s",
-+ lstn_t *pThis;
-+ sbool hasWildcard;
-+
-+ hasWildcard = containsGlobWildcard((char*)inst->pszFileBaseName);
-+ if(hasWildcard) {
-+ if(runModConf->opMode == OPMODE_POLLING) {
-+ errmsg.LogError(0, RS_RET_IMFILE_WILDCARD,
-+ "imfile: The to-be-monitored file \"%s\" contains "
-+ "wildcards. This is not supported in "
-+ "polling mode.", inst->pszFileName);
-+ ABORT_FINALIZE(RS_RET_IMFILE_WILDCARD);
-+ } else if(inst->pszStateFile != NULL) {
-+ errmsg.LogError(0, RS_RET_IMFILE_WILDCARD,
-+ "imfile: warning: it looks like to-be-monitored "
-+ "file \"%s\" contains wildcards. This usually "
-+ "does not work well with specifying a state file.",
- inst->pszFileName);
-- ABORT_FINALIZE(RS_RET_OUT_OF_DESRIPTORS);
-+ }
- }
-- ++iFilPtr; /* we got a new file to monitor */
-
-- resetConfigVariables(NULL, NULL); /* values are both dummies */
-+ CHKiRet(lstnAdd(&pThis));
-+ pThis->hasWildcard = hasWildcard;
-+ pThis->pszFileName = (uchar*) strdup((char*) inst->pszFileName);
-+ pThis->pszDirName = inst->pszDirName; /* use memory from inst! */
-+ pThis->pszBaseName = (uchar*)strdup((char*)inst->pszFileBaseName); /* be consistent with expanded wildcards! */
-+ pThis->pszTag = (uchar*) strdup((char*) inst->pszTag);
-+ pThis->lenTag = ustrlen(pThis->pszTag);
-+ pThis->pszStateFile = inst->pszStateFile == NULL ? NULL : (uchar*) strdup((char*) inst->pszStateFile);
-+
-+ CHKiRet(ratelimitNew(&pThis->ratelimiter, "imfile", (char*)inst->pszFileName));
-+ CHKmalloc(pThis->multiSub.ppMsgs = MALLOC(inst->nMultiSub * sizeof(msg_t*)));
-+ pThis->multiSub.maxElem = inst->nMultiSub;
-+ pThis->multiSub.nElem = 0;
-+ pThis->iSeverity = inst->iSeverity;
-+ pThis->iFacility = inst->iFacility;
-+ pThis->maxLinesAtOnce = inst->maxLinesAtOnce;
-+ pThis->iPersistStateInterval = inst->iPersistStateInterval;
-+ pThis->readMode = inst->readMode;
-+ pThis->bRMStateOnDel = inst->bRMStateOnDel;
-+ pThis->addMetadata = (inst->addMetadata == ADD_METADATA_UNSPECIFIED) ?
-+ hasWildcard : inst->addMetadata;
-+ pThis->pRuleset = inst->pBindRuleset;
-+ pThis->nRecords = 0;
-+ pThis->pStrm = NULL;
-+ pThis->masterLstn = NULL; /* we *are* a master! */
- finalize_it:
- RETiRet;
- }
-@@ -466,6 +955,8 @@ CODESTARTnewInpInst
- inst->pszFileName = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
- } else if(!strcmp(inppblk.descr[i].name, "statefile")) {
- inst->pszStateFile = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
-+ } else if(!strcmp(inppblk.descr[i].name, "removestateondelete")) {
-+ inst->bRMStateOnDel = (uint8_t) pvals[i].val.d.n;
- } else if(!strcmp(inppblk.descr[i].name, "tag")) {
- inst->pszTag = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
- } else if(!strcmp(inppblk.descr[i].name, "ruleset")) {
-@@ -476,8 +967,19 @@ CODESTARTnewInpInst
- inst->iFacility = pvals[i].val.d.n;
- } else if(!strcmp(inppblk.descr[i].name, "readmode")) {
- inst->readMode = pvals[i].val.d.n;
-+ } else if(!strcmp(inppblk.descr[i].name, "deletestateonfiledelete")) {
-+ inst->bRMStateOnDel = (sbool) pvals[i].val.d.n;
-+ } else if(!strcmp(inppblk.descr[i].name, "addmetadata")) {
-+ inst->addMetadata = (sbool) pvals[i].val.d.n;
- } else if(!strcmp(inppblk.descr[i].name, "maxlinesatonce")) {
-- inst->maxLinesAtOnce = pvals[i].val.d.n;
-+ if( loadModConf->opMode == OPMODE_INOTIFY
-+ && pvals[i].val.d.n > 0) {
-+ errmsg.LogError(0, RS_RET_PARAM_NOT_PERMITTED,
-+ "parameter \"maxLinesAtOnce\" not "
-+ "permited in inotify mode - ignored");
-+ } else {
-+ inst->maxLinesAtOnce = pvals[i].val.d.n;
-+ }
- } else if(!strcmp(inppblk.descr[i].name, "persiststateinterval")) {
- inst->iPersistStateInterval = pvals[i].val.d.n;
- } else if(!strcmp(inppblk.descr[i].name, "maxsubmitatonce")) {
-@@ -487,6 +989,7 @@ CODESTARTnewInpInst
- "param '%s'\n", inppblk.descr[i].name);
- }
- }
-+ CHKiRet(checkInstance(inst));
- finalize_it:
- CODE_STD_FINALIZERnewInpInst
- cnfparamvalsDestruct(pvals, &inppblk);
-@@ -497,6 +1000,7 @@ CODESTARTbeginCnfLoad
- loadModConf = pModConf;
- pModConf->pConf = pConf;
- /* init our settings */
-+ loadModConf->opMode = OPMODE_POLLING;
- loadModConf->iPollInterval = DFLT_PollInterval;
- loadModConf->configSetViaV2Method = 0;
- bLegacyCnfModGlobalsPermitted = 1;
-@@ -518,6 +1022,7 @@ BEGINsetModCnf
- struct cnfparamvals *pvals = NULL;
- int i;
- CODESTARTsetModCnf
-+ loadModConf->opMode = OPMODE_POLLING;
- pvals = nvlstGetParams(lst, &modpblk, NULL);
- if(pvals == NULL) {
- errmsg.LogError(0, RS_RET_MISSING_CNFPARAMS, "imfile: error processing module "
-@@ -535,6 +1040,17 @@ CODESTARTsetModCnf
- continue;
- if(!strcmp(modpblk.descr[i].name, "pollinginterval")) {
- loadModConf->iPollInterval = (int) pvals[i].val.d.n;
-+ } else if(!strcmp(modpblk.descr[i].name, "mode")) {
-+ if(!es_strconstcmp(pvals[i].val.d.estr, "polling"))
-+ loadModConf->opMode = OPMODE_POLLING;
-+ else if(!es_strconstcmp(pvals[i].val.d.estr, "inotify"))
-+ loadModConf->opMode = OPMODE_INOTIFY;
-+ else {
-+ char *cstr = es_str2cstr(pvals[i].val.d.estr, NULL);
-+ errmsg.LogError(0, RS_RET_PARAM_ERROR, "imfile: unknown "
-+ "mode '%s'", cstr);
-+ free(cstr);
-+ }
- } else {
- dbgprintf("imfile: program error, non-handled "
- "param '%s' in beginCnfLoad\n", modpblk.descr[i].name);
-@@ -559,7 +1075,9 @@ CODESTARTendCnfLoad
- /* persist module-specific settings from legacy config system */
- loadModConf->iPollInterval = cs.iPollInterval;
- }
-- dbgprintf("imfile: polling interval is %d\n", loadModConf->iPollInterval);
-+ dbgprintf("imfile: opmode is %d, polling interval is %d\n",
-+ loadModConf->opMode,
-+ loadModConf->iPollInterval);
-
- loadModConf = NULL; /* done loading */
- /* free legacy config vars */
-@@ -591,11 +1109,15 @@ BEGINactivateCnf
- instanceConf_t *inst;
- CODESTARTactivateCnf
- runModConf = pModConf;
-+ runModConf->pRootLstn = NULL,
-+ runModConf->pTailLstn = NULL;
-+
- for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
- addListner(inst);
- }
-+
- /* if we could not set up any listeners, there is no point in running... */
-- if(iFilPtr == 0) {
-+ if(runModConf->pRootLstn == 0) {
- errmsg.LogError(0, NO_ERRCODE, "imfile: no file monitors could be started, "
- "input not activated.\n");
- ABORT_FINALIZE(RS_RET_NO_RUN);
-@@ -610,6 +1132,8 @@ CODESTARTfreeCnf
- for(inst = pModConf->root ; inst != NULL ; ) {
- free(inst->pszBindRuleset);
- free(inst->pszFileName);
-+ free(inst->pszDirName);
-+ free(inst->pszFileBaseName);
- free(inst->pszTag);
- free(inst->pszStateFile);
- del = inst;
-@@ -619,30 +1143,7 @@ CODESTARTfreeCnf
- ENDfreeCnf
-
-
--
--/* This function is the cancel cleanup handler. It is called when rsyslog decides the
-- * module must be stopped, what most probably happens during shutdown of rsyslogd. When
-- * this function is called, the runInput() function (below) is already terminated - somewhere
-- * in the middle of what it was doing. The cancel cleanup handler below should take
-- * care of any locked mutexes and such, things that really need to be cleaned up
-- * before processing continues. In general, many plugins do not need to provide
-- * any code at all here.
-- *
-- * IMPORTANT: the calling interface of this function can NOT be modified. It actually is
-- * called by pthreads. The provided argument is currently not being used.
-- */
--static void
--inputModuleCleanup(void __attribute__((unused)) *arg)
--{
-- BEGINfunc
-- ENDfunc
--}
--
--
--/* This function is called by the framework to gather the input. The module stays
-- * most of its lifetime inside this function. It MUST NEVER exit this function. Doing
-- * so would end module processing and rsyslog would NOT reschedule the module. If
-- * you exit from this function, you violate the interface specification!
-+/* Monitor files in traditional polling mode.
- *
- * We go through all files and remember if at least one had data. If so, we do
- * another run (until no data was present in any file). Then we sleep for
-@@ -659,33 +1160,655 @@ inputModuleCleanup(void __attribute__((unused)) *arg)
- * On spamming the main queue: keep in mind that it will automatically rate-limit
- * ourselfes if we begin to overrun it. So we really do not need to care here.
- */
--#pragma GCC diagnostic ignored "-Wempty-body"
--BEGINrunInput
-- int i;
-+static rsRetVal
-+doPolling(void)
-+{
- int bHadFileData; /* were there at least one file with data during this run? */
--CODESTARTrunInput
-- pthread_cleanup_push(inputModuleCleanup, NULL);
-+ DEFiRet;
- while(glbl.GetGlobalInputTermState() == 0) {
- do {
-+ lstn_t *pLstn;
- bHadFileData = 0;
-- for(i = 0 ; i < iFilPtr ; ++i) {
-+ for(pLstn = runModConf->pRootLstn ; pLstn != NULL ; pLstn = pLstn->next) {
- if(glbl.GetGlobalInputTermState() == 1)
- break; /* terminate input! */
-- pollFile(&files[i], &bHadFileData);
-+ pollFile(pLstn, &bHadFileData);
- }
-- } while(iFilPtr > 1 && bHadFileData == 1 && glbl.GetGlobalInputTermState() == 0); /* warning: do...while()! */
-+ } while(bHadFileData == 1 && glbl.GetGlobalInputTermState() == 0);
-+ /* warning: do...while()! */
-
-- /* Note: the additional 10ns wait is vitally important. It guards rsyslog against totally
-- * hogging the CPU if the users selects a polling interval of 0 seconds. It doesn't hurt any
-- * other valid scenario. So do not remove. -- rgerhards, 2008-02-14
-+ /* Note: the additional 10ns wait is vitally important. It guards rsyslog
-+ * against totally hogging the CPU if the users selects a polling interval
-+ * of 0 seconds. It doesn't hurt any other valid scenario. So do not remove.
-+ * rgerhards, 2008-02-14
- */
- if(glbl.GetGlobalInputTermState() == 0)
- srSleep(runModConf->iPollInterval, 10);
- }
-- DBGPRINTF("imfile: terminating upon request of rsyslog core\n");
-
-- pthread_cleanup_pop(0); /* just for completeness, but never called... */
-- RETiRet; /* use it to make sure the housekeeping is done! */
-+ RETiRet;
-+}
-+
-+
-+#if HAVE_INOTIFY_INIT
-+static rsRetVal
-+fileTableInit(fileTable_t *const __restrict__ tab, const int nelem)
-+{
-+ DEFiRet;
-+ CHKmalloc(tab->listeners = malloc(sizeof(dirInfoFiles_t) * nelem));
-+ tab->allocMax = nelem;
-+ tab->currMax = 0;
-+finalize_it:
-+ RETiRet;
-+}
-+/* uncomment if needed
-+static void
-+fileTableDisplay(fileTable_t *tab)
-+{
-+ int f;
-+ uchar *baseName;
-+ DBGPRINTF("imfile: dirs.currMaxfiles %d\n", tab->currMax);
-+ for(f = 0 ; f < tab->currMax ; ++f) {
-+ baseName = tab->listeners[f].pLstn->pszBaseName;
-+ DBGPRINTF("imfile: TABLE %p CONTENTS, %d->%p:'%s'\n", tab, f, tab->listeners[f].pLstn, (char*)baseName);
-+ }
-+}
-+*/
-+
-+static int
-+fileTableSearch(fileTable_t *const __restrict__ tab, uchar *const __restrict__ fn)
-+{
-+ int f;
-+ uchar *baseName = NULL;
-+ /* UNCOMMENT FOR DEBUG fileTableDisplay(tab); */
-+ for(f = 0 ; f < tab->currMax ; ++f) {
-+ baseName = tab->listeners[f].pLstn->pszBaseName;
-+ if(!fnmatch((char*)baseName, (char*)fn, FNM_PATHNAME | FNM_PERIOD))
-+ break; /* found */
-+ }
-+ if(f == tab->currMax)
-+ f = -1;
-+ DBGPRINTF("imfile: fileTableSearch file '%s' - '%s', found:%d\n", fn, baseName, f);
-+ return f;
-+}
-+
-+static int
-+fileTableSearchNoWildcard(fileTable_t *const __restrict__ tab, uchar *const __restrict__ fn)
-+{
-+ int f;
-+ uchar *baseName = NULL;
-+ /* UNCOMMENT FOR DEBUG fileTableDisplay(tab); */
-+ for(f = 0 ; f < tab->currMax ; ++f) {
-+ baseName = tab->listeners[f].pLstn->pszBaseName;
-+ if (strcmp((const char*)baseName, (const char*)fn) == 0)
-+ break; /* found */
-+ }
-+ if(f == tab->currMax)
-+ f = -1;
-+ DBGPRINTF("imfile: fileTableSearchNoWildcard file '%s' - '%s', found:%d\n", fn, baseName, f);
-+ return f;
-+}
-+
-+/* add file to file table */
-+static rsRetVal
-+fileTableAddFile(fileTable_t *const __restrict__ tab, lstn_t *const __restrict__ pLstn)
-+{
-+ int j;
-+ DEFiRet;
-+ /* UNCOMMENT FOR DEBUG fileTableDisplay(tab); */
-+ for(j = 0 ; j < tab->currMax && tab->listeners[j].pLstn != pLstn ; ++j)
-+ ; /* just scan */
-+ if(j < tab->currMax) {
-+ ++tab->listeners[j].refcnt;
-+ DBGPRINTF("imfile: file '%s' already registered, refcnt now %d\n",
-+ pLstn->pszFileName, tab->listeners[j].refcnt);
-+ FINALIZE;
-+ }
-+
-+ if(tab->currMax == tab->allocMax) {
-+ const int newMax = 2 * tab->allocMax;
-+ dirInfoFiles_t *newListenerTab = realloc(tab->listeners, newMax * sizeof(dirInfoFiles_t));
-+ if(newListenerTab == NULL) {
-+ errmsg.LogError(0, RS_RET_OUT_OF_MEMORY,
-+ "cannot alloc memory to map directory/file relationship "
-+ "for '%s' - ignoring", pLstn->pszFileName);
-+ ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-+ }
-+ tab->listeners = newListenerTab;
-+ tab->allocMax = newMax;
-+ DBGPRINTF("imfile: increased dir table to %d entries\n", allocMaxDirs);
-+ }
-+
-+ tab->listeners[tab->currMax].pLstn = pLstn;
-+ tab->listeners[tab->currMax].refcnt = 1;
-+ tab->currMax++;
-+finalize_it:
-+ RETiRet;
-+}
-+
-+/* delete a file from file table */
-+static rsRetVal
-+fileTableDelFile(fileTable_t *const __restrict__ tab, lstn_t *const __restrict__ pLstn)
-+{
-+ int j;
-+ DEFiRet;
-+
-+ for(j = 0 ; j < tab->currMax && tab->listeners[j].pLstn != pLstn ; ++j)
-+ ; /* just scan */
-+ if(j == tab->currMax) {
-+ DBGPRINTF("imfile: no association for file '%s'\n", pLstn->pszFileName);
-+ FINALIZE;
-+ }
-+ tab->listeners[j].refcnt--;
-+ if(tab->listeners[j].refcnt == 0) {
-+ /* we remove that entry (but we never shrink the table) */
-+ if(j < tab->currMax - 1) {
-+ /* entry in middle - need to move others */
-+ memmove(tab->listeners+j, tab->listeners+j+1,
-+ (tab->currMax -j-1) * sizeof(dirInfoFiles_t));
-+ }
-+ --tab->currMax;
-+ }
-+finalize_it:
-+ RETiRet;
-+}
-+/* add entry to dirs array */
-+static rsRetVal
-+dirsAdd(uchar *dirName)
-+{
-+ int newMax;
-+ dirInfo_t *newDirTab;
-+ DEFiRet;
-+
-+ if(currMaxDirs == allocMaxDirs) {
-+ newMax = 2 * allocMaxDirs;
-+ newDirTab = realloc(dirs, newMax * sizeof(dirInfo_t));
-+ if(newDirTab == NULL) {
-+ errmsg.LogError(0, RS_RET_OUT_OF_MEMORY,
-+ "cannot alloc memory to monitor directory '%s' - ignoring",
-+ dirName);
-+ ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-+ }
-+ dirs = newDirTab;
-+ allocMaxDirs = newMax;
-+ DBGPRINTF("imfile: increased dir table to %d entries\n", allocMaxDirs);
-+ }
-+
-+ /* if we reach this point, there is space in the file table for the new entry */
-+ dirs[currMaxDirs].dirName = dirName;
-+ CHKiRet(fileTableInit(&dirs[currMaxDirs].active, INIT_FILE_IN_DIR_TAB_SIZE));
-+ CHKiRet(fileTableInit(&dirs[currMaxDirs].configured, INIT_FILE_IN_DIR_TAB_SIZE));
-+
-+ ++currMaxDirs;
-+ DBGPRINTF("imfile: added to dirs table: '%s'\n", dirName);
-+finalize_it:
-+ RETiRet;
-+}
-+
-+
-+/* checks if a dir name is already inside the dirs array. If so, returns
-+ * its index. If not present, -1 is returned.
-+ */
-+static int
-+dirsFindDir(uchar *dir)
-+{
-+ int i;
-+
-+ for(i = 0 ; i < currMaxDirs && ustrcmp(dir, dirs[i].dirName) ; ++i)
-+ ; /* just scan, all done in for() */
-+ if(i == currMaxDirs)
-+ i = -1;
-+ return i;
-+}
-+
-+static rsRetVal
-+dirsInit(void)
-+{
-+ instanceConf_t *inst;
-+ DEFiRet;
-+
-+ free(dirs);
-+ CHKmalloc(dirs = malloc(sizeof(dirInfo_t) * INIT_FILE_TAB_SIZE));
-+ allocMaxDirs = INIT_FILE_TAB_SIZE;
-+ currMaxDirs = 0;
-+
-+ for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
-+ if(dirsFindDir(inst->pszDirName) == -1)
-+ dirsAdd(inst->pszDirName);
-+ }
-+
-+finalize_it:
-+ RETiRet;
-+}
-+
-+/* add file to directory (create association)
-+ * fIdx is index into file table, all other information is pulled from that table.
-+ * bActive is 1 if the file is to be added to active set, else zero
-+ */
-+static rsRetVal
-+dirsAddFile(lstn_t *__restrict__ pLstn, const int bActive)
-+{
-+ int dirIdx;
-+ dirInfo_t *dir;
-+ DEFiRet;
-+
-+ dirIdx = dirsFindDir(pLstn->pszDirName);
-+ if(dirIdx == -1) {
-+ errmsg.LogError(0, RS_RET_INTERNAL_ERROR, "imfile: could not find "
-+ "directory '%s' in dirs array - ignoring",
-+ pLstn->pszDirName);
-+ FINALIZE;
-+ }
-+
-+ dir = dirs + dirIdx;
-+ CHKiRet(fileTableAddFile((bActive ? &dir->active : &dir->configured), pLstn));
-+ DBGPRINTF("imfile: associated file [%s] to directory %d[%s], Active = %d\n",
-+ pLstn->pszFileName, dirIdx, dir->dirName, bActive);
-+ /* UNCOMMENT FOR DEBUG fileTableDisplay(bActive ? &dir->active : &dir->configured); */
-+finalize_it:
-+ RETiRet;
-+}
-+
-+
-+static void
-+in_setupDirWatch(const int dirIdx)
-+{
-+ int wd;
-+ wd = inotify_add_watch(ino_fd, (char*)dirs[dirIdx].dirName, IN_CREATE|IN_DELETE|IN_MOVED_FROM);
-+ if(wd < 0) {
-+ DBGPRINTF("imfile: could not create dir watch for '%s'\n",
-+ dirs[dirIdx].dirName);
-+ goto done;
-+ }
-+ wdmapAdd(wd, dirIdx, NULL);
-+ DBGPRINTF("imfile: watch %d added for dir %s\n", wd, dirs[dirIdx].dirName);
-+done: return;
-+}
-+
-+/* Setup a new file watch for a known active file. It must already have
-+ * been entered into the correct tables.
-+ * Note: we need to try to read this file, as it may already contain data this
-+ * needs to be processed, and we won't get an event for that as notifications
-+ * happen only for things after the watch has been activated.
-+ * Note: newFileName is NULL for configured files, and non-NULL for dynamically
-+ * detected files (e.g. wildcards!)
-+ */
-+static void
-+startLstnFile(lstn_t *const __restrict__ pLstn)
-+{
-+ rsRetVal localRet;
-+ const int wd = inotify_add_watch(ino_fd, (char*)pLstn->pszFileName, IN_MODIFY);
-+ if(wd < 0) {
-+ char errStr[512];
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ DBGPRINTF("imfile: could not create file table entry for '%s' - "
-+ "not processing it now: %s\n",
-+ pLstn->pszFileName, errStr);
-+ goto done;
-+ }
-+ if((localRet = wdmapAdd(wd, -1, pLstn)) != RS_RET_OK) {
-+ DBGPRINTF("imfile: error %d adding file to wdmap, ignoring\n", localRet);
-+ goto done;
-+ }
-+ DBGPRINTF("imfile: watch %d added for file %s\n", wd, pLstn->pszFileName);
-+ dirsAddFile(pLstn, ACTIVE_FILE);
-+ pollFile(pLstn, NULL);
-+done: return;
-+}
-+
-+/* Setup a new file watch for dynamically discovered files (via wildcards).
-+ * Note: we need to try to read this file, as it may already contain data this
-+ * needs to be processed, and we won't get an event for that as notifications
-+ * happen only for things after the watch has been activated.
-+ */
-+static void
-+in_setupFileWatchDynamic(lstn_t *pLstn, uchar *const __restrict__ newBaseName)
-+{
-+ char fullfn[MAXFNAME];
-+ struct stat fileInfo;
-+ snprintf(fullfn, MAXFNAME, "%s/%s", pLstn->pszDirName, newBaseName);
-+ if(stat(fullfn, &fileInfo) != 0) {
-+ char errStr[1024];
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ dbgprintf("imfile: ignoring file '%s' cannot stat(): %s\n",
-+ fullfn, errStr);
-+ goto done;
-+ }
-+
-+ if(S_ISDIR(fileInfo.st_mode)) {
-+ DBGPRINTF("imfile: ignoring directory '%s'\n", fullfn);
-+ goto done;
-+ }
-+
-+ if(lstnDup(&pLstn, newBaseName) != RS_RET_OK)
-+ goto done;
-+
-+ startLstnFile(pLstn);
-+done: return;
-+}
-+
-+/* Setup a new file watch for static (configured) files.
-+ * Note: we need to try to read this file, as it may already contain data this
-+ * needs to be processed, and we won't get an event for that as notifications
-+ * happen only for things after the watch has been activated.
-+ */
-+static void
-+in_setupFileWatchStatic(lstn_t *const __restrict__ pLstn)
-+{
-+ DBGPRINTF("imfile: adding file '%s' to configured table\n",
-+ pLstn->pszFileName);
-+ dirsAddFile(pLstn, CONFIGURED_FILE);
-+
-+ if(pLstn->hasWildcard) {
-+ DBGPRINTF("imfile: file '%s' has wildcard, doing initial "
-+ "expansion\n", pLstn->pszFileName);
-+ glob_t files;
-+ const int ret = glob((char*)pLstn->pszFileName,
-+ GLOB_MARK|GLOB_NOSORT|GLOB_BRACE, NULL, &files);
-+ if(ret == 0) {
-+ unsigned i;
-+ for(i = 0 ; i < files.gl_pathc ; i++) {
-+ uchar basen[MAXFNAME];
-+ uchar *const file = (uchar*)files.gl_pathv[i];
-+ if(file[strlen((char*)file)-1] == '/')
-+ continue;/* we cannot process subdirs! */
-+ getBasename(basen, file);
-+ in_setupFileWatchDynamic(pLstn, basen);
-+ }
-+ globfree(&files);
-+ }
-+ } else {
-+ /* Duplicate static object as well, otherwise the configobject could be deleted later! */
-+ if(lstnDup(&pLstn, pLstn->pszBaseName) != RS_RET_OK) {
-+ DBGPRINTF("imfile: in_setupFileWatchStatic failed to duplicate listener for '%s'\n", pLstn->pszFileName);
-+ goto done;
-+ }
-+ startLstnFile(pLstn);
-+ }
-+done: return;
-+}
-+
-+/* setup our initial set of watches, based on user config */
-+static void
-+in_setupInitialWatches()
-+{
-+ int i;
-+ for(i = 0 ; i < currMaxDirs ; ++i) {
-+ in_setupDirWatch(i);
-+ }
-+ lstn_t *pLstn;
-+ for(pLstn = runModConf->pRootLstn ; pLstn != NULL ; pLstn = pLstn->next) {
-+ if(pLstn->masterLstn == NULL) {
-+ /* we process only static (master) entries */
-+ in_setupFileWatchStatic(pLstn);
-+ }
-+ }
-+}
-+
-+static void
-+in_dbg_showEv(struct inotify_event *ev)
-+{
-+ if(ev->mask & IN_IGNORED) {
-+ DBGPRINTF("INOTIFY event: watch was REMOVED\n");
-+ } else if(ev->mask & IN_MODIFY) {
-+ DBGPRINTF("INOTIFY event: watch was MODIFID\n");
-+ } else if(ev->mask & IN_ACCESS) {
-+ DBGPRINTF("INOTIFY event: watch IN_ACCESS\n");
-+ } else if(ev->mask & IN_ATTRIB) {
-+ DBGPRINTF("INOTIFY event: watch IN_ATTRIB\n");
-+ } else if(ev->mask & IN_CLOSE_WRITE) {
-+ DBGPRINTF("INOTIFY event: watch IN_CLOSE_WRITE\n");
-+ } else if(ev->mask & IN_CLOSE_NOWRITE) {
-+ DBGPRINTF("INOTIFY event: watch IN_CLOSE_NOWRITE\n");
-+ } else if(ev->mask & IN_CREATE) {
-+ DBGPRINTF("INOTIFY event: file was CREATED: %s\n", ev->name);
-+ } else if(ev->mask & IN_DELETE) {
-+ DBGPRINTF("INOTIFY event: watch IN_DELETE\n");
-+ } else if(ev->mask & IN_DELETE_SELF) {
-+ DBGPRINTF("INOTIFY event: watch IN_DELETE_SELF\n");
-+ } else if(ev->mask & IN_MOVE_SELF) {
-+ DBGPRINTF("INOTIFY event: watch IN_MOVE_SELF\n");
-+ } else if(ev->mask & IN_MOVED_FROM) {
-+ DBGPRINTF("INOTIFY event: watch IN_MOVED_FROM\n");
-+ } else if(ev->mask & IN_MOVED_TO) {
-+ DBGPRINTF("INOTIFY event: watch IN_MOVED_TO\n");
-+ } else if(ev->mask & IN_OPEN) {
-+ DBGPRINTF("INOTIFY event: watch IN_OPEN\n");
-+ } else if(ev->mask & IN_ISDIR) {
-+ DBGPRINTF("INOTIFY event: watch IN_ISDIR\n");
-+ } else {
-+ DBGPRINTF("INOTIFY event: unknown mask code %8.8x\n", ev->mask);
-+ }
-+}
-+
-+
-+/* inotify told us that a file's wd was closed. We now need to remove
-+ * the file from our internal structures. Remember that a different inode
-+ * with the same name may already be in processing.
-+ */
-+static void
-+in_removeFile(const int dirIdx,
-+ lstn_t *const __restrict__ pLstn)
-+{
-+ uchar statefile[MAXFNAME];
-+ uchar toDel[MAXFNAME];
-+ int bDoRMState;
-+ int wd;
-+ uchar *statefn;
-+ DBGPRINTF("imfile: remove listener '%s', dirIdx %d\n",
-+ pLstn->pszFileName, dirIdx);
-+ if(pLstn->bRMStateOnDel) {
-+ statefn = getStateFileName(pLstn, statefile, sizeof(statefile));
-+ snprintf((char*)toDel, sizeof(toDel), "%s/%s",
-+ glbl.GetWorkDir(), (char*)statefn);
-+ bDoRMState = 1;
-+ } else {
-+ bDoRMState = 0;
-+ }
-+ pollFile(pLstn, NULL); /* one final try to gather data */
-+ /* delete listener data */
-+ DBGPRINTF("imfile: DELETING listener data for '%s' - '%s'\n", pLstn->pszBaseName, pLstn->pszFileName);
-+ lstnDel(pLstn);
-+ fileTableDelFile(&dirs[dirIdx].active, pLstn);
-+ if(bDoRMState) {
-+ DBGPRINTF("imfile: unlinking '%s'\n", toDel);
-+ if(unlink((char*)toDel) != 0) {
-+ char errStr[1024];
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ errmsg.LogError(0, RS_RET_ERR, "imfile: could not remove state "
-+ "file \"%s\": %s", toDel, errStr);
-+ }
-+ }
-+ wd = wdmapLookupListner(pLstn);
-+ wdmapDel(wd);
-+}
-+
-+static void
-+in_handleDirEventCREATE(struct inotify_event *ev, const int dirIdx)
-+{
-+ lstn_t *pLstn;
-+ int ftIdx;
-+ ftIdx = fileTableSearch(&dirs[dirIdx].active, (uchar*)ev->name);
-+ if(ftIdx >= 0) {
-+ pLstn = dirs[dirIdx].active.listeners[ftIdx].pLstn;
-+ } else {
-+ dbgprintf("imfile: file '%s' not active in dir '%s'\n",
-+ ev->name, dirs[dirIdx].dirName);
-+ ftIdx = fileTableSearch(&dirs[dirIdx].configured, (uchar*)ev->name);
-+ if(ftIdx == -1) {
-+ dbgprintf("imfile: file '%s' not associated with dir '%s'\n",
-+ ev->name, dirs[dirIdx].dirName);
-+ goto done;
-+ }
-+ pLstn = dirs[dirIdx].configured.listeners[ftIdx].pLstn;
-+ }
-+ DBGPRINTF("imfile: file '%s' associated with dir '%s'\n", ev->name, dirs[dirIdx].dirName);
-+ in_setupFileWatchDynamic(pLstn, (uchar*)ev->name);
-+done: return;
-+}
-+
-+/* note: we need to care only for active files in the DELETE case.
-+ * Two reasons: a) if this is a configured file, it should be active
-+ * b) if not for some reason, there still is nothing we can do against
-+ * it, and trying to process a *deleted* file really makes no sense
-+ * (remeber we don't have it open, so it actually *is gone*).
-+ */
-+static void
-+in_handleDirEventDELETE(struct inotify_event *const ev, const int dirIdx)
-+{
-+ const int ftIdx = fileTableSearch(&dirs[dirIdx].active, (uchar*)ev->name);
-+ if(ftIdx == -1) {
-+ dbgprintf("imfile: deleted file '%s' not active in dir '%s'\n",
-+ ev->name, dirs[dirIdx].dirName);
-+ goto done;
-+ }
-+ DBGPRINTF("imfile: imfile delete processing for '%s'\n",
-+ dirs[dirIdx].active.listeners[ftIdx].pLstn->pszFileName);
-+ in_removeFile(dirIdx, dirs[dirIdx].active.listeners[ftIdx].pLstn);
-+done: return;
-+}
-+
-+static void
-+in_handleDirEvent(struct inotify_event *const ev, const int dirIdx)
-+{
-+ DBGPRINTF("imfile: handle dir event for %s\n", dirs[dirIdx].dirName);
-+ if((ev->mask & IN_CREATE)) {
-+ in_handleDirEventCREATE(ev, dirIdx);
-+ } else if((ev->mask & IN_DELETE)) {
-+ in_handleDirEventDELETE(ev, dirIdx);
-+ } else {
-+ DBGPRINTF("imfile: got non-expected inotify event:\n");
-+ in_dbg_showEv(ev);
-+ }
-+}
-+
-+
-+static void
-+in_handleFileEvent(struct inotify_event *ev, const wd_map_t *const etry)
-+{
-+ if(ev->mask & IN_MODIFY) {
-+ pollFile(etry->pLstn, NULL);
-+ } else {
-+ DBGPRINTF("imfile: got non-expected inotify event:\n");
-+ in_dbg_showEv(ev);
-+ }
-+}
-+
-+static void
-+in_processEvent(struct inotify_event *ev)
-+{
-+ wd_map_t *etry;
-+ lstn_t *pLstn;
-+ int iRet;
-+ int ftIdx;
-+ int wd;
-+
-+ DBGPRINTF("imfile: in_processEvent (wd=%d) event Mask='0x%.8X'\n", ev->wd, ev->mask);
-+ if(ev->mask & IN_IGNORED) {
-+ goto done;
-+ } else if(ev->mask & IN_MOVED_FROM) {
-+ /* Find wd entry and remove it */
-+ etry = wdmapLookup(ev->wd);
-+ if(etry != NULL) {
-+ ftIdx = fileTableSearchNoWildcard(&dirs[etry->dirIdx].active, (uchar*)ev->name);
-+ DBGPRINTF("imfile: IN_MOVED_FROM Event (ftIdx=%d, name=%s)\n", ftIdx, ev->name);
-+ if(ftIdx >= 0) {
-+ /* Find listener and wd table index*/
-+ pLstn = dirs[etry->dirIdx].active.listeners[ftIdx].pLstn;
-+ wd = wdmapLookupListner(pLstn);
-+
-+ /* Remove file from inotify watch */
-+ iRet = inotify_rm_watch(ino_fd, wd); /* Note this will TRIGGER IN_IGNORED Event! */
-+ if (iRet != 0) {
-+ DBGPRINTF("imfile: inotify_rm_watch error %d (ftIdx=%d, wd=%d, name=%s)\n", errno, ftIdx, wd, ev->name);
-+ } else {
-+ DBGPRINTF("imfile: inotify_rm_watch successfully removed file from watch (ftIdx=%d, wd=%d, name=%s)\n", ftIdx, wd, ev->name);
-+ }
-+ in_removeFile(etry->dirIdx, pLstn);
-+ DBGPRINTF("imfile: IN_MOVED_FROM Event file removed file (wd=%d, name=%s)\n", wd, ev->name);
-+ }
-+ }
-+ goto done;
-+ }
-+ etry = wdmapLookup(ev->wd);
-+ if(etry == NULL) {
-+ DBGPRINTF("imfile: could not lookup wd %d\n", ev->wd);
-+ goto done;
-+ }
-+ if(etry->pLstn == NULL) { /* directory? */
-+ in_handleDirEvent(ev, etry->dirIdx);
-+ } else {
-+ in_handleFileEvent(ev, etry);
-+ }
-+done: return;
-+}
-+
-+/* Monitor files in inotify mode */
-+static rsRetVal
-+do_inotify()
-+{
-+ char iobuf[8192];
-+ struct inotify_event *ev;
-+ int rd;
-+ int currev;
-+ DEFiRet;
-+
-+ CHKiRet(wdmapInit());
-+ CHKiRet(dirsInit());
-+ ino_fd = inotify_init();
-+ if(ino_fd < 0) {
-+ errmsg.LogError(1, RS_RET_INOTIFY_INIT_FAILED, "imfile: Init inotify instance failed ");
-+ return RS_RET_INOTIFY_INIT_FAILED;
-+ }
-+ DBGPRINTF("imfile: inotify fd %d\n", ino_fd);
-+ in_setupInitialWatches();
-+
-+ while(glbl.GetGlobalInputTermState() == 0) {
-+ rd = read(ino_fd, iobuf, sizeof(iobuf));
-+ if(rd < 0 && Debug) {
-+ char errStr[1024];
-+ rs_strerror_r(errno, errStr, sizeof(errStr));
-+ DBGPRINTF("imfile: error during inotify: %s\n", errStr);
-+ }
-+ currev = 0;
-+ while(currev < rd) {
-+ ev = (struct inotify_event*) (iobuf+currev);
-+ in_dbg_showEv(ev);
-+ in_processEvent(ev);
-+ currev += sizeof(struct inotify_event) + ev->len;
-+ }
-+ }
-+
-+finalize_it:
-+ close(ino_fd);
-+ RETiRet;
-+}
-+
-+#else /* #if HAVE_INOTIFY_INIT */
-+static rsRetVal
-+do_inotify()
-+{
-+ errmsg.LogError(0, RS_RET_NOT_IMPLEMENTED, "imfile: mode set to inotify, but the "
-+ "platform does not support inotify");
-+ return RS_RET_NOT_IMPLEMENTED;
-+}
-+#endif /* #if HAVE_INOTIFY_INIT */
-+
-+/* This function is called by the framework to gather the input. The module stays
-+ * most of its lifetime inside this function. It MUST NEVER exit this function. Doing
-+ * so would end module processing and rsyslog would NOT reschedule the module. If
-+ * you exit from this function, you violate the interface specification!
-+ */
-+BEGINrunInput
-+CODESTARTrunInput
-+ DBGPRINTF("imfile: working in %s mode\n",
-+ (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify");
-+ if(runModConf->opMode == OPMODE_POLLING)
-+ iRet = doPolling();
-+ else
-+ iRet = do_inotify();
-+
-+ DBGPRINTF("imfile: terminating upon request of rsyslog core\n");
- ENDrunInput
- #pragma GCC diagnostic warning "-Wempty-body"
- /* END no-touch zone *
-@@ -718,25 +1841,26 @@ ENDwillRun
- * rgerhards, 2008-02-13
- */
- static rsRetVal
--persistStrmState(fileInfo_t *pInfo)
-+persistStrmState(lstn_t *pLstn)
- {
- DEFiRet;
- strm_t *psSF = NULL; /* state file (stream) */
- size_t lenDir;
-+ uchar statefile[MAXFNAME];
-
-- ASSERT(pInfo != NULL);
--
-- /* TODO: create a function persistObj in obj.c? */
-+ uchar *const statefn = getStateFileName(pLstn, statefile, sizeof(statefile));
-+ DBGPRINTF("imfile: persisting state for '%s' to file '%s'\n",
-+ pLstn->pszFileName, statefn);
- CHKiRet(strm.Construct(&psSF));
- lenDir = ustrlen(glbl.GetWorkDir());
- if(lenDir > 0)
- CHKiRet(strm.SetDir(psSF, glbl.GetWorkDir(), lenDir));
- CHKiRet(strm.SettOperationsMode(psSF, STREAMMODE_WRITE_TRUNC));
- CHKiRet(strm.SetsType(psSF, STREAMTYPE_FILE_SINGLE));
-- CHKiRet(strm.SetFName(psSF, pInfo->pszStateFile, strlen((char*) pInfo->pszStateFile)));
-+ CHKiRet(strm.SetFName(psSF, statefn, strlen((char*) statefn)));
- CHKiRet(strm.ConstructFinalize(psSF));
-
-- CHKiRet(strm.Serialize(pInfo->pStrm, psSF));
-+ CHKiRet(strm.Serialize(pLstn->pStrm, psSF));
- CHKiRet(strm.Flush(psSF));
-
- CHKiRet(strm.Destruct(&psSF));
-@@ -749,7 +1873,7 @@ finalize_it:
- errmsg.LogError(0, iRet, "imfile: could not persist state "
- "file %s - data may be repeated on next "
- "startup. Is WorkDirectory set?",
-- pInfo->pszStateFile);
-+ statefn);
- }
-
- RETiRet;
-@@ -760,23 +1884,10 @@ finalize_it:
- * shall free any resources and prepare the module for unload.
- */
- BEGINafterRun
-- int i;
- CODESTARTafterRun
-- /* Close files and persist file state information. We do NOT abort on error iRet as that makes
-- * matters worse (at least we can try persisting the others...). Please note that, under stress
-- * conditions, it may happen that we are terminated before we actuall could open all streams. So
-- * before we change anything, we need to make sure the stream was open.
-- */
-- for(i = 0 ; i < iFilPtr ; ++i) {
-- if(files[i].pStrm != NULL) { /* stream open? */
-- persistStrmState(&files[i]);
-- strm.Destruct(&(files[i].pStrm));
-- }
-- ratelimitDestruct(files[i].ratelimiter);
-- free(files[i].multiSub.ppMsgs);
-- free(files[i].pszFileName);
-- free(files[i].pszTag);
-- free(files[i].pszStateFile);
-+ while(runModConf->pRootLstn != NULL) {
-+ /* Note: lstnDel() reasociates root! */
-+ lstnDel(runModConf->pRootLstn);
- }
-
- if(pInputName != NULL)
-@@ -804,6 +1915,15 @@ CODESTARTmodExit
- objRelease(errmsg, CORE_COMPONENT);
- objRelease(prop, CORE_COMPONENT);
- objRelease(ruleset, CORE_COMPONENT);
-+#if HAVE_INOTIFY_INIT
-+ /* we use these vars only in inotify mode */
-+ if(dirs != NULL) {
-+ free(dirs->active.listeners);
-+ free(dirs->configured.listeners);
-+ free(dirs);
-+ }
-+ free(wdmap);
-+#endif
- ENDmodExit
-
-
-@@ -840,7 +1960,6 @@ resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unus
- cs.iFacility = 128; /* local0 */
- cs.iSeverity = 5; /* notice, as of rfc 3164 */
- cs.readMode = 0;
-- cs.pBindRuleset = NULL;
- cs.maxLinesAtOnce = 10240;
-
- RETiRet;
-diff --git a/runtime/msg.c b/runtime/msg.c
-index 10ecf48..ae36907 100644
---- a/runtime/msg.c
-+++ b/runtime/msg.c
-@@ -4043,6 +4043,31 @@ finalize_it:
- RETiRet;
- }
-
-+/* add Metadata to the message. This is stored in a special JSON
-+ * container. Note that only string types are currently supported,
-+ * what should pose absolutely no problem with the string-ish nature
-+ * of rsyslog metadata.
-+ * added 2015-01-09 rgerhards
-+ */
-+rsRetVal
-+msgAddMetadata(msg_t *const __restrict__ pMsg,
-+ uchar *const __restrict__ metaname,
-+ uchar *const __restrict__ metaval)
-+{
-+ DEFiRet;
-+ struct json_object *const json = json_object_new_object();
-+ CHKmalloc(json);
-+ struct json_object *const jval = json_object_new_string((char*)metaval);
-+ if(jval == NULL) {
-+ json_object_put(json);
-+ ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-+ }
-+ json_object_object_add(json, metaname, jval);
-+ iRet = msgAddJSON(pMsg, (uchar*)"!metadata", json);
-+ finalize_it:
-+ RETiRet;
-+}
-+
- static struct json_object *
- jsonDeepCopy(struct json_object *src)
- {
-diff --git a/runtime/msg.h b/runtime/msg.h
-index e7babdb..4692158 100644
---- a/runtime/msg.h
-+++ b/runtime/msg.h
-@@ -187,6 +187,7 @@ rsRetVal msgGetCEEVar(msg_t *pThis, cstr_t *propName, var_t **ppVar);
- es_str_t* msgGetCEEVarNew(msg_t *pMsg, char *name);
- rsRetVal msgAddJSON(msg_t *pM, uchar *name, struct json_object *json);
- rsRetVal getCEEPropVal(msg_t *pM, es_str_t *propName, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed);
-+rsRetVal msgAddMetadata(msg_t *msg, uchar *metaname, uchar *metaval);
- rsRetVal MsgGetSeverity(msg_t *pThis, int *piSeverity);
- rsRetVal MsgDeserialize(msg_t *pMsg, strm_t *pStrm);
-
-diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
-index e62ba86..2efc340 100644
---- a/runtime/rsyslog.h
-+++ b/runtime/rsyslog.h
-@@ -219,6 +219,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth
- RS_RET_NO_MORE_DATA = -3006, /**< insufficient data, e.g. end of string during parsing */
- RS_RET_INVALID_IP = -3007, /**< invalid ip found where valid was expected */
- RS_RET_OBJ_CREATION_FAILED = - 3008, /**< the creation of an object failed (no details available) */
-+ RS_RET_INOTIFY_INIT_FAILED = - 3009, /**< the initialization of an inotify instance failed (no details available) */
- RS_RET_PARAM_ERROR = -1000, /**< invalid parameter in call to function */
- RS_RET_MISSING_INTERFACE = -1001,/**< interface version mismatch, required missing */
- RS_RET_INVALID_CORE_INTERFACE = -1002,/**< interface provided by host invalid, can not be used */
-@@ -460,6 +461,11 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth
- RS_RET_CA_CERT_MISSING = -2329,/**< a CA cert is missing where one is required (e.g. TLS) */
- RS_RET_CERT_MISSING = -2330,/**< a cert is missing where one is required (e.g. TLS) */
- RS_RET_CERTKEY_MISSING = -2331,/**< a cert (private) key is missing where one is required (e.g. TLS) */
-+ RS_RET_STATEFILE_WRONG_FNAME = -2361,/**< state file is for wrong file */
-+
-+ /* up to 2419 reserved for 8.4.x */
-+ RS_RET_IMFILE_WILDCARD = -2420, /**< imfile file name contains wildcard, which may be problematic */
-+ RS_RET_FILE_ALREADY_IN_TABLE = -2431,/**< in imfile: table already contains to be added file */
-
- /* RainerScript error messages (range 1000.. 1999) */
- RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */
-diff --git a/runtime/srutils.c b/runtime/srutils.c
-index 6a509b4..e6b45be 100644
---- a/runtime/srutils.c
-+++ b/runtime/srutils.c
-@@ -642,11 +642,11 @@ containsGlobWildcard(char *str)
- return 0;
- }
- /* From Linux Programmer's Guide:
-- * "A string is a wildcard pattern if it contains one of the characters '?', '*' or '['"
-- * "One can remove the special meaning of '?', '*' and '[' by preceding them by a backslash"
-+ * "A string is a wildcard pattern if it contains one of the characters '?', '*', '{' or '['"
-+ * "One can remove the special meaning of '?', '*', '{' and '[' by preceding them by a backslash"
- */
- for(p = str; *p != '\0'; p++) {
-- if((*p == '?' || *p == '*' || *p == '[') &&
-+ if((*p == '?' || *p == '*' || *p == '[' || *p == '{') &&
- (p == str || *(p-1) != '\\')) {
- return 1;
- }
---
-2.5.5
diff --git a/SOURCES/rsyslog-7.4.7-rhbz1312459-partial-msg-loss.patch b/SOURCES/rsyslog-7.4.7-rhbz1312459-partial-msg-loss.patch
deleted file mode 100644
index 796197e..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz1312459-partial-msg-loss.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c7dc590f9c6d9cd92a83ad25ca4738ee6bda6c3b Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Sat, 5 Mar 2016 20:59:16 +0100
-Subject: [PATCH] Fix processing of partial messages over TCP
-
-Commit b0e8ce6c added a new variable to track processing of a single
-message split into multiple packets. Several bits of code weren't
-ported to the new variable and could cause mishandling.
-Messages not terminated by a NL were discarded upon connection
-termination.
----
- tcps_sess.c | 5 ++---
- tcps_sess.h | 1 -
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/tcps_sess.c b/tcps_sess.c
-index 5821e44..199bece 100644
---- a/tcps_sess.c
-+++ b/tcps_sess.c
-@@ -69,7 +69,7 @@ static rsRetVal Close(tcps_sess_t *pThis);
- /* Standard-Constructor */
- BEGINobjConstruct(tcps_sess) /* be sure to specify the object type also in END macro! */
- pThis->iMsg = 0; /* just make sure... */
-- pThis->bAtStrtOfFram = 1; /* indicate frame header expected */
-+ pThis->inputState = eAtStrtFram; /* indicate frame header expected */
- pThis->eFraming = TCP_FRAMING_OCTET_STUFFING; /* just make sure... */
- /* now allocate the message reception buffer */
- CHKmalloc(pThis->pMsg = (uchar*) MALLOC(sizeof(uchar) * iMaxLine + 1));
-@@ -265,7 +265,6 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG
-
- finalize_it:
- /* reset status variables */
-- pThis->bAtStrtOfFram = 1;
- pThis->iMsg = 0;
-
- RETiRet;
-@@ -293,7 +292,7 @@ PrepareClose(tcps_sess_t *pThis)
-
- ISOBJ_TYPE_assert(pThis, tcps_sess);
-
-- if(pThis->bAtStrtOfFram == 1) {
-+ if(pThis->inputState == eAtStrtFram) {
- /* this is how it should be. There is no unprocessed
- * data left and such we have nothing to do. For simplicity
- * reasons, we immediately return in that case.
-diff --git a/tcps_sess.h b/tcps_sess.h
-index 4506cf0..3e10acf 100644
---- a/tcps_sess.h
-+++ b/tcps_sess.h
-@@ -35,7 +35,6 @@ struct tcps_sess_s {
- tcpLstnPortList_t *pLstnInfo; /* pointer back to listener info */
- netstrm_t *pStrm;
- int iMsg; /* index of next char to store in msg */
-- sbool bAtStrtOfFram; /* are we at the very beginning of a new frame? */
- sbool bSuppOctetFram; /**< copy from listener, to speed up access */
- enum {
- eAtStrtFram,
---
-2.5.5
-
diff --git a/SOURCES/rsyslog-7.4.7-rhbz743890-imjournal-sanitize-msgs.patch b/SOURCES/rsyslog-7.4.7-rhbz743890-imjournal-sanitize-msgs.patch
deleted file mode 100644
index eb58390..0000000
--- a/SOURCES/rsyslog-7.4.7-rhbz743890-imjournal-sanitize-msgs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 177a4863f016fae5640fffd6b6ff8f86b5ffee3a Mon Sep 17 00:00:00 2001
-From: Tomas Heinrich <theinric@redhat.com>
-Date: Mon, 28 Jul 2014 18:39:06 +0200
-Subject: [PATCH] imjournal: sanitize messages as imuxsock does it
-
-This change makes these directives available for imjournal:
- $ControlCharacterEscapePrefix
- $DropTrailingLFOnReception
- $Escape8bitCharactersOnReceive
- $EscapeControlCharacterTab
- $EscapeControlCharactersOnReceive
- $SpaceNLOnReceive
----
- plugins/imjournal/imjournal.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
-index 7d42b84..b0b034c 100755
---- a/plugins/imjournal/imjournal.c
-+++ b/plugins/imjournal/imjournal.c
-@@ -44,6 +44,7 @@
- #include "imjournal.h"
- #include "net.h"
- #include "glbl.h"
-+#include "parser.h"
- #include "prop.h"
- #include "errmsg.h"
- #include "srUtils.h"
-@@ -58,6 +59,7 @@ MODULE_CNFNAME("imjournal")
- DEF_IMOD_STATIC_DATA
- DEFobjCurrIf(datetime)
- DEFobjCurrIf(glbl)
-+DEFobjCurrIf(parser)
- DEFobjCurrIf(prop)
- DEFobjCurrIf(net)
- DEFobjCurrIf(errmsg)
-@@ -142,6 +144,7 @@ enqMsg(uchar *msg, uchar *pszTag, int iFacility, int iSeverity, struct timeval *
- {
- struct syslogTime st;
- msg_t *pMsg;
-+ size_t len;
- DEFiRet;
-
- assert(msg != NULL);
-@@ -155,7 +158,10 @@ enqMsg(uchar *msg, uchar *pszTag, int iFacility, int iSeverity, struct timeval *
- }
- MsgSetFlowControlType(pMsg, eFLOWCTL_LIGHT_DELAY);
- MsgSetInputName(pMsg, pInputName);
-- MsgSetRawMsgWOSize(pMsg, (char*)msg);
-+ len = strlen((char*)msg);
-+ MsgSetRawMsg(pMsg, (char*)msg, len);
-+ if(len > 0)
-+ parser.SanitizeMsg(pMsg);
- MsgSetMSGoffs(pMsg, 0); /* we do not have a header... */
- MsgSetRcvFrom(pMsg, glbl.GetLocalHostNameProp());
- MsgSetRcvFromIP(pMsg, pLocalHostIP);
-@@ -670,6 +676,7 @@ CODESTARTmodExit
- objRelease(glbl, CORE_COMPONENT);
- objRelease(net, CORE_COMPONENT);
- objRelease(datetime, CORE_COMPONENT);
-+ objRelease(parser, CORE_COMPONENT);
- objRelease(prop, CORE_COMPONENT);
- objRelease(errmsg, CORE_COMPONENT);
- ENDmodExit
-@@ -750,6 +757,7 @@ CODESTARTmodInit
- CODEmodInit_QueryRegCFSLineHdlr
- CHKiRet(objUse(datetime, CORE_COMPONENT));
- CHKiRet(objUse(glbl, CORE_COMPONENT));
-+ CHKiRet(objUse(parser, CORE_COMPONENT));
- CHKiRet(objUse(prop, CORE_COMPONENT));
- CHKiRet(objUse(net, CORE_COMPONENT));
- CHKiRet(objUse(errmsg, CORE_COMPONENT));
---
-1.9.3
-
diff --git a/SOURCES/rsyslog-8.24.0-doc-polling-by-default.patch b/SOURCES/rsyslog-8.24.0-doc-polling-by-default.patch
new file mode 100644
index 0000000..581be48
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-doc-polling-by-default.patch
@@ -0,0 +1,25 @@
+diff -up ./doc/configuration/modules/imfile.html.orig ./doc/configuration/modules/imfile.html
+--- ./doc/configuration/modules/imfile.html.orig 2016-11-24 10:52:53.192779734 -0500
++++ ./doc/configuration/modules/imfile.html 2016-11-24 11:01:07.132961531 -0500
+@@ -152,11 +152,12 @@ parts of that file.</p>
+ <dt>
+ <code class="descname">mode ["inotify"/"polling"]</code></dt>
+ <dd><blockquote>
+-<div><p><em>Default: “inotify”</em></p>
++<div><p><em>Default: “polling”</em></p>
+ <p><em>Available since: 8.1.5</em></p>
+ </div></blockquote>
+ <p>This specifies if imfile is shall run in inotify (“inotify”) or polling
+-(“polling”) mode. Traditionally, imfile used polling mode, which is
++(“polling”) mode. Traditionally, imfile used polling mode (and this option
++is ON by default in rhel because of backwards compatibility), which is
+ much more resource-intense (and slower) than inotify mode. It is
+ suggested that users turn on “polling” mode only if they experience
+ strange problems in inotify mode. In theory, there should never be a
+@@ -675,4 +676,4 @@ $InputFilePollInterval 10
+ © Copyright 2008-2016, Rainer Gerhards and Adiscon.
+ </div>
+ </body>
+-</html>
+\ No newline at end of file
++</html>
diff --git a/SOURCES/rsyslog-8.24.0-msg_c_nonoverwrite_merge.patch b/SOURCES/rsyslog-8.24.0-msg_c_nonoverwrite_merge.patch
new file mode 100644
index 0000000..1ca26ff
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-msg_c_nonoverwrite_merge.patch
@@ -0,0 +1,65 @@
+From fa7d98b0cb0512d84355e3aafdc5a3e366842f2a Mon Sep 17 00:00:00 2001
+From: Radovan Sroka <rsroka@redhat.com>
+Date: Mon, 21 Nov 2016 13:38:18 +0100
+Subject: [PATCH 2/4] Rebased from: Patch2:
+ rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
+
+Resolves:
+ no adressed bugzila
+---
+ runtime/msg.c | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/msg.c b/runtime/msg.c
+index f6e017b..5430331 100644
+--- a/runtime/msg.c
++++ b/runtime/msg.c
+@@ -4632,6 +4632,27 @@ finalize_it:
+ RETiRet;
+ }
+
++static rsRetVal jsonMerge(struct json_object *existing, struct json_object *json);
++
++static rsRetVal
++jsonMergeNonOverwrite(struct json_object *existing, struct json_object *json)
++{
++ DEFiRet;
++
++ struct json_object_iterator it = json_object_iter_begin(existing);
++ struct json_object_iterator itEnd = json_object_iter_end(existing);
++ while (!json_object_iter_equal(&it, &itEnd)) {
++ json_object_object_add(json, json_object_iter_peek_name(&it),
++ json_object_get(json_object_iter_peek_value(&it)));
++ json_object_iter_next(&it);
++ }
++
++ CHKiRet(jsonMerge(existing, json));
++finalize_it:
++ RETiRet;
++}
++
++
+ static rsRetVal
+ jsonMerge(struct json_object *existing, struct json_object *json)
+ {
+@@ -4714,7 +4735,7 @@ msgAddJSON(msg_t * const pM, uchar *name, struct json_object *json, int force_re
+ if(*pjroot == NULL)
+ *pjroot = json;
+ else
+- CHKiRet(jsonMerge(*pjroot, json));
++ CHKiRet(jsonMergeNonOverwrite(*pjroot, json));
+ } else {
+ if(*pjroot == NULL) {
+ /* now we need a root obj */
+@@ -4742,7 +4763,7 @@ msgAddJSON(msg_t * const pM, uchar *name, struct json_object *json, int force_re
+ json_object_object_add(parent, (char*)leaf, json);
+ } else {
+ if(json_object_get_type(json) == json_type_object) {
+- CHKiRet(jsonMerge(*pjroot, json));
++ CHKiRet(jsonMergeNonOverwrite(*pjroot, json));
+ } else {
+ /* TODO: improve the code below, however, the current
+ * state is not really bad */
+--
+2.7.4
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1056548-getaddrinfo.patch b/SOURCES/rsyslog-8.24.0-rhbz1056548-getaddrinfo.patch
new file mode 100644
index 0000000..82012cd
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1056548-getaddrinfo.patch
@@ -0,0 +1,56 @@
+diff --git a/runtime/net.c b/runtime/net.c
+index 3610fc5..2d8de94 100644
+--- a/runtime/net.c
++++ b/runtime/net.c
+@@ -1181,26 +1181,24 @@ getLocalHostname(uchar **ppName)
+ }
+
+ char *dot = strstr(hnbuf, ".");
++ struct addrinfo *res = NULL;
+ if(!empty_hostname && dot == NULL) {
+ /* we need to (try) to find the real name via resolver */
+- struct hostent *hent = gethostbyname((char*)hnbuf);
+- if(hent) {
+- int i = 0;
+- if(hent->h_aliases) {
+- const size_t hnlen = strlen(hnbuf);
+- for(i = 0; hent->h_aliases[i]; i++) {
+- if(!strncmp(hent->h_aliases[i], hnbuf, hnlen)
+- && hent->h_aliases[i][hnlen] == '.') {
+- break; /* match! */
+- }
+- }
+- }
+- if(hent->h_aliases && hent->h_aliases[i]) {
+- CHKmalloc(fqdn = (uchar*)strdup(hent->h_aliases[i]));
+- } else {
+- CHKmalloc(fqdn = (uchar*)strdup(hent->h_name));
++ struct addrinfo flags;
++ memset(&flags, 0, sizeof(flags));
++ flags.ai_flags = AI_CANONNAME;
++ int error = getaddrinfo((char*)hnbuf, NULL, &flags, &res);
++ if (error != 0) {
++ dbgprintf("getaddrinfo: %s\n", gai_strerror(error));
++ ABORT_FINALIZE(RS_RET_IO_ERROR);
++ }
++ if (res != NULL) {
++ /* When AI_CANONNAME is set first member of res linked-list */
++ /* should contain what we need */
++ if (res->ai_canonname != NULL && res->ai_canonname[0] != '\0') {
++ CHKmalloc(fqdn = (uchar*)strdup(res->ai_canonname));
++ dot = strstr((char*)fqdn, ".");
+ }
+- dot = strstr((char*)fqdn, ".");
+ }
+ }
+
+@@ -1215,6 +1213,9 @@ getLocalHostname(uchar **ppName)
+
+ *ppName = fqdn;
+ finalize_it:
++ if (res != NULL) {
++ freeaddrinfo(res);
++ }
+ RETiRet;
+ }
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1088021-systemd-time-backwards.patch b/SOURCES/rsyslog-8.24.0-rhbz1088021-systemd-time-backwards.patch
new file mode 100644
index 0000000..2800f03
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1088021-systemd-time-backwards.patch
@@ -0,0 +1,28 @@
+diff -up ./plugins/imjournal/imjournal.c.time ./plugins/imjournal/imjournal.c
+--- ./plugins/imjournal/imjournal.c.time 2016-12-21 17:50:13.849000000 +0100
++++ ./plugins/imjournal/imjournal.c 2016-12-21 18:20:03.908000000 +0100
+@@ -538,7 +538,24 @@ loadJournalState(void)
+ "couldn't seek to cursor `%s'\n", readCursor);
+ iRet = RS_RET_ERR;
+ } else {
++ char * tmp_cursor = NULL;
+ sd_journal_next(j);
++ /*
++ * This is resolving the situation when system is after reboot and boot_id doesn't match
++ * so cursor pointing into "future". Usually sd_journal_next jump to head of journal due to journal aproximation,
++ * but when system time goes backwards and cursor is still invalid, rsyslog stops logging. We use
++ * sd_journal_get_cursor to validate our cursor. When cursor is invalid we are trying to jump to the head of journal
++ * This problem with time is not affecting persistent journal.
++ * */
++ if (sd_journal_get_cursor(j, &tmp_cursor) < 0 && sd_journal_has_persistent_files(j) == 0) {
++ errmsg.LogError(0, RS_RET_IO_ERROR, "imjournal: "
++ "loaded invalid cursor, seeking to the head of journal\n");
++ if (sd_journal_seek_head(j) < 0) {
++ errmsg.LogError(0, RS_RET_ERR, "imjournal: "
++ "sd_journal_seek_head() failed, when cursor is invalid\n");
++ iRet = RS_RET_ERR;
++ }
++ }
+ }
+ } else {
+ errmsg.LogError(0, RS_RET_IO_ERROR, "imjournal: "
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1165236-snmp-mib.patch b/SOURCES/rsyslog-8.24.0-rhbz1165236-snmp-mib.patch
new file mode 100644
index 0000000..efdae89
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1165236-snmp-mib.patch
@@ -0,0 +1,20 @@
+@@ -, +, @@
+---
+ plugins/omsnmp/omsnmp.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+--- a/plugins/omsnmp/omsnmp.c
++++ a/plugins/omsnmp/omsnmp.c
+@@ -454,6 +454,12 @@ CODESTARTnewActInst
+ }
+ }
+
++ /* Init NetSNMP library and read in MIB database */
++ init_snmp("rsyslog");
++
++ /* Set some defaults in the NetSNMP library */
++ netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DEFAULT_PORT, pData->iPort );
++
+ CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*)strdup((pData->tplName == NULL) ?
+ "RSYSLOG_FileFormat" : (char*)pData->tplName),
+ OMSR_NO_RQD_TPL_OPTS));
+--
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1188503-imjournal-default-tag.patch b/SOURCES/rsyslog-8.24.0-rhbz1188503-imjournal-default-tag.patch
new file mode 100644
index 0000000..84d82e6
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1188503-imjournal-default-tag.patch
@@ -0,0 +1,163 @@
+From 5fb2e24e4820b4ae206eb250be8d464fcb97879f Mon Sep 17 00:00:00 2001
+From: Tomas Sykora <tosykora@redhat.com>
+Date: Tue, 15 Nov 2016 06:32:58 -0500
+Subject: [PATCH 3/4] Rebased from: Patch21:
+ rsyslog-7.4.7-rhbz1188503-imjournal-default-tag.patch
+
+Resolves:
+rhbz#1188503
+---
+ plugins/imjournal/imjournal.c | 63 ++++++++++++++++++++++++++++---------------
+ 1 file changed, 42 insertions(+), 21 deletions(-)
+
+diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
+index 41fe8c6..d4ea0d5 100644
+--- a/plugins/imjournal/imjournal.c
++++ b/plugins/imjournal/imjournal.c
+@@ -76,6 +76,7 @@ static struct configSettings_s {
+ int iDfltSeverity;
+ int iDfltFacility;
+ int bUseJnlPID;
++ char *dfltTag;
+ } cs;
+
+ static rsRetVal facilityHdlr(uchar **pp, void *pVal);
+@@ -90,6 +91,7 @@ static struct cnfparamdescr modpdescr[] = {
+ { "defaultseverity", eCmdHdlrSeverity, 0 },
+ { "defaultfacility", eCmdHdlrString, 0 },
+ { "usepidfromsystem", eCmdHdlrBinary, 0 },
++ { "defaulttag", eCmdHdlrGetWord, 0 },
+ };
+ static struct cnfparamblk modpblk =
+ { CNFPARAMBLK_VERSION,
+@@ -100,6 +102,7 @@ static struct cnfparamblk modpblk =
+ #define DFLT_persiststateinterval 10
+ #define DFLT_SEVERITY pri2sev(LOG_NOTICE)
+ #define DFLT_FACILITY pri2fac(LOG_USER)
++#define DFLT_TAG "journal"
+
+ static int bLegacyCnfModGlobalsPermitted = 1;/* are legacy module-global config parameters permitted? */
+
+@@ -191,8 +194,13 @@ enqMsg(uchar *msg, uchar *pszTag, int iFacility, int iSeverity, struct timeval *
+ }
+ MsgSetFlowControlType(pMsg, eFLOWCTL_LIGHT_DELAY);
+ MsgSetInputName(pMsg, pInputName);
++ /* Recalculating the message length shouldn't cause problems as all
++ * potential zero-bytes have been excaped in sanitizeValue(). */
+ len = strlen((char*)msg);
+ MsgSetRawMsg(pMsg, (char*)msg, len);
++ /* NB: SanitizeMsg() only touches the raw message and its
++ * length which only contain the msg part. Thus the TAG and
++ * other fields are not sanitized. */
+ if(len > 0)
+ parser.SanitizeMsg(pMsg);
+ MsgSetMSGoffs(pMsg, 0); /* we do not have a header... */
+@@ -230,7 +238,7 @@ readjournal(void)
+
+ /* Information from messages */
+ char *message = NULL;
+- char *sys_iden;
++ char *sys_iden = NULL;
+ char *sys_iden_help = NULL;
+
+ const void *get;
+@@ -291,29 +299,34 @@ readjournal(void)
+ /* Get message identifier, client pid and add ':' */
+ if (sd_journal_get_data(j, "SYSLOG_IDENTIFIER", &get, &length) >= 0) {
+ CHKiRet(sanitizeValue(((const char *)get) + 18, length - 18, &sys_iden));
+- } else {
+- CHKmalloc(sys_iden = strdup("journal"));
+ }
+
+- if (sd_journal_get_data(j, pid_field_name, &pidget, &pidlength) >= 0) {
+- char *sys_pid;
+- int val_ofs;
+-
+- val_ofs = strlen(pid_field_name) + 1; /* name + '=' */
+- CHKiRet_Hdlr(sanitizeValue(((const char *)pidget) + val_ofs, pidlength - val_ofs, &sys_pid)) {
+- free (sys_iden);
+- FINALIZE;
++ if (sys_iden == NULL && !cs.dfltTag[0]) {
++ /* This is a special case: if no tag was obtained from
++ * the message and the user has set the default tag to
++ * an empty string, nothing is inserted.
++ */
++ CHKmalloc(sys_iden_help = calloc(1, 1));
++ } else {
++ if (sys_iden == NULL) {
++ /* Use a predefined tag if it can't be obtained from the message */
++ CHKmalloc(sys_iden = strdup(cs.dfltTag));
++ }
++ if (sd_journal_get_data(j, "SYSLOG_PID", &pidget, &pidlength) >= 0) {
++ char *sys_pid;
++ CHKiRet_Hdlr(sanitizeValue(((const char *)pidget) + 11, pidlength - 11, &sys_pid)) {
++ free (sys_iden);
++ FINALIZE;
++ }
++ r = asprintf(&sys_iden_help, "%s[%s]:", sys_iden, sys_pid);
++ free (sys_pid);
++ } else {
++ r = asprintf(&sys_iden_help, "%s:", sys_iden);
++ }
++ free (sys_iden);
++ if (-1 == r) {
++ ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
+ }
+- r = asprintf(&sys_iden_help, "%s[%s]:", sys_iden, sys_pid);
+- free (sys_pid);
+- } else {
+- r = asprintf(&sys_iden_help, "%s:", sys_iden);
+- }
+-
+- free (sys_iden);
+-
+- if (-1 == r) {
+- ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
+ }
+
+ json = json_object_new_object();
+@@ -606,12 +619,15 @@ CODESTARTbeginCnfLoad
+ cs.ratelimitInterval = 600;
+ cs.iDfltSeverity = DFLT_SEVERITY;
+ cs.iDfltFacility = DFLT_FACILITY;
++ cs.dfltTag = NULL;
+ cs.bUseJnlPID = 0;
+ ENDbeginCnfLoad
+
+
+ BEGINendCnfLoad
+ CODESTARTendCnfLoad
++ if (cs.dfltTag == NULL)
++ cs.dfltTag = strdup(DFLT_TAG);
+ ENDendCnfLoad
+
+
+@@ -628,6 +644,7 @@ ENDactivateCnf
+ BEGINfreeCnf
+ CODESTARTfreeCnf
+ free(cs.stateFile);
++ free(cs.dfltTag);
+ ENDfreeCnf
+
+ /* open journal */
+@@ -710,6 +727,8 @@ CODESTARTsetModCnf
+ free(fac);
+ } else if (!strcmp(modpblk.descr[i].name, "usepidfromsystem")) {
+ cs.bUseJnlPID = (int) pvals[i].val.d.n;
++ } else if (!strcmp(modpblk.descr[i].name, "defaulttag")) {
++ cs.dfltTag = (char *)es_str2cstr(pvals[i].val.d.estr, NULL);
+ } else {
+ dbgprintf("imjournal: program error, non-handled "
+ "param '%s' in beginCnfLoad\n", modpblk.descr[i].name);
+@@ -770,6 +789,8 @@ CODEmodInit_QueryRegCFSLineHdlr
+ facilityHdlr, &cs.iDfltFacility, STD_LOADABLE_MODULE_ID));
+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalusepidfromsystem", 0, eCmdHdlrBinary,
+ NULL, &cs.bUseJnlPID, STD_LOADABLE_MODULE_ID));
++ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaulttag", 0, eCmdHdlrGetWord,
++ NULL, &cs.dfltTag, STD_LOADABLE_MODULE_ID));
+ ENDmodInit
+ /* vim:set ai:
+ */
+--
+2.7.4
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1196230-ratelimit-add-source.patch b/SOURCES/rsyslog-8.24.0-rhbz1196230-ratelimit-add-source.patch
new file mode 100644
index 0000000..b1d140c
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1196230-ratelimit-add-source.patch
@@ -0,0 +1,52 @@
+From f4958b548776e8b9c9c5ef211116eb503aff8e5b Mon Sep 17 00:00:00 2001
+From: Jiri Vymazal <jvymazal@redhat.com>
+Date: Tue, 18 Apr 2017 16:42:22 +0200
+Subject: [PATCH] Putting process name into ratelimiter with imuxsock
+
+---
+ plugins/imuxsock/imuxsock.c | 25 ++++++++++++++++++++-----
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
+index 277c30e..1a57f6e 100644
+--- a/plugins/imuxsock/imuxsock.c
++++ b/plugins/imuxsock/imuxsock.c
+@@ -594,7 +594,7 @@ findRatelimiter(lstn_t *pLstn, struct ucred *cred, ratelimit_t **prl)
+ ratelimit_t *rl = NULL;
+ int r;
+ pid_t *keybuf;
+- char pidbuf[256];
++ char pinfobuf[512];
+ DEFiRet;
+
+ if(cred == NULL)
+@@ -616,10 +616,25 @@ findRatelimiter(lstn_t *pLstn, struct ucred *cred, ratelimit_t **prl)
+ DBGPRINTF("imuxsock: no ratelimiter for pid %lu, creating one\n",
+ (unsigned long) cred->pid);
+ STATSCOUNTER_INC(ctrNumRatelimiters, mutCtrNumRatelimiters);
+- snprintf(pidbuf, sizeof(pidbuf), "pid %lu",
+- (unsigned long) cred->pid);
+- pidbuf[sizeof(pidbuf)-1] = '\0'; /* to be on safe side */
+- CHKiRet(ratelimitNew(&rl, "imuxsock", pidbuf));
++ /* read process name from system */
++ char procName[256]; /* enough for any sane process name */
++ snprintf(procName, sizeof(procName), "/proc/%lu/cmdline", (unsigned long) cred->pid);
++ FILE *f = fopen(procName, "r");
++ if (f) {
++ size_t len;
++ len = fread(procName, sizeof(char), 256, f);
++ if (len > 0) {
++ snprintf(pinfobuf, sizeof(pinfobuf), "pid: %lu, name: %s",
++ (unsigned long) cred->pid, procName);
++ }
++ fclose(f);
++ }
++ else {
++ snprintf(pinfobuf, sizeof(pinfobuf), "pid: %lu",
++ (unsigned long) cred->pid);
++ }
++ pinfobuf[sizeof(pinfobuf)-1] = '\0'; /* to be on safe side */
++ CHKiRet(ratelimitNew(&rl, "imuxsock", pinfobuf));
+ ratelimitSetLinuxLike(rl, pLstn->ratelimitInterval, pLstn->ratelimitBurst);
+ ratelimitSetSeverity(rl, pLstn->ratelimitSev);
+ CHKmalloc(keybuf = malloc(sizeof(pid_t)));
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1245194-imjournal-ste-file.patch b/SOURCES/rsyslog-8.24.0-rhbz1245194-imjournal-ste-file.patch
new file mode 100644
index 0000000..cd8b910
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1245194-imjournal-ste-file.patch
@@ -0,0 +1,24 @@
+From: Jiri Vymazal <jvymazal@redhat.com>
+Date: Fri, 13 Jan 2017 13:38:53 -0500
+Subject: [PATCH 1/1] Rebased from: Patch33:
+ rsyslog-7.4.7-rhbz1245194-imjournal-ste-file.patch
+
+Resolves:
+rhbz#1245194
+---
+ plugins/imjournal/imjournal.c | 2 ++
+ 1 file changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/imjournal/imjournal.c b/plugins/imjournal/imjournal.c
+index d4ea0d5..9d40e04 100644
+--- a/plugins/imjournal/imjournal.c
++++ b/plugins/imjournal/imjournal.c
+@@ -793,6 +793,8 @@
+ NULL, &cs.stateFile, STD_LOADABLE_MODULE_ID));
+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalignorepreviousmessages", 0, eCmdHdlrBinary,
+ NULL, &cs.bIgnorePrevious, STD_LOADABLE_MODULE_ID));
++ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournalignorenonvalidstatefile", 0, eCmdHdlrBinary,
++ NULL, &cs.bIgnoreNonValidStatefile, STD_LOADABLE_MODULE_ID));
+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaultseverity", 0, eCmdHdlrSeverity,
+ NULL, &cs.iDfltSeverity, STD_LOADABLE_MODULE_ID));
+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"imjournaldefaultfacility", 0, eCmdHdlrCustomHandler,
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1286707-recover_qi-doc.patch b/SOURCES/rsyslog-8.24.0-rhbz1286707-recover_qi-doc.patch
new file mode 100644
index 0000000..42a69b1
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1286707-recover_qi-doc.patch
@@ -0,0 +1,27 @@
+From ff07a7cfc171dc2151cc8afe44776525d34a9e01 Mon Sep 17 00:00:00 2001
+From: jvymazal <jvymazal@redhat.com>
+Date: Tue, 3 Jan 2017 10:24:26 +0100
+Subject: [PATCH] Update queues.rst
+
+Update queues.rst
+---
+ source/concepts/queues.rst | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/source/concepts/queues.rst b/source/concepts/queues.rst
+index eb394e8..c71413c 100644
+--- a/source/concepts/queues.rst
++++ b/source/concepts/queues.rst
+@@ -153,6 +153,12 @@ can be requested via "*<object>QueueSyncQueueFiles on/off* with the
+ default being off. Activating this option has a performance penalty, so
+ it should not be turned on without reason.
+
++If you happen to lose or otherwise need the housekeeping structures and
++have all yours queue chunks you can use perl script included in rsyslog
++package to generate it.
++Usage: recover_qi.pl -w *$WorkDirectory* -f QueueFileName -d 8 > QueueFileName.qi
++
++
+ In-Memory Queues
+ ~~~~~~~~~~~~~~~~
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1303617-imfile-wildcards.patch b/SOURCES/rsyslog-8.24.0-rhbz1303617-imfile-wildcards.patch
new file mode 100644
index 0000000..be1f0ce
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1303617-imfile-wildcards.patch
@@ -0,0 +1,30 @@
+From 75dc28c1cb4d3988608352f83f7dc420c17d7c64 Mon Sep 17 00:00:00 2001
+From: Tomas Sykora <tosykora@redhat.com>
+Date: Thu, 24 Nov 2016 10:27:48 -0500
+Subject: [PATCH 2/4] Rebased from:
+ rsyslog-7.4.7-rhbz1303617-imfile-wildcards.patch
+
+Resolves:
+rhbz#1303617
+
+-this patch was already upstreamed, we just have different default option (polling) than upstream
+---
+ plugins/imfile/imfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
+index 519768c..09a321e 100644
+--- a/plugins/imfile/imfile.c
++++ b/plugins/imfile/imfile.c
+@@ -1121,7 +1121,7 @@ BEGINsetModCnf
+ struct cnfparamvals *pvals = NULL;
+ int i;
+ CODESTARTsetModCnf
+- loadModConf->opMode = OPMODE_INOTIFY; /* new style config has different default! */
++ loadModConf->opMode = OPMODE_POLLING; /* Difference from upstream, upstream has default option INOTIFY */
+ pvals = nvlstGetParams(lst, &modpblk, NULL);
+ if(pvals == NULL) {
+ errmsg.LogError(0, RS_RET_MISSING_CNFPARAMS, "imfile: error processing module "
+--
+2.7.4
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1399569-flushontxend.patch b/SOURCES/rsyslog-8.24.0-rhbz1399569-flushontxend.patch
new file mode 100644
index 0000000..abe61bc
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1399569-flushontxend.patch
@@ -0,0 +1,36 @@
+From 1a80a71e91f445f29763fbd724a1c6f3fbf2077a Mon Sep 17 00:00:00 2001
+From: Tomas Sykora <tosykora@redhat.com>
+Date: Fri, 23 Dec 2016 06:49:22 -0500
+Subject: [PATCH 1/3] When flushOnTXEnd is off messages should be written to a
+ file only when the buffer is full. This was broken with upstream commit
+ 6de0103, which was reverted with this patch.
+
+Resolves: RHBZ#1399569
+---
+ tools/omfile.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/tools/omfile.c b/tools/omfile.c
+index 77bf65c..4d849c5 100644
+--- a/tools/omfile.c
++++ b/tools/omfile.c
+@@ -1046,14 +1046,9 @@ CODESTARTcommitTransaction
+ writeFile(pData, pParams, i);
+ }
+ /* Note: pStrm may be NULL if there was an error opening the stream */
+- if(pData->bUseAsyncWriter) {
+- if(pData->bFlushOnTXEnd && pData->pStrm != NULL) {
++ if(pData->bFlushOnTXEnd && pData->pStrm != NULL) {
++ if(!pData->bUseAsyncWriter)
+ CHKiRet(strm.Flush(pData->pStrm));
+- }
+- } else {
+- if(pData->pStrm != NULL) {
+- CHKiRet(strm.Flush(pData->pStrm));
+- }
+ }
+
+ finalize_it:
+--
+2.9.3
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1400594-tls-config.patch b/SOURCES/rsyslog-8.24.0-rhbz1400594-tls-config.patch
new file mode 100644
index 0000000..5011000
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1400594-tls-config.patch
@@ -0,0 +1,29 @@
+From 83ea7bc475cc722033082e51416947842810d1fc Mon Sep 17 00:00:00 2001
+From: Tomas Sykora <tosykora@redhat.com>
+Date: Fri, 23 Dec 2016 06:51:52 -0500
+Subject: [PATCH 2/3] In rsyslog v7 because of bug mix of old and new syntax
+ had to be used to configure tls server-client. In rsyslog v8 this bug was
+ fixed but the mixed configuration didn't worked anymore which was a
+ regresion. With this patch, mixed configuration workes again.
+
+Resolves: RHBZ#1400594
+---
+ tools/omfwd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/omfwd.c b/tools/omfwd.c
+index 45fcfd6..c1d3e64 100644
+--- a/tools/omfwd.c
++++ b/tools/omfwd.c
+@@ -925,6 +925,8 @@ initTCP(wrkrInstanceData_t *pWrkrData)
+ CHKiRet(tcpclt.SetSendPrepRetry(pWrkrData->pTCPClt, TCPSendPrepRetry));
+ CHKiRet(tcpclt.SetFraming(pWrkrData->pTCPClt, pData->tcp_framing));
+ CHKiRet(tcpclt.SetRebindInterval(pWrkrData->pTCPClt, pData->iRebindInterval));
++ if (cs.iStrmDrvrMode)
++ pData->iStrmDrvrMode = cs.iStrmDrvrMode;
+ }
+ finalize_it:
+ RETiRet;
+--
+2.9.3
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1401870-watermark.patch b/SOURCES/rsyslog-8.24.0-rhbz1401870-watermark.patch
new file mode 100644
index 0000000..7d931e5
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1401870-watermark.patch
@@ -0,0 +1,31 @@
+From f1cff52cc3bca3ed050f5e8e2c25698bebcf3258 Mon Sep 17 00:00:00 2001
+From: Tomas Sykora <tosykora@redhat.com>
+Date: Fri, 23 Dec 2016 06:56:41 -0500
+Subject: [PATCH 3/3] When highwatermark is reached, messages should be
+ imediately written to a queue file. Instead of that, messages weren't written
+ until rsyslog was stopped. This was caused by overwritting watermark values
+ by -1.
+
+Resolves: RHBZ#1401870
+---
+ action.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/action.c b/action.c
+index 45828cc..3f8c82c 100644
+--- a/action.c
++++ b/action.c
+@@ -276,8 +276,8 @@ actionResetQueueParams(void)
+ cs.ActionQueType = QUEUETYPE_DIRECT; /* type of the main message queue above */
+ cs.iActionQueueSize = 1000; /* size of the main message queue above */
+ cs.iActionQueueDeqBatchSize = 16; /* default batch size */
+- cs.iActionQHighWtrMark = -1; /* high water mark for disk-assisted queues */
+- cs.iActionQLowWtrMark = -1; /* low water mark for disk-assisted queues */
++ cs.iActionQHighWtrMark = 800; /* high water mark for disk-assisted queues */
++ cs.iActionQLowWtrMark = 200; /* low water mark for disk-assisted queues */
+ cs.iActionQDiscardMark = 980; /* begin to discard messages */
+ cs.iActionQDiscardSeverity = 8; /* discard warning and above */
+ cs.iActionQueueNumWorkers = 1; /* number of worker threads for the mm queue above */
+--
+2.9.3
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1403831-missing-cmd-line-switches.patch b/SOURCES/rsyslog-8.24.0-rhbz1403831-missing-cmd-line-switches.patch
new file mode 100644
index 0000000..74ec4e9
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1403831-missing-cmd-line-switches.patch
@@ -0,0 +1,123 @@
+From e62f3e1a46a6599a6b8dc22e9df0ebefe00b7d08 Mon Sep 17 00:00:00 2001
+From: jvymazal <jvymazal@redhat.com>
+Date: Fri, 13 Jan 2017 12:06:04 +0100
+Subject: [PATCH] added obsolete command-line switches for backward
+ comaptibility (#1)
+
+* added obsolete command-line switches for backward comaptibility
+
+* removed the added warnings since we are not obsoleting any cmd-line opts
+
+Resolves: RHBZ#1403831
+---
+ tools/rsyslogd.c | 49 +++++++++++++++++++------------------------------
+ 1 file changed, 19 insertions(+), 30 deletions(-)
+
+diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
+index b53eeaf..5e3cde2 100644
+--- a/tools/rsyslogd.c
++++ b/tools/rsyslogd.c
+@@ -1191,6 +1191,15 @@ initAll(int argc, char **argv)
+ case 'w': /* disable disallowed host warnings */
+ case 'C':
+ case 'x': /* disable dns for remote messages */
++ case 'a': /* obsolete switches from here below for backwards compatibility */
++ case 'c':
++ case 'g':
++ case 'h':
++ case 'm':
++ case 'o':
++ case 'p':
++ case 'r':
++ case 't':
+ CHKiRet(bufOptAdd(ch, optarg));
+ break;
+ #if defined(_AIX)
+@@ -1249,27 +1258,15 @@ initAll(int argc, char **argv)
+ DBGPRINTF("deque option %c, optarg '%s'\n", ch, (arg == NULL) ? "" : arg);
+ switch((char)ch) {
+ case '4':
+- fprintf (stderr, "rsyslogd: the -4 command line option will go away "
+- "soon.\nPlease use the global(net.ipprotocol=\"ipv4-only\") "
+- "configuration parameter instead.\n");
+ glbl.SetDefPFFamily(PF_INET);
+ break;
+ case '6':
+- fprintf (stderr, "rsyslogd: the -6 command line option will go away "
+- "soon.\nPlease use the global(net.ipprotocol=\"ipv6-only\") "
+- "configuration parameter instead.\n");
+ glbl.SetDefPFFamily(PF_INET6);
+ break;
+ case 'A':
+- fprintf (stderr, "rsyslogd: the -A command line option will go away "
+- "soon.\n"
+- "Please use the omfwd parameter \"upd.sendToAll\" instead.\n");
+ send_to_all++;
+ break;
+ case 'S': /* Source IP for local client to be used on multihomed host */
+- fprintf (stderr, "rsyslogd: the -S command line option will go away "
+- "soon.\n"
+- "Please use the omrelp parameter \"localClientIP\" instead.\n");
+ if(glbl.GetSourceIPofLocalClient() != NULL) {
+ fprintf (stderr, "rsyslogd: Only one -S argument allowed, the first one is taken.\n");
+ } else {
+@@ -1283,9 +1280,6 @@ initAll(int argc, char **argv)
+ PidFile = arg;
+ break;
+ case 'l':
+- fprintf (stderr, "rsyslogd: the -l command line option will go away "
+- "soon.\n Make yourself heard on the rsyslog mailing "
+- "list if you need it any longer.\n");
+ if(glbl.GetLocalHosts() != NULL) {
+ fprintf (stderr, "rsyslogd: Only one -l argument allowed, the first one is taken.\n");
+ } else {
+@@ -1299,21 +1293,12 @@ initAll(int argc, char **argv)
+ iConfigVerify = (arg == NULL) ? 0 : atoi(arg);
+ break;
+ case 'q': /* add hostname if DNS resolving has failed */
+- fprintf (stderr, "rsyslogd: the -q command line option will go away "
+- "soon.\nPlease use the global(net.aclAddHostnameOnFail=\"on\") "
+- "configuration parameter instead.\n");
+ *(net.pACLAddHostnameOnFail) = 1;
+ break;
+ case 'Q': /* dont resolve hostnames in ACL to IPs */
+- fprintf (stderr, "rsyslogd: the -Q command line option will go away "
+- "soon.\nPlease use the global(net.aclResolveHostname=\"off\") "
+- "configuration parameter instead.\n");
+ *(net.pACLDontResolve) = 1;
+ break;
+ case 's':
+- fprintf (stderr, "rsyslogd: the -s command line option will go away "
+- "soon.\n Make yourself heard on the rsyslog mailing "
+- "list if you need it any longer.\n");
+ if(glbl.GetStripDomains() != NULL) {
+ fprintf (stderr, "rsyslogd: Only one -s argument allowed, the first one is taken.\n");
+ } else {
+@@ -1353,17 +1338,21 @@ initAll(int argc, char **argv)
+ bChDirRoot = 0;
+ break;
+ case 'w': /* disable disallowed host warnigs */
+- fprintf (stderr, "rsyslogd: the -w command line option will go away "
+- "soon.\nPlease use the global(net.permitWarning=\"off\") "
+- "configuration parameter instead.\n");
+ glbl.SetOption_DisallowWarning(0);
+ break;
+ case 'x': /* disable dns for remote messages */
+- fprintf (stderr, "rsyslogd: the -x command line option will go away "
+- "soon.\nPlease use the global(net.enableDNS=\"off\") "
+- "configuration parameter instead.\n");
+ glbl.SetDisableDNS(1);
+ break;
++ case 'a':
++ case 'c':
++ case 'g':
++ case 'h':
++ case 'm':
++ case 'o':
++ case 'p':
++ case 'r':
++ case 't':
++ break;
+ case '?':
+ default:
+ rsyslogd_usage();
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1403907-imudp-deprecated-parameter.patch b/SOURCES/rsyslog-8.24.0-rhbz1403907-imudp-deprecated-parameter.patch
new file mode 100644
index 0000000..dbb8685
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1403907-imudp-deprecated-parameter.patch
@@ -0,0 +1,30 @@
+From: Jiri Vymazal <jvymazal@redhat.com>
+Date: Fri, 03 Feb 2017 15:12:42 -0500
+Subject: [PATCH 1/1] rsyslog-8.24.0-rhbz1403907-imudp-deprecated-parameter.patch
+
+Resolves:
+rhbz#1403907
+---
+ plugins/imudp/imudp.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/plugins/imudp/imudp.c 2017-01-10 10:00:04.000000000 +0100
++++ b/plugins/imudp/imudp.c 2017-02-03 14:46:59.075987660 +0100
+@@ -920,8 +920,6 @@
+ inst->bAppendPortToInpname = (int) pvals[i].val.d.n;
+ bAppendPortUsed = 1;
+ } else if(!strcmp(inppblk.descr[i].name, "inputname")) {
+- errmsg.LogError(0, RS_RET_DEPRECATED , "imudp: deprecated parameter inputname "
+- "used. Suggest to use name instead");
+ if(inst->inputname != NULL) {
+ errmsg.LogError(0, RS_RET_INVALID_PARAMS, "imudp: name and inputname "
+ "parameter specified - only one can be used");
+@@ -929,8 +927,6 @@
+ }
+ inst->inputname = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+ } else if(!strcmp(inppblk.descr[i].name, "inputname.appendport")) {
+- errmsg.LogError(0, RS_RET_DEPRECATED , "imudp: deprecated parameter inputname.appendport "
+- "used. Suggest to use name.appendport instead");
+ if(bAppendPortUsed) {
+ errmsg.LogError(0, RS_RET_INVALID_PARAMS, "imudp: name.appendport and "
+ "inputname.appendport parameter specified - only one can be used");
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1419228-journal-switch-persistent.patch b/SOURCES/rsyslog-8.24.0-rhbz1419228-journal-switch-persistent.patch
new file mode 100644
index 0000000..bd1d320
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1419228-journal-switch-persistent.patch
@@ -0,0 +1,116 @@
+diff -up ./plugins/imjournal/imjournal.c.journal ./plugins/imjournal/imjournal.c
+--- ./plugins/imjournal/imjournal.c.journal 2017-03-13 14:38:11.820000000 +0100
++++ ./plugins/imjournal/imjournal.c 2017-03-13 14:45:16.006000000 +0100
+@@ -115,6 +115,25 @@ static const char *pid_field_name; /* re
+ static ratelimit_t *ratelimiter = NULL;
+ static sd_journal *j;
+
++static rsRetVal persistJournalState(void);
++static rsRetVal loadJournalState(void);
++
++static rsRetVal openJournal(sd_journal** jj) {
++ DEFiRet;
++
++ if (sd_journal_open(jj, SD_JOURNAL_LOCAL_ONLY) < 0)
++ iRet = RS_RET_IO_ERROR;
++ RETiRet;
++}
++
++static void closeJournal(sd_journal** jj) {
++
++ if (cs.stateFile) { /* can't persist without a state file */
++ persistJournalState();
++ }
++ sd_journal_close(*jj);
++}
++
+
+ /* ugly workaround to handle facility numbers; values
+ * derived from names need to be eight times smaller,
+@@ -436,20 +455,25 @@ persistJournalState (void)
+ }
+
+
++static rsRetVal skipOldMessages(void);
+ /* Polls the journal for new messages. Similar to sd_journal_wait()
+ * except for the special handling of EINTR.
+ */
++
++#define POLL_TIMEOUT 1000 /* timeout for poll is 1s */
++
+ static rsRetVal
+ pollJournal(void)
+ {
+ DEFiRet;
+ struct pollfd pollfd;
+- int r;
++ int pr = 0;
++ int jr = 0;
+
+ pollfd.fd = sd_journal_get_fd(j);
+ pollfd.events = sd_journal_get_events(j);
+- r = poll(&pollfd, 1, -1);
+- if (r == -1) {
++ pr = poll(&pollfd, 1, POLL_TIMEOUT);
++ if (pr == -1) {
+ if (errno == EINTR) {
+ /* EINTR is also received during termination
+ * so return now to check the term state.
+@@ -465,12 +489,30 @@ pollJournal(void)
+ }
+ }
+
+- assert(r == 1);
+
+- r = sd_journal_process(j);
+- if (r < 0) {
+- char errStr[256];
++ jr = sd_journal_process(j);
++
++ if (pr == 1 && jr == SD_JOURNAL_INVALIDATE) {
++ /* do not persist stateFile sd_journal_get_cursor will fail! */
++ char* tmp = cs.stateFile;
++ cs.stateFile = NULL;
++ closeJournal(&j);
++ cs.stateFile = tmp;
++
++ iRet = openJournal(&j);
++ if (iRet != RS_RET_OK) {
++ char errStr[256];
++ rs_strerror_r(errno, errStr, sizeof(errStr));
++ errmsg.LogError(0, RS_RET_IO_ERROR,
++ "sd_journal_open() failed: '%s'", errStr);
++ ABORT_FINALIZE(RS_RET_ERR);
++ }
+
++ iRet = loadJournalState();
++ errmsg.LogError(0, RS_RET_OK, "imjournal: "
++ "journal reloaded...");
++ } else if (jr < 0) {
++ char errStr[256];
+ rs_strerror_r(errno, errStr, sizeof(errStr));
+ errmsg.LogError(0, RS_RET_ERR,
+ "sd_journal_process() failed: '%s'", errStr);
+@@ -694,20 +736,13 @@ ENDfreeCnf
+ /* open journal */
+ BEGINwillRun
+ CODESTARTwillRun
+- int ret;
+- ret = sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY);
+- if (ret < 0) {
+- iRet = RS_RET_IO_ERROR;
+- }
++ iRet = openJournal(&j);
+ ENDwillRun
+
+ /* close journal */
+ BEGINafterRun
+ CODESTARTafterRun
+- if (cs.stateFile) { /* can't persist without a state file */
+- persistJournalState();
+- }
+- sd_journal_close(j);
++ closeJournal(&j);
+ ratelimitDestruct(ratelimiter);
+ ENDafterRun
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1422414-glbDoneLoadCnf-segfault.patch b/SOURCES/rsyslog-8.24.0-rhbz1422414-glbDoneLoadCnf-segfault.patch
new file mode 100644
index 0000000..bfb171f
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1422414-glbDoneLoadCnf-segfault.patch
@@ -0,0 +1,84 @@
+From d649d77cd585f70c6122d7e4ce95e82ad0e9af5e Mon Sep 17 00:00:00 2001
+From: Radovan Sroka <rsroka@redhat.com>
+Date: Thu, 23 Feb 2017 15:05:27 +0100
+Subject: [PATCH] Fixed segfault in glblDoneLoadCnf()
+
+This is caused by uninitialized net static structure in glbl objUse(net)
+is not called after start of glbl module.
+
+It looks like it is not possible to use objUse(net) when glbl module
+starts. So we call it inside of glblDoneLoadCnf().
+---
+ runtime/glbl.c | 6 ++++--
+ runtime/glbl.h | 2 +-
+ runtime/rsconf.c | 6 +++---
+ 3 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/runtime/glbl.c b/runtime/glbl.c
+index 2079c46..1a32c2d 100644
+--- a/runtime/glbl.c
++++ b/runtime/glbl.c
+@@ -1076,11 +1076,13 @@ do_setenv(const char *const var)
+ /* This processes the "regular" parameters which are to be set after the
+ * config has been fully loaded.
+ */
+-void
++rsRetVal
+ glblDoneLoadCnf(void)
+ {
+ int i;
+ unsigned char *cstr;
++ DEFiRet;
++ CHKiRet(objUse(net, CORE_COMPONENT));
+
+ qsort(tzinfos, ntzinfos, sizeof(tzinfo_t), qs_arrcmp_tzinfo);
+ DBGPRINTF("Timezone information table (%d entries):\n", ntzinfos);
+@@ -1210,7 +1212,7 @@ glblDoneLoadCnf(void)
+ stddbg = -1;
+ }
+
+-finalize_it: return;
++finalize_it: RETiRet;
+ }
+
+
+diff --git a/runtime/glbl.h b/runtime/glbl.h
+index 6d18a2c..048c0a6 100644
+--- a/runtime/glbl.h
++++ b/runtime/glbl.h
+@@ -125,7 +125,7 @@ void glblProcessCnf(struct cnfobj *o);
+ void glblProcessTimezone(struct cnfobj *o);
+ void glblProcessMainQCnf(struct cnfobj *o);
+ void glblDestructMainqCnfObj(void);
+-void glblDoneLoadCnf(void);
++rsRetVal glblDoneLoadCnf(void);
+ const uchar * glblGetWorkDirRaw(void);
+ tzinfo_t* glblFindTimezoneInfo(char *id);
+ int GetGnuTLSLoglevel(void);
+diff --git a/runtime/rsconf.c b/runtime/rsconf.c
+index dc6bd7f..f337e1f 100644
+--- a/runtime/rsconf.c
++++ b/runtime/rsconf.c
+@@ -627,11 +627,11 @@ dropPrivileges(rsconf_t *cnf)
+ /* tell the rsysog core (including ourselfs) that the config load is done and
+ * we need to prepare to move over to activate mode.
+ */
+-static inline void
++static inline rsRetVal
+ tellCoreConfigLoadDone(void)
+ {
+ DBGPRINTF("telling rsyslog core that config load for %p is done\n", loadConf);
+- glblDoneLoadCnf();
++ return glblDoneLoadCnf();
+ }
+
+
+@@ -1345,7 +1345,7 @@ ourConf = loadConf; // TODO: remove, once ourConf is gone!
+ DBGPRINTF("Number of actions in this configuration: %d\n", iActionNbr);
+ rulesetOptimizeAll(loadConf);
+
+- tellCoreConfigLoadDone();
++ CHKiRet(tellCoreConfigLoadDone());
+ tellModulesConfigLoadDone();
+
+ tellModulesCheckConfig();
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1422789-missing-chdir-w-chroot.patch b/SOURCES/rsyslog-8.24.0-rhbz1422789-missing-chdir-w-chroot.patch
new file mode 100644
index 0000000..e67e13f
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1422789-missing-chdir-w-chroot.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/rsyslogd.c b/tools/rsyslogd.c
+index c099705..12b037f 100644
+--- a/tools/rsyslogd.c
++++ b/tools/rsyslogd.c
+@@ -1350,6 +1350,10 @@ initAll(int argc, char **argv)
+ perror("chroot");
+ exit(1);
+ }
++ if(chdir("/") != 0) {
++ perror("chdir");
++ exit(1);
++ }
+ break;
+ case 'u': /* misc user settings */
+ iHelperUOpt = (arg == NULL) ? 0 : atoi(arg);
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1427821-backport-num2ipv4.patch b/SOURCES/rsyslog-8.24.0-rhbz1427821-backport-num2ipv4.patch
new file mode 100644
index 0000000..2822fa0
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1427821-backport-num2ipv4.patch
@@ -0,0 +1,243 @@
+From d6f180ec175f3660e36478b9e32ec6ca73e33604 Mon Sep 17 00:00:00 2001
+From: Jan Gerhards <jgerhards@adiscon.com>
+Date: Fri, 10 Feb 2017 14:30:01 +0100
+Subject: [PATCH] add num2ipv4 function and test
+
+closes https://github.com/rsyslog/rsyslog/issues/1322
+
+testbench: add testcase empty string for num2ipv4 function
+
+see https://github.com/rsyslog/rsyslog/issues/1412
+---
+ grammar/rainerscript.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++
+ grammar/rainerscript.h | 4 +-
+ tests/Makefile.am | 2 +
+ tests/rscript_num2ipv4.sh | 41 +++++++++++++++++
+ 4 files changed, 161 insertions(+), 1 deletion(-)
+ create mode 100755 tests/rscript_num2ipv4.sh
+
+diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
+index 30af5e7b..2f0fc2d8 100644
+--- a/grammar/rainerscript.c
++++ b/grammar/rainerscript.c
+@@ -1710,6 +1710,113 @@ doRandomGen(struct svar *__restrict__ const sourceVal) {
+ return x % max;
+ }
+
++static long long
++ipv42num(char *str)
++{
++ unsigned num[4] = {0, 0, 0, 0};
++ long long value = -1;
++ size_t len = strlen(str);
++ int cyc = 0;
++ int prevdot = 0;
++ int startblank = 0;
++ int endblank = 0;
++ DBGPRINTF("rainerscript: (ipv42num) arg: '%s'\n", str);
++ for(unsigned int i = 0 ; i < len ; i++) {
++ switch(str[i]){
++ case '0':
++ case '1':
++ case '2':
++ case '3':
++ case '4':
++ case '5':
++ case '6':
++ case '7':
++ case '8':
++ case '9':
++ if(endblank == 1){
++ DBGPRINTF("rainerscript: (ipv42num) error: wrong IP-Address format (invalid space(1))\n");
++ goto done;
++ }
++ prevdot = 0;
++ startblank = 0;
++ DBGPRINTF("rainerscript: (ipv42num) cycle: %d\n", cyc);
++ num[cyc] = num[cyc]*10+(str[i]-'0');
++ break;
++ case ' ':
++ prevdot = 0;
++ if(i == 0 || startblank == 1){
++ startblank = 1;
++ break;
++ }
++ else{
++ endblank = 1;
++ break;
++ }
++ case '.':
++ if(endblank == 1){
++ DBGPRINTF("rainerscript: (ipv42num) error: wrong IP-Address format (inalid space(2))\n");
++ goto done;
++ }
++ startblank = 0;
++ if(prevdot == 1){
++ DBGPRINTF("rainerscript: (ipv42num) error: wrong IP-Address format (two dots after one another)\n");
++ goto done;
++ }
++ prevdot = 1;
++ cyc++;
++ if(cyc > 3){
++ DBGPRINTF("rainerscript: (ipv42num) error: wrong IP-Address format (too many dots)\n");
++ goto done;
++ }
++ break;
++ default:
++ DBGPRINTF("rainerscript: (ipv42num) error: wrong IP-Address format (invalid charakter)\n");
++ goto done;
++ }
++ }
++ if(cyc != 3){
++ DBGPRINTF("rainerscript: (ipv42num) error: wrong IP-Address format (wrong number of dots)\n");
++ goto done;
++ }
++ value = num[0]*256*256*256+num[1]*256*256+num[2]*256+num[3];
++done:
++ DBGPRINTF("rainerscript: (ipv42num): return value:'%lld'\n",value);
++ return(value);
++}
++
++
++static es_str_t*
++num2ipv4(struct svar *__restrict__ const sourceVal) {
++ int success = 0;
++ int numip[4];
++ char str[16];
++ size_t len;
++ es_str_t *estr;
++ long long num = var2Number(sourceVal, &success);
++ DBGPRINTF("rainrescript: (num2ipv4) var2Number output: '%lld\n'", num);
++ if (! success) {
++ DBGPRINTF("rainerscript: (num2ipv4) couldn't access number\n");
++ len = snprintf(str, 16, "-1");
++ goto done;
++ }
++ if(num < 0 || num > 4294967295) {
++ DBGPRINTF("rainerscript: (num2ipv4) invalid number(too big/negative); does not represent IPv4 address\n");
++ len = snprintf(str, 16, "-1");
++ goto done;
++ }
++ for(int i = 0 ; i < 4 ; i++){
++ numip[i] = num % 256;
++ num = num / 256;
++ }
++ DBGPRINTF("rainerscript: (num2ipv4) Numbers: 1:'%d' 2:'%d' 3:'%d' 4:'%d'\n", numip[0], numip[1], numip[2], numip[3]);
++ len = snprintf(str, 16, "%d.%d.%d.%d", numip[3], numip[2], numip[1], numip[0]);
++done:
++ DBGPRINTF("rainerscript: (num2ipv4) ipv4-Address: %s, lengh: %zu\n", str, len);
++ estr = es_newStrFromCStr(str, len);
++ return(estr);
++}
++
++
+ /* Perform a function call. This has been moved out of cnfExprEval in order
+ * to keep the code small and easier to maintain.
+ */
+@@ -1775,6 +1882,12 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co
+ ret->datatype = 'N';
+ varFreeMembers(&r[0]);
+ break;
++ case CNFFUNC_NUM2IPV4:
++ cnfexprEval(func->expr[0], &r[0], usrptr);
++ ret->d.estr = num2ipv4(&r[0]);
++ ret->datatype = 'S';
++ varFreeMembers(&r[0]);
++ break;
+ case CNFFUNC_GETENV:
+ /* note: the optimizer shall have replaced calls to getenv()
+ * with a constant argument to a single string (once obtained via
+@@ -3958,6 +4071,8 @@ funcName2ID(es_str_t *fname, unsigned short nParams)
+ GENERATE_FUNC("strlen", 1, CNFFUNC_STRLEN);
+ } else if(FUNC_NAME("getenv")) {
+ GENERATE_FUNC("getenv", 1, CNFFUNC_GETENV);
++ } else if(FUNC_NAME("num2ipv4")) {
++ GENERATE_FUNC("num2ipv4", 1, CNFFUNC_NUM2IPV4);
+ } else if(FUNC_NAME("tolower")) {
+ GENERATE_FUNC("tolower", 1, CNFFUNC_TOLOWER);
+ } else if(FUNC_NAME("cstr")) {
+diff --git a/grammar/rainerscript.h b/grammar/rainerscript.h
+index 7bac7566..0fdbdc72 100644
+--- a/grammar/rainerscript.h
++++ b/grammar/rainerscript.h
+@@ -232,7 +232,9 @@ enum cnffuncid {
+ CNFFUNC_REPLACE,
+ CNFFUNC_WRAP,
+ CNFFUNC_RANDOM,
+- CNFFUNC_DYN_INC
++ CNFFUNC_DYN_INC,
++ CNFFUNC_IPV42NUM,
++ CNFFUNC_NUM2IPV4
+ };
+
+ struct cnffunc {
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index f792b44a..572c6250 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -206,6 +206,7 @@ TESTS += \
+ rscript_lt_var.sh \
+ rscript_ne.sh \
+ rscript_ne_var.sh \
++ rscript_num2ipv4.sh \
+ empty-prop-comparison.sh \
+ rs_optimizer_pri.sh \
+ cee_simple.sh \
+@@ -728,6 +729,7 @@ EXTRA_DIST= \
+ rscript_ne.sh \
+ testsuites/rscript_ne.conf \
+ rscript_ne_var.sh \
++ rscript_num2ipv4.sh \
+ testsuites/rscript_ne_var.conf \
+ rscript_eq.sh \
+ testsuites/rscript_eq.conf \
+diff --git a/tests/rscript_num2ipv4.sh b/tests/rscript_num2ipv4.sh
+new file mode 100755
+index 00000000..6e0026a9
+--- /dev/null
++++ b/tests/rscript_num2ipv4.sh
+@@ -0,0 +1,41 @@
++#!/bin/bash
++# add 2017-02-09 by Jan Gerhards, released under ASL 2.0
++. $srcdir/diag.sh init
++. $srcdir/diag.sh generate-conf
++. $srcdir/diag.sh add-conf '
++module(load="../plugins/imtcp/.libs/imtcp")
++input(type="imtcp" port="13514")
++
++set $!ip!v1 = num2ipv4("0");
++set $!ip!v2 = num2ipv4("1");
++set $!ip!v3 = num2ipv4("256");
++set $!ip!v4 = num2ipv4("65536");
++set $!ip!v5 = num2ipv4("16777216");
++set $!ip!v6 = num2ipv4("135");
++set $!ip!v7 = num2ipv4("16843009");
++set $!ip!v8 = num2ipv4("3777036554");
++set $!ip!v9 = num2ipv4("2885681153");
++set $!ip!v10 = num2ipv4("4294967295");
++
++set $!ip!e1 = num2ipv4("a");
++set $!ip!e2 = num2ipv4("-123");
++set $!ip!e3 = num2ipv4("1725464567890");
++set $!ip!e4 = num2ipv4("4294967296");
++set $!ip!e5 = num2ipv4("2839.");
++set $!ip!e6 = num2ipv4("");
++
++
++template(name="outfmt" type="string" string="%!ip%\n")
++local4.* action(type="omfile" file="rsyslog.out.log" template="outfmt")
++'
++. $srcdir/diag.sh startup
++. $srcdir/diag.sh tcpflood -m1 -y
++. $srcdir/diag.sh shutdown-when-empty
++. $srcdir/diag.sh wait-shutdown
++echo '{ "v1": "0.0.0.0", "v2": "0.0.0.1", "v3": "0.0.1.0", "v4": "0.1.0.0", "v5": "1.0.0.0", "v6": "0.0.0.135", "v7": "1.1.1.1", "v8": "225.33.1.10", "v9": "172.0.0.1", "v10": "255.255.255.255", "e1": "-1", "e2": "-1", "e3": "-1", "e4": "-1", "e5": "-1", "e6": "-1" }' | cmp rsyslog.out.log
++if [ ! $? -eq 0 ]; then
++ echo "invalid function output detected, rsyslog.out.log is:"
++ cat rsyslog.out.log
++ . $srcdir/diag.sh error-exit 1
++fi;
++. $srcdir/diag.sh exit
+--
+2.12.2
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1427821-str2num-emty-string-handle.patch b/SOURCES/rsyslog-8.24.0-rhbz1427821-str2num-emty-string-handle.patch
new file mode 100644
index 0000000..ab35376
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1427821-str2num-emty-string-handle.patch
@@ -0,0 +1,28 @@
+@@ -, +, @@
+---
+ grammar/rainerscript.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+--- a/grammar/rainerscript.c
++++ a/grammar/rainerscript.c
+@@ -1276,6 +1276,13 @@ str2num(es_str_t *s, int *bSuccess)
+ int64_t num = 0;
+ const uchar *const c = es_getBufAddr(s);
+
++ if(s->lenStr == 0) {
++ DBGPRINTF("rainerscript: str2num: strlen == 0; invalid input (no string)\n");
++ if(bSuccess != NULL) {
++ *bSuccess = 1;
++ }
++ goto done;
++ }
+ if(c[0] == '-') {
+ neg = -1;
+ i = -1;
+@@ -1290,6 +1297,7 @@ str2num(es_str_t *s, int *bSuccess)
+ num *= neg;
+ if(bSuccess != NULL)
+ *bSuccess = (i == s->lenStr) ? 1 : 0;
++done:
+ return num;
+ }
+
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1427828-set-unset-not-checking-varName.patch b/SOURCES/rsyslog-8.24.0-rhbz1427828-set-unset-not-checking-varName.patch
new file mode 100644
index 0000000..8d89d2b
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1427828-set-unset-not-checking-varName.patch
@@ -0,0 +1,90 @@
+From e2767839bc23f1a2f70543efabfe0ca1be166ee9 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Tue, 24 Jan 2017 13:24:29 +0100
+Subject: [PATCH] rainescript: set/unset statement do not check variable name
+ validity
+
+Only JSON-based variables can be use with set and unset. Unfortunately,
+this restriction is not checked. If an invalid variable is given
+(e.g. $invalid), this is not detected upon config processing on
+startup. During execution phase, this can lead to a segfault, a
+memory leak or other types of problems.
+
+see also https://github.com/rsyslog/rsyslog/issues/1376
+closes https://github.com/rsyslog/rsyslog/issues/1377
+---
+ grammar/rainerscript.c | 43 +++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
+index 0ebd6f1..2106ef9 100644
+--- a/grammar/rainerscript.c
++++ b/grammar/rainerscript.c
+@@ -3062,6 +3062,19 @@ cnfstmtNew(unsigned s_type)
+ return cnfstmt;
+ }
+
++/* This function disables a cnfstmt by setting it to NOP. This is
++ * useful when we detect errors late in the parsing processing, where
++ * we need to return a valid cnfstmt. The optimizer later removes the
++ * NOPs, so all is well.
++ * NOTE: this call assumes that no dynamic data structures have been
++ * allocated. If so, these MUST be freed before calling cnfstmtDisable().
++ */
++static void
++cnfstmtDisable(struct cnfstmt *cnfstmt)
++{
++ cnfstmt->nodetype = S_NOP;
++}
++
+ void cnfstmtDestructLst(struct cnfstmt *root);
+
+ static void cnfIteratorDestruct(struct cnfitr *itr);
+@@ -3166,11 +3179,22 @@ cnfIteratorDestruct(struct cnfitr *itr)
+ struct cnfstmt *
+ cnfstmtNewSet(char *var, struct cnfexpr *expr, int force_reset)
+ {
++ propid_t propid;
+ struct cnfstmt* cnfstmt;
+ if((cnfstmt = cnfstmtNew(S_SET)) != NULL) {
+- cnfstmt->d.s_set.varname = (uchar*) var;
+- cnfstmt->d.s_set.expr = expr;
+- cnfstmt->d.s_set.force_reset = force_reset;
++ if(propNameToID((uchar *)var, &propid) == RS_RET_OK
++ && ( propid == PROP_CEE
++ || propid == PROP_LOCAL_VAR
++ || propid == PROP_GLOBAL_VAR)
++ ) {
++ cnfstmt->d.s_set.varname = (uchar*) var;
++ cnfstmt->d.s_set.expr = expr;
++ cnfstmt->d.s_set.force_reset = force_reset;
++ } else {
++ parser_errmsg("invalid variable '%s' in set statement.", var);
++ free(var);
++ cnfstmtDisable(cnfstmt);
++ }
+ }
+ return cnfstmt;
+ }
+@@ -3254,9 +3278,20 @@ cnfstmtNewReloadLookupTable(struct cnffparamlst *fparams)
+ struct cnfstmt *
+ cnfstmtNewUnset(char *var)
+ {
++ propid_t propid;
+ struct cnfstmt* cnfstmt;
+ if((cnfstmt = cnfstmtNew(S_UNSET)) != NULL) {
+- cnfstmt->d.s_unset.varname = (uchar*) var;
++ if(propNameToID((uchar *)var, &propid) == RS_RET_OK
++ && ( propid == PROP_CEE
++ || propid == PROP_LOCAL_VAR
++ || propid == PROP_GLOBAL_VAR)
++ ) {
++ cnfstmt->d.s_unset.varname = (uchar*) var;
++ } else {
++ parser_errmsg("invalid variable '%s' in unset statement.", var);
++ free(var);
++ cnfstmtDisable(cnfstmt);
++ }
+ }
+ return cnfstmt;
+ }
diff --git a/SOURCES/rsyslog-8.24.0-rhbz1431616-pmrfc3164sd-backport.patch b/SOURCES/rsyslog-8.24.0-rhbz1431616-pmrfc3164sd-backport.patch
new file mode 100644
index 0000000..39e16b6
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-rhbz1431616-pmrfc3164sd-backport.patch
@@ -0,0 +1,413 @@
+diff -up ./configure.ac.pmrfc3164sd ./configure.ac
+--- ./configure.ac.pmrfc3164sd 2017-01-10 10:01:24.000000000 +0100
++++ ./configure.ac 2017-04-03 10:10:40.912388923 +0200
+@@ -1559,6 +1559,18 @@ AC_ARG_ENABLE(pmpanngfw,
+ )
+ AM_CONDITIONAL(ENABLE_PMPANNGFW, test x$enable_pmpanngfw = xyes)
+
++# settings for pmrfc3164sd
++AC_ARG_ENABLE(pmrfc3164sd,
++ [AS_HELP_STRING([--enable-pmrfc3164sd],[Compiles rfc3164sd parser module @<:@default=no@:>@])],
++ [case "${enableval}" in
++ yes) enable_pmrfc3164sd="yes" ;;
++ no) enable_pmrfc3164sd="no" ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-pmrfc3164sd) ;;
++ esac],
++ [enable_pmrfc3164sd=no]
++)
++AM_CONDITIONAL(ENABLE_PMRFC3164SD, test x$enable_pmrfc3164sd = xyes)
++
+
+ # settings for omruleset
+ AC_ARG_ENABLE(omruleset,
+@@ -1953,6 +1965,7 @@ AC_CONFIG_FILES([Makefile \
+ plugins/mmexternal/Makefile \
+ plugins/omstdout/Makefile \
+ plugins/omjournal/Makefile \
++ plugins/pmrfc3164sd/Makefile \
+ plugins/pmciscoios/Makefile \
+ plugins/pmnull/Makefile \
+ plugins/omruleset/Makefile \
+@@ -2057,6 +2070,7 @@ echo " omamqp1 module will be compile
+ echo " omtcl module will be compiled: $enable_omtcl"
+ echo
+ echo "---{ parser modules }---"
++echo " pmrfc3164sd module will be compiled: $enable_pmrfc3164sd"
+ echo " pmlastmsg module will be compiled: $enable_pmlastmsg"
+ echo " pmcisconames module will be compiled: $enable_pmcisconames"
+ echo " pmciscoios module will be compiled: $enable_pmciscoios"
+diff -up ./Makefile.am.pmrfc3164sd ./Makefile.am
+--- ./Makefile.am.pmrfc3164sd 2017-01-10 10:00:04.000000000 +0100
++++ ./Makefile.am 2017-04-03 10:10:40.912388923 +0200
+@@ -115,6 +115,10 @@ if ENABLE_PMLASTMSG
+ SUBDIRS += plugins/pmlastmsg
+ endif
+
++if ENABLE_PMRFC3164SD
++SUBDIRS += plugins/pmrfc3164sd
++endif
++
+ if ENABLE_OMRULESET
+ SUBDIRS += plugins/omruleset
+ endif
+diff -up ./plugins/pmrfc3164sd/Makefile.am.pmrfc3164sd ./plugins/pmrfc3164sd/Makefile.am
+--- ./plugins/pmrfc3164sd/Makefile.am.pmrfc3164sd 2017-04-03 10:10:40.912388923 +0200
++++ ./plugins/pmrfc3164sd/Makefile.am 2017-04-03 10:10:40.912388923 +0200
+@@ -0,0 +1,8 @@
++pkglib_LTLIBRARIES = pmrfc3164sd.la
++
++pmrfc3164sd_la_SOURCES = pmrfc3164sd.c
++pmrfc3164sd_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) -I ../../tools
++pmrfc3164sd_la_LDFLAGS = -module -avoid-version
++pmrfc3164sd_la_LIBADD =
++
++EXTRA_DIST =
+diff -up ./plugins/pmrfc3164sd/pmrfc3164sd.c.pmrfc3164sd ./plugins/pmrfc3164sd/pmrfc3164sd.c
+--- ./plugins/pmrfc3164sd/pmrfc3164sd.c.pmrfc3164sd 2017-04-03 10:10:40.913388923 +0200
++++ ./plugins/pmrfc3164sd/pmrfc3164sd.c 2017-04-03 10:26:52.012341658 +0200
+@@ -0,0 +1,345 @@
++/* pmrfc3164sd.c
++ * This is a parser module for RFC3164(legacy syslog)-formatted messages.
++ *
++ * NOTE: read comments in module-template.h to understand how this file
++ * works!
++ *
++ * File begun on 2009-11-04 by RGerhards
++ *
++ * Copyright 2007, 2009 Rainer Gerhards and Adiscon GmbH.
++ *
++ * This file is part of rsyslog.
++ *
++ * Rsyslog is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * Rsyslog is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>.
++ *
++ * A copy of the GPL can be found in the file "COPYING" in this distribution.
++ */
++#include "config.h"
++#include "rsyslog.h"
++#include <stdlib.h>
++#include <string.h>
++#include <assert.h>
++#include <errno.h>
++#include <ctype.h>
++#include "syslogd.h"
++#include "conf.h"
++#include "syslogd-types.h"
++#include "template.h"
++#include "msg.h"
++#include "module-template.h"
++#include "glbl.h"
++#include "errmsg.h"
++#include "parser.h"
++#include "datetime.h"
++#include "unicode-helper.h"
++
++MODULE_TYPE_PARSER
++MODULE_TYPE_NOKEEP
++MODULE_CNFNAME("pmrfc3164sd")
++PARSER_NAME("contrib.rfc3164sd")
++
++/* internal structures
++ */
++DEF_PMOD_STATIC_DATA
++DEFobjCurrIf(errmsg)
++DEFobjCurrIf(glbl)
++DEFobjCurrIf(parser)
++DEFobjCurrIf(datetime)
++
++
++/* static data */
++static int bParseHOSTNAMEandTAG; /* cache for the equally-named global param - performance enhancement */
++
++
++BEGINisCompatibleWithFeature
++CODESTARTisCompatibleWithFeature
++ if(eFeat == sFEATUREAutomaticSanitazion)
++ iRet = RS_RET_OK;
++ if(eFeat == sFEATUREAutomaticPRIParsing)
++ iRet = RS_RET_OK;
++ENDisCompatibleWithFeature
++
++/* Helper to parseRFCSyslogMsg. This function parses the structured
++ * data field of a message. It does NOT parse inside structured data,
++ * just gets the field as whole. Parsing the single entities is left
++ * to other functions. The parsepointer is advanced
++ * to after the terminating SP. The caller must ensure that the
++ * provided buffer is large enough to hold the to be extracted value.
++ * Returns 0 if everything is fine or 1 if either the field is not
++ * SP-terminated or any other error occurs. -- rger, 2005-11-24
++ * The function now receives the size of the string and makes sure
++ * that it does not process more than that. The *pLenStr counter is
++ * updated on exit. -- rgerhards, 2009-09-23
++ */
++static int parseRFCStructuredData(uchar **pp2parse, uchar *pResult, int *pLenStr)
++{
++ uchar *p2parse;
++ int bCont = 1;
++ int iRet = 0;
++ int lenStr;
++
++ assert(pp2parse != NULL);
++ assert(*pp2parse != NULL);
++ assert(pResult != NULL);
++
++ p2parse = *pp2parse;
++ lenStr = *pLenStr;
++
++ /* this is the actual parsing loop
++ * Remeber: structured data starts with [ and includes any characters
++ * until the first ] followed by a SP. There may be spaces inside
++ * structured data. There may also be \] inside the structured data, which
++ * do NOT terminate an element.
++ */
++
++ /* trim */
++ while(lenStr > 0 && *p2parse == ' ') {
++ ++p2parse; /* eat SP, but only if not at end of string */
++ --lenStr;
++ }
++
++ if(lenStr == 0 || *p2parse != '[')
++ return 1; /* this is NOT structured data! */
++
++ if(*p2parse == '-') { /* empty structured data? */
++ *pResult++ = '-';
++ ++p2parse;
++ --lenStr;
++ } else {
++ while(bCont) {
++ if(lenStr < 2) {
++ /* we now need to check if we have only structured data */
++ if(lenStr > 0 && *p2parse == ']') {
++ *pResult++ = *p2parse;
++ p2parse++;
++ lenStr--;
++ bCont = 0;
++ } else {
++ iRet = 1; /* this is not valid! */
++ bCont = 0;
++ }
++ } else if(*p2parse == '\\' && *(p2parse+1) == ']') {
++ /* this is escaped, need to copy both */
++ *pResult++ = *p2parse++;
++ *pResult++ = *p2parse++;
++ lenStr -= 2;
++ } else if(*p2parse == ']' && *(p2parse+1) == ' ') {
++ /* found end, just need to copy the ] and eat the SP */
++ *pResult++ = *p2parse;
++ p2parse += 2;
++ lenStr -= 2;
++ bCont = 0;
++ } else {
++ *pResult++ = *p2parse++;
++ --lenStr;
++ }
++ }
++ }
++
++ if(lenStr > 0 && *p2parse == ' ') {
++ ++p2parse; /* eat SP, but only if not at end of string */
++ --lenStr;
++ } else {
++ iRet = 1; /* there MUST be an SP! */
++ }
++ *pResult = '\0';
++
++ /* set the new parse pointer */
++ *pp2parse = p2parse;
++ *pLenStr = lenStr;
++ return 0;
++}
++
++/* parse a legay-formatted syslog message.
++ */
++BEGINparse
++ uchar *p2parse;
++ int lenMsg;
++ int bTAGCharDetected;
++ int i; /* general index for parsing */
++ uchar bufParseTAG[CONF_TAG_MAXSIZE];
++ uchar bufParseHOSTNAME[CONF_HOSTNAME_MAXSIZE];
++ uchar *pBuf = NULL;
++CODESTARTparse
++ dbgprintf("Message will now be parsed by the legacy syslog parser with structured-data support.\n");
++ assert(pMsg != NULL);
++ assert(pMsg->pszRawMsg != NULL);
++ lenMsg = pMsg->iLenRawMsg - pMsg->offAfterPRI; /* note: offAfterPRI is already the number of PRI chars (do not add one!) */
++ p2parse = pMsg->pszRawMsg + pMsg->offAfterPRI; /* point to start of text, after PRI */
++ setProtocolVersion(pMsg, MSG_LEGACY_PROTOCOL);
++
++ /* Check to see if msg contains a timestamp. We start by assuming
++ * that the message timestamp is the time of reception (which we
++ * generated ourselfs and then try to actually find one inside the
++ * message. There we go from high-to low precison and are done
++ * when we find a matching one. -- rgerhards, 2008-09-16
++ */
++ if(datetime.ParseTIMESTAMP3339(&(pMsg->tTIMESTAMP), &p2parse, &lenMsg) == RS_RET_OK) {
++ /* we are done - parse pointer is moved by ParseTIMESTAMP3339 */;
++ } else if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), &p2parse, &lenMsg, NO_PARSE3164_TZSTRING, NO_PERMIT_YEAR_AFTER_TIME) == RS_RET_OK) {
++ /* we are done - parse pointer is moved by ParseTIMESTAMP3164 */;
++ } else if(*p2parse == ' ' && lenMsg > 1) { /* try to see if it is slighly malformed - HP procurve seems to do that sometimes */
++ ++p2parse; /* move over space */
++ --lenMsg;
++ if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), &p2parse, &lenMsg, NO_PARSE3164_TZSTRING, NO_PERMIT_YEAR_AFTER_TIME) == RS_RET_OK) {
++ /* indeed, we got it! */
++ /* we are done - parse pointer is moved by ParseTIMESTAMP3164 */;
++ } else {/* parse pointer needs to be restored, as we moved it off-by-one
++ * for this try.
++ */
++ --p2parse;
++ ++lenMsg;
++ }
++ }
++
++ if(pMsg->msgFlags & IGNDATE) {
++ /* we need to ignore the msg data, so simply copy over reception date */
++ memcpy(&pMsg->tTIMESTAMP, &pMsg->tRcvdAt, sizeof(struct syslogTime));
++ }
++
++ /* rgerhards, 2006-03-13: next, we parse the hostname and tag. But we
++ * do this only when the user has not forbidden this. I now introduce some
++ * code that allows a user to configure rsyslogd to treat the rest of the
++ * message as MSG part completely. In this case, the hostname will be the
++ * machine that we received the message from and the tag will be empty. This
++ * is meant to be an interim solution, but for now it is in the code.
++ */
++ if(bParseHOSTNAMEandTAG && !(pMsg->msgFlags & INTERNAL_MSG)) {
++ /* parse HOSTNAME - but only if this is network-received!
++ * rger, 2005-11-14: we still have a problem with BSD messages. These messages
++ * do NOT include a host name. In most cases, this leads to the TAG to be treated
++ * as hostname and the first word of the message as the TAG. Clearly, this is not
++ * of advantage ;) I think I have now found a way to handle this situation: there
++ * are certain characters which are frequently used in TAG (e.g. ':'), which are
++ * *invalid* in host names. So while parsing the hostname, I check for these characters.
++ * If I find them, I set a simple flag but continue. After parsing, I check the flag.
++ * If it was set, then we most probably do not have a hostname but a TAG. Thus, I change
++ * the fields. I think this logic shall work with any type of syslog message.
++ * rgerhards, 2009-06-23: and I now have extended this logic to every character
++ * that is not a valid hostname.
++ */
++ bTAGCharDetected = 0;
++ if(lenMsg > 0 && pMsg->msgFlags & PARSE_HOSTNAME) {
++ i = 0;
++ while(i < lenMsg && (isalnum(p2parse[i]) || p2parse[i] == '.' || p2parse[i] == '.'
++ || p2parse[i] == '_' || p2parse[i] == '-') && i < (CONF_HOSTNAME_MAXSIZE - 1)) {
++ bufParseHOSTNAME[i] = p2parse[i];
++ ++i;
++ }
++
++ if(i == lenMsg) {
++ /* we have a message that is empty immediately after the hostname,
++ * but the hostname thus is valid! -- rgerhards, 2010-02-22
++ */
++ p2parse += i;
++ lenMsg -= i;
++ bufParseHOSTNAME[i] = '\0';
++ MsgSetHOSTNAME(pMsg, bufParseHOSTNAME, i);
++ } else if(i > 0 && p2parse[i] == ' ' && isalnum(p2parse[i-1])) {
++ /* we got a hostname! */
++ p2parse += i + 1; /* "eat" it (including SP delimiter) */
++ lenMsg -= i + 1;
++ bufParseHOSTNAME[i] = '\0';
++ MsgSetHOSTNAME(pMsg, bufParseHOSTNAME, i);
++ }
++ }
++
++ /* now parse TAG - that should be present in message from all sources.
++ * This code is somewhat not compliant with RFC 3164. As of 3164,
++ * the TAG field is ended by any non-alphanumeric character. In
++ * practice, however, the TAG often contains dashes and other things,
++ * which would end the TAG. So it is not desirable. As such, we only
++ * accept colon and SP to be terminators. Even there is a slight difference:
++ * a colon is PART of the TAG, while a SP is NOT part of the tag
++ * (it is CONTENT). Starting 2008-04-04, we have removed the 32 character
++ * size limit (from RFC3164) on the tag. This had bad effects on existing
++ * envrionments, as sysklogd didn't obey it either (probably another bug
++ * in RFC3164...). We now receive the full size, but will modify the
++ * outputs so that only 32 characters max are used by default.
++ */
++ i = 0;
++ while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i < CONF_TAG_MAXSIZE) {
++ bufParseTAG[i++] = *p2parse++;
++ --lenMsg;
++ }
++ if(lenMsg > 0 && *p2parse == ':') {
++ ++p2parse;
++ --lenMsg;
++ bufParseTAG[i++] = ':';
++ }
++
++ /* no TAG can only be detected if the message immediatly ends, in which case an empty TAG
++ * is considered OK. So we do not need to check for empty TAG. -- rgerhards, 2009-06-23
++ */
++ bufParseTAG[i] = '\0'; /* terminate string */
++ MsgSetTAG(pMsg, bufParseTAG, i);
++ } else {/* we enter this code area when the user has instructed rsyslog NOT
++ * to parse HOSTNAME and TAG - rgerhards, 2006-03-13
++ */
++ if(!(pMsg->msgFlags & INTERNAL_MSG)) {
++ DBGPRINTF("HOSTNAME and TAG not parsed by user configuraton.\n");
++ }
++ }
++
++ CHKmalloc(pBuf = MALLOC(sizeof(uchar) * (lenMsg + 1)));
++
++ /* STRUCTURED-DATA */
++ if (parseRFCStructuredData(&p2parse, pBuf, &lenMsg) == 0)
++ MsgSetStructuredData(pMsg, (char*)pBuf);
++ else
++ MsgSetStructuredData(pMsg, "-");
++
++ /* The rest is the actual MSG */
++ MsgSetMSGoffs(pMsg, p2parse - pMsg->pszRawMsg);
++
++finalize_it:
++ if(pBuf != NULL)
++ free(pBuf);
++ENDparse
++
++
++BEGINmodExit
++CODESTARTmodExit
++ /* release what we no longer need */
++ objRelease(errmsg, CORE_COMPONENT);
++ objRelease(glbl, CORE_COMPONENT);
++ objRelease(parser, CORE_COMPONENT);
++ objRelease(datetime, CORE_COMPONENT);
++ENDmodExit
++
++
++BEGINqueryEtryPt
++CODESTARTqueryEtryPt
++CODEqueryEtryPt_STD_PMOD_QUERIES
++CODEqueryEtryPt_IsCompatibleWithFeature_IF_OMOD_QUERIES
++ENDqueryEtryPt
++
++
++BEGINmodInit()
++CODESTARTmodInit
++ *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
++CODEmodInit_QueryRegCFSLineHdlr
++ CHKiRet(objUse(glbl, CORE_COMPONENT));
++ CHKiRet(objUse(errmsg, CORE_COMPONENT));
++ CHKiRet(objUse(parser, CORE_COMPONENT));
++ CHKiRet(objUse(datetime, CORE_COMPONENT));
++
++ dbgprintf("rfc3164sd parser init called\n");
++ bParseHOSTNAMEandTAG = glbl.GetParseHOSTNAMEandTAG(); /* cache value, is set only during rsyslogd option processing */
++
++
++ENDmodInit
++
++/* vim:set ai:
++ */
diff --git a/SOURCES/rsyslog-8.24.0-sd-service.patch b/SOURCES/rsyslog-8.24.0-sd-service.patch
new file mode 100644
index 0000000..3018ada
--- /dev/null
+++ b/SOURCES/rsyslog-8.24.0-sd-service.patch
@@ -0,0 +1,30 @@
+From fc47fd36a8549fae46ab7dbff31d542c829c1004 Mon Sep 17 00:00:00 2001
+From: Radovan Sroka <rsroka@redhat.com>
+Date: Mon, 21 Nov 2016 16:49:48 +0100
+Subject: [PATCH 1/4] Rebased from: Patch0: rsyslog-7.4.1-sd-service.patch
+
+Resolves:
+ no bugzilla
+---
+ rsyslog.service.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/rsyslog.service.in b/rsyslog.service.in
+index cb629ee..74d2149 100644
+--- a/rsyslog.service.in
++++ b/rsyslog.service.in
+@@ -6,7 +6,10 @@ Documentation=http://www.rsyslog.com/doc/
+
+ [Service]
+ Type=notify
+-ExecStart=@sbindir@/rsyslogd -n
++EnvironmentFile=-/etc/sysconfig/rsyslog
++ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
++Restart=on-failure
++UMask=0066
+ StandardOutput=null
+ Restart=on-failure
+
+--
+2.7.4
+
diff --git a/SPECS/rsyslog.spec b/SPECS/rsyslog.spec
index 9a9b80d..ebb4a6c 100644
--- a/SPECS/rsyslog.spec
+++ b/SPECS/rsyslog.spec
@@ -13,64 +13,29 @@
Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog
-Version: 7.4.7
-Release: 16%{?dist}
+Version: 8.24.0
+Release: 12%{?dist}
License: (GPLv3+ and ASL 2.0)
Group: System Environment/Daemons
URL: http://www.rsyslog.com/
Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
+Source1: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-%{version}.tar.gz
Source2: rsyslog.conf
Source3: rsyslog.sysconfig
Source4: rsyslog.log
-# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
-Patch0: rsyslog-7.4.1-sd-service.patch
-Patch1: rsyslog-7.2.2-manpage-dbg-mode.patch
-# prevent modification of trusted properties (proposed upstream)
-Patch2: rsyslog-7.2.1-msg_c_nonoverwrite_merge.patch
-# sent upstream
-Patch5: rsyslog-7.4.7-bz1030044-remove-ads.patch
-# merged upstream
-Patch6: rsyslog-7.4.7-numeric-uid.patch
-# adapted from http://git.adiscon.com/?p=rsyslog.git;a=commitdiff;h=16207e3d55ac6bb15af6d50791d2c7462816de57
-Patch7: rsyslog-7.4.7-omelasticsearch-atomic-inst.patch
-Patch8: rsyslog-7.4.7-bz1052266-dont-link-libee.patch
-Patch9: rsyslog-7.4.7-bz1054171-omjournal-warning.patch
-Patch10: rsyslog-7.4.7-bz1038136-imjournal-message-loss.patch
-Patch11: rsyslog-7.4.7-bz1142373-cve-2014-3634.patch
-Patch12: rsyslog-7.4.7-rhbz1151037-add-mmcount.patch
-Patch13: rsyslog-7.4.7-rhbz743890-imjournal-sanitize-msgs.patch
-Patch14: rsyslog-7.4.7-rhbz1184410-imuxsock-create-path.patch
-Patch15: rsyslog-7.4.7-rhbz1202489-path-creation-race.patch
-Patch16: rsyslog-7.4.7-rhbz1238713-html-docs.patch
-Patch17: rsyslog-7.4.7-rhbz1078878-division-by-zero.patch
-Patch18: rsyslog-7.4.7-rhbz1143846-clarify-SysSock.Use.patch
-Patch19: rsyslog-7.4.7-rhbz1151041-imuxsock-socket-limit.patch
-Patch20: rsyslog-7.4.7-rhbz1101602-imjournal-zero-bytes.patch
-Patch21: rsyslog-7.4.7-rhbz1188503-imjournal-default-tag.patch
-Patch22: rsyslog-7.4.7-rhbz1184402-imuxsock-hostname.patch
-Patch23: rsyslog-7.4.7-bz1254511-ppc64le_bug.patch
-Patch24: rsyslog-7.4.7-rhbz1224336-ruleset-crash.patch
-Patch25: rsyslog-7.4.7-rhbz1216957-imjournal-ste-file.patch
-Patch26: rsyslog-7.4.7-rhbz1214257-maxMessageSize.patch
-Patch27: rsyslog-7.4.7-rhbz1282687-ruleset-parser-crash.patch
-Patch28: rsyslog-7.4.7-rhbz1312459-partial-msg-loss.patch
-Patch29: rsyslog-7.4.7-rhbz1223566-imrelp-multi-ruleset.patch
-Patch30: rsyslog-7.4.7-rhbz1295798-shutdown-delay.patch
-Patch31: rsyslog-7.4.7-rhbz1146237-mmutf8fix.patch
-Patch32: rsyslog-7.4.7-rhbz1263853-startup-order.patch
-Patch33: rsyslog-7.4.7-rhbz1245194-imjournal-ste-file.patch
-Patch34: rsyslog-7.4.7-rhbz1303617-imfile-wildcards.patch
-Patch35: rsyslog-7.4.7-rhbz1222746-json-race.patch
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
BuildRequires: bison
BuildRequires: flex
-BuildRequires: json-c-devel
+BuildRequires: libfastjson-devel
BuildRequires: libestr-devel >= 0.1.9
BuildRequires: libuuid-devel
BuildRequires: pkgconfig
BuildRequires: python-docutils
-# make sure systemd is in a version that isn't affected by rhbz#974132
-BuildRequires: systemd-devel >= 204-8
+# it depens on rhbz#1419228
+BuildRequires: systemd-devel >= 219-39
BuildRequires: zlib-devel
Requires: logrotate >= 3.5.2
@@ -83,6 +48,36 @@ Requires(postun): systemd
Provides: syslog
Obsoletes: sysklogd < 1.5-11
+# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
+Patch0: rsyslog-8.24.0-sd-service.patch
+Patch1: rsyslog-8.24.0-msg_c_nonoverwrite_merge.patch
+Patch2: rsyslog-8.24.0-rhbz1188503-imjournal-default-tag.patch
+
+Patch3: rsyslog-8.24.0-rhbz1303617-imfile-wildcards.patch
+Patch4: rsyslog-8.24.0-doc-polling-by-default.patch
+Patch5: rsyslog-8.24.0-rhbz1399569-flushontxend.patch
+Patch6: rsyslog-8.24.0-rhbz1400594-tls-config.patch
+Patch7: rsyslog-8.24.0-rhbz1401870-watermark.patch
+
+Patch8: rsyslog-8.24.0-rhbz1403831-missing-cmd-line-switches.patch
+Patch9: rsyslog-8.24.0-rhbz1245194-imjournal-ste-file.patch
+Patch10: rsyslog-8.24.0-rhbz1286707-recover_qi-doc.patch
+Patch11: rsyslog-8.24.0-rhbz1088021-systemd-time-backwards.patch
+Patch12: rsyslog-8.24.0-rhbz1403907-imudp-deprecated-parameter.patch
+Patch13: rsyslog-8.24.0-rhbz1196230-ratelimit-add-source.patch
+Patch14: rsyslog-8.24.0-rhbz1422789-missing-chdir-w-chroot.patch
+Patch15: rsyslog-8.24.0-rhbz1422414-glbDoneLoadCnf-segfault.patch
+Patch16: rsyslog-8.24.0-rhbz1427828-set-unset-not-checking-varName.patch
+
+Patch17: rsyslog-8.24.0-rhbz1427821-backport-num2ipv4.patch
+Patch18: rsyslog-8.24.0-rhbz1427821-str2num-emty-string-handle.patch
+
+Patch19: rsyslog-8.24.0-rhbz1165236-snmp-mib.patch
+Patch20: rsyslog-8.24.0-rhbz1419228-journal-switch-persistent.patch
+Patch21: rsyslog-8.24.0-rhbz1431616-pmrfc3164sd-backport.patch
+
+Patch22: rsyslog-8.24.0-rhbz1056548-getaddrinfo.patch
+
%package crypto
Summary: Encryption support
Group: System Environment/Daemons
@@ -282,49 +277,51 @@ spoof the sender address. Also, it enables to circle through a number
of source ports.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+# set up rsyslog-doc sources
+%setup -q -a 1 -T -c
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
+rm -r LICENSE README.md build.sh source build/objects.inv
+mv build doc
+
+# set up rsyslog sources
+%setup -q -D
+
+%patch0 -p1 -b .service
+%patch1 -p1 -b .msg_merge
+%patch2 -p1 -b .default_tag
+%patch3 -p1 -b .wildcards
+%patch4 -p1 -b .doc-polling
+
+%patch5 -p1 -b .flushontxend
+%patch6 -p1 -b .tls-config
+%patch7 -p1 -b .watermark
+
+%patch8 -p1 -b .missg-cmd-line-switches
+%patch9 -p1 -b .ste-file
+#%%patch10 is applied right after doc setup
+%patch11 -p1 -b .systemd-time
+%patch12 -p1 -b .imudp-deprecated-parameter
+%patch13 -p1 -b .ratelimit-add-source
+%patch14 -p1 -b .missing-chdir-w-chroot
+%patch15 -p1 -b .glbDoneLoadCnf-segfault
+%patch16 -p1 -b .set-unset-check-varName
+
+%patch17 -p1 -b .num2ipv4
+%patch18 -p1 -b .str2num-handle-emty-strings
+%patch19 -p1 -b .snmp-mib
+%patch20 -p1 -b .journal-switch
+%patch21 -p1 -b .pmrfc3164sd
+%patch22 -p1 -b .getaddrinfo
+
+autoreconf
%build
%ifarch sparc64
#sparc64 need big PIE
-export CFLAGS="$RPM_OPT_FLAGS -fPIE -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
+export CFLAGS="$RPM_OPT_FLAGS -fPIE -DPATH_PIDFILE=\\\"/var/run/syslogd.pid\\\""
export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
%else
-export CFLAGS="$RPM_OPT_FLAGS -fpie -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
+export CFLAGS="$RPM_OPT_FLAGS -fpie -DPATH_PIDFILE=\\\"/var/run/syslogd.pid\\\""
export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
%endif
@@ -337,7 +334,9 @@ export HIREDIS_LIBS=-L%{_libdir}
--prefix=/usr \
--disable-static \
--disable-testbench \
+ --disable-liblogging-stdlog \
--enable-elasticsearch \
+ --enable-generate-man-pages \
--enable-gnutls \
--enable-gssapi-krb5 \
--enable-imdiag \
@@ -366,6 +365,7 @@ export HIREDIS_LIBS=-L%{_libdir}
%if %{want_rabbitmq}
--enable-omrabbitmq \
%endif
+ --enable-omruleset \
--enable-omstdout \
--enable-omudpspoof \
--enable-omuxsock \
@@ -398,7 +398,7 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
install -p -m 644 plugins/ommysql/createDB.sql %{buildroot}%{rsyslog_docdir}/mysql-createDB.sql
install -p -m 644 plugins/ompgsql/createDB.sql %{buildroot}%{rsyslog_docdir}/pgsql-createDB.sql
# extract documentation
-cp -r doc/*.{html,jpeg,jpg,png} %{buildroot}%{rsyslog_docdir}/html
+cp -r doc/* %{buildroot}%{rsyslog_docdir}/html
# get rid of libtool libraries
rm -f %{buildroot}%{_libdir}/rsyslog/*.la
# get rid of socket activation by default
@@ -460,6 +460,7 @@ done
%{_libdir}/rsyslog/lmzlibw.so
%{_libdir}/rsyslog/mmanon.so
%{_libdir}/rsyslog/mmcount.so
+%{_libdir}/rsyslog/mmexternal.so
%{_libdir}/rsyslog/mmutf8fix.so
%{_libdir}/rsyslog/omjournal.so
%{_libdir}/rsyslog/ommail.so
@@ -561,6 +562,78 @@ done
%{_libdir}/rsyslog/omudpspoof.so
%changelog
+* Wed May 10 2017 Radovan Sroka <rsroka@redhat.com> - 8.24.0-12
+- added BuildRequires for systemd >= 219-39 depents on rhbz#1419228
+
+* Tue May 09 2017 Radovan Sroka <rsroka@redhat.com> - 8.24.0-11
+RHEL 7.4 ERRATUM
+- added new patch that backports num2ipv4 due to rhbz#1427821
+ resolves: rhbz#1427821
+- enable pmrfc3164sd module
+ resolves: rhbz#1431616
+
+* Wed May 03 2017 Jiri Vymazal <jvymazal@redhat.com> - 8.24.0-10
+RHEL 7.4 ERRATUM
+- edited patches Patch19 and Patch21
+ resolves: rhbz#1419228(coverity scan problems)
+ resolves: rhbz#1056548(failed QA, coverity scan problems)
+
+* Tue May 02 2017 Jiri Vymazal <jvymazal@redhat.com> - 8.24.0-9
+RHEL 7.4 ERRATUM
+- added autoreconf call
+- added patch to replace gethostbyname with getaddrinfo call
+ resolves: rhbz#1056548(failed QA)
+
+* Wed Apr 19 2017 Radovan Sroka <rsroka@redhat.com> - 8.24.0-8
+RHEL 7.4 ERRATUM
+- added dependency automake autoconf libtool due to yum-builddep
+- reenable omruleset module
+ resolves: rhbz#1431615
+ resolves: rhbz#1428403
+ resolves: rhbz#1427821(fix regression, failed QA)
+ resolves: rhbz#1432069
+- resolves: rhbz#1165236
+ resolves: rhbz#1419228
+ resolves: rhbz#1431616
+ resolves: rhbz#1196230(failed QA)
+
+* Thu Mar 02 2017 Radovan Sroka <rsroka@redhat.com> - 8.24.0-7
+- reverted logrotate file that was added by mistake
+
+* Wed Mar 01 2017 Radovan Sroka <rsroka@redhat.com> - 8.24.0-6
+- RHEL 7.4 ERRATUM
+- rsyslog rebase to 8.24
+- added patch to prevent segfault while setting aclResolveHostname
+ config options
+ resolves: rhbz#1422414
+- added patch to check config variable names at startup
+ resolves: rhbz#1427828
+- added patch for str2num to handle empty strings
+ resolves: rhbz#1427821
+- fixed typo in added-chdir patch
+ resolves: rhbz#1422789
+- added patch to log source process when beginning rate-limiting
+ resolves: rhbz#1196230
+- added patch to chdir after chroot
+ resolves: rhbz#1422789
+- added patch to remove "inputname" imudp module parameter
+ deprecation warnings
+ resolves: rhbz#1403907
+- added patch which resolves situation when time goes backwards
+ and statefile is invalid
+ resolves rhbz#1088021
+- added a patch to bring back deprecated cmd-line switches and
+ remove associated warnings
+ resolves: rhbz#1403831
+- added documentation recover_qi.pl
+ resolves: rhbz#1286707
+- add another setup for doc package
+- add --enable-generate-man-pages to configure parameters;
+ the rscryutil man page isn't generated without it
+ https://github.com/rsyslog/rsyslog/pull/469
+- enable mmcount, mmexternal modules
+- remove omruleset and pmrfc3164sd modules
+
* Thu Jul 14 2016 Tomas Heinrich <theinric@redhat.com> 7.4.7-16
- add a patch to prevent races in libjson-c calls
resolves: rhbz#1222746