mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] rsyslog: version bump 8.8.0 -> 8.25.0
@ 2017-03-23 11:35 Bastian Stender
  2017-03-24 14:34 ` Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Bastian Stender @ 2017-03-23 11:35 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Stender

Signed-off-by: Bastian Stender <bst@pengutronix.de>
---
 rules/rsyslog.in   |  1 +
 rules/rsyslog.make | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/rules/rsyslog.in b/rules/rsyslog.in
index eab69d676..64f1063ea 100644
--- a/rules/rsyslog.in
+++ b/rules/rsyslog.in
@@ -9,6 +9,7 @@ menuconfig RSYSLOG
 	select ZLIB
 	select LIBESTR
 	select JSON_C
+	select LIBFASTJSON
 	select LIBNET		if RSYSLOG_OMUDPSPOOF
 	select SYSTEMD		if RSYSLOG_SYSTEMD
 	prompt "rsyslog                       "
diff --git a/rules/rsyslog.make b/rules/rsyslog.make
index 95a315b80..c4af9280f 100644
--- a/rules/rsyslog.make
+++ b/rules/rsyslog.make
@@ -16,14 +16,14 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog
 #
 # Paths and names
 #
-RSYSLOG_VERSION	:= 8.8.0
-RSYSLOG_MD5	:= 188088dc496fb0a121edb8816d1fac83
+RSYSLOG_VERSION	:= 8.25.0
+RSYSLOG_MD5	:= 3181df494402b4c2adf5b02a7925c8f6
 RSYSLOG		:= rsyslog-$(RSYSLOG_VERSION)
 RSYSLOG_SUFFIX	:= tar.gz
 RSYSLOG_URL	:= http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
 RSYSLOG_SOURCE	:= $(SRCDIR)/$(RSYSLOG).$(RSYSLOG_SUFFIX)
 RSYSLOG_DIR	:= $(BUILDDIR)/$(RSYSLOG)
-RSYSLOG_LICENSE	:= GPL-3.0, LGPL-3.0, Apache
+RSYSLOG_LICENSE	:= GPL-3.0, LGPL-3.0, Apache-2.0
 RSYSLOG_LICENSE_FILES := \
 	file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \
 	file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \
@@ -49,6 +49,7 @@ RSYSLOG_CONF_OPT	:= \
 	--disable-jemalloc \
 	--enable-unlimited-select \
 	--disable-debug \
+	--disable-debug-symbols \
 	--disable-rtinst \
 	--disable-debugless \
 	--disable-valgrind \
@@ -65,21 +66,27 @@ RSYSLOG_CONF_OPT	:= \
 	--disable-libgcrypt \
 	--enable-rsyslogrt \
 	--enable-rsyslogd \
+	--disable-extended-tests \
 	--disable-mysql-tests \
+	--disable-pgsql-tests \
 	--disable-mail \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
 	--disable-mmnormalize \
 	--disable-mmjsonparse \
+	--disable-mmgrok \
 	--disable-mmaudit \
 	--disable-mmanon \
+	--disable-mmrm1stspace \
 	--disable-mmutf8fix \
 	--disable-mmcount \
 	--disable-mmsequence \
+	--disable-mmdblookup \
 	--disable-mmfields \
 	--disable-mmpstrucdata \
 	--disable-mmrfc5424addhmac \
 	--disable-relp \
 	--disable-guardtime \
+	--disable-gt-ksi \
 	--disable-liblogging-stdlog \
 	--disable-rfc3195 \
 	--disable-testbench \
@@ -94,13 +101,16 @@ RSYSLOG_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
 	--disable-pmcisconames \
 	--disable-pmciscoios \
+	--disable-pmnull \
 	--disable-pmaixforwardedfrom \
 	--disable-pmsnare \
+	--disable-pmpanngfw \
 	--disable-omruleset \
 	--$(call ptx/endis, PTXCONF_RSYSLOG_OMUXSOCK)-omuxsock \
 	--disable-mmsnmptrapd \
 	--disable-omhdfs \
 	--disable-omkafka \
+	--disable-kafka-tests \
 	--disable-ommongodb \
 	--disable-imzmq3 \
 	--disable-imczmq \
@@ -108,7 +118,11 @@ RSYSLOG_CONF_OPT	:= \
 	--disable-omczmq \
 	--disable-omrabbitmq \
 	--disable-omhiredis \
-	--disable-generate-man-pages
+	--disable-omhttpfs \
+	--disable-omamqp1 \
+	--disable-omtcl \
+	--disable-generate-man-pages \
+	--disable-distcheck-workaround
 
 ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
 RSYSLOG_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-24 14:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-23 11:35 [ptxdist] [PATCH] rsyslog: version bump 8.8.0 -> 8.25.0 Bastian Stender
2017-03-24 14:34 ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox