wok rev 24946

updated nagios and nagios-dev (4.4.6 -> 4.4.7)
author Hans-G?nter Theisgen
date Fri Apr 22 17:20:04 2022 +0100 (2022-04-22)
parents 584e67527789
children 5b83babda761
files nagios-dev/receipt nagios/description.txt nagios/receipt
line diff
     1.1 --- a/nagios-dev/receipt	Fri Apr 22 16:00:56 2022 +0000
     1.2 +++ b/nagios-dev/receipt	Fri Apr 22 17:20:04 2022 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagios-dev"
     1.7 -VERSION="4.4.6"
     1.8 +VERSION="4.4.7"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Nagios development files."
    1.11  MAINTAINER="erjo@slitaz.org"
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/nagios/description.txt	Fri Apr 22 17:20:04 2022 +0100
     2.3 @@ -0,0 +1,3 @@
     2.4 +Nagios is a powerful, enterprise-class host, service, application,
     2.5 +and network monitoring program.
     2.6 +Designed to be fast, flexible, and rock-solid stable.
     3.1 --- a/nagios/receipt	Fri Apr 22 16:00:56 2022 +0000
     3.2 +++ b/nagios/receipt	Fri Apr 22 17:20:04 2022 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="nagios"
     3.7 -VERSION="4.4.6"
     3.8 +VERSION="4.4.7"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Host and network monitoring."
    3.11  MAINTAINER="erjo@slitaz.org"
    3.12 @@ -13,7 +13,7 @@
    3.13  
    3.14  SUGGESTED="nagios-nrpe"
    3.15  DEPENDS="apache libjpeg libltdl libpng nagios-plugins"
    3.16 -BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool procps unzip"
    3.17 +BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool openssl-dev procps unzip"
    3.18  # busybox ps and unzip do not supply the required options
    3.19  
    3.20  # What is the latest version available today?
    3.21 @@ -29,13 +29,13 @@
    3.22  compile_rules()
    3.23  {
    3.24  	while read patch_file
    3.25 -	 do
    3.26 +	  do
    3.27  		if [ ! -f done.$patch_file ]
    3.28  		  then
    3.29  			patch -p1 < $stuff/$patch_file || return 1
    3.30  			touch done.$patch_file
    3.31  		fi
    3.32 -	 done <<EOT
    3.33 +	  done <<EOT
    3.34  $PACKAGE-Makefiles.u
    3.35  EOT
    3.36  
    3.37 @@ -54,8 +54,9 @@
    3.38  		--datadir=/usr/share/nagios				\
    3.39  		--localstatedir=/var/lib/nagios				\
    3.40  		$CONFIGURE_ARGS 
    3.41 -		
    3.42 -	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
    3.43 +
    3.44 +	# 4.4.7 not required
    3.45 +#	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
    3.46  	
    3.47  	#~ make all && make DESTDIR=$DESTDIR fullinstall \
    3.48  	#~ && make DESTDIR=$DESTDIR install-config
    3.49 @@ -70,12 +71,13 @@
    3.50  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.51  genpkg_rules()
    3.52  {
    3.53 -	mkdir -p $fs/usr $fs/etc/init.d
    3.54 +	mkdir -p $fs/etc/apache
    3.55 +	mkdir -p $fs/etc/init.d
    3.56 +	mkdir -p $fs/usr
    3.57  	mkdir -p $fs/var/lib/nagios/rw
    3.58  	mkdir -p $fs/var/log/nagios
    3.59  	mkdir -p $fs/var/spool/nagios/checkresults
    3.60 -	mkdir -p $fs/etc/apache
    3.61 -		
    3.62 +
    3.63  	cp -a $install/etc/apache	$fs/etc
    3.64  	cp -a $install/etc/nagios	$fs/etc
    3.65  	cp -a $stuff/nagios		$fs/etc/init.d
    3.66 @@ -101,7 +103,7 @@
    3.67  {
    3.68  	if ! grep -q nagios "$1/etc/passwd"
    3.69  	  then
    3.70 -		echo -n "Adding user/group nagios..."
    3.71 +		echo -n "Adding user and group nagios..."
    3.72  		chroot "$1/" addgroup -S nagios
    3.73  		chroot "$1/" adduser -S -D -H -G nagios nagios
    3.74  		status
    3.75 @@ -125,7 +127,7 @@
    3.76  	echo -e "\nTo start $PACKAGE server you can run :\n"
    3.77  	echo "/etc/init.d/$PACKAGE start"
    3.78  	echo -e "Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf\n"
    3.79 -	echo -e "Default login/password for the Web GUI is nagiosadmin/nagios"
    3.80 +	echo -e "Default user and password for the Web GUI is nagiosadmin and nagios"
    3.81  }
    3.82  
    3.83  pre_remove()