Add patch for check_ifstatus

nagios-plugins/nagios-plugins#650
JasonRivers · Aug 30, 2022 · 00844b7 · 00844b7
1 parent f3908f1
commit 00844b7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -127,9 +127,12 @@ RUN cd /tmp
     make clean                                                                       && \
     cd /tmp && rm -Rf nagioscore
 
+ADD patches/nagios-plugins-2.4.0_check_ifstatus.patch /tmp/nagios-plugins-2.4.0_check_ifstatus.patch
+
 RUN cd /tmp                                                                                   && \
     git clone https://github.com/nagios-plugins/nagios-plugins.git -b $NAGIOS_PLUGINS_BRANCH  && \
     cd nagios-plugins                                                                         && \
+    patch plugins-scripts/check_ifstatus.pl /tmp/nagios-plugins-2.4.0_check_ifstatus.patch    && \
     ./tools/setup                                                                             && \
     ./configure                                                 \
         --prefix=${NAGIOS_HOME}                                 \

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Docker image for Nagios
 
 Build Status: [![Build Status](https://travis-ci.org/JasonRivers/Docker-Nagios.svg?branch=master)](https://travis-ci.org/JasonRivers/Docker-Nagios)
 
-Nagios Core 4.4.6 running on Ubuntu 20.04 LTS with NagiosGraph & NRPE
+Nagios Core 4.4.7 running on Ubuntu 20.04 LTS with NagiosGraph & NRPE
 
 | Product | Version |
 | ------- | ------- |
@@ -14,6 +14,9 @@ Nagios Core 4.4.6 running on Ubuntu 20.04 LTS with NagiosGraph & NRPE
 | NCPA | 2.4.0 |
 | NSCA | 2.10.0 |
 
+### PATCHES
+* check_ifstatus-2.4.0 - https://github.com/nagios-plugins/nagios-plugins/issues/650
+
 
 ### Configurations
 Nagios Configuration lives in /opt/nagios/etc

diff --git a/patches/nagios-plugins-2.4.0_check_ifstatus.patch b/patches/nagios-plugins-2.4.0_check_ifstatus.patch
@@ -0,0 +1,15 @@
+--- /root/bin/check_ifstatus    2022-04-07 14:00:01.000000000 -0700
++++ /root/bin/check_ifstatus    2022-04-21 11:26:32.923348000 -0700
+@@ -136,11 +136,11 @@
+ }
+
+
+-push(@snmpoids,$snmpLocIfDescr);
+ push(@snmpoids,$snmpIfOperStatus);
+ push(@snmpoids,$snmpIfAdminStatus);
+ push(@snmpoids,$snmpIfDescr);
+ push(@snmpoids,$snmpIfType);
++push(@snmpoids,$snmpLocIfDescr) if ( defined $ifXTable);
+ push(@snmpoids,$snmpIfName) if ( defined $ifXTable);
+ push(@snmpoids,$snmpIfAlias) if ( defined $ifXTable);
+