update nagios_nrpe to 3.2.1

Message ID 5684f8f2-d132-39a3-86e6-22918cecb22c@link38.eu
State Superseded
Headers
Series update nagios_nrpe to 3.2.1 |

Commit Message

Peter Müller April 22, 2018, 3:04 a.m. UTC
  Update NRPE to 3.2.1, which fixes various security vulnerabilities
and bugs (changelog is available at:
https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md).

Due to changes in ./configure, some options such as initsystem (sysV)
need to be specified now. Also, simple "make" does not exist anymore
and must be replaced by "make all".

This fixes #11700 and partly addresses #11551.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
---
 lfs/nagios_nrpe | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
  

Comments

Michael Tremer April 23, 2018, 7:27 p.m. UTC | #1
Hello,

does this patch not change anything in the rootfiles at all?

If you have any questions, Matthias can help :)

Best,
-Michael

On Sat, 2018-04-21 at 19:04 +0200, Peter Müller wrote:
> Update NRPE to 3.2.1, which fixes various security vulnerabilities
> and bugs (changelog is available at:
> https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md).
> 
> Due to changes in ./configure, some options such as initsystem (sysV)
> need to be specified now. Also, simple "make" does not exist anymore
> and must be replaced by "make all".
> 
> This fixes #11700 and partly addresses #11551.
> 
> Signed-off-by: Peter Müller <peter.mueller@link38.eu>
> ---
>  lfs/nagios_nrpe | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
> index 369f9335d..bebb80144 100644
> --- a/lfs/nagios_nrpe
> +++ b/lfs/nagios_nrpe
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 2.12
> +VER        = 3.2.1
>  
>  THISAPP    = nrpe-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = nagios_nrpe
> -PAK_VER    = 4
> +PAK_VER    = 5
>  
>  DEPS       = "nagios-plugins"
>  
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = b2d75e2962f1e3151ef58794d60c9e97
> +$(DL_FILE)_MD5 = 8997e195fea93cdceb8c7ed8ac1d43bc
>  
>  install : $(TARGET)
>  
> @@ -80,14 +80,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	cd $(DIR_APP) && ./configure \
>  		--prefix=/usr \
>  		--libexecdir=/usr/lib/nagios \
> +		--sysconfdir=/etc/nagios \
> +		--with-init-type=sysv \
>  		--with-nrpe-user=nobody \
>  		--with-nrpe-group=nobody \
>  		--with-nagios-user=nobody \
> -		--with-nagios-group=nobody \
> -		--enable-command-args \
> -		ac_cv_lib_wrap_main=no
> +		--with-nagios-group=nobody
>  
> -	cd $(DIR_APP) && make $(MAKETUNING)
> +	cd $(DIR_APP) && make all $(MAKETUNING)
>  	cd $(DIR_APP) && make install
> +	cd $(DIR_APP) && make install-config
>  	@rm -rf $(DIR_APP)
>  	@$(POSTBUILD)
  
Peter Müller April 24, 2018, 12:12 a.m. UTC | #2
Hello,

yes, indeed, the rootfiles are not changed here as I'll do this in
another patch in order to avoid patches going too big (or is this wrong
here?).

Further, there are still some questions left regarding the rootfile,
I'll try myself and get back to this if bigger problems appear.

Best regards,
Peter Müller

> Hello,
> 
> does this patch not change anything in the rootfiles at all?
> 
> If you have any questions, Matthias can help :)
> 
> Best,
> -Michael
> 
> On Sat, 2018-04-21 at 19:04 +0200, Peter Müller wrote:
>> Update NRPE to 3.2.1, which fixes various security vulnerabilities
>> and bugs (changelog is available at:
>> https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md).
>>
>> Due to changes in ./configure, some options such as initsystem (sysV)
>> need to be specified now. Also, simple "make" does not exist anymore
>> and must be replaced by "make all".
>>
>> This fixes #11700 and partly addresses #11551.
>>
>> Signed-off-by: Peter Müller <peter.mueller@link38.eu>
>> ---
>>  lfs/nagios_nrpe | 15 ++++++++-------
>>  1 file changed, 8 insertions(+), 7 deletions(-)
>>
>> diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
>> index 369f9335d..bebb80144 100644
>> --- a/lfs/nagios_nrpe
>> +++ b/lfs/nagios_nrpe
>> @@ -24,7 +24,7 @@
>>  
>>  include Config
>>  
>> -VER        = 2.12
>> +VER        = 3.2.1
>>  
>>  THISAPP    = nrpe-$(VER)
>>  DL_FILE    = $(THISAPP).tar.gz
>> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>>  TARGET     = $(DIR_INFO)/$(THISAPP)
>>  PROG       = nagios_nrpe
>> -PAK_VER    = 4
>> +PAK_VER    = 5
>>  
>>  DEPS       = "nagios-plugins"
>>  
>> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>>  
>>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>  
>> -$(DL_FILE)_MD5 = b2d75e2962f1e3151ef58794d60c9e97
>> +$(DL_FILE)_MD5 = 8997e195fea93cdceb8c7ed8ac1d43bc
>>  
>>  install : $(TARGET)
>>  
>> @@ -80,14 +80,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>  	cd $(DIR_APP) && ./configure \
>>  		--prefix=/usr \
>>  		--libexecdir=/usr/lib/nagios \
>> +		--sysconfdir=/etc/nagios \
>> +		--with-init-type=sysv \
>>  		--with-nrpe-user=nobody \
>>  		--with-nrpe-group=nobody \
>>  		--with-nagios-user=nobody \
>> -		--with-nagios-group=nobody \
>> -		--enable-command-args \
>> -		ac_cv_lib_wrap_main=no
>> +		--with-nagios-group=nobody
>>  
>> -	cd $(DIR_APP) && make $(MAKETUNING)
>> +	cd $(DIR_APP) && make all $(MAKETUNING)
>>  	cd $(DIR_APP) && make install
>> +	cd $(DIR_APP) && make install-config
>>  	@rm -rf $(DIR_APP)
>>  	@$(POSTBUILD)
  
Michael Tremer April 24, 2018, 12:36 a.m. UTC | #3
Hi,

On Mon, 2018-04-23 at 16:12 +0200, Peter Müller wrote:
> Hello,
> 
> yes, indeed, the rootfiles are not changed here as I'll do this in
> another patch in order to avoid patches going too big (or is this wrong
> here?).

The update of the package itself should be one patch. So that one patch can be
applied to get a new version of the package and reverted to go back to the old
one.

> Further, there are still some questions left regarding the rootfile,
> I'll try myself and get back to this if bigger problems appear.
> 
> Best regards,
> Peter Müller
> 
> > Hello,
> > 
> > does this patch not change anything in the rootfiles at all?
> > 
> > If you have any questions, Matthias can help :)
> > 
> > Best,
> > -Michael
> > 
> > On Sat, 2018-04-21 at 19:04 +0200, Peter Müller wrote:
> > > Update NRPE to 3.2.1, which fixes various security vulnerabilities
> > > and bugs (changelog is available at:
> > > https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md).
> > > 
> > > Due to changes in ./configure, some options such as initsystem (sysV)
> > > need to be specified now. Also, simple "make" does not exist anymore
> > > and must be replaced by "make all".
> > > 
> > > This fixes #11700 and partly addresses #11551.
> > > 
> > > Signed-off-by: Peter Müller <peter.mueller@link38.eu>
> > > ---
> > >  lfs/nagios_nrpe | 15 ++++++++-------
> > >  1 file changed, 8 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
> > > index 369f9335d..bebb80144 100644
> > > --- a/lfs/nagios_nrpe
> > > +++ b/lfs/nagios_nrpe
> > > @@ -24,7 +24,7 @@
> > >  
> > >  include Config
> > >  
> > > -VER        = 2.12
> > > +VER        = 3.2.1
> > >  
> > >  THISAPP    = nrpe-$(VER)
> > >  DL_FILE    = $(THISAPP).tar.gz
> > > @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> > >  DIR_APP    = $(DIR_SRC)/$(THISAPP)
> > >  TARGET     = $(DIR_INFO)/$(THISAPP)
> > >  PROG       = nagios_nrpe
> > > -PAK_VER    = 4
> > > +PAK_VER    = 5
> > >  
> > >  DEPS       = "nagios-plugins"
> > >  
> > > @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> > >  
> > >  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > >  
> > > -$(DL_FILE)_MD5 = b2d75e2962f1e3151ef58794d60c9e97
> > > +$(DL_FILE)_MD5 = 8997e195fea93cdceb8c7ed8ac1d43bc
> > >  
> > >  install : $(TARGET)
> > >  
> > > @@ -80,14 +80,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> > >  	cd $(DIR_APP) && ./configure \
> > >  		--prefix=/usr \
> > >  		--libexecdir=/usr/lib/nagios \
> > > +		--sysconfdir=/etc/nagios \
> > > +		--with-init-type=sysv \
> > >  		--with-nrpe-user=nobody \
> > >  		--with-nrpe-group=nobody \
> > >  		--with-nagios-user=nobody \
> > > -		--with-nagios-group=nobody \
> > > -		--enable-command-args \
> > > -		ac_cv_lib_wrap_main=no
> > > +		--with-nagios-group=nobody
> > >  
> > > -	cd $(DIR_APP) && make $(MAKETUNING)
> > > +	cd $(DIR_APP) && make all $(MAKETUNING)
> > >  	cd $(DIR_APP) && make install
> > > +	cd $(DIR_APP) && make install-config
> > >  	@rm -rf $(DIR_APP)
> > >  	@$(POSTBUILD)
  

Patch

diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
index 369f9335d..bebb80144 100644
--- a/lfs/nagios_nrpe
+++ b/lfs/nagios_nrpe
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 2.12
+VER        = 3.2.1
 
 THISAPP    = nrpe-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios_nrpe
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = "nagios-plugins"
 
@@ -44,7 +44,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b2d75e2962f1e3151ef58794d60c9e97
+$(DL_FILE)_MD5 = 8997e195fea93cdceb8c7ed8ac1d43bc
 
 install : $(TARGET)
 
@@ -80,14 +80,15 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-init-type=sysv \
 		--with-nrpe-user=nobody \
 		--with-nrpe-group=nobody \
 		--with-nagios-user=nobody \
-		--with-nagios-group=nobody \
-		--enable-command-args \
-		ac_cv_lib_wrap_main=no
+		--with-nagios-group=nobody
 
-	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make all $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && make install-config
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)