From b733eaecef21a8aa0b8c35ed0ab53e15b6ff55aa Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Fri, 20 Nov 2020 09:11:11 +0100 Subject: [PATCH] updated monit to latest 5.27.1 version. This closes #993. --- buildroot-patches/0004-monit.patch | 43 +++++++++++++++++++ .../package/monit/0002-configure-fixes.patch | 22 ++++++++++ .../monit/0002-configure-fixes.patch.orig | 0 .../buildroot/package/monit/monit.hash | 4 ++ .../buildroot/package/monit/monit.hash.orig | 4 ++ .../buildroot/package/monit/monit.mk | 2 +- .../buildroot/package/monit/monit.mk.orig | 2 +- 7 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 buildroot-patches/0004-monit/buildroot/package/monit/0002-configure-fixes.patch create mode 100644 buildroot-patches/0004-monit/buildroot/package/monit/0002-configure-fixes.patch.orig create mode 100644 buildroot-patches/0004-monit/buildroot/package/monit/monit.hash create mode 100644 buildroot-patches/0004-monit/buildroot/package/monit/monit.hash.orig diff --git a/buildroot-patches/0004-monit.patch b/buildroot-patches/0004-monit.patch index 1f76086312..5ecdabf90e 100644 --- a/buildroot-patches/0004-monit.patch +++ b/buildroot-patches/0004-monit.patch @@ -1,5 +1,48 @@ +--- buildroot/package/monit/0002-configure-fixes.patch.orig ++++ buildroot/package/monit/0002-configure-fixes.patch +@@ -0,0 +1,22 @@ ++diff -ruN monit-5.27.1.orig/configure.ac monit-5.27.1/configure.ac ++--- monit-5.27.1.orig/configure.ac 2020-10-24 20:26:57.000000000 +0200 +++++ monit-5.27.1/configure.ac 2020-11-19 17:31:30.656661653 +0100 ++@@ -9,6 +9,7 @@ ++ AC_INIT([monit], [5.27.1], [monit-general@nongnu.org]) ++ AC_CONFIG_AUX_DIR(config) ++ AC_CONFIG_MACRO_DIR([m4]) +++AC_CONFIG_MACRO_DIR([config]) ++ AM_INIT_AUTOMAKE ++ AC_CONFIG_SRCDIR([src/monit.c]) ++ AC_CONFIG_SUBDIRS([libmonit]) ++diff -ruN monit-5.27.1.orig/libmonit/configure.ac monit-5.27.1/libmonit/configure.ac ++--- monit-5.27.1.orig/libmonit/configure.ac 2020-10-24 20:26:57.000000000 +0200 +++++ monit-5.27.1/libmonit/configure.ac 2020-11-19 17:31:44.220707976 +0100 ++@@ -5,6 +5,7 @@ ++ AC_INIT([libmonit], [1.0], [monit-dev@tildeslash.com]) ++ AC_CONFIG_AUX_DIR(config) ++ AC_CONFIG_MACRO_DIR([m4]) +++AC_CONFIG_MACRO_DIR([config]) ++ AM_INIT_AUTOMAKE ++ AC_CONFIG_SRCDIR([src]) ++ +--- buildroot/package/monit/monit.hash.orig ++++ buildroot/package/monit/monit.hash +@@ -1,4 +1,4 @@ +-# From https://mmonit.com/monit/dist/monit-5.26.0.tar.gz.sha256: +-sha256 87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2 monit-5.26.0.tar.gz ++# From https://mmonit.com/monit/dist/monit-5.27.1.tar.gz.sha256: ++sha256 f57408d16185687513a3c4eb3f2bb72eef76331ac16210e9652e846e5c84ed51 monit-5.27.1.tar.gz + # Locally computed + sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING --- buildroot/package/monit/monit.mk.orig +++ buildroot/package/monit/monit.mk +@@ -4,7 +4,7 @@ + # + ################################################################################ + +-MONIT_VERSION = 5.26.0 ++MONIT_VERSION = 5.27.1 + MONIT_SITE = http://mmonit.com/monit/dist + MONIT_LICENSE = AGPL-3.0 with OpenSSL exception + MONIT_LICENSE_FILES = COPYING @@ -14,14 +14,15 @@ MONIT_CONF_ENV = \ diff --git a/buildroot-patches/0004-monit/buildroot/package/monit/0002-configure-fixes.patch b/buildroot-patches/0004-monit/buildroot/package/monit/0002-configure-fixes.patch new file mode 100644 index 0000000000..9631eb82ae --- /dev/null +++ b/buildroot-patches/0004-monit/buildroot/package/monit/0002-configure-fixes.patch @@ -0,0 +1,22 @@ +diff -ruN monit-5.27.1.orig/configure.ac monit-5.27.1/configure.ac +--- monit-5.27.1.orig/configure.ac 2020-10-24 20:26:57.000000000 +0200 ++++ monit-5.27.1/configure.ac 2020-11-19 17:31:30.656661653 +0100 +@@ -9,6 +9,7 @@ + AC_INIT([monit], [5.27.1], [monit-general@nongnu.org]) + AC_CONFIG_AUX_DIR(config) + AC_CONFIG_MACRO_DIR([m4]) ++AC_CONFIG_MACRO_DIR([config]) + AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR([src/monit.c]) + AC_CONFIG_SUBDIRS([libmonit]) +diff -ruN monit-5.27.1.orig/libmonit/configure.ac monit-5.27.1/libmonit/configure.ac +--- monit-5.27.1.orig/libmonit/configure.ac 2020-10-24 20:26:57.000000000 +0200 ++++ monit-5.27.1/libmonit/configure.ac 2020-11-19 17:31:44.220707976 +0100 +@@ -5,6 +5,7 @@ + AC_INIT([libmonit], [1.0], [monit-dev@tildeslash.com]) + AC_CONFIG_AUX_DIR(config) + AC_CONFIG_MACRO_DIR([m4]) ++AC_CONFIG_MACRO_DIR([config]) + AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR([src]) + diff --git a/buildroot-patches/0004-monit/buildroot/package/monit/0002-configure-fixes.patch.orig b/buildroot-patches/0004-monit/buildroot/package/monit/0002-configure-fixes.patch.orig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/buildroot-patches/0004-monit/buildroot/package/monit/monit.hash b/buildroot-patches/0004-monit/buildroot/package/monit/monit.hash new file mode 100644 index 0000000000..26399fedd4 --- /dev/null +++ b/buildroot-patches/0004-monit/buildroot/package/monit/monit.hash @@ -0,0 +1,4 @@ +# From https://mmonit.com/monit/dist/monit-5.27.1.tar.gz.sha256: +sha256 f57408d16185687513a3c4eb3f2bb72eef76331ac16210e9652e846e5c84ed51 monit-5.27.1.tar.gz +# Locally computed +sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING diff --git a/buildroot-patches/0004-monit/buildroot/package/monit/monit.hash.orig b/buildroot-patches/0004-monit/buildroot/package/monit/monit.hash.orig new file mode 100644 index 0000000000..26d665c083 --- /dev/null +++ b/buildroot-patches/0004-monit/buildroot/package/monit/monit.hash.orig @@ -0,0 +1,4 @@ +# From https://mmonit.com/monit/dist/monit-5.26.0.tar.gz.sha256: +sha256 87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2 monit-5.26.0.tar.gz +# Locally computed +sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING diff --git a/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk b/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk index a9efc181bb..f0b7ad500a 100644 --- a/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk +++ b/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONIT_VERSION = 5.25.2 +MONIT_VERSION = 5.27.1 MONIT_SITE = http://mmonit.com/monit/dist MONIT_LICENSE = AGPL-3.0 with OpenSSL exception MONIT_LICENSE_FILES = COPYING diff --git a/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk.orig b/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk.orig index 906ed842d6..93e310ff78 100644 --- a/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk.orig +++ b/buildroot-patches/0004-monit/buildroot/package/monit/monit.mk.orig @@ -4,7 +4,7 @@ # ################################################################################ -MONIT_VERSION = 5.25.2 +MONIT_VERSION = 5.26.0 MONIT_SITE = http://mmonit.com/monit/dist MONIT_LICENSE = AGPL-3.0 with OpenSSL exception MONIT_LICENSE_FILES = COPYING