diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-02 17:47:13 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-02 17:53:26 +0200 |
| commit | 073e09d61a12d80b9a04a91f1a9ffba6ca1efa3f (patch) | |
| tree | fb14183813761ac9bf92de444fe55054eb485541 /rules/rsyslog.make | |
| parent | 7f9b2b3d943f3c54432d10c1fea487e0b247d6ca (diff) | |
| download | ptxdist-073e09d61a12d80b9a04a91f1a9ffba6ca1efa3f.tar.gz ptxdist-073e09d61a12d80b9a04a91f1a9ffba6ca1efa3f.tar.xz | |
rsyslog: version bump 5.8.13 -> 8.8.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/rsyslog.make')
| -rw-r--r-- | rules/rsyslog.make | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/rules/rsyslog.make b/rules/rsyslog.make index 52d8851c3..12b0abf7e 100644 --- a/rules/rsyslog.make +++ b/rules/rsyslog.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog # # Paths and names # -RSYSLOG_VERSION := 5.8.13 -RSYSLOG_MD5 := 8d228a8b622f90b320c95f38be7fc5bb +RSYSLOG_VERSION := 8.8.0 +RSYSLOG_MD5 := 188088dc496fb0a121edb8816d1fac83 RSYSLOG := rsyslog-$(RSYSLOG_VERSION) RSYSLOG_SUFFIX := tar.gz RSYSLOG_URL := http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX) @@ -41,31 +41,46 @@ RSYSLOG_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ --$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \ - --$(call ptx/endis, PTXCONF_RSYSLOG_ZLIB)-zlib \ --disable-gssapi-krb5 \ - --enable-pthreads \ --$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \ - --disable-unix \ + --enable-kmsg \ + --$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \ --$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \ - --enable-fsstnd \ + --disable-jemalloc \ --enable-unlimited-select \ --disable-debug \ --disable-rtinst \ + --disable-debugless \ --disable-valgrind \ --disable-memcheck \ --disable-diagtools \ + --disable-usertools \ --disable-mysql \ --disable-pgsql \ - --disable-oracle \ --disable-libdbi \ --disable-snmp \ + --disable-uuid \ + --disable-elasticsearch \ --disable-gnutls \ + --disable-libgcrypt \ --enable-rsyslogrt \ --enable-rsyslogd \ --disable-mysql-tests \ --disable-mail \ --$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \ + --disable-mmnormalize \ + --disable-mmjsonparse \ + --disable-mmaudit \ + --disable-mmanon \ + --disable-mmutf8fix \ + --disable-mmcount \ + --disable-mmsequence \ + --disable-mmfields \ + --disable-mmpstrucdata \ + --disable-mmrfc5424addhmac \ --disable-relp \ + --disable-guardtime \ + --disable-liblogging-stdlog \ --disable-rfc3195 \ --disable-testbench \ --$(call ptx/endis, PTXCONF_RSYSLOG_IMFILE)-imfile \ @@ -75,21 +90,25 @@ RSYSLOG_CONF_OPT := \ --$(call ptx/endis, PTXCONF_RSYSLOG_OMPROG)-omprog \ --$(call ptx/endis, PTXCONF_RSYSLOG_OMUDPSPOOF)-omudpspoof \ --$(call ptx/endis, PTXCONF_RSYSLOG_OMSTDOUT)-omstdout \ + --$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \ --$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \ --disable-pmcisconames \ + --disable-pmciscoios \ --disable-pmaixforwardedfrom \ --disable-pmsnare \ - --disable-pmrfc3164sd \ --disable-omruleset \ - --disable-omdbalerting \ - --disable-gui \ --$(call ptx/endis, PTXCONF_RSYSLOG_OMUXSOCK)-omuxsock \ - --disable-cust1 \ - --disable-smcustbindcdr \ - --disable-imtemplate \ - --disable-omtemplate \ --disable-mmsnmptrapd \ --disable-omhdfs \ + --disable-omkafka \ + --disable-ommongodb \ + --disable-imzmq3 \ + --disable-imczmq \ + --disable-omzmq3 \ + --disable-omczmq \ + --disable-omrabbitmq \ + --disable-omhiredis \ + --disable-generate-man-pages ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT RSYSLOG_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system @@ -100,6 +119,7 @@ endif RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMDIAG) += imdiag RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMFILE) += imfile RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKLOG) += imklog +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD) += imjournal RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMMARK) += immark RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMPSTATS) += impstats RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMPTCP) += imptcp @@ -113,9 +133,10 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_REGEXP) += lmregexp RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmstrmsrv RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmtcpclt RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmtcpsrv -RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_ZLIB) += lmzlibw +RSYSLOG_PLUGINS-y += lmzlibw RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMPROG) += omprog RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMSTDOUT) += omstdout +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD) += omjournal RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUDPSPOOF) += omudpspoof RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUXSOCK) += omuxsock RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMLASTMSG) += pmlastmsg |