CVS commit: pkgsrc/net/nagios-plugins

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr  2 10:35:35 UTC 2022

Modified Files:
        pkgsrc/net/nagios-plugins: distinfo
        pkgsrc/net/nagios-plugins/patches: patch-plugins_check_nagios.c
Added Files:
        pkgsrc/net/nagios-plugins/patches: patch-plugins_check__ide__smart.c

Log Message:
nagios-plugins: Fix building on NetBSD-current.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/nagios-plugins/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/nagios-plugins/patches/patch-plugins_check__ide__smart.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nagios-plugins/distinfo
diff -u pkgsrc/net/nagios-plugins/distinfo:1.26 pkgsrc/net/nagios-plugins/distinfo:1.27
--- pkgsrc/net/nagios-plugins/distinfo:1.26     Tue Oct 26 11:06:04 2021
+++ pkgsrc/net/nagios-plugins/distinfo  Sat Apr  2 10:35:35 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2021/10/26 11:06:04 nia Exp $
+$NetBSD: distinfo,v 1.27 2022/04/02 10:35:35 nia Exp $
 
 BLAKE2s (nagios-plugins-2.2.1.tar.gz) = 976274874f96d7614ac6359b7feb9692874e947677d88a6d2daa6e569bb61ce5
 SHA512 (nagios-plugins-2.2.1.tar.gz) = 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
@@ -13,5 +13,6 @@ SHA1 (patch-plugins-root_Makefile.in) = 
 SHA1 (patch-plugins-scripts_check__breeze.pl) = 57ffda78989fd0d0c0fa26c74b7f53bd083dab4f
 SHA1 (patch-plugins-scripts_check__wave.pl) = 535b008877cad780afa2ed3429ffb84e7da3ec28
 SHA1 (patch-plugins__check_swap.c) = b822de3488ecace977a739ebcfc56229763cd945
+SHA1 (patch-plugins_check__ide__smart.c) = 34ea76bf79da83fa84b6f0ff7f425462d0aac69e
 SHA1 (patch-plugins_check__radius.c) = 3f86bac4f7aa52931bad46d9ee4a421c2ee744f3
-SHA1 (patch-plugins_check_nagios.c) = a137ba674b2b61daa3af9a7be705d30af4a48aa8
+SHA1 (patch-plugins_check_nagios.c) = a58d12f461a4501a8066101e091307456faf32cf

Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c
diff -u pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c:1.1 pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c:1.2
--- pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c:1.1  Fri Aug  3 14:03:09 2018
+++ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c      Sat Apr  2 10:35:35 2022
@@ -1,11 +1,10 @@
-$NetBSD: patch-plugins_check_nagios.c,v 1.1 2018/08/03 14:03:09 manu Exp $
+$NetBSD: patch-plugins_check_nagios.c,v 1.2 2022/04/02 10:35:35 nia Exp $
 
 Crash fix: initialize variable, check bounds on string copy.
 
---- plugins/check_nagios.c.orig
+--- plugins/check_nagios.c.orig        2017-01-19 16:01:31.000000000 +0000
 +++ plugins/check_nagios.c
-@@ -71,9 +71,9 @@
-       char procstat[8];
+@@ -72,7 +72,7 @@ main (int argc, char **argv)
  #ifdef PS_USES_PROCETIME
        char procetime[MAX_INPUT_BUFFER];
  #endif /* PS_USES_PROCETIME */
@@ -14,9 +13,7 @@ Crash fix: initialize variable, check bo
        char *procargs;
        int pos, cols;
        int expected_cols = PS_COLS - 1;
-       const char *zombie = "Z";
-@@ -143,9 +143,10 @@
- 
+@@ -144,7 +144,8 @@ main (int argc, char **argv)
                        /* Some ps return full pathname for command. This removes path */
                        temp_string = strtok ((char *)procprog, "/");
                        while (temp_string) {
@@ -26,4 +23,3 @@ Crash fix: initialize variable, check bo
                                temp_string = strtok (NULL, "/");
                        }
  
-                       /* May get empty procargs */

Added files:

Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_check__ide__smart.c
diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins_check__ide__smart.c:1.1
--- /dev/null   Sat Apr  2 10:35:35 2022
+++ pkgsrc/net/nagios-plugins/patches/patch-plugins_check__ide__smart.c Sat Apr  2 10:35:35 2022
@@ -0,0 +1,22 @@
+$NetBSD: patch-plugins_check__ide__smart.c,v 1.1 2022/04/02 10:35:35 nia Exp $
+
+__u8 and __u16 are not defined in videoio.h in NetBSD 9.99.x.
+
+--- plugins/check_ide_smart.c.orig     2017-01-16 17:24:03.000000000 +0000
++++ plugins/check_ide_smart.c
+@@ -56,11 +56,14 @@ void print_usage (void);
+ #include <sys/device.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+-#include <sys/videoio.h> /* for __u8 and friends */
+ #include <sys/scsiio.h>
+ #include <sys/ataio.h>
+ #include <dev/ata/atareg.h>
+ #include <dev/ic/wdcreg.h>
++#include <stdint.h>
++
++#define __u8 uint8_t
++#define __u16 uint16_t
+ 
+ #define SMART_ENABLE WDSM_ENABLE_OPS
+ #define SMART_DISABLE WDSM_DISABLE_OPS