* [Buildroot] [PATCH 1/1] package/monit: update to 5.33.0
@ 2023-09-17 21:05 Jens Maus via buildroot
2023-09-21 19:07 ` Arnout Vandecappelle via buildroot
2023-09-22 19:47 ` [Buildroot] [PATCH v2] " Jens Maus via buildroot
0 siblings, 2 replies; 4+ messages in thread
From: Jens Maus via buildroot @ 2023-09-17 21:05 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
This commit updates monit to the latest 5.33.0 version which also
requires some additional patch to configure as well as enabled ipv6
support.
Signed-off-by: Jens Maus <mail@jens-maus.de>
---
package/monit/0002-configure-fixes.patch | 24 ++++++++++++++++++++++++
package/monit/monit.hash | 4 ++--
package/monit/monit.mk | 8 +++++---
3 files changed, 31 insertions(+), 5 deletions(-)
create mode 100644 package/monit/0002-configure-fixes.patch
diff --git a/package/monit/0002-configure-fixes.patch b/package/monit/0002-configure-fixes.patch
new file mode 100644
index 0000000000..74698e9927
--- /dev/null
+++ b/package/monit/0002-configure-fixes.patch
@@ -0,0 +1,24 @@
+diff -ruN monit-5.29.0.orig/configure.ac monit-5.29.0/configure.ac
+--- monit-5.29.0.orig/configure.ac 2021-08-24 18:15:35.000000000 +0200
++++ monit-5.29.0/configure.ac 2021-11-20 10:34:31.074783265 +0100
+@@ -8,7 +8,7 @@
+ # Example: 5.0_beta2
+ AC_INIT([monit], [5.29.0], [monit-general@nongnu.org])
+ AC_CONFIG_AUX_DIR(config)
+-AC_CONFIG_MACRO_DIR([m4])
++AC_CONFIG_MACRO_DIRS([m4 config])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src/monit.c])
+ AC_CONFIG_SUBDIRS([libmonit])
+diff -ruN monit-5.29.0.orig/libmonit/configure.ac monit-5.29.0/libmonit/configure.ac
+--- monit-5.29.0.orig/libmonit/configure.ac 2021-08-24 18:15:35.000000000 +0200
++++ monit-5.29.0/libmonit/configure.ac 2021-11-20 10:34:54.123439163 +0100
+@@ -4,7 +4,7 @@
+
+ AC_INIT([libmonit], [1.0], [monit-dev@tildeslash.com])
+ AC_CONFIG_AUX_DIR(config)
+-AC_CONFIG_MACRO_DIR([m4])
++AC_CONFIG_MACRO_DIRS([m4 config])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src])
+
diff --git a/package/monit/monit.hash b/package/monit/monit.hash
index 26d665c083..1d9feca57b 100644
--- a/package/monit/monit.hash
+++ b/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.33.0.tar.gz.sha256
+sha256 1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5 monit-5.33.0.tar.gz
# Locally computed
sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index 6d5d475813..69db62d711 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -4,26 +4,28 @@
#
################################################################################
-MONIT_VERSION = 5.26.0
+MONIT_VERSION = 5.33.0
MONIT_SITE = http://mmonit.com/monit/dist
MONIT_LICENSE = AGPL-3.0 with OpenSSL exception
MONIT_LICENSE_FILES = COPYING
MONIT_CPE_ID_VENDOR = mmonit
MONIT_SELINUX_MODULES = monit
+
#
# Touching Makefile.am:
MONIT_AUTORECONF = YES
MONIT_CONF_ENV = \
libmonit_cv_setjmp_available=yes \
- libmonit_cv_vsnprintf_c99_conformant=yes
+ libmonit_cv_vsnprintf_c99_conformant=yes \
+ ac_cv_ipv6=yes
MONIT_CONF_OPTS += \
--without-pam \
--with-largefiles
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MONIT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
+MONIT_CONF_OPTS += --with-ssl --with-ssl-dir=$(STAGING_DIR)/usr
MONIT_DEPENDENCIES += openssl
else
MONIT_CONF_OPTS += --without-ssl
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/monit: update to 5.33.0
2023-09-17 21:05 [Buildroot] [PATCH 1/1] package/monit: update to 5.33.0 Jens Maus via buildroot
@ 2023-09-21 19:07 ` Arnout Vandecappelle via buildroot
2023-09-22 19:47 ` [Buildroot] [PATCH v2] " Jens Maus via buildroot
1 sibling, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2023-09-21 19:07 UTC (permalink / raw)
To: Jens Maus, buildroot; +Cc: Thomas Petazzoni
Hi Jens,
On 17/09/2023 23:05, Jens Maus via buildroot wrote:
> This commit updates monit to the latest 5.33.0 version which also
> requires some additional patch to configure as well as enabled ipv6
> support.
>
> Signed-off-by: Jens Maus <mail@jens-maus.de>
I have a few comments - a bit too much to just fix while applying, I'm afraid.
Can you address them and resubmit?
> ---
> package/monit/0002-configure-fixes.patch | 24 ++++++++++++++++++++++++
> package/monit/monit.hash | 4 ++--
> package/monit/monit.mk | 8 +++++---
> 3 files changed, 31 insertions(+), 5 deletions(-)
> create mode 100644 package/monit/0002-configure-fixes.patch
>
> diff --git a/package/monit/0002-configure-fixes.patch b/package/monit/0002-configure-fixes.patch
> new file mode 100644
> index 0000000000..74698e9927
> --- /dev/null
> +++ b/package/monit/0002-configure-fixes.patch
check-package says:
package/monit/0002-configure-fixes.patch:0: missing Signed-off-by in the header
(http://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches)
package/monit/0002-configure-fixes.patch:0: missing Upstream in the header
(http://nightly.buildroot.org/#_additional_patch_documentation)
Please make sure the patch is sent upstream (or explain why it's not possible).
Also (but not a hard requirement), we prefer git-formatted patches - clone it
from git@bitbucket.org:tildeslash/monit.git
> @@ -0,0 +1,24 @@
> +diff -ruN monit-5.29.0.orig/configure.ac monit-5.29.0/configure.ac
> +--- monit-5.29.0.orig/configure.ac 2021-08-24 18:15:35.000000000 +0200
> ++++ monit-5.29.0/configure.ac 2021-11-20 10:34:31.074783265 +0100
> +@@ -8,7 +8,7 @@
> + # Example: 5.0_beta2
> + AC_INIT([monit], [5.29.0], [monit-general@nongnu.org])
> + AC_CONFIG_AUX_DIR(config)
> +-AC_CONFIG_MACRO_DIR([m4])
> ++AC_CONFIG_MACRO_DIRS([m4 config])
> + AM_INIT_AUTOMAKE
> + AC_CONFIG_SRCDIR([src/monit.c])
> + AC_CONFIG_SUBDIRS([libmonit])
> +diff -ruN monit-5.29.0.orig/libmonit/configure.ac monit-5.29.0/libmonit/configure.ac
> +--- monit-5.29.0.orig/libmonit/configure.ac 2021-08-24 18:15:35.000000000 +0200
> ++++ monit-5.29.0/libmonit/configure.ac 2021-11-20 10:34:54.123439163 +0100
> +@@ -4,7 +4,7 @@
> +
> + AC_INIT([libmonit], [1.0], [monit-dev@tildeslash.com])
> + AC_CONFIG_AUX_DIR(config)
> +-AC_CONFIG_MACRO_DIR([m4])
> ++AC_CONFIG_MACRO_DIRS([m4 config])
> + AM_INIT_AUTOMAKE
> + AC_CONFIG_SRCDIR([src])
> +
> diff --git a/package/monit/monit.hash b/package/monit/monit.hash
> index 26d665c083..1d9feca57b 100644
> --- a/package/monit/monit.hash
> +++ b/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.33.0.tar.gz.sha256
> +sha256 1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5 monit-5.33.0.tar.gz
> # Locally computed
> sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING
> diff --git a/package/monit/monit.mk b/package/monit/monit.mk
> index 6d5d475813..69db62d711 100644
> --- a/package/monit/monit.mk
> +++ b/package/monit/monit.mk
> @@ -4,26 +4,28 @@
> #
> ################################################################################
>
> -MONIT_VERSION = 5.26.0
> +MONIT_VERSION = 5.33.0
> MONIT_SITE = http://mmonit.com/monit/dist
> MONIT_LICENSE = AGPL-3.0 with OpenSSL exception
> MONIT_LICENSE_FILES = COPYING
> MONIT_CPE_ID_VENDOR = mmonit
> MONIT_SELINUX_MODULES = monit
> +
> #
You can remove this redundant #
> # Touching Makefile.am:
It wasn't in here before, but please mention in the comment which patches
touch Makefile.am and configure.ac.
Applied to master, thanks.
Regards,
Arnout
> MONIT_AUTORECONF = YES
>
> MONIT_CONF_ENV = \
> libmonit_cv_setjmp_available=yes \
> - libmonit_cv_vsnprintf_c99_conformant=yes
> + libmonit_cv_vsnprintf_c99_conformant=yes \
> + ac_cv_ipv6=yes
>
> MONIT_CONF_OPTS += \
> --without-pam \
> --with-largefiles
>
> ifeq ($(BR2_PACKAGE_OPENSSL),y)
> -MONIT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
> +MONIT_CONF_OPTS += --with-ssl --with-ssl-dir=$(STAGING_DIR)/usr
> MONIT_DEPENDENCIES += openssl
> else
> MONIT_CONF_OPTS += --without-ssl
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2] package/monit: update to 5.33.0
2023-09-17 21:05 [Buildroot] [PATCH 1/1] package/monit: update to 5.33.0 Jens Maus via buildroot
2023-09-21 19:07 ` Arnout Vandecappelle via buildroot
@ 2023-09-22 19:47 ` Jens Maus via buildroot
2023-09-29 20:11 ` Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Jens Maus via buildroot @ 2023-09-22 19:47 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
This commit updates monit to the latest 5.33.0 version which also
requires some additional patch to configure as well as enabled ipv6
support.
Signed-off-by: Jens Maus <mail@jens-maus.de>
---
Changes v1 -> v2:
- added Signed-off-by and Upstream (Arnout)
- revised configure.ac patch (Arnout)
- minor changes to monit.mk (Arnout)
Signed-off-by: Jens Maus <mail@jens-maus.de>
---
...re.ac-fixes-missing-config-macro-dir.patch | 44 +++++++++++++++++++
package/monit/monit.hash | 4 +-
package/monit/monit.mk | 10 +++--
3 files changed, 52 insertions(+), 6 deletions(-)
create mode 100644 package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch
diff --git a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch
new file mode 100644
index 0000000000..325dcc17e1
--- /dev/null
+++ b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch
@@ -0,0 +1,44 @@
+From 2c06ecdc02de75a9e7e1e30e9c3d7d3a64269b7c Mon Sep 17 00:00:00 2001
+From: Jens Maus <mail@jens-maus.de>
+Date: Fri, 22 Sep 2023 21:32:18 +0200
+Subject: [PATCH] configure.ac: fixes missing config macro dir
+
+This adds the config dir to the AC_CONFIG_MACRO_DIRS in configure.ac
+so that m4 macros are properly loaded upon autoreconf use.
+
+Upstream: N/A (specific to buildroot)
+Signed-off-by: Jens Maus <mail@jens-maus.de>
+---
+ configure.ac | 2 +-
+ libmonit/configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3c3d30a2..f4c5ea07 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@ AC_PREREQ([2.53])
+ # Example: 5.0_beta2
+ AC_INIT([monit], [5.34.0], [monit-general@nongnu.org])
+ AC_CONFIG_AUX_DIR(config)
+-AC_CONFIG_MACRO_DIR([m4])
++AC_CONFIG_MACRO_DIRS([m4 config])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src/monit.c])
+ AC_CONFIG_SUBDIRS([libmonit])
+diff --git a/libmonit/configure.ac b/libmonit/configure.ac
+index d4cd0789..5366444a 100644
+--- a/libmonit/configure.ac
++++ b/libmonit/configure.ac
+@@ -4,7 +4,7 @@ AC_PREREQ([2.53])
+
+ AC_INIT([libmonit], [1.0], [monit-dev@tildeslash.com])
+ AC_CONFIG_AUX_DIR(config)
+-AC_CONFIG_MACRO_DIR([m4])
++AC_CONFIG_MACRO_DIRS([m4 config])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src])
+
+--
+2.34.1
+
diff --git a/package/monit/monit.hash b/package/monit/monit.hash
index 26d665c083..1d9feca57b 100644
--- a/package/monit/monit.hash
+++ b/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.33.0.tar.gz.sha256
+sha256 1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5 monit-5.33.0.tar.gz
# Locally computed
sha256 d5a4f52b1a5e1e7fe14e01a76aac8b08dc6bbea15466058f271456c97aac1ada COPYING
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index 6d5d475813..ce0f5f0e92 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -4,26 +4,28 @@
#
################################################################################
-MONIT_VERSION = 5.26.0
+MONIT_VERSION = 5.33.0
MONIT_SITE = http://mmonit.com/monit/dist
MONIT_LICENSE = AGPL-3.0 with OpenSSL exception
MONIT_LICENSE_FILES = COPYING
MONIT_CPE_ID_VENDOR = mmonit
MONIT_SELINUX_MODULES = monit
-#
+
# Touching Makefile.am:
+# 0001-configure.ac-fixes-missing-config-macro-dir.patch touches configure.ac
MONIT_AUTORECONF = YES
MONIT_CONF_ENV = \
libmonit_cv_setjmp_available=yes \
- libmonit_cv_vsnprintf_c99_conformant=yes
+ libmonit_cv_vsnprintf_c99_conformant=yes \
+ ac_cv_ipv6=yes
MONIT_CONF_OPTS += \
--without-pam \
--with-largefiles
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MONIT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
+MONIT_CONF_OPTS += --with-ssl --with-ssl-dir=$(STAGING_DIR)/usr
MONIT_DEPENDENCIES += openssl
else
MONIT_CONF_OPTS += --without-ssl
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2] package/monit: update to 5.33.0
2023-09-22 19:47 ` [Buildroot] [PATCH v2] " Jens Maus via buildroot
@ 2023-09-29 20:11 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2023-09-29 20:11 UTC (permalink / raw)
To: Jens Maus via buildroot; +Cc: Thomas Petazzoni, Jens Maus
>>>>> "Jens" == Jens Maus via buildroot <buildroot@buildroot.org> writes:
> This commit updates monit to the latest 5.33.0 version which also
> requires some additional patch to configure as well as enabled ipv6
> support.
> Signed-off-by: Jens Maus <mail@jens-maus.de>
> ---
> Changes v1 -> v2:
> - added Signed-off-by and Upstream (Arnout)
> - revised configure.ac patch (Arnout)
> - minor changes to monit.mk (Arnout)
> Signed-off-by: Jens Maus <mail@jens-maus.de>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-29 20:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-17 21:05 [Buildroot] [PATCH 1/1] package/monit: update to 5.33.0 Jens Maus via buildroot
2023-09-21 19:07 ` Arnout Vandecappelle via buildroot
2023-09-22 19:47 ` [Buildroot] [PATCH v2] " Jens Maus via buildroot
2023-09-29 20:11 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.