CVS commit: pkgsrc/net/cacti-spine

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  5 14:31:35 UTC 2022

Modified Files:
        pkgsrc/net/cacti-spine: distinfo
Added Files:
        pkgsrc/net/cacti-spine/patches: patch-common.h patch-ping.c

Log Message:
cacti-spine: Fix building on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/cacti-spine/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/cacti-spine/patches/patch-common.h \
    pkgsrc/net/cacti-spine/patches/patch-ping.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/cacti-spine/distinfo
diff -u pkgsrc/net/cacti-spine/distinfo:1.9 pkgsrc/net/cacti-spine/distinfo:1.10
--- pkgsrc/net/cacti-spine/distinfo:1.9 Sun Feb 20 20:43:31 2022
+++ pkgsrc/net/cacti-spine/distinfo     Thu May  5 14:31:35 2022
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2022/02/20 20:43:31 gavan Exp $
+$NetBSD: distinfo,v 1.10 2022/05/05 14:31:35 nia Exp $
 
 BLAKE2s (cacti-spine-1.2.2.tar.gz) = 8f1c26909fdcba748abbb658bd02a0ec92c4784a66e3624a236f3c0415df025b
 SHA512 (cacti-spine-1.2.2.tar.gz) = ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e
 Size (cacti-spine-1.2.2.tar.gz) = 2310298 bytes
+SHA1 (patch-common.h) = b879113c3330606782bed1ef656f643abce90889
+SHA1 (patch-ping.c) = 785c0c6fe7d15b17238b136ba3ae69e8db5a5b49
 SHA1 (patch-spine.h) = 87775016517bfae923b619e1cd0bc084b399dbfd
 SHA1 (patch-sql.c) = 4effef9bda2c49aeb707c8bc25dfa8cfe520b050

Added files:

Index: pkgsrc/net/cacti-spine/patches/patch-common.h
diff -u /dev/null pkgsrc/net/cacti-spine/patches/patch-common.h:1.1
--- /dev/null   Thu May  5 14:31:35 2022
+++ pkgsrc/net/cacti-spine/patches/patch-common.h       Thu May  5 14:31:35 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-common.h,v 1.1 2022/05/05 14:31:35 nia Exp $
+
+Uses bool - need to include stdbool.h.
+
+--- common.h.orig      2019-02-24 14:53:23.000000000 +0000
++++ common.h
+@@ -90,6 +90,7 @@
+ #include <semaphore.h>
+ #include <signal.h>
+ #include <stdarg.h>
++#include <stdbool.h>
+ #include <stdio.h>
+ #include <syslog.h>
+ 
Index: pkgsrc/net/cacti-spine/patches/patch-ping.c
diff -u /dev/null pkgsrc/net/cacti-spine/patches/patch-ping.c:1.1
--- /dev/null   Thu May  5 14:31:35 2022
+++ pkgsrc/net/cacti-spine/patches/patch-ping.c Thu May  5 14:31:35 2022
@@ -0,0 +1,20 @@
+$NetBSD: patch-ping.c,v 1.1 2022/05/05 14:31:35 nia Exp $
+
+Horrible hack: NetBSD has gethostbyname_r in libc but it doesn't
+actually work.
+
+--- ping.c.orig        2019-02-24 14:53:23.000000000 +0000
++++ ping.c
+@@ -34,6 +34,12 @@
+ #include "common.h"
+ #include "spine.h"
+ 
++#ifdef __NetBSD__
++#undef HAVE_GETHOSTBYNAME_R_GLIBC
++#undef HAVE_GETHOSTBYNAME_R_SOLARIS
++#undef HAVE_GETHOSTBYNAME_R_HPUX
++#endif
++
+ /*! \fn int ping_host(host_t *host, ping_t *ping)
+  *  \brief ping a host to determine if it is reachable for polling
+  *  \param host a pointer to the current host structure