From 1093f54c02c0d80f9d8cdeb9437942350068a1d3 Mon Sep 17 00:00:00 2001
From: Niels Horn <niels.horn@gmail.com>
Date: Wed, 8 Sep 2010 18:18:04 -0400
Subject: [PATCH] network/nagios: Updated for version 3.2.2.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 network/nagios/README.SLACKWARE  |  9 +++++++++
 network/nagios/nagios.SlackBuild | 14 ++++++++------
 network/nagios/nagios.info       |  6 +++---
 network/nagios/slack-desc        |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/network/nagios/README.SLACKWARE b/network/nagios/README.SLACKWARE
index fcc3735d24..58c3afe45b 100644
--- a/network/nagios/README.SLACKWARE
+++ b/network/nagios/README.SLACKWARE
@@ -119,3 +119,12 @@ with the nagios-plugins.
 To monitor Windows hosts, install NSClient++ on them.
 
 Do check the http://wiki.nagios.org pages for some useful information.
+
+3) Growing log files
+--------------------
+
+If you are monitoring several items, your log files can grow considerably.
+Nagios keeps a history of all logs in /var/nagios/archives/.
+After a few months this can be quite a bit of information, so consider
+creating some kind of clean-up or compacting script (Left as an exercise to
+the reader :) )
diff --git a/network/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild
index 7e3e73c261..5b6f9ac9cb 100644
--- a/network/nagios/nagios.SlackBuild
+++ b/network/nagios/nagios.SlackBuild
@@ -3,12 +3,12 @@
 # Slackware build script for nagios:
 # IT infrastructure monitoring system
 
-# Written by Niels Horn - niels.horn@gmail.com
-# revision date 2010/07/10
+# Written by Niels Horn <niels.horn@gmail.com>
+# revision date 2010/09/04
 
 PRGNAM=nagios
-VERSION=${VERSION:-3.2.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -78,8 +78,8 @@ CFLAGS="$SLKCFLAGS" \
   --sbindir=/usr/sbin/$PRGNAM \
   --datadir=$DOCROOT/$PRGNAM \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --libexecdir=/usr/libexec/nagios \
-  --sysconfdir=/etc/nagios \
+  --libexecdir=/usr/libexec/$PRGNAM \
+  --sysconfdir=/etc/$PRGNAM \
   --localstatedir=/var/$PRGNAM \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux$ARCHQUADLET \
@@ -105,6 +105,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Change configuration files to .new
 find $PKG/etc/$PRGNAM/ -name *.cfg | while read cfg ; do mv $cfg $cfg.new ; done
 mv $PKG/etc/httpd/extra/nagios.conf $PKG/etc/httpd/extra/nagios.conf.new
+# cfg files may contain passwords, so we don't want 'others' to read them
+chmod -R g-w,o-rx $PKG/etc/$PRGNAM
 
 # Create directory for lock-file
 mkdir -p $PKG/var/run/nagios
diff --git a/network/nagios/nagios.info b/network/nagios/nagios.info
index 08c9299fe7..b6d70748d4 100644
--- a/network/nagios/nagios.info
+++ b/network/nagios/nagios.info
@@ -1,8 +1,8 @@
 PRGNAM="nagios"
-VERSION="3.2.1"
+VERSION="3.2.2"
 HOMEPAGE="http://www.nagios.org/"
-DOWNLOAD="http://downloads.sourceforge.net/nagios/nagios-3.2.1.tar.gz"
-MD5SUM="d4655ee8c95c9679fd4fd53dac34bbe3"
+DOWNLOAD="http://downloads.sourceforge.net/nagios/nagios-3.2.2.tar.gz"
+MD5SUM="e73004f401bfd680631ba900b5a8e60a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
diff --git a/network/nagios/slack-desc b/network/nagios/slack-desc
index 5632f5d8d5..915b6a6cb5 100644
--- a/network/nagios/slack-desc
+++ b/network/nagios/slack-desc
@@ -8,7 +8,7 @@
       |-----handy-ruler------------------------------------------------------|
 nagios: Nagios (a powerful IT infrastructure monitoring system)
 nagios:
-nagios: Nagios is a powerful monitoring system for organizations to identify 
+nagios: Nagios is a powerful monitoring system for organizations to identify
 nagios: and resolve IT infrastructure problems before they affect critical
 nagios: business processes.
 nagios: