diff options
| -rw-r--r-- | network/nagios/README.SLACKWARE (renamed from network/nagios/README.Slackware) | 0 | ||||
| -rw-r--r-- | network/nagios/nagios.SlackBuild | 32 | ||||
| -rw-r--r-- | network/nagios/nagios.info | 8 |
3 files changed, 21 insertions, 19 deletions
diff --git a/network/nagios/README.Slackware b/network/nagios/README.SLACKWARE index fcc3735d2485..fcc3735d2485 100644 --- a/network/nagios/README.Slackware +++ b/network/nagios/README.SLACKWARE diff --git a/network/nagios/nagios.SlackBuild b/network/nagios/nagios.SlackBuild index 103b682fcffa..ebc74a69f171 100644 --- a/network/nagios/nagios.SlackBuild +++ b/network/nagios/nagios.SlackBuild @@ -4,10 +4,10 @@ # IT infrastructure monitoring system # Written by Niels Horn - niels.horn@gmail.com -# revision date 2009/11/15 +# revision date 2010/03/11 PRGNAM=nagios -VERSION=3.2.0 +VERSION=${VERSION:-3.2.1} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -22,12 +22,19 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" + ARCHQUADLET="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" + ARCHQUADLET="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" + ARCHQUADLET="" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv4t" + LIBDIRSUFFIX="" + ARCHQUADLET="-gnueabi" fi set -e @@ -58,7 +65,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc/nagios \ --localstatedir=/var/$PRGNAM \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux \ + --build=$ARCH-slackware-linux$ARCHQUADLET \ --with-httpd-conf=/etc/httpd/extra \ --with-checkresult-dir=/var/spool/$PRGNAM \ --with-init-dir=/etc/rc.d \ @@ -82,11 +89,6 @@ make install-webconf xargs strip --strip-unneeded 2> /dev/null || true ) -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) - # 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 @@ -107,20 +109,20 @@ mv $PKG/$DOCROOT/$PRGNAM/docs $PKG/usr/doc/$PRGNAM-$VERSION/html ( cd $PKG/$DOCROOT/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION/html docs ) find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README.Slackware > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE # Fixup some ownership and permission issues -chown -R root:root $PKG/usr/doc/nagios-3.2.0/html -chmod 0755 $PKG/usr/doc/nagios-3.2.0/html{,/images} +chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/html +chmod 0755 $PKG/usr/doc/$PRGNAM-$VERSION/html{,/images} chown root:root $PKG/usr/sbin -chown -R root:nagios $PKG/usr/sbin/nagios -chmod -R 0754 $PKG/usr/sbin/nagios +chown -R root:nagios $PKG/usr/sbin/$PRGNAM +chmod -R 0754 $PKG/usr/sbin/$PRGNAM chown root:root $PKG/usr/bin chmod 0755 $PKG/usr/bin chown root:nagios $PKG/usr/bin/* chmod 0754 $PKG/usr/bin/* -chown nagios:nagios $PKG/var/run/nagios -chmod 0775 $PKG/var/run/nagios +chown nagios:nagios $PKG/var/run/$PRGNAM +chmod 0775 $PKG/var/run/$PRGNAM mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/nagios/nagios.info b/network/nagios/nagios.info index 2202f2b81c5b..05085771b619 100644 --- a/network/nagios/nagios.info +++ b/network/nagios/nagios.info @@ -1,10 +1,10 @@ PRGNAM="nagios" -VERSION="3.2.0" +VERSION="3.2.1" HOMEPAGE="http://www.nagios.org/" -DOWNLOAD="http://prdownloads.sourceforge.net/sourceforge/nagios/nagios-3.2.0.tar.gz" -MD5SUM="3566167cc60ddeaad34e7d2e26ed4a58" +DOWNLOAD="http://downloads.sourceforge.net/nagios/nagios-3.2.1.tar.gz" +MD5SUM="d4655ee8c95c9679fd4fd53dac34bbe3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Niels Horn" EMAIL="niels.horn@gmail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" |