[packages/nagios-plugins] up to 2.0
glen
glen at pld-linux.org
Mon Apr 21 13:38:46 CEST 2014
commit 9cc2238c32dfd35cba24502066c9faf7386cd74c
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Apr 21 13:22:21 2014 +0300
up to 2.0
nagios-plugins-check_hpjd-no-paper-out.patch | 33 ++++++++++++++--------
...-plugins-check_ping-socket-filter-warning.patch | 20 ++++++-------
nagios-plugins-configure.patch | 14 ---------
nagios-plugins.spec | 9 +++---
4 files changed, 34 insertions(+), 42 deletions(-)
---
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index a6361b0..2ab14fa 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -12,12 +12,12 @@
Summary: Host/service/network monitoring program plugins for Nagios
Summary(pl.UTF-8): Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
Name: nagios-plugins
-Version: 1.5
-Release: 2
+Version: 2.0
+Release: 1
License: GPL v3
Group: Networking
Source0: http://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 730ac30df4a5e88fed8a766a2311d209
+# Source0-md5: 567592556f59bd64108e28c23aa382d3
# http://git.pld-linux.org/cgi-bin/cgit.cgi/projects/nagios-config.git/
Source1: %{name}-config-20140307.tar.bz2
# Source1-md5: de5c205501cb89c183193d4088d48222
@@ -30,7 +30,6 @@ Patch5: %{name}-check_ping-socket-filter-warning.patch
Patch7: %{name}-pgsql.patch
Patch9: %{name}-check_log_paths.patch
Patch13: %{name}-check_radius_segfault.patch
-Patch18: %{name}-configure.patch
Patch20: %{name}-cosmetic.patch
Patch21: %{name}-check_hpjd-no-paper-out.patch
Patch23: %{name}-check_disk_smb-zero-cap.patch
@@ -510,7 +509,6 @@ mv nagios-plugins-config-*/* .
%patch5 -p1
%patch7 -p1
%patch13 -p1
-%patch18 -p1
%patch20 -p1
%patch21 -p1
%patch23 -p1
@@ -679,6 +677,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_pluginarchdir}/check_ssmtp
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_udp.cfg
%attr(755,root,root) %{_pluginarchdir}/check_udp
+%attr(755,root,root) %{_pluginarchdir}/check_uptime
# these plugins need suid bit to operate
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_dhcp.cfg
diff --git a/nagios-plugins-check_hpjd-no-paper-out.patch b/nagios-plugins-check_hpjd-no-paper-out.patch
index 92d3c0f..f8bf17c 100644
--- a/nagios-plugins-check_hpjd-no-paper-out.patch
+++ b/nagios-plugins-check_hpjd-no-paper-out.patch
@@ -1,9 +1,18 @@
---- nagios-plugins-1.4.15/plugins/check_hpjd.c~ 2010-09-14 16:49:38.000000000 +0300
-+++ nagios-plugins-1.4.15/plugins/check_hpjd.c 2010-09-14 16:52:30.060156750 +0300
-@@ -70,6 +70,7 @@
+--- nagios-plugins-2.0/plugins/check_hpjd.c~ 2014-04-21 11:57:30.000000000 +0300
++++ nagios-plugins-2.0/plugins/check_hpjd.c 2014-04-21 12:56:26.818058154 +0300
+@@ -41,7 +41,7 @@
+ #define DEFAULT_COMMUNITY "public"
+ #define DEFAULT_PORT "161"
+-const char *option_summary = "-H host [-C community]\n";
++const char *option_summary = "-H host [-C community] [-n]\n";
+
+ #define HPJD_LINE_STATUS ".1.3.6.1.4.1.11.2.3.9.1.1.2.1"
+ #define HPJD_PAPER_STATUS ".1.3.6.1.4.1.11.2.3.9.1.1.2.2"
+@@ -67,6 +67,7 @@
char *community = NULL;
char *address = NULL;
+ char *port = NULL;
+int nopaperout = 0;
int
@@ -19,20 +28,20 @@
strcpy (errmsg, _("Out of Paper"));
}
else if (line_status == OFFLINE) {
-@@ -318,6 +321,7 @@
+@@ -317,6 +318,7 @@
/* {"critical", required_argument,0,'c'}, */
/* {"warning", required_argument,0,'w'}, */
- /* {"port", required_argument,0,'P'}, */
+ {"port", required_argument,0,'p'},
+ {"nopaperout", no_argument, 0, 'n'},
{"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
-@@ -328,7 +332,7 @@
+@@ -327,7 +329,7 @@
+
-
while (1) {
-- c = getopt_long (argc, argv, "+hVH:C:", longopts, &option);
-+ c = getopt_long (argc, argv, "+hnVH:C:", longopts, &option);
+- c = getopt_long (argc, argv, "+hVH:C:p:", longopts, &option);
++ c = getopt_long (argc, argv, "+hnVH:C:p:", longopts, &option);
if (c == -1 || c == EOF || c == 1)
break;
@@ -56,10 +65,10 @@
printf ("\n");
#ifdef NP_EXTRA_OPTS
-@@ -421,5 +421,5 @@
+@@ -437,5 +439,5 @@
print_usage (void)
{
printf ("%s\n", _("Usage:"));
-- printf ("%s -H host [-C community]\n", progname);
-+ printf ("%s -H host [-C community] [-n]\n", progname);
+- printf ("%s -H host [-C community] [-p port]\n", progname);
++ printf ("%s -H host [-C community] [-p port] [-n]\n", progname);
}
diff --git a/nagios-plugins-check_ping-socket-filter-warning.patch b/nagios-plugins-check_ping-socket-filter-warning.patch
index 7be5868..3adc175 100644
--- a/nagios-plugins-check_ping-socket-filter-warning.patch
+++ b/nagios-plugins-check_ping-socket-filter-warning.patch
@@ -1,15 +1,13 @@
we don't want message from ping triggering a warning:
WARNING: failed to install socket filter: Protocol not available
---- nagios-plugins-1.4.3/plugins/check_ping.c~ 2006-05-21 23:02:33.988927080 +0300
-+++ nagios-plugins-1.4.3/plugins/check_ping.c 2006-05-21 23:04:28.671500218 +0300
-@@ -454,7 +454,8 @@
- /* check stderr, setting at least WARNING if there is output here */
- /* Add warning into warn_text */
+--- nagios-plugins-2.0/plugins/check_ping.c~ 2014-03-04 21:21:36.000000000 +0200
++++ nagios-plugins-2.0/plugins/check_ping.c 2014-04-21 11:54:59.704871496 +0300
+@@ -484,6 +484,7 @@
while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
-- if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) {
-+ if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP") &&
-+ ! strstr(buf,"WARNING: failed to install socket filter: Protocol not available")) {
- if (verbose >= 3) {
- printf("Got stderr: %s", buf);
- }
+ if (
+ ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
++ && ! strstr(buf,"WARNING: failed to install socket filter: Protocol not available")
+ && ! strstr(buf,"Warning: time of day goes back")
+
+ ) {
diff --git a/nagios-plugins-configure.patch b/nagios-plugins-configure.patch
deleted file mode 100644
index d67615b..0000000
--- a/nagios-plugins-configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- nagios-plugins-1.4.13/configure.in~ 2008-10-11 14:23:22.000000000 +0300
-+++ nagios-plugins-1.4.13/configure.in 2008-10-11 14:32:51.873613770 +0300
-@@ -1298,7 +1298,10 @@
- fi
-
- AC_PATH_PROG(PATH_TO_QMAIL_QSTAT,qmail-qstat)
--if test -x "$PATH_TO_QMAIL_QSTAT"
-+AC_ARG_WITH(qmail_qstat_command,
-+ ACX_HELP_STRING([--with-qmail-qstat-command=PATH],
-+ [sets path to qmail-qstat]), PATH_TO_QMAIL_QSTAT=$withval)
-+if test -n "$PATH_TO_QMAIL_QSTAT"
- then
- AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_QMAIL_QSTAT",[path to qmail-qstat])
- else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugins.git/commitdiff/40ba2206a21edcef62db7cdfd03206cb07847696
More information about the pld-cvs-commit
mailing list