[packages/monitoring-plugins] Up to 2.4.0 (no translation files in tarball)
arekm
arekm at pld-linux.org
Wed Dec 3 20:32:36 CET 2025
commit 7d5167d3382616e202d9e955932a37336cf32fd0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Dec 3 20:32:30 2025 +0100
Up to 2.4.0 (no translation files in tarball)
monitoring-plugins.spec | 19 ++++----
nagios-plugins-check_disk_smb-zero-cap.patch | 14 ------
nagios-plugins-tainted.patch | 66 ----------------------------
3 files changed, 10 insertions(+), 89 deletions(-)
---
diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec
index 7b98136..e7de603 100644
--- a/monitoring-plugins.spec
+++ b/monitoring-plugins.spec
@@ -11,23 +11,23 @@
Summary: Network Monitoring Plugins for Nagios and compatible
Summary(pl.UTF-8): Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
Name: monitoring-plugins
-Version: 2.3.2
-Release: 2
+Version: 2.4.0
+Release: 1
License: GPL v3+
Group: Networking
Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 8d98e0ca261ed3e6d796c2569b99c814
+# Source0-md5: 65c60a7175a0de2ab476e789186d837d
# https://git.pld-linux.org/projects/nagios-config
Source1: nagios-plugins-config-20150412.tar.xz
# Source1-md5: 2f0f29735345c158d11c2009be3e1478
Source2: nagios-utils.php
#Patch: nagios-plugins-shared.patch # needs finishing
-Patch0: nagios-plugins-tainted.patch
+
Patch4: nagios-plugins-noroot.patch
Patch5: nagios-plugins-check_ping-socket-filter-warning.patch
Patch7: nagios-plugins-pgsql.patch
Patch9: nagios-plugins-check_log_paths.patch
-Patch23: nagios-plugins-check_disk_smb-zero-cap.patch
+
Patch24: nagios-plugins-paths.patch
URL: https://www.monitoring-plugins.org/
BuildRequires: autoconf
@@ -517,11 +517,11 @@ Wtyczki przekazane do projektu Nagios. Część z nich działa, część nie.
%prep
%setup -q -a1
mv nagios-plugins-config-*/* .
-%patch -P0 -p1
+
%patch -P4 -p1
%patch -P5 -p1
%patch -P7 -p1
-%patch -P23 -p1
+
%patch -P24 -p1
# remove libtool m4 macro copies, breaks when system libtool is older
@@ -604,7 +604,7 @@ cp -p lib/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/lib
install -d $RPM_BUILD_ROOT%{_sysconfdir}
cp -p commands/*.cfg $RPM_BUILD_ROOT%{_sysconfdir}
-%find_lang %{name}
+#%%find_lang %{name}
# replace USER1 macro with actual value
plugins=$(grep -Eoh 'command_line.*USER1\$/[^ ]+' $RPM_BUILD_ROOT%{_sysconfdir}/*.cfg | awk -F/ '{print $NF}' | sort -u)
@@ -633,7 +633,8 @@ rm -rf $RPM_BUILD_ROOT
%triggerun -n monitoring-plugin-check_mailq -- nagios-nrpe
%nagios_nrpe -d check_mailq -f %{_sysconfdir}/check_mailq.cfg
-%files -f %{name}.lang
+#%%files -f %{name}.lang
+%files
%defattr(644,root,root,755)
%doc ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog
%doc FAQ NEWS README REQUIREMENTS SUPPORT THANKS
diff --git a/nagios-plugins-check_disk_smb-zero-cap.patch b/nagios-plugins-check_disk_smb-zero-cap.patch
deleted file mode 100644
index 4ed3b91..0000000
--- a/nagios-plugins-check_disk_smb-zero-cap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/monitoring-plugins/monitoring-plugins/pull/1411
-
---- nagios-plugins-1.4.16/plugins-scripts/check_disk_smb.pl~ 2012-06-27 20:32:47.000000000 +0300
-+++ nagios-plugins-1.4.16/plugins-scripts/check_disk_smb.pl 2012-12-06 16:42:57.696786740 +0200
-@@ -209,7 +209,8 @@
- my ($total_bytes) = $1 * $2;
- my ($occupied_bytes) = $1 * $2 - $avail_bytes;
- my ($avail) = $avail_bytes/1024;
-- my ($capper) = int(($3/$1)*100);
-+ my ($capper);
-+ if ($1!=0) { $capper = int(($3/$1)*100) } else { $capper=100 };
- my ($mountpt) = "\\\\$host\\$share";
-
- # TODO : why is the kB the standard unit for args ?
diff --git a/nagios-plugins-tainted.patch b/nagios-plugins-tainted.patch
deleted file mode 100644
index 4b17ad6..0000000
--- a/nagios-plugins-tainted.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://github.com/monitoring-plugins/monitoring-plugins/pull/1413
-
-diff -urNp -x '*.orig' monitoring-plugins-2.3.org/plugins-scripts/check_breeze.pl monitoring-plugins-2.3/plugins-scripts/check_breeze.pl
---- monitoring-plugins-2.3.org/plugins-scripts/check_breeze.pl 2020-12-09 22:38:01.000000000 +0100
-+++ monitoring-plugins-2.3/plugins-scripts/check_breeze.pl 2021-10-05 22:41:00.938298593 +0200
-@@ -16,6 +16,7 @@ sub print_usage ();
- $ENV{'PATH'}='@TRUSTED_PATH@';
- $ENV{'BASH_ENV'}='';
- $ENV{'ENV'}='';
-+$ENV{'CDPATH'}='';
-
- Getopt::Long::Configure('bundling');
- GetOptions
-diff -urNp -x '*.orig' monitoring-plugins-2.3.org/plugins-scripts/check_wave.pl monitoring-plugins-2.3/plugins-scripts/check_wave.pl
---- monitoring-plugins-2.3.org/plugins-scripts/check_wave.pl 2020-12-09 22:38:01.000000000 +0100
-+++ monitoring-plugins-2.3/plugins-scripts/check_wave.pl 2021-10-05 22:41:00.938298593 +0200
-@@ -19,6 +19,7 @@ sub print_usage ();
- $ENV{'PATH'}='@TRUSTED_PATH@';
- $ENV{'BASH_ENV'}='';
- $ENV{'ENV'}='';
-+$ENV{'CDPATH'}='';
-
- Getopt::Long::Configure('bundling');
- GetOptions
-@@ -50,34 +51,34 @@ my $critical = $1 if ($opt_c =~ /([0-9]+
- ($opt_w) || ($opt_w = shift) || ($opt_w = 60);
- my $warning = $1 if ($opt_w =~ /([0-9]+)/);
-
--$low1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
-+$low1 = `/usr/bin/snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
- @test = split(/ /,$low1);
- $low1 = $test[2];
-
--$med1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
-+$med1 = `/usr/bin/snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
- @test = split(/ /,$med1);
- $med1 = $test[2];
-
--$high1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
-+$high1 = `/usr/bin/snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
- @test = split(/ /,$high1);
- $high1 = $test[2];
-
- sleep(2);
-
--$snr = `snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
-+$snr = `/usr/bin/snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
- @test = split(/ /,$snr);
- $snr = $test[2];
- $snr = int($snr*25);
-
--$low2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
-+$low2 = `/usr/bin/snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
- @test = split(/ /,$low2);
- $low2 = $test[2];
-
--$med2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
-+$med2 = `/usr/bin/snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
- @test = split(/ /,$med2);
- $med2 = $test[2];
-
--$high2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
-+$high2 = `/usr/bin/snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
- @test = split(/ /,$high2);
- $high2 = $test[2];
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/monitoring-plugins.git/commitdiff/7d5167d3382616e202d9e955932a37336cf32fd0
More information about the pld-cvs-commit
mailing list