Re: [Buildroot] [PATCH 1/1] package/monit: update to 5.33.0

From: Arnout Vandecappelle via buildroot <buildroot@buildroot.org>
To: Jens Maus <mail@jens-maus.de>, buildroot@buildroot.org
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: Re: [Buildroot] [PATCH 1/1] package/monit: update to 5.33.0
Date: Thu, 21 Sep 2023 21:07:41 +0200	[thread overview]
Message-ID: <2fdbac8a-9a26-8350-e21a-ffef3d62cde4@mind.be> (raw)
In-Reply-To: <20230917210523.1577198-1-mail@jens-maus.de>

  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