Rediff patches.

diff --git a/nagios-plugins-check_hpjd-no-paper-out.patch b/nagios-plugins-check_hpjd-no-paper-out.patch
index 4f360c7ffe6861ce92590a2703760fe2c1d68436..4fe84e1dd4cacae9d002fad4b804d202d3531061 100644 (file)
--- a/nagios-plugins-check_hpjd-no-paper-out.patch
+++ b/nagios-plugins-check_hpjd-no-paper-out.patch
@@ -1,6 +1,7 @@
---- nagios-plugins-2.1.3/plugins/check_hpjd.c~ 2016-09-13 19:59:41.000000000 +0300
-+++ nagios-plugins-2.1.3/plugins/check_hpjd.c  2016-09-13 20:00:10.839538694 +0300
-@@ -41,7 +41,7 @@
+diff -urNp -x '*.orig' nagios-plugins-2.3.3.org/plugins/check_hpjd.c nagios-plugins-2.3.3/plugins/check_hpjd.c
+--- nagios-plugins-2.3.3.org/plugins/check_hpjd.c      2019-12-04 22:53:08.000000000 +0100
++++ nagios-plugins-2.3.3/plugins/check_hpjd.c  2021-04-19 12:01:52.206215349 +0200
+@@ -41,7 +41,7 @@ const char *email = "devel@nagios-plugin
  #define DEFAULT_COMMUNITY "public"
  #define DEFAULT_PORT "161"
  
@@ -17,7 +18,7 @@
  
  int
  main (int argc, char **argv)
-@@ -243,7 +244,9 @@
+@@ -251,7 +252,9 @@ main (int argc, char **argv)
                        strcpy (errmsg, _("Paper Jam"));
                }
                else if (paper_out) {
@@ -28,7 +29,7 @@
                        strcpy (errmsg, _("Out of Paper"));
                }
                else if (line_status == OFFLINE) {
-@@ -329,6 +329,7 @@ process_arguments (int argc, char **argv
+@@ -326,6 +329,7 @@ process_arguments (int argc, char **argv
  /*            {"critical",       required_argument,0,'c'}, */
  /*            {"warning",        required_argument,0,'w'}, */
                {"port", required_argument,0,'p'}, 
@@ -36,7 +37,7 @@
                {"flawcorrection", no_argument, 0, 'N'},
                {"version", no_argument, 0, 'V'},
                {"help", no_argument, 0, 'h'},
-@@ -327,7 +329,7 @@
+@@ -337,7 +341,7 @@ process_arguments (int argc, char **argv
  
  
        while (1) {
@@ -45,7 +46,7 @@
  
                if (c == -1 || c == EOF || c == 1)
                        break;
-@@ -364,6 +364,9 @@ process_arguments (int argc, char **argv
+@@ -360,6 +364,9 @@ process_arguments (int argc, char **argv
                        else
                                port = atoi(optarg);
                        break;
@@ -55,7 +56,7 @@
                  case 'N':                                                                       /* flaw correction */
                          flawcorrection=1;
                          break;
-@@ -404,7 +411,9 @@
+@@ -429,7 +436,9 @@ print_help (void)
  
        printf (" %s\n", "-C, --community=STRING");
        printf ("    %s", _("The SNMP community name "));
@@ -63,9 +64,9 @@
        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 @@
+       printf (" %s\n", "-p, --port=STRING");
+       printf ("    %s", _("Specify the port to check "));
+@@ -449,5 +458,5 @@ void
  print_usage (void)
  {
    printf ("%s\n", _("Usage:"));

diff --git a/nagios-plugins-check_radius_segfault.patch b/nagios-plugins-check_radius_segfault.patch
index ae1e81aa6f9e4a7700dde4be6cbc1a697d39764f..8b09fb959354be535e59f889e9cc4408bab00826 100644 (file)
--- a/nagios-plugins-check_radius_segfault.patch
+++ b/nagios-plugins-check_radius_segfault.patch
@@ -3,12 +3,12 @@
 ##
 
 @DPATCH@
-diff -urNad nagios-plugins-1.4.5~/plugins/check_radius.c nagios-plugins-1.4.5/plugins/check_radius.c
---- nagios-plugins-1.4.5~/plugins/check_radius.c       2006-10-20 01:53:28.000000000 +0200
-+++ nagios-plugins-1.4.5/plugins/check_radius.c        2006-11-20 20:38:49.000000000 +0100
-@@ -137,6 +137,14 @@
-                       rc_read_dictionary (rc_conf_str (str)))
-               die (STATE_UNKNOWN, _("Config file error"));
+diff -urNp -x '*.orig' nagios-plugins-2.3.3.org/plugins/check_radius.c nagios-plugins-2.3.3/plugins/check_radius.c
+--- nagios-plugins-2.3.3.org/plugins/check_radius.c    2019-12-04 22:53:08.000000000 +0100
++++ nagios-plugins-2.3.3/plugins/check_radius.c        2021-04-19 12:01:35.422382755 +0200
+@@ -185,6 +185,14 @@ main (int argc, char **argv)
+                       my_rc_read_dictionary (my_rc_conf_str (str)))
+               die (STATE_UNKNOWN, _("Config file error\n"));
  
 +      /* Initialize Value Pair to prevent segfault on rc_avpair_add. 
 +       * debugging on radiuslib-ng show that the mem isn't allocated,
@@ -20,4 +20,4 @@ diff -urNad nagios-plugins-1.4.5~/plugins/check_radius.c nagios-plugins-1.4.5/pl
 +
        service = PW_AUTHENTICATE_ONLY;
  
-       if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+       memset (&data, 0, sizeof(data));

diff --git a/nagios-plugins-noroot.patch b/nagios-plugins-noroot.patch
index 07efc9c2bb5c2d77e9109bdb693fe8df98f0e724..af6dd8786663c51032e2d7d3b714d48379d89d65 100644 (file)
--- 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' nagios-plugins-2.3.3.org/plugins-root/Makefile.am nagios-plugins-2.3.3/plugins-root/Makefile.am
+--- nagios-plugins-2.3.3.org/plugins-root/Makefile.am  2020-02-20 20:14:52.000000000 +0100
++++ nagios-plugins-2.3.3/plugins-root/Makefile.am      2021-04-19 12:00:59.891325797 +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_NOSUID = \

diff --git a/nagios-plugins-pgsql.patch b/nagios-plugins-pgsql.patch
index 401c3687eef12fb3b2dda6ddaaec2d53b969cd72..11d6fdf622cfbf8a251985465519e501ef569109 100644 (file)
--- 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 @@
+diff -urNp -x '*.orig' nagios-plugins-2.3.3.org/plugins/check_pgsql.c nagios-plugins-2.3.3/plugins/check_pgsql.c
+--- nagios-plugins-2.3.3.org/plugins/check_pgsql.c     2019-12-04 22:53:08.000000000 +0100
++++ nagios-plugins-2.3.3/plugins/check_pgsql.c 2021-04-19 12:01:17.181840152 +0200
+@@ -36,6 +36,7 @@ const char *email = "devel@nagios-plugin
  #include "utils.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 c021ac6f069d27daab0f5ea45d47e48444d30ed3..fa62d7b20d64c05e2eed7d28ac72b3bada5cf5a7 100644 (file)
--- a/nagios-plugins-tainted.patch
+++ b/nagios-plugins-tainted.patch
@@ -1,24 +1,26 @@
---- ./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' nagios-plugins-2.3.3.org/plugins-scripts/check_breeze.pl nagios-plugins-2.3.3/plugins-scripts/check_breeze.pl
+--- nagios-plugins-2.3.3.org/plugins-scripts/check_breeze.pl   2017-01-16 18:24:03.000000000 +0100
++++ nagios-plugins-2.3.3/plugins-scripts/check_breeze.pl       2021-04-19 12:00:29.523755726 +0200
+@@ -17,6 +17,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' nagios-plugins-2.3.3.org/plugins-scripts/check_wave.pl nagios-plugins-2.3.3/plugins-scripts/check_wave.pl
+--- nagios-plugins-2.3.3.org/plugins-scripts/check_wave.pl     2019-12-04 22:53:08.000000000 +0100
++++ nagios-plugins-2.3.3/plugins-scripts/check_wave.pl 2021-04-19 12:00:29.523755726 +0200
+@@ -21,6 +21,7 @@ sub print_usage ();
+ $ENV{'PATH'}='@TRUSTED_PATH@';
  $ENV{'BASH_ENV'}='';
  $ENV{'ENV'}='';
 +$ENV{'CDPATH'}='';
  
  Getopt::Long::Configure('bundling');
  GetOptions
-@@ -53,7 +53,7 @@ my $critical = $1 if ($opt_c =~ /([0-9]+
+@@ -52,7 +53,7 @@ my $critical = $1 if ($opt_c =~ /([0-9]+
  ($opt_w) || ($opt_w = shift) || ($opt_w = 60);
  my $warning = $1 if ($opt_w =~ /([0-9]+)/);
  
@@ -27,7 +29,7 @@
  unless ($low1) {
        print "UNKNOWN - Could not find the 'snmpget' command Please install\n";
        print "the snmp commands (usually net-snmp) before using $PROGNAME\n";
-@@ -62,30 +62,30 @@ unless ($low1) {
+@@ -61,30 +62,30 @@ unless ($low1) {
  @test = split(/ /,$low1);
  $low1 = $test[2];
  

diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index afac646e491b8502161862be7d1a38aface1e3c7..d23f8bf293d592331f64bf4c92d692d8f16f3458 100644 (file)
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -38,6 +38,7 @@ Patch9:               %{name}-paths.patch
 Patch10:       %{name}-ping.patch
 Patch11:       dns-config.patch
 Patch12:       %{name}-check_http-nocache.patch
+Patch13:       ipv6.patch
 URL:           http://www.nagiosplugins.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -525,6 +526,7 @@ mv nagios-plugins-config-*/* .
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+#%patch13 -p1
 
 # remove libtool m4 macro copies, breaks when system libtool is older
 %{__rm} gl/m4/libtool.m4 gl/m4/lt*.m4