# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1650704631 -3600
# Node ID cf5131fd17f5431998338c89996c2a8ed985940f
# Parent  4ebf2fc81c63778d422f9e62a595e796a38f4407
updated nagios-plugins and nagios-plugins-mysql (2.3.3 -> 2.4.0)

diff -r 4ebf2fc81c63 -r cf5131fd17f5 nagios-plugins-lang/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios-plugins-lang/receipt	Sat Apr 23 10:03:51 2022 +0100
@@ -0,0 +1,17 @@
+# SliTaz package receipt.
+
+PACKAGE="nagios-plugins-lang"
+VERSION="2.4.0"
+CATEGORY="localization"
+SHORT_DESC="Nagios plugins - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL3"
+WEB_SITE="https://www.nagios-plugins.org/"
+
+WANTED="nagios-plugins"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders	locale
+}
diff -r 4ebf2fc81c63 -r cf5131fd17f5 nagios-plugins-mysql/receipt
--- a/nagios-plugins-mysql/receipt	Fri Apr 22 17:54:28 2022 +0100
+++ b/nagios-plugins-mysql/receipt	Sat Apr 23 10:03:51 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagios-plugins-mysql"
-VERSION="2.3.3"
+VERSION="2.4.0"
 CATEGORY="meta"
 SHORT_DESC="Dependencies for Nagios MySQL plugin."
 MAINTAINER="erjo@slitaz.org"
diff -r 4ebf2fc81c63 -r cf5131fd17f5 nagios-plugins/receipt
--- a/nagios-plugins/receipt	Fri Apr 22 17:54:28 2022 +0100
+++ b/nagios-plugins/receipt	Sat Apr 23 10:03:51 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagios-plugins"
-VERSION="2.3.3"
+VERSION="2.4.0"
 CATEGORY="network"
 SHORT_DESC="Plugins for host, service and network monitoring program nagios."
 MAINTAINER="erjo@slitaz.org"
@@ -9,11 +9,12 @@
 WEB_SITE="https://www.nagios-plugins.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://www.nagios-plugins.org/download/$TARBALL"
+WGET_URL="https://github.com/$PACKAGE/$PACKAGE/archive/refs/tags/release-$VERSION.tar.gz"
 
-DEPENDS="fping libssl procps"
-BUILD_DEPENDS="libmysqlclient mysql-dev openldap-dev openssl-dev \
-	radiusclient-ng radiusclient-ng-dev procps"
+SUGGESTED="nagios-plugins-lang"
+DEPENDS="fping libssl"
+BUILD_DEPENDS="automake libmysqlclient mysql-dev openldap-dev openssl-dev
+	radiusclient-ng radiusclient-ng-dev"
 
 current_version()
 {
@@ -24,6 +25,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	./autogen.sh &&
 	./configure						\
 		--prefix=/usr					\
 		--libexecdir=/usr/lib/nagios/plugins		\
@@ -33,9 +35,10 @@
 		--with-fping-command="/usr/sbin/fping"		\
 		--mandir=/usr/share/man				\
 		$CONFIGURE_ARGS &&
+	patch --strip=0 --input=$stuff/patches/check_load.c-2.4.0 &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR install-root
+	make install DESTDIR=$DESTDIR &&
+	make install-root DESTDIR=$DESTDIR
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -58,12 +61,12 @@
 	if ! grep -q nagios "$1/etc/passwd"
 	  then
 		echo
-		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
 	fi
-	
+
 	if [ -f "$1/etc/nagios/resource.cfg" ]
 	  then
 		sed -i 's|/usr/lib/nagios|/usr/lib/nagios/plugins|' \
diff -r 4ebf2fc81c63 -r cf5131fd17f5 nagios-plugins/stuff/patches/check_load.c-2.4.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios-plugins/stuff/patches/check_load.c-2.4.0	Sat Apr 23 10:03:51 2022 +0100
@@ -0,0 +1,10 @@
+--- plugins/check_load.c.original
++++ plugins/check_load.c
+@@ -47,6 +47,7 @@
+ #define LOADAVG_5MIN	1
+ #define LOADAVG_15MIN	2
+ #endif /* !defined LOADAVG_1MIN */
++#define PS_COMMAND "/bin/ps"
+ 
+ 
+ static int process_arguments (int argc, char **argv);