diff options
author | Alexander Dahl <ada@thorsis.com> | 2018-07-27 10:59:15 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-07-30 10:03:21 +0200 |
commit | 517d75612e0e8dfc39e330bb9bcab812820945f6 (patch) | |
tree | 8306ee0591b4e516470991bb14ae0e4d01b71013 /rules | |
parent | b4df2cb34f829cf743681e3abd7e0327d03487db (diff) | |
download | ptxdist-517d75612e0e8dfc39e330bb9bcab812820945f6.tar.gz ptxdist-517d75612e0e8dfc39e330bb9bcab812820945f6.tar.xz |
monit: version bump 5.17.1 -> 5.25.2
This includes a lot of fixes and new features, including a fix for
CVE-2016-7067 in monit 5.20.0.
See https://mmonit.com/monit/changes/ for complete release notes.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r-- | rules/monit.in | 5 | ||||
-rw-r--r-- | rules/monit.make | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/rules/monit.in b/rules/monit.in index 8d20d2232..31b00ee0c 100644 --- a/rules/monit.in +++ b/rules/monit.in @@ -4,6 +4,7 @@ menuconfig MONIT tristate prompt "monit " select OPENSSL if MONIT_SSL + select ZLIB if MONIT_ZLIB select BUSYBOX_START_STOP_DAEMON if MONIT_STARTSCRIPT select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS if MONIT_STARTSCRIPT help @@ -16,6 +17,10 @@ config MONIT_SSL bool prompt "SSL support" +config MONIT_ZLIB + bool + prompt "zlib support" + config MONIT_STARTSCRIPT bool prompt "install /etc/init.d/monit" diff --git a/rules/monit.make b/rules/monit.make index 99266622d..6386374b7 100644 --- a/rules/monit.make +++ b/rules/monit.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MONIT) += monit # # Paths and names # -MONIT_VERSION := 5.17.1 -MONIT_MD5 := 6918ed7411a244c9e158f5e54c86be78 +MONIT_VERSION := 5.25.2 +MONIT_MD5 := 890df599d6c1e9cfbbdd3edbacb7db81 MONIT := monit-$(MONIT_VERSION) MONIT_SUFFIX := tar.gz MONIT_URL := http://mmonit.com/monit/dist/$(MONIT).$(MONIT_SUFFIX) @@ -39,7 +39,9 @@ MONIT_CONF_OPT := $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ --enable-optimized \ --disable-profiling \ + --$(call ptx/wwo, PTXCONF_GLOBAL_IPV6)-ipv6 \ --$(call ptx/wwo, PTXCONF_GLOBAL_LARGE_FILE)-largefiles \ + --$(call ptx/wwo, PTXCONF_MONIT_ZLIB)-zlib \ --without-pam \ --$(call ptx/wwo, PTXCONF_MONIT_SSL)-ssl \ --with-ssl-dir=$(SYSROOT)/usr |