# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1650644404 -3600
# Node ID c145e26c3fc51a033a51396967fa40a8f9acec98
# Parent  584e67527789a4565d03dc9ad5b8d622a0f062cf
updated nagios and nagios-dev (4.4.6 -> 4.4.7)

diff -r 584e67527789 -r c145e26c3fc5 nagios-dev/receipt
--- a/nagios-dev/receipt	Fri Apr 22 16:00:56 2022 +0000
+++ b/nagios-dev/receipt	Fri Apr 22 17:20:04 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagios-dev"
-VERSION="4.4.6"
+VERSION="4.4.7"
 CATEGORY="development"
 SHORT_DESC="Nagios development files."
 MAINTAINER="erjo@slitaz.org"
diff -r 584e67527789 -r c145e26c3fc5 nagios/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/description.txt	Fri Apr 22 17:20:04 2022 +0100
@@ -0,0 +1,3 @@
+Nagios is a powerful, enterprise-class host, service, application,
+and network monitoring program.
+Designed to be fast, flexible, and rock-solid stable.
diff -r 584e67527789 -r c145e26c3fc5 nagios/receipt
--- a/nagios/receipt	Fri Apr 22 16:00:56 2022 +0000
+++ b/nagios/receipt	Fri Apr 22 17:20:04 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagios"
-VERSION="4.4.6"
+VERSION="4.4.7"
 CATEGORY="network"
 SHORT_DESC="Host and network monitoring."
 MAINTAINER="erjo@slitaz.org"
@@ -13,7 +13,7 @@
 
 SUGGESTED="nagios-nrpe"
 DEPENDS="apache libjpeg libltdl libpng nagios-plugins"
-BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool procps unzip"
+BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool openssl-dev procps unzip"
 # busybox ps and unzip do not supply the required options
 
 # What is the latest version available today?
@@ -29,13 +29,13 @@
 compile_rules()
 {
 	while read patch_file
-	 do
+	  do
 		if [ ! -f done.$patch_file ]
 		  then
 			patch -p1 < $stuff/$patch_file || return 1
 			touch done.$patch_file
 		fi
-	 done <<EOT
+	  done <<EOT
 $PACKAGE-Makefiles.u
 EOT
 
@@ -54,8 +54,9 @@
 		--datadir=/usr/share/nagios				\
 		--localstatedir=/var/lib/nagios				\
 		$CONFIGURE_ARGS 
-		
-	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
+
+	# 4.4.7 not required
+#	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
 	
 	#~ make all && make DESTDIR=$DESTDIR fullinstall \
 	#~ && make DESTDIR=$DESTDIR install-config
@@ -70,12 +71,13 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/etc/init.d
+	mkdir -p $fs/etc/apache
+	mkdir -p $fs/etc/init.d
+	mkdir -p $fs/usr
 	mkdir -p $fs/var/lib/nagios/rw
 	mkdir -p $fs/var/log/nagios
 	mkdir -p $fs/var/spool/nagios/checkresults
-	mkdir -p $fs/etc/apache
-		
+
 	cp -a $install/etc/apache	$fs/etc
 	cp -a $install/etc/nagios	$fs/etc
 	cp -a $stuff/nagios		$fs/etc/init.d
@@ -101,7 +103,7 @@
 {
 	if ! grep -q nagios "$1/etc/passwd"
 	  then
-		echo -n "Adding user/group nagios..."
+		echo -n "Adding user and group nagios..."
 		chroot "$1/" addgroup -S nagios
 		chroot "$1/" adduser -S -D -H -G nagios nagios
 		status
@@ -125,7 +127,7 @@
 	echo -e "\nTo start $PACKAGE server you can run :\n"
 	echo "/etc/init.d/$PACKAGE start"
 	echo -e "Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf\n"
-	echo -e "Default login/password for the Web GUI is nagiosadmin/nagios"
+	echo -e "Default user and password for the Web GUI is nagiosadmin and nagios"
 }
 
 pre_remove()