SliTaz Repositories

     1.1 --- a/nagios-dev/receipt	Thu May 02 18:01:53 2019 +0100
     1.2 +++ b/nagios-dev/receipt	Fri May 03 11:24:27 2019 +0100
     1.3 @@ -1,12 +1,13 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagios-dev"
     1.7 -VERSION="3.5.1"
     1.8 +VERSION="4.4.3"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Nagios development files"
    1.11 +SHORT_DESC="Nagios development files."
    1.12  MAINTAINER="erjo@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14  WEB_SITE="https://www.nagios.org/"
    1.15 +
    1.16  WANTED="nagios"
    1.17  
    1.18  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.19 @@ -15,4 +16,3 @@
    1.20  	mkdir -p $fs/usr
    1.21  	cp -pa $src/include $fs/usr
    1.22  }
    1.23 -

     2.1 --- a/nagios/receipt	Thu May 02 18:01:53 2019 +0100
     2.2 +++ b/nagios/receipt	Fri May 03 11:24:27 2019 +0100
     2.3 @@ -1,56 +1,60 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nagios"
     2.7 -VERSION="3.5.1"
     2.8 +VERSION="4.4.3"
     2.9  CATEGORY="network"
    2.10 -SHORT_DESC="Host and network monitoring"
    2.11 +SHORT_DESC="Host and network monitoring."
    2.12  MAINTAINER="erjo@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14 +WEB_SITE="https://www.nagios.org/"
    2.15 +
    2.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.17 -WEB_SITE="https://www.nagios.org/"
    2.18  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.19 +
    2.20  SUGGESTED="nagios-nrpe"
    2.21 -
    2.22 -DEPENDS="apache nagios-plugins libpng libjpeg libltdl"
    2.23 -BUILD_DEPENDS="libgd-dev libpng-dev jpeg-dev libtool"
    2.24 +DEPENDS="apache libjpeg libltdl libpng nagios-plugins"
    2.25 +BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool procps unzip"
    2.26 +# busybox ps and unzip do not supply the required options
    2.27  
    2.28  # Rules to configure and make the package.
    2.29  compile_rules()
    2.30  {
    2.31 -	while read patch_file; do
    2.32 +	while read patch_file
    2.33 +	 do
    2.34  		if [ ! -f done.$patch_file ]; then
    2.35  			patch -p1 < $stuff/$patch_file || return 1
    2.36  			touch done.$patch_file
    2.37  		fi
    2.38 -	done <<EOT
    2.39 +	 done <<EOT
    2.40  $PACKAGE-Makefiles.u
    2.41  EOT
    2.42 -	./configure \
    2.43 -		--prefix=/usr \
    2.44 -		--infodir=/usr/share/info \
    2.45 -		--mandir=/usr/share/man \
    2.46 -		--with-nagios-user=nagios \
    2.47 -		--with-nagios-group=nagios \
    2.48 -		--with-lockfile=/var/run/nagios/nagios.pid \
    2.49 -		--with-checkresult-dir=/var/spool/nagios/checkresults \
    2.50 -		--sysconfdir=/etc/nagios \
    2.51 -		--with-httpd-conf=/etc/apache/conf.d \
    2.52 -		--libexecdir=/usr/lib/nagios/plugins \
    2.53 -		--sbindir=/usr/lib/nagios/cgi \
    2.54 -		--datadir=/usr/share/nagios \
    2.55 -		--localstatedir=/var/lib/nagios \
    2.56 +
    2.57 +	./configure							\
    2.58 +		--prefix=/usr						\
    2.59 +		--infodir=/usr/share/info				\
    2.60 +		--mandir=/usr/share/man					\
    2.61 +		--with-nagios-user=nagios				\
    2.62 +		--with-nagios-group=nagios				\
    2.63 +		--with-lockfile=/var/run/nagios/nagios.pid		\
    2.64 +		--with-checkresult-dir=/var/spool/nagios/checkresults	\
    2.65 +		--sysconfdir=/etc/nagios				\
    2.66 +		--with-httpd-conf=/etc/apache/conf.d			\
    2.67 +		--libexecdir=/usr/lib/nagios/plugins			\
    2.68 +		--sbindir=/usr/lib/nagios/cgi				\
    2.69 +		--datadir=/usr/share/nagios				\
    2.70 +		--localstatedir=/var/lib/nagios				\
    2.71  		$CONFIGURE_ARGS 
    2.72  		
    2.73  	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
    2.74  	
    2.75  	#~ make all && make DESTDIR=$DESTDIR fullinstall \
    2.76  	#~ && make DESTDIR=$DESTDIR install-config
    2.77 -	make all && make install \
    2.78 -	&& make install-config \
    2.79 -	&& make install-commandmode \
    2.80 -	&& make install-webconf \
    2.81 -	&& make install-classicui 
    2.82 -	
    2.83 +	make all &&
    2.84 +	make install &&
    2.85 +	make install-config &&
    2.86 +	make install-commandmode &&
    2.87 +	make install-webconf &&
    2.88 +	make install-classicui
    2.89  }
    2.90  
    2.91  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.92 @@ -62,21 +66,21 @@
    2.93  	  $fs/var/spool/nagios/checkresults \
    2.94  	  $fs/etc/apache
    2.95  		
    2.96 -	cp -a $install/etc/apache $fs/etc
    2.97 -	cp -a $install/etc/nagios $fs/etc
    2.98 -	cp -a $stuff/nagios  $fs/etc/init.d
    2.99 +	cp -a $install/etc/apache	$fs/etc
   2.100 +	cp -a $install/etc/nagios	$fs/etc
   2.101 +	cp -a $stuff/nagios		$fs/etc/init.d
   2.102  	install -o root -g root -m 644 $stuff/htpasswd.users  $fs/etc/nagios/
   2.103  	
   2.104 -	cp -a $install/usr/bin $fs/usr
   2.105 -	cp -a $install/usr/lib $fs/usr
   2.106 -	cp -a $install/usr/share $fs/usr
   2.107 +	cp -a $install/usr/bin		$fs/usr
   2.108 +	cp -a $install/usr/lib		$fs/usr
   2.109 +	cp -a $install/usr/share	$fs/usr
   2.110  	
   2.111 -	# Put doc in separate package
   2.112 +	# Put documentation in a separate package
   2.113  	rm -rf $fs/usr/share/nagios/docs
   2.114  	
   2.115 -	# Fix Apache config for Nagvis
   2.116 +	# Mofify Apache config for nagvis
   2.117  	sed -i 's/Options None/Options FollowSymLinks/' $fs/etc/apache/conf.d/nagios.conf
   2.118 -	
   2.119 +
   2.120  	# Fix permissions 
   2.121  	chmod 755 $fs/usr/bin/nagios*
   2.122  }
   2.123 @@ -90,13 +94,13 @@
   2.124  		status
   2.125  	fi
   2.126  	
   2.127 -	# Fix perms for files and directories
   2.128 -	chroot "$1/" chown -R nagios.nagios /var/log/nagios \
   2.129 -	  /var/spool/nagios \
   2.130 -	  /var/lib/nagios \
   2.131 -	  /usr/share/nagios \
   2.132 +	# Fix permissions for files and directories
   2.133 +	chroot "$1/" chown -R nagios.nagios \
   2.134 +	  /var/log/nagios	\
   2.135 +	  /var/spool/nagios	\
   2.136 +	  /var/lib/nagios	\
   2.137 +	  /usr/share/nagios	\
   2.138  	  /etc/nagios/*
   2.139 -	  
   2.140  	
   2.141  	chmod 2775 "$1/var/lib/nagios/rw"
   2.142  	chroot "$1/" addgroup www nagios