[ptxdist] [PATCH 0/3] monit: Upgrade from two years old version

[ptxdist] [PATCH 0/3] monit: Upgrade from two years old version

[Alexander Dahl]

Hei hei,

since 5.17.1 from March 2016 there were some new releases for monit,
including bug fixes, security fixes, build fixes, and new features.
This series does a little cleanup on the old version and then
upgrades to 5.25.2, introducing one new option.

Greets
Alex

Alexander Dahl (3):
  monit: Fix largefile configure options
  monit: Add license file hash
  monit: version bump 5.17.1 -> 5.25.2

 rules/monit.in   |  5 +++++
 rules/monit.make | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/3] monit: Fix largefile configure options

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/monit.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/monit.make b/rules/monit.make
index 2870e8056..a72c8e77d 100644
--- a/rules/monit.make
+++ b/rules/monit.make
@@ -35,9 +35,10 @@ MONIT_CONF_ENV	:= $(CROSS_ENV) \
 
 MONIT_CONF_TOOL	:= autoconf
 MONIT_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-optimized \
 	--disable-profiling \
-	$(GLOBAL_LARGE_FILE_OPTION) \
+	--$(call ptx/wwo, PTXCONF_GLOBAL_LARGE_FILE)-largefiles \
 	--without-pam \
 	--$(call ptx/wwo, PTXCONF_MONIT_SSL)-ssl \
 	--with-ssl-dir=$(SYSROOT)/usr
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] monit: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/monit.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/monit.make b/rules/monit.make
index a72c8e77d..99266622d 100644
--- a/rules/monit.make
+++ b/rules/monit.make
@@ -1,6 +1,6 @@
 # -*-makefile-*-
 #
-# Copyright (C) 2014,2016 by Alexander Dahl <post@lespocky.de>
+# Copyright (C) 2014,2016,2018 by Alexander Dahl <post@lespocky.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -24,6 +24,7 @@ MONIT_URL	:= http://mmonit.com/monit/dist/$(MONIT).$(MONIT_SUFFIX)
 MONIT_SOURCE	:= $(SRCDIR)/$(MONIT).$(MONIT_SUFFIX)
 MONIT_DIR	:= $(BUILDDIR)/$(MONIT)
 MONIT_LICENSE	:= AGPL-3.0-only
+MONIT_LICENSE_FILES := file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] monit: version bump 5.17.1 -> 5.25.2

[Alexander Dahl]

This includes a lot of fixes and new features, including a fix for
CVE-2016-7067 in monit 5.20.0.

See https://mmonit.com/monit/changes/ for complete release notes.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/monit.in   | 5 +++++
 rules/monit.make | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rules/monit.in b/rules/monit.in
index 8d20d2232..31b00ee0c 100644
--- a/rules/monit.in
+++ b/rules/monit.in
@@ -4,6 +4,7 @@ menuconfig MONIT
 	tristate
 	prompt "monit                         "
 	select OPENSSL if MONIT_SSL
+	select ZLIB if MONIT_ZLIB
 	select BUSYBOX_START_STOP_DAEMON if MONIT_STARTSCRIPT
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS if MONIT_STARTSCRIPT
 	help
@@ -16,6 +17,10 @@ config MONIT_SSL
 	bool
 	prompt "SSL support"
 
+config MONIT_ZLIB
+	bool
+	prompt "zlib support"
+
 config MONIT_STARTSCRIPT
 	bool
 	prompt "install /etc/init.d/monit"
diff --git a/rules/monit.make b/rules/monit.make
index 99266622d..6386374b7 100644
--- a/rules/monit.make
+++ b/rules/monit.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MONIT) += monit
 #
 # Paths and names
 #
-MONIT_VERSION	:= 5.17.1
-MONIT_MD5	:= 6918ed7411a244c9e158f5e54c86be78
+MONIT_VERSION	:= 5.25.2
+MONIT_MD5	:= 890df599d6c1e9cfbbdd3edbacb7db81
 MONIT		:= monit-$(MONIT_VERSION)
 MONIT_SUFFIX	:= tar.gz
 MONIT_URL	:= http://mmonit.com/monit/dist/$(MONIT).$(MONIT_SUFFIX)
@@ -39,7 +39,9 @@ MONIT_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-optimized \
 	--disable-profiling \
+	--$(call ptx/wwo, PTXCONF_GLOBAL_IPV6)-ipv6 \
 	--$(call ptx/wwo, PTXCONF_GLOBAL_LARGE_FILE)-largefiles \
+	--$(call ptx/wwo, PTXCONF_MONIT_ZLIB)-zlib \
 	--without-pam \
 	--$(call ptx/wwo, PTXCONF_MONIT_SSL)-ssl \
 	--with-ssl-dir=$(SYSROOT)/usr
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] monit: Fix largefile configure options

[Roland Hieber]

Hei hei,

On Fri, Jul 27, 2018 at 10:59:13AM +0200, Alexander Dahl wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>

> ---
>  rules/monit.make | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/monit.make b/rules/monit.make
> index 2870e8056..a72c8e77d 100644
> --- a/rules/monit.make
> +++ b/rules/monit.make
> @@ -35,9 +35,10 @@ MONIT_CONF_ENV	:= $(CROSS_ENV) \
>  
>  MONIT_CONF_TOOL	:= autoconf
>  MONIT_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--enable-optimized \
>  	--disable-profiling \
> -	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--$(call ptx/wwo, PTXCONF_GLOBAL_LARGE_FILE)-largefiles \

Hmm. Why are you adding both GLOBAL_LARGE_FILE_OPTION and
PTXCONF_GLOBAL_LARGE_FILE? Are those two independent kconfig options
(and if yo, why)? Does the configure script respect both of them? I
guess this should be mentioned in the commit message :-)

 - Roland

>  	--without-pam \
>  	--$(call ptx/wwo, PTXCONF_MONIT_SSL)-ssl \
>  	--with-ssl-dir=$(SYSROOT)/usr
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Roland Hieber                     | r.hieber@pengutronix.de     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] monit: Fix largefile configure options

[Alexander Dahl]

Hello Roland,

Am Freitag, 27. Juli 2018, 11:42:42 CEST schrieb Roland Hieber:
> On Fri, Jul 27, 2018 at 10:59:13AM +0200, Alexander Dahl wrote:
> > +	$(GLOBAL_LARGE_FILE_OPTION) \
> > 
> >  	--enable-optimized \
> >  	--disable-profiling \
> > 
> > -	$(GLOBAL_LARGE_FILE_OPTION) \
> > +	--$(call ptx/wwo, PTXCONF_GLOBAL_LARGE_FILE)-largefiles \
> 
> Hmm. Why are you adding both GLOBAL_LARGE_FILE_OPTION and
> PTXCONF_GLOBAL_LARGE_FILE? Are those two independent kconfig options
> (and if yo, why)? Does the configure script respect both of them? I
> guess this should be mentioned in the commit message :-)

I don't know why monit has two options for the same thing. The doc output from 
./configure --help contains this:

  --disable-largefile     omit support for large files

and 

  --without-largefiles    disable large files support (default: enabled)

The script configure_helper.py complains about it, I am not familiar with 
autotools, so I can not judge what monit tries to do here. Because this is not 
the first time, I would guess monit upstream has broken autotools files? Maybe 
someone with more experience on that can say which option of those is used?

Alex


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/3] monit: Fix largefile configure options

[Michael Olbrich]

On Fri, Jul 27, 2018 at 11:55:29AM +0200, Alexander Dahl wrote:
> Am Freitag, 27. Juli 2018, 11:42:42 CEST schrieb Roland Hieber:
> > On Fri, Jul 27, 2018 at 10:59:13AM +0200, Alexander Dahl wrote:
> > > +	$(GLOBAL_LARGE_FILE_OPTION) \
> > > 
> > >  	--enable-optimized \
> > >  	--disable-profiling \
> > > 
> > > -	$(GLOBAL_LARGE_FILE_OPTION) \
> > > +	--$(call ptx/wwo, PTXCONF_GLOBAL_LARGE_FILE)-largefiles \
> > 
> > Hmm. Why are you adding both GLOBAL_LARGE_FILE_OPTION and
> > PTXCONF_GLOBAL_LARGE_FILE? Are those two independent kconfig options
> > (and if yo, why)? Does the configure script respect both of them? I
> > guess this should be mentioned in the commit message :-)
> 
> I don't know why monit has two options for the same thing. The doc output from 
> ./configure --help contains this:
> 
>   --disable-largefile     omit support for large files
> 
> and 
> 
>   --without-largefiles    disable large files support (default: enabled)
> 
> The script configure_helper.py complains about it, I am not familiar with 
> autotools, so I can not judge what monit tries to do here. Because this is not 
> the first time, I would guess monit upstream has broken autotools files? Maybe 
> someone with more experience on that can say which option of those is used?

I checked to configure.ac. Setting both like this is correct.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de