diff mbox series

[v2] update nagios_nrpe to 3.2.1

Message ID fd7cd71a-4237-5ed3-98bb-5d556f1072d6@link38.eu
State Accepted
Commit 3a0695be8f75ced863631401692e333047f9b6cf
Headers
Series [v2] update nagios_nrpe to 3.2.1 |

Commit Message

Peter Müller April 29, 2018, 6:20 p.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".

Rootfile information is now included which was missing in the
first version of this patch.

This fixes #11700 and partly addresses #11551.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
---
 config/rootfiles/packages/nagios_nrpe |  4 +++-
 lfs/nagios_nrpe                       | 15 ++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

Comments

Michael Tremer April 30, 2018, 8:45 p.m. UTC | #1 
Thanks and merged.

On Sun, 2018-04-29 at 10:20 +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".
> 
> Rootfile information is now included which was missing in the
> first version of this patch.
> 
> This fixes #11700 and partly addresses #11551.
> 
> Signed-off-by: Peter Müller <peter.mueller@link38.eu>
> ---
>  config/rootfiles/packages/nagios_nrpe |  4 +++-
>  lfs/nagios_nrpe                       | 15 ++++++++-------
>  2 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/config/rootfiles/packages/nagios_nrpe
> b/config/rootfiles/packages/nagios_nrpe
> index 83ce40200..51adc47f9 100644
> --- a/config/rootfiles/packages/nagios_nrpe
> +++ b/config/rootfiles/packages/nagios_nrpe
> @@ -1,4 +1,6 @@
> +etc/nagios
> +etc/nagios/nrpe.cfg
>  #root/.rnd
> +#usr/bin/nrpe-uninstall
>  usr/bin/nrpe
> -#usr/lib/nagios
>  usr/lib/nagios/check_nrpe
> 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)
diff mbox series

Patch

diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/nagios_nrpe
index 83ce40200..51adc47f9 100644
--- a/config/rootfiles/packages/nagios_nrpe
+++ b/config/rootfiles/packages/nagios_nrpe
@@ -1,4 +1,6 @@ 
+etc/nagios
+etc/nagios/nrpe.cfg
 #root/.rnd
+#usr/bin/nrpe-uninstall
 usr/bin/nrpe
-#usr/lib/nagios
 usr/lib/nagios/check_nrpe
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)