From patchwork Sun Apr 29 18:20:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 1732 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 003FB60ACB for ; Sun, 29 Apr 2018 10:20:23 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 659551109356; Sun, 29 Apr 2018 09:20:23 +0100 (BST) Authentication-Results: dkim=pass header.d=link38.eu; dmarc=pass (policy=none) header.from=link38.eu; spf=pass smtp.mailfrom=peter.mueller@link38.eu Received: from mx-nbg.link38.eu (mx-nbg.link38.eu [37.120.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx-nbg.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id ED8B4105FDFC for ; Sun, 29 Apr 2018 09:20:19 +0100 (BST) ARC-Authentication-Results: i=1; mx-nbg.link38.eu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1524990019; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vuGnrx3mZxLiDPcr9ci7nXDmB/2CD45bZViaWROVHrM=; b=e4077lP/cDZuTzlRw3BHU2VY7nrZRlajtc2hcvT6J9IoHY11UeW0YyfNtXpsdoFxEWnnPF tBhEx+RhdOaa/M5uHDaBDPWlSn6YxCjo1lLIylKXtLupaiVYd78auLwcm8XVDowBcmy+fJ Q5bcVzVtDL/7TgYGp6WlehguXakYBH43VREa48HMpq1cRqo7noMQzGvaQH32ioXCoSLUTA ev1FoH5Y+zJg6iimvgEvcZR62b5SAYjF4JV8MwSdiu2dwhMNy+jREqwBM2IuluQvQRc1XY SloWXRrz0A9l4WYRrmEgV6BeC8CVO4yol9p6Vkl6kUOdYiJGxY7A8t+rsCL+2g== ARC-Seal: i=1; s=201803; d=link38.eu; t=1524990019; a=rsa-sha256; cv=none; b=CJ5dEC1Yf06RuPgzVSMoEToxO7p90HsBz6JqqKhqksSkBcoFK0/PJGBXD7iGfraO9rb599LryWTOXsp4wN1zg+/W9Q+Jol4TKHbb92rw4p5bZdbrHgQ8YSqncX/taLD2TVtIvHjuJE8oKtJOcmeUwoTu3Uo9dXs86upzq6oDcn/UgoaCU9aSjZgqQmUJNdH5S+Nbe6FVn7LYqi4/wMT7Ie94Gqb1d++mlh++ZKMkBBbaxzcsP91OhsHMkbrECxeT2/j6NcbinPWj6KH58dLX9CkLTJn9wv3LtkZTZEUEPNUjWbkEKYFcfsteg0hea2dZHmNt7Sobnr95C4kzO7jv0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1524990019; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vuGnrx3mZxLiDPcr9ci7nXDmB/2CD45bZViaWROVHrM=; b=Mu72VoFkNM57lgHTf0W5446tUzgEPUN6tpjHAr+i9hNBzn3J8FeIvjwybB5pJQ6szciLpY AtsAbLvKxSJOIFMDXrLiImVoudszL1g6Z82fi/xCN/3EOa33Kn/EjQcwzBvNPBlnRSzosd UQGZx31rdWt1zAf/ibL4uOoYna1zXq8bu3sYJem8fka2eq/E4xsOVOXRrro6+A7ceIquXr /c+OZSaxDBGFypJmXLzq0B138iYJjkdXNiMr8PMZaxTi5OuQg3FccDAb2i1ppYvHO890Ga BDjIwtb2SbgDB6UkRJuPpK7CZ+iMgWeMdSQktywxTdRk7Hi7vlhpBjHWW10EYA== Subject: [PATCH v2] update nagios_nrpe to 3.2.1 To: "IPFire: Development-List" References: <5684f8f2-d132-39a3-86e6-22918cecb22c@link38.eu> <1524475638.1637848.210.camel@ipfire.org> <71633987-b84e-a62e-58d0-eef615a9aa8c@link38.eu> <1524494169.1637848.248.camel@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: Date: Sun, 29 Apr 2018 10:20:17 +0200 MIME-Version: 1.0 In-Reply-To: <1524494169.1637848.248.camel@ipfire.org> Content-Language: en-US X-Spamd-Result: default: False [-7.54 / 11.00]; IP_SCORE(-3.78)[ip: (-9.90), ipnet: 37.120.160.0/19(-4.95), asn: 197540(-3.95), country: DE(-0.09)]; RCVD_IN_DNSWL_MED(-2.00)[53.167.120.37.list.dnswl.org : 127.0.6.2]; RCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[]; MX_GOOD(-0.01)[cached: mx-nbg.link38.eu]; ARC_REJECT(2.00)[seal check failed: fail, {[1] = sig:link38.eu:reject}]; BAYES_HAM(-3.00)[100.00%]; DKIM_TRACE(0.00)[link38.eu:+]; TO_DN_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:37.120.167.53]; RCPT_COUNT_ONE(0.00)[1]; DMARC_POLICY_ALLOW(-0.25)[link38.eu,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_ALLOW(-0.20)[link38.eu]; ASN(0.00)[asn:197540, ipnet:37.120.160.0/19, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-7.54 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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)