CVS commit: pkgsrc/net/nagios-plugins

["Christopher KOBAYASHI" <sekiya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sekiya
Date:           Wed Jan 11 09:27:28 UTC 2023

Modified Files:
        pkgsrc/net/nagios-plugins: distinfo
        pkgsrc/net/nagios-plugins/patches: patch-plugins_check_radius.c

Log Message:
Linux-flavored includes should not be the default.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/nagios-plugins/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.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.28 pkgsrc/net/nagios-plugins/distinfo:1.29
--- pkgsrc/net/nagios-plugins/distinfo:1.28     Mon Jan  9 00:28:41 2023
+++ pkgsrc/net/nagios-plugins/distinfo  Wed Jan 11 09:27:27 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2023/01/09 00:28:41 sekiya Exp $
+$NetBSD: distinfo,v 1.29 2023/01/11 09:27:27 sekiya Exp $
 
 BLAKE2s (nagios-plugins-2.3.3.tar.gz) = 4eee57a0cae28eab4a115d1f518506a7c33ab0ab66e505088a7af2a65308bb22
 SHA512 (nagios-plugins-2.3.3.tar.gz) = 2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7
@@ -14,5 +14,5 @@ SHA1 (patch-plugins-scripts_check_wave.p
 SHA1 (patch-plugins_Makefile.in) = 3509f2972feabe4806e4529c320eb5a119b5df77
 SHA1 (patch-plugins_check_ide_smart.c) = 6601814ad4ac91f11dbeb18613254df55e14edbd
 SHA1 (patch-plugins_check_nagios.c) = 922d4494c77c1764ee30f004e96ce8734ab6954f
-SHA1 (patch-plugins_check_radius.c) = 909c78e18a969c0d0c8431151c0b6069afaaf2ae
+SHA1 (patch-plugins_check_radius.c) = 02bd463b9e02512d5de1b54132ef0c0a0d217783
 SHA1 (patch-plugins_check_swap.c) = ecef90186c97256051ae1e238f95d9861c87e31b

Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c
diff -u pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c:1.1 pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c:1.2
--- pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c:1.1  Mon Jan  9 00:28:41 2023
+++ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c      Wed Jan 11 09:27:28 2023
@@ -1,9 +1,28 @@
-$NetBSD: patch-plugins_check_radius.c,v 1.1 2023/01/09 00:28:41 sekiya Exp $
+$NetBSD: patch-plugins_check_radius.c,v 1.2 2023/01/11 09:27:28 sekiya Exp $
+
+Do not assume that we are compiling under Linux.
 
 Support radius config.
 
---- plugins/check_radius.c.orig        2019-12-05 06:53:08.000000000 +0900
-+++ plugins/check_radius.c     2023-01-09 08:53:32.981542458 +0900
+--- plugins/check_radius.c.orig        2023-01-11 18:07:22.189005504 +0900
++++ plugins/check_radius.c     2023-01-11 18:07:11.857369955 +0900
+@@ -38,13 +38,13 @@
+ 
+ #include <ifaddrs.h>
+ 
+-#ifdef __FreeBSD__
+-#include <net/if_dl.h>
+-#else
++#if defined(__linux__)
+ #include <linux/if_packet.h>
+ #define AF_LINK AF_PACKET
+ #define LLADDR(l) ((l)->sll_addr)
+ #define sockaddr_dl sockaddr_ll
++#else
++#include <net/if_dl.h>
+ #endif
+ 
+ #if defined(HAVE_LIBFREERADIUS_CLIENT)
 @@ -99,7 +99,7 @@
  char *nasipaddress = NULL;
  char *castid = NULL;