[packages/monitoring-plugins] - up to 2.3; heck_hpjd-no-paper-out dropped - upsteam implements this using -D option
arekm
arekm at pld-linux.org
Tue Dec 15 13:59:36 CET 2020
commit 6b850541317cd0324cc9454ca54b1ff44ad3ad32
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Dec 15 13:59:27 2020 +0100
- up to 2.3; heck_hpjd-no-paper-out dropped - upsteam implements this using -D option
monitoring-plugins.spec | 23 ++++-----
nagios-plugins-check_hpjd-no-paper-out.patch | 76 ----------------------------
2 files changed, 10 insertions(+), 89 deletions(-)
---
diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec
index d00398b..91ca87b 100644
--- a/monitoring-plugins.spec
+++ b/monitoring-plugins.spec
@@ -11,12 +11,12 @@
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.2
-Release: 3
+Version: 2.3
+Release: 1
License: GPL v3+
Group: Networking
Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 549e243ba1fb5c5b3be3a86961de40a7
+# Source0-md5: b373cb010bb1136aa5692a7e9c0c8ec1
# https://git.pld-linux.org/projects/nagios-config
Source1: nagios-plugins-config-20150412.tar.xz
# Source1-md5: 2f0f29735345c158d11c2009be3e1478
@@ -27,13 +27,13 @@ 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
-Patch21: nagios-plugins-check_hpjd-no-paper-out.patch
Patch23: nagios-plugins-check_disk_smb-zero-cap.patch
Patch24: nagios-plugins-paths.patch
Patch27: nagios-plugins-ping.patch
URL: https://www.monitoring-plugins.org/
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: curl-devel
BuildRequires: file
BuildRequires: gettext-tools >= 0.15
BuildRequires: libdbi-devel
@@ -314,20 +314,17 @@ Nagios plugin to check LDAP servers.
Wtyczka Nagiosa do sprawdzania serwerów LDAP.
%package -n monitoring-plugin-check_load
-Summary: Nagios plugin to check uptime using procps
-Summary(pl.UTF-8): Wtyczka Nagiosa do sprawdzania uptime'u przy użyciu procps
+Summary: Nagios plugin to check load
+Summary(pl.UTF-8): Wtyczka Nagiosa do sprawdzania obciążenia
Group: Networking
Requires: nagios-common
-Requires: procps
-Provides: nagios-plugins-procps = %{version}-%{release}
Obsoletes: nagios-plugin-check_load
-Obsoletes: nagios-plugins-procps
%description -n monitoring-plugin-check_load
-Nagios plugin to check uptime using procps.
+Nagios plugin to check load..
%description -n monitoring-plugin-check_load -l pl.UTF-8
-Wtyczka Nagiosa do sprawdzania uptime'u przy użyciu procps.
+Wtyczka Nagiosa do sprawdzania obciążenia.
%package -n monitoring-plugin-check_mailq
Summary: Nagios plugin to check the number of messages in the local mail queue
@@ -535,7 +532,6 @@ mv nagios-plugins-config-*/* .
%patch4 -p1
%patch5 -p1
%patch7 -p1
-%patch21 -p1
%patch23 -p1
%patch24 -p1
%patch27 -p1
@@ -657,6 +653,7 @@ rm -rf $RPM_BUILD_ROOT
# plugins
%attr(755,root,root) %{plugindir}/check_apt
%attr(755,root,root) %{plugindir}/check_cluster
+%attr(755,root,root) %{plugindir}/check_curl
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_disk.cfg
%attr(755,root,root) %{plugindir}/check_disk
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_dummy.cfg
@@ -705,7 +702,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{plugindir}/check_ssmtp
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_udp.cfg
%attr(755,root,root) %{plugindir}/check_udp
-#%attr(755,root,root) %{plugindir}/check_uptime
+%attr(755,root,root) %{plugindir}/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
deleted file mode 100644
index b8e4e59..0000000
--- a/nagios-plugins-check_hpjd-no-paper-out.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://github.com/monitoring-plugins/monitoring-plugins/pull/1410
-
---- 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
- main (int argc, char **argv)
-@@ -243,7 +244,9 @@
- strcpy (errmsg, _("Paper Jam"));
- }
- else if (paper_out) {
-- result = STATE_WARNING;
-+ if (!nopaperout) {
-+ result = STATE_WARNING;
-+ }
- strcpy (errmsg, _("Out of Paper"));
- }
- else if (line_status == OFFLINE) {
-@@ -317,6 +318,7 @@
- /* {"critical", required_argument,0,'c'}, */
- /* {"warning", required_argument,0,'w'}, */
- {"port", required_argument,0,'p'},
-+ {"nopaperout", no_argument, 0, 'n'},
- {"version", no_argument, 0, 'V'},
- {"help", no_argument, 0, 'h'},
- {0, 0, 0, 0}
-@@ -327,7 +329,7 @@
-
-
- while (1) {
-- 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;
-@@ -345,6 +349,9 @@
- case 'C': /* community */
- community = strscpy (community, optarg);
- break;
-+ case 'n': /* nopaperout */
-+ nopaperout = 1;
-+ break;
- case 'V': /* version */
- print_revision (progname, revision);
- exit (STATE_OK);
-@@ -404,7 +411,9 @@
-
- printf (" %s\n", "-C, --community=STRING");
- printf (" %s", _("The SNMP community name "));
-+ printf (" %s\n", "-n, --nopaperout");
- printf (_("(default=%s)"), DEFAULT_COMMUNITY);
-+ printf (" %s\n", "No return WARNING state on \"Out of paper\"");
- printf ("\n");
-
- #ifdef NP_EXTRA_OPTS
-@@ -437,5 +439,5 @@
- print_usage (void)
- {
- printf ("%s\n", _("Usage:"));
-- printf ("%s -H host [-C community] [-p port]\n", progname);
-+ printf ("%s -H host [-C community] [-p port] [-n]\n", progname);
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/monitoring-plugins.git/commitdiff/6b850541317cd0324cc9454ca54b1ff44ad3ad32
More information about the pld-cvs-commit
mailing list