SliTaz Repositories

     1.1 --- a/nagios/receipt	Mon Jan 21 12:26:11 2019 +0100
     1.2 +++ b/nagios/receipt	Sat Jan 25 15:58:26 2020 +0100
     1.3 @@ -1,56 +1,60 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagios"
     1.7 -VERSION="3.5.1"
     1.8 +VERSION="4.4.3"
     1.9  CATEGORY="network"
    1.10 -SHORT_DESC="Host and network monitoring"
    1.11 +SHORT_DESC="Host and network monitoring."
    1.12  MAINTAINER="erjo@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 +WEB_SITE="https://www.nagios.org/"
    1.15 +
    1.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.17 -WEB_SITE="https://www.nagios.org/"
    1.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.19 +
    1.20  SUGGESTED="nagios-nrpe"
    1.21 -
    1.22 -DEPENDS="apache nagios-plugins libpng libjpeg libltdl"
    1.23 -BUILD_DEPENDS="libgd-dev libpng-dev jpeg-dev libtool"
    1.24 +DEPENDS="apache libjpeg libltdl libpng nagios-plugins"
    1.25 +BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool procps unzip"
    1.26 +# busybox ps and unzip do not supply the required options
    1.27  
    1.28  # Rules to configure and make the package.
    1.29  compile_rules()
    1.30  {
    1.31 -	while read patch_file; do
    1.32 +	while read patch_file
    1.33 +	 do
    1.34  		if [ ! -f done.$patch_file ]; then
    1.35  			patch -p1 < $stuff/$patch_file || return 1
    1.36  			touch done.$patch_file
    1.37  		fi
    1.38 -	done <<EOT
    1.39 +	 done <<EOT
    1.40  $PACKAGE-Makefiles.u
    1.41  EOT
    1.42 -	./configure \
    1.43 -		--prefix=/usr \
    1.44 -		--infodir=/usr/share/info \
    1.45 -		--mandir=/usr/share/man \
    1.46 -		--with-nagios-user=nagios \
    1.47 -		--with-nagios-group=nagios \
    1.48 -		--with-lockfile=/var/run/nagios/nagios.pid \
    1.49 -		--with-checkresult-dir=/var/spool/nagios/checkresults \
    1.50 -		--sysconfdir=/etc/nagios \
    1.51 -		--with-httpd-conf=/etc/apache/conf.d \
    1.52 -		--libexecdir=/usr/lib/nagios/plugins \
    1.53 -		--sbindir=/usr/lib/nagios/cgi \
    1.54 -		--datadir=/usr/share/nagios \
    1.55 -		--localstatedir=/var/lib/nagios \
    1.56 +
    1.57 +	./configure							\
    1.58 +		--prefix=/usr						\
    1.59 +		--infodir=/usr/share/info				\
    1.60 +		--mandir=/usr/share/man					\
    1.61 +		--with-nagios-user=nagios				\
    1.62 +		--with-nagios-group=nagios				\
    1.63 +		--with-lockfile=/var/run/nagios/nagios.pid		\
    1.64 +		--with-checkresult-dir=/var/spool/nagios/checkresults	\
    1.65 +		--sysconfdir=/etc/nagios				\
    1.66 +		--with-httpd-conf=/etc/apache/conf.d			\
    1.67 +		--libexecdir=/usr/lib/nagios/plugins			\
    1.68 +		--sbindir=/usr/lib/nagios/cgi				\
    1.69 +		--datadir=/usr/share/nagios				\
    1.70 +		--localstatedir=/var/lib/nagios				\
    1.71  		$CONFIGURE_ARGS 
    1.72  		
    1.73  	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
    1.74  	
    1.75  	#~ make all && make DESTDIR=$DESTDIR fullinstall \
    1.76  	#~ && make DESTDIR=$DESTDIR install-config
    1.77 -	make all && make install \
    1.78 -	&& make install-config \
    1.79 -	&& make install-commandmode \
    1.80 -	&& make install-webconf \
    1.81 -	&& make install-classicui 
    1.82 -	
    1.83 +	make all &&
    1.84 +	make install &&
    1.85 +	make install-config &&
    1.86 +	make install-commandmode &&
    1.87 +	make install-webconf &&
    1.88 +	make install-classicui
    1.89  }
    1.90  
    1.91  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.92 @@ -62,21 +66,21 @@
    1.93  	  $fs/var/spool/nagios/checkresults \
    1.94  	  $fs/etc/apache
    1.95  		
    1.96 -	cp -a $install/etc/apache $fs/etc
    1.97 -	cp -a $install/etc/nagios $fs/etc
    1.98 -	cp -a $stuff/nagios  $fs/etc/init.d
    1.99 +	cp -a $install/etc/apache	$fs/etc
   1.100 +	cp -a $install/etc/nagios	$fs/etc
   1.101 +	cp -a $stuff/nagios		$fs/etc/init.d
   1.102  	install -o root -g root -m 644 $stuff/htpasswd.users  $fs/etc/nagios/
   1.103  	
   1.104 -	cp -a $install/usr/bin $fs/usr
   1.105 -	cp -a $install/usr/lib $fs/usr
   1.106 -	cp -a $install/usr/share $fs/usr
   1.107 +	cp -a $install/usr/bin		$fs/usr
   1.108 +	cp -a $install/usr/lib		$fs/usr
   1.109 +	cp -a $install/usr/share	$fs/usr
   1.110  	
   1.111 -	# Put doc in separate package
   1.112 +	# Put documentation in a separate package
   1.113  	rm -rf $fs/usr/share/nagios/docs
   1.114  	
   1.115 -	# Fix Apache config for Nagvis
   1.116 +	# Mofify Apache config for nagvis
   1.117  	sed -i 's/Options None/Options FollowSymLinks/' $fs/etc/apache/conf.d/nagios.conf
   1.118 -	
   1.119 +
   1.120  	# Fix permissions 
   1.121  	chmod 755 $fs/usr/bin/nagios*
   1.122  }
   1.123 @@ -90,13 +94,13 @@
   1.124  		status
   1.125  	fi
   1.126  	
   1.127 -	# Fix perms for files and directories
   1.128 -	chroot "$1/" chown -R nagios.nagios /var/log/nagios \
   1.129 -	  /var/spool/nagios \
   1.130 -	  /var/lib/nagios \
   1.131 -	  /usr/share/nagios \
   1.132 +	# Fix permissions for files and directories
   1.133 +	chroot "$1/" chown -R nagios.nagios \
   1.134 +	  /var/log/nagios	\
   1.135 +	  /var/spool/nagios	\
   1.136 +	  /var/lib/nagios	\
   1.137 +	  /usr/share/nagios	\
   1.138  	  /etc/nagios/*
   1.139 -	  
   1.140  	
   1.141  	chmod 2775 "$1/var/lib/nagios/rw"
   1.142  	chroot "$1/" addgroup www nagios