commit 6f5c93ad0048d91d8dd9bf6070ea66f9398810ed
Author: Jan Rękorajski <[email protected]>
Date: Tue Oct 5 22:42:33 2021 +0200
- rediff patches, rebuild with openssl 3.0.0, rel 2
monitoring-plugins.spec | 2 +-
nagios-plugins-noroot.patch | 9 +++++----
nagios-plugins-pgsql.patch | 12 ++++++------
nagios-plugins-tainted.patch | 20 +++++++++++---------
4 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec
index a40d94e..989f48b 100644
--- a/monitoring-plugins.spec
+++ b/monitoring-plugins.spec
@@ -12,7 +12,7 @@ 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
-Release: 1
+Release: 2
License: GPL v3+
Group: Networking
Source0:
https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz
diff --git a/nagios-plugins-noroot.patch b/nagios-plugins-noroot.patch
index 07efc9c..8929fd1 100644
--- a/nagios-plugins-noroot.patch
+++ b/nagios-plugins-noroot.patch
@@ -1,6 +1,7 @@
---- ./plugins-root/Makefile.am~ 2005-10-19 15:59:55.000000000 +0300
-+++ ./plugins-root/Makefile.am 2005-11-05 03:52:30.000000000 +0200
-@@ -40,10 +40,6 @@
+diff -urNp -x '*.orig' monitoring-plugins-2.3.org/plugins-root/Makefile.am
monitoring-plugins-2.3/plugins-root/Makefile.am
+--- monitoring-plugins-2.3.org/plugins-root/Makefile.am 2020-12-09
22:38:01.000000000 +0100
++++ monitoring-plugins-2.3/plugins-root/Makefile.am 2021-10-05
22:41:01.104964271 +0200
+@@ -46,10 +46,6 @@ INSTALL_SUID = \
p=$$f; \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
@@ -10,4 +11,4 @@
- chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
done
- install-root: $(EXTRA_PROGRAMS)
+ install-root: $(noinst_PROGRAMS)
diff --git a/nagios-plugins-pgsql.patch b/nagios-plugins-pgsql.patch
index 401c368..ffe6e26 100644
--- a/nagios-plugins-pgsql.patch
+++ b/nagios-plugins-pgsql.patch
@@ -5,14 +5,14 @@
## DP: include pg_config_manual.h since NAMEDATALEN definition moved there
with psql 8.3
@DPATCH@
-diff -Nur nagios-plugins-1.4.11.orig/plugins/check_pgsql.c
nagios-plugins-1.4.11/plugins/check_pgsql.c
---- nagios-plugins-1.4.11.orig/plugins/check_pgsql.c 2007-01-28
22:46:41.000000000 +0100
-+++ nagios-plugins-1.4.11/plugins/check_pgsql.c 2008-01-24
15:54:56.533368467 +0100
-@@ -43,6 +43,7 @@
- #include "utils.h"
+diff -urNp -x '*.orig' monitoring-plugins-2.3.org/plugins/check_pgsql.c
monitoring-plugins-2.3/plugins/check_pgsql.c
+--- monitoring-plugins-2.3.org/plugins/check_pgsql.c 2020-12-09
22:38:01.000000000 +0100
++++ monitoring-plugins-2.3/plugins/check_pgsql.c 2021-10-05
22:41:01.444962254 +0200
+@@ -37,6 +37,7 @@ const char *email = "devel@monitoring-pl
+ #include "utils_cmd.h"
#include "netutils.h"
+#include "pg_config_manual.h"
#include <libpq-fe.h>
+ #include <pg_config_manual.h>
- #define DEFAULT_DB "template1"
diff --git a/nagios-plugins-tainted.patch b/nagios-plugins-tainted.patch
index 6caedf3..4b17ad6 100644
--- a/nagios-plugins-tainted.patch
+++ b/nagios-plugins-tainted.patch
@@ -1,26 +1,28 @@
https://github.com/monitoring-plugins/monitoring-plugins/pull/1413
---- ./plugins-scripts/check_breeze.pl~ 2005-03-15 00:05:04.000000000 +0200
-+++ ./plugins-scripts/check_breeze.pl 2005-03-23 20:16:43.123595875 +0200
-@@ -15,6 +15,7 @@
- $ENV{'PATH'}='';
+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
---- ./plugins-scripts/check_wave.pl~ 2005-03-23 20:20:48.076385198 +0200
-+++ ./plugins-scripts/check_wave.pl 2005-03-23 20:21:02.774789652 +0200
-@@ -19,6 +19,7 @@
- $ENV{'PATH'}='';
+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 @@
+@@ -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]+)/);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/monitoring-plugins.git/commitdiff/6f5c93ad0048d91d8dd9bf6070ea66f9398810ed
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
