wok rev 24950

updated nagios-plugins and nagios-plugins-mysql (2.3.3 -> 2.4.0)
author Hans-G?nter Theisgen
date Sat Apr 23 10:03:51 2022 +0100 (2022-04-23)
parents 4ebf2fc81c63
children 08e0172a1a69
files nagios-plugins-lang/receipt nagios-plugins-mysql/receipt nagios-plugins/receipt nagios-plugins/stuff/patches/check_load.c-2.4.0
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/nagios-plugins-lang/receipt	Sat Apr 23 10:03:51 2022 +0100
     1.3 @@ -0,0 +1,17 @@
     1.4 +# SliTaz package receipt.
     1.5 +
     1.6 +PACKAGE="nagios-plugins-lang"
     1.7 +VERSION="2.4.0"
     1.8 +CATEGORY="localization"
     1.9 +SHORT_DESC="Nagios plugins - localised messages."
    1.10 +MAINTAINER="maintainer@slitaz.org"
    1.11 +LICENSE="GPL3"
    1.12 +WEB_SITE="https://www.nagios-plugins.org/"
    1.13 +
    1.14 +WANTED="nagios-plugins"
    1.15 +
    1.16 +# Rules to gen a SliTaz package suitable for Tazpkg.
    1.17 +genpkg_rules()
    1.18 +{
    1.19 +	cook_copy_folders	locale
    1.20 +}
     2.1 --- a/nagios-plugins-mysql/receipt	Fri Apr 22 17:54:28 2022 +0100
     2.2 +++ b/nagios-plugins-mysql/receipt	Sat Apr 23 10:03:51 2022 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="nagios-plugins-mysql"
     2.7 -VERSION="2.3.3"
     2.8 +VERSION="2.4.0"
     2.9  CATEGORY="meta"
    2.10  SHORT_DESC="Dependencies for Nagios MySQL plugin."
    2.11  MAINTAINER="erjo@slitaz.org"
     3.1 --- a/nagios-plugins/receipt	Fri Apr 22 17:54:28 2022 +0100
     3.2 +++ b/nagios-plugins/receipt	Sat Apr 23 10:03:51 2022 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="nagios-plugins"
     3.7 -VERSION="2.3.3"
     3.8 +VERSION="2.4.0"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Plugins for host, service and network monitoring program nagios."
    3.11  MAINTAINER="erjo@slitaz.org"
    3.12 @@ -9,11 +9,12 @@
    3.13  WEB_SITE="https://www.nagios-plugins.org/"
    3.14  
    3.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.16 -WGET_URL="https://www.nagios-plugins.org/download/$TARBALL"
    3.17 +WGET_URL="https://github.com/$PACKAGE/$PACKAGE/archive/refs/tags/release-$VERSION.tar.gz"
    3.18  
    3.19 -DEPENDS="fping libssl procps"
    3.20 -BUILD_DEPENDS="libmysqlclient mysql-dev openldap-dev openssl-dev \
    3.21 -	radiusclient-ng radiusclient-ng-dev procps"
    3.22 +SUGGESTED="nagios-plugins-lang"
    3.23 +DEPENDS="fping libssl"
    3.24 +BUILD_DEPENDS="automake libmysqlclient mysql-dev openldap-dev openssl-dev
    3.25 +	radiusclient-ng radiusclient-ng-dev"
    3.26  
    3.27  current_version()
    3.28  {
    3.29 @@ -24,6 +25,7 @@
    3.30  # Rules to configure and make the package.
    3.31  compile_rules()
    3.32  {
    3.33 +	./autogen.sh &&
    3.34  	./configure						\
    3.35  		--prefix=/usr					\
    3.36  		--libexecdir=/usr/lib/nagios/plugins		\
    3.37 @@ -33,9 +35,10 @@
    3.38  		--with-fping-command="/usr/sbin/fping"		\
    3.39  		--mandir=/usr/share/man				\
    3.40  		$CONFIGURE_ARGS &&
    3.41 +	patch --strip=0 --input=$stuff/patches/check_load.c-2.4.0 &&
    3.42  	make &&
    3.43 -	make DESTDIR=$DESTDIR install &&
    3.44 -	make DESTDIR=$DESTDIR install-root
    3.45 +	make install DESTDIR=$DESTDIR &&
    3.46 +	make install-root DESTDIR=$DESTDIR
    3.47  }
    3.48  
    3.49  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.50 @@ -58,12 +61,12 @@
    3.51  	if ! grep -q nagios "$1/etc/passwd"
    3.52  	  then
    3.53  		echo
    3.54 -		echo -n "Adding user/group nagios..."
    3.55 +		echo -n "Adding user and group nagios..."
    3.56  		chroot "$1/" addgroup -S nagios
    3.57  		chroot "$1/" adduser -S -D -H -G nagios nagios
    3.58  		status
    3.59  	fi
    3.60 -	
    3.61 +
    3.62  	if [ -f "$1/etc/nagios/resource.cfg" ]
    3.63  	  then
    3.64  		sed -i 's|/usr/lib/nagios|/usr/lib/nagios/plugins|' \
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/nagios-plugins/stuff/patches/check_load.c-2.4.0	Sat Apr 23 10:03:51 2022 +0100
     4.3 @@ -0,0 +1,10 @@
     4.4 +--- plugins/check_load.c.original
     4.5 ++++ plugins/check_load.c
     4.6 +@@ -47,6 +47,7 @@
     4.7 + #define LOADAVG_5MIN	1
     4.8 + #define LOADAVG_15MIN	2
     4.9 + #endif /* !defined LOADAVG_1MIN */
    4.10 ++#define PS_COMMAND "/bin/ps"
    4.11 + 
    4.12 + 
    4.13 + static int process_arguments (int argc, char **argv);