summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJörg Krause <joerg.krause@embedded.rocks>2016-12-21 17:01:34 +0100
committerPeter Korsgaard <peter@korsgaard.com>2016-12-23 22:56:17 +0100
commitb1cd530b3cfe5b505be410d6b81dc0cd3e1776e2 (patch)
tree755a2d92bc222960288e3b4dd8c85e7d074de9f7 /package
parentc5c78f258a2e1b2ba5cf38f662e7464c793d7712 (diff)
downloadbuildroot-b1cd530b3cfe5b505be410d6b81dc0cd3e1776e2.tar.gz
buildroot-b1cd530b3cfe5b505be410d6b81dc0cd3e1776e2.zip
package/monit: security bump to version 5.20.0
Fixes CVE-2016-7067. Note that since version 5.20.0 monit optionally depends on zlib. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 0bf7c74e1551a64ab3164f374304154b21bc5045)
Diffstat (limited to 'package')
-rw-r--r--package/monit/monit.hash4
-rw-r--r--package/monit/monit.mk9
2 files changed, 10 insertions, 3 deletions
diff --git a/package/monit/monit.hash b/package/monit/monit.hash
index 04f87901eb..8eb02fce66 100644
--- a/package/monit/monit.hash
+++ b/package/monit/monit.hash
@@ -1,2 +1,2 @@
-# From https://mmonit.com/monit/dist/monit-5.17.tar.gz.sha256:
-sha256 2fbcdea79ae39228791a0aaa685ebbf650f2b58d086eaf77a33226e972cb216e monit-5.17.tar.gz
+# From https://mmonit.com/monit/dist/monit-5.20.0.tar.gz.sha256:
+sha256 ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d monit-5.20.0.tar.gz
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index 1d5904b64d..f4899c3c0d 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.17
+MONIT_VERSION = 5.20.0
MONIT_SITE = http://mmonit.com/monit/dist
MONIT_LICENSE = AGPLv3 with OpenSSL exception
MONIT_LICENSE_FILES = COPYING
@@ -27,4 +27,11 @@ else
MONIT_CONF_OPTS += --without-ssl
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+MONIT_CONF_OPTS += --with-zlib
+MONIT_DEPENDENCIES += zlib
+else
+MONIT_CONF_OPTS += --without-zlib
+endif
+
$(eval $(autotools-package))
OpenPOWER on IntegriCloud