From 4dc9e9919d1c69c269cf0490d85ae54ec427d9a8 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 10 Mar 2023 14:15:33 +0800 Subject: monit: upgrade 5.32.0 -> 5.33.0 Changelog: ========== New: Added click-jacking protection headers to Monit HTTP GUI (the SAMEORIGIN iframe is allowed). Fixed: Issue #1035: If the start, stop or restart program statement contains the equal sign, which is not followed by a space character, the configuration is not parsed correctly. Fixed: Issue #1047: If the MariaDB server doesn't allow access to the host, from which Monit test is running, Monit reported: Invalid handshake packet sequence id -- not MySQL protocol. Fixed: Add the missing responsetime option to the ping test. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/monit/monit_5.32.0.bb | 56 --------------------------- meta-oe/recipes-support/monit/monit_5.33.0.bb | 56 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 meta-oe/recipes-support/monit/monit_5.32.0.bb create mode 100644 meta-oe/recipes-support/monit/monit_5.33.0.bb (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/monit/monit_5.32.0.bb b/meta-oe/recipes-support/monit/monit_5.32.0.bb deleted file mode 100644 index e4ec9d5262..0000000000 --- a/meta-oe/recipes-support/monit/monit_5.32.0.bb +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ -processes, programs, files, directories and filesystems on a UNIX system. \ -Monit conducts automatic maintenance and repair and can execute meaningful \ -causal actions in error situations." - -HOMEPAGE = "http://mmonit.com/monit/" - -LICENSE = "AGPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ - file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" - -SRC_URI = " \ - https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ - file://monit \ - file://monitrc \ -" - -SRC_URI[sha256sum] = "1077052d4c4e848ac47d14f9b37754d46419aecbe8c9a07e1f869c914faf3216" - -DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" - -inherit autotools-brokensep systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" - -EXTRA_OECONF = "\ - libmonit_cv_setjmp_available=no \ - libmonit_cv_vsnprintf_c99_conformant=no \ - --with-ssl-lib-dir=${STAGING_LIBDIR} \ - --with-ssl-incl-dir=${STAGING_INCDIR} \ -" - -SYSTEMD_SERVICE:${PN} = "monit.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME:${PN} = "monit" -INITSCRIPT_PARAMS:${PN} = "defaults 89" - -do_configure:prepend() { - rm -rf ${S}/m4/* -} - -do_install:append() { - - # Configuration file - install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc - - # SystemD - install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service - sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service - - # SysV - install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit -} diff --git a/meta-oe/recipes-support/monit/monit_5.33.0.bb b/meta-oe/recipes-support/monit/monit_5.33.0.bb new file mode 100644 index 0000000000..66d4079a94 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit_5.33.0.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ +processes, programs, files, directories and filesystems on a UNIX system. \ +Monit conducts automatic maintenance and repair and can execute meaningful \ +causal actions in error situations." + +HOMEPAGE = "http://mmonit.com/monit/" + +LICENSE = "AGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ + file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" + +SRC_URI = " \ + https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ + file://monit \ + file://monitrc \ +" + +SRC_URI[sha256sum] = "1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5" + +DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" + +inherit autotools-brokensep systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + +EXTRA_OECONF = "\ + libmonit_cv_setjmp_available=no \ + libmonit_cv_vsnprintf_c99_conformant=no \ + --with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ +" + +SYSTEMD_SERVICE:${PN} = "monit.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "monit" +INITSCRIPT_PARAMS:${PN} = "defaults 89" + +do_configure:prepend() { + rm -rf ${S}/m4/* +} + +do_install:append() { + + # Configuration file + install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc + + # SystemD + install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service + sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service + + # SysV + install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit +} -- cgit v1.2.3-54-g00ecf