Update nrpe to 2.12 (#3639)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@11694 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-07-06 11:58:17 +00:00
parent e92c23bfc5
commit 47583479f3
2 changed files with 24 additions and 25 deletions

View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nrpe PKG_NAME:=nrpe
PKG_VERSION:=2.8.1 PKG_VERSION:=2.12
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/nagios PKG_SOURCE_URL:=@SF/nagios
PKG_MD5SUM:= PKG_MD5SUM:=b2d75e2962f1e3151ef58794d60c9e97
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -27,11 +27,12 @@ define Package/nrpe
endef endef
define Package/nrpe/description define Package/nrpe/description
NOTE: several assumptions are made: The NRPE addon is designed to allow you to execute Nagios plugins on
1) As openssl is used to generate some stuff during "configure" it is remote Linux/Unix machines. The main reason for doing this is to allow
assumed that openssl is installed on compiling PC in its default Nagios to monitor "local" resources (like CPU load, memory usage, etc.)
location (i.e. accessible as /usr/bin/openssl). on remote machines. Since these public resources are not usually
2) "nagios" user and group should exist on your openwrt installation. exposed to external machines, an agent like NRPE must be installed on
the remote Linux/Unix machines.
endef endef
define Package/nrpe/postinst define Package/nrpe/postinst

View File

@ -1,19 +1,17 @@
Index: nrpe-2.8.1/configure --- a/configure
=================================================================== +++ b/configure
--- nrpe-2.8.1.orig/configure 2007-10-11 14:40:36.000000000 +0200 @@ -6694,11 +6694,9 @@
+++ nrpe-2.8.1/configure 2007-10-11 14:40:36.000000000 +0200
@@ -6073,11 +6073,9 @@
echo "" echo ""
echo "*** Generating DH Parameters for SSL/TLS ***" echo "*** Generating DH Parameters for SSL/TLS ***"
- if test -f "$ssldir/sbin/openssl"; then - if test -f "$ssldir/sbin/openssl"; then
- sslbin=$ssldir/sbin/openssl - sslbin=$ssldir/sbin/openssl
- else - else
- sslbin=$ssldir/bin/openssl - sslbin=$ssldir/bin/openssl
- fi - fi
+ # Use host openssl as it just generates some random stuff, + # Use host openssl as it just generates some random stuff,
+ # nothing machine-specific + # nothing machine-specific
+ sslbin=/usr/bin/openssl + sslbin=/usr/bin/openssl
# awk to strip off meta data at bottom of dhparam output # awk to strip off meta data at bottom of dhparam output
$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
fi fi