Skip to content

Commit

Permalink
updated monit to latest 5.27.1 version. This closes #993.
Browse files Browse the repository at this point in the history
  • Loading branch information
jens-maus committed Nov 20, 2020
1 parent 5757bc9 commit b733eae
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 2 deletions.
43 changes: 43 additions & 0 deletions buildroot-patches/0004-monit.patch
Original file line number Diff line number Diff line change
@@ -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], [[email protected]])
+ 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], [[email protected]])
+ 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 = \
Expand Down
Original file line number Diff line number Diff line change
@@ -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], [[email protected]])
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], [[email protected]])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([config])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src])

Empty file.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b733eae

Please sign in to comment.