wok diff nagios/receipt @ rev 24986

Up nettle 3.7.3 again, need glib-networking rebuild to no break midori
author Stanislas Leduc <shann@slitaz.org>
date Wed May 11 08:28:28 2022 -0400 (2022-05-11)
parents afae00265386
children d3556b8f5c3d
line diff
     1.1 --- a/nagios/receipt	Tue Feb 08 16:59:06 2022 +0000
     1.2 +++ b/nagios/receipt	Wed May 11 08:28:28 2022 -0400
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagios"
     1.7 -VERSION="4.4.6"
     1.8 +VERSION="4.4.7"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Host and network monitoring."
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12 @@ -13,7 +13,7 @@
    1.13  
    1.14  SUGGESTED="nagios-nrpe"
    1.15  DEPENDS="apache libjpeg libltdl libpng nagios-plugins"
    1.16 -BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool procps unzip"
    1.17 +BUILD_DEPENDS="jpeg-dev libgd-dev libpng-dev libtool openssl-dev procps unzip"
    1.18  # busybox ps and unzip do not supply the required options
    1.19  
    1.20  # What is the latest version available today?
    1.21 @@ -29,13 +29,13 @@
    1.22  compile_rules()
    1.23  {
    1.24  	while read patch_file
    1.25 -	 do
    1.26 +	  do
    1.27  		if [ ! -f done.$patch_file ]
    1.28  		  then
    1.29  			patch -p1 < $stuff/$patch_file || return 1
    1.30  			touch done.$patch_file
    1.31  		fi
    1.32 -	 done <<EOT
    1.33 +	  done <<EOT
    1.34  $PACKAGE-Makefiles.u
    1.35  EOT
    1.36  
    1.37 @@ -54,8 +54,9 @@
    1.38  		--datadir=/usr/share/nagios				\
    1.39  		--localstatedir=/var/lib/nagios				\
    1.40  		$CONFIGURE_ARGS 
    1.41 -		
    1.42 -	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
    1.43 +
    1.44 +	# 4.4.7 not required
    1.45 +#	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
    1.46  	
    1.47  	#~ make all && make DESTDIR=$DESTDIR fullinstall \
    1.48  	#~ && make DESTDIR=$DESTDIR install-config
    1.49 @@ -70,12 +71,13 @@
    1.50  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.51  genpkg_rules()
    1.52  {
    1.53 -	mkdir -p $fs/usr $fs/etc/init.d
    1.54 +	mkdir -p $fs/etc/apache
    1.55 +	mkdir -p $fs/etc/init.d
    1.56 +	mkdir -p $fs/usr
    1.57  	mkdir -p $fs/var/lib/nagios/rw
    1.58  	mkdir -p $fs/var/log/nagios
    1.59  	mkdir -p $fs/var/spool/nagios/checkresults
    1.60 -	mkdir -p $fs/etc/apache
    1.61 -		
    1.62 +
    1.63  	cp -a $install/etc/apache	$fs/etc
    1.64  	cp -a $install/etc/nagios	$fs/etc
    1.65  	cp -a $stuff/nagios		$fs/etc/init.d
    1.66 @@ -101,7 +103,7 @@
    1.67  {
    1.68  	if ! grep -q nagios "$1/etc/passwd"
    1.69  	  then
    1.70 -		echo -n "Adding user/group nagios..."
    1.71 +		echo -n "Adding user and group nagios..."
    1.72  		chroot "$1/" addgroup -S nagios
    1.73  		chroot "$1/" adduser -S -D -H -G nagios nagios
    1.74  		status
    1.75 @@ -125,7 +127,7 @@
    1.76  	echo -e "\nTo start $PACKAGE server you can run :\n"
    1.77  	echo "/etc/init.d/$PACKAGE start"
    1.78  	echo -e "Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf\n"
    1.79 -	echo -e "Default login/password for the Web GUI is nagiosadmin/nagios"
    1.80 +	echo -e "Default user and password for the Web GUI is nagiosadmin and nagios"
    1.81  }
    1.82  
    1.83  pre_remove()