SF.net SVN: gar:[26732] csw/mgar/pkg/nsd/trunk

[idogan23 at users.sourceforge.net]

Revision: 26732
          http://sourceforge.net/p/gar/code/26732
Author:   idogan23
Date:     2021-02-08 19:15:24 +0000 (Mon, 08 Feb 2021)
Log Message:
-----------
nsd: Fix ifaddrs.h compile error. https://github.com/NLnetLabs/nsd/commit/5e42dc839f6f43c7dea27a9daca4f0d9c370caa3

Modified Paths:
--------------
    csw/mgar/pkg/nsd/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch
    csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch

Modified: csw/mgar/pkg/nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nsd/trunk/Makefile	2021-02-08 15:42:31 UTC (rev 26731)
+++ csw/mgar/pkg/nsd/trunk/Makefile	2021-02-08 19:15:24 UTC (rev 26732)
@@ -32,6 +32,8 @@
 
 PATCHFILES += 0001-Fix-AF_LOCAL_nsd_c.patch
 PATCHFILES += 0002-Fix-AF_LOCAL_remote_c.patch
+PATCHFILES += 0003-ifaddrs_configure_ac.patch
+PATCHFILES += 0004-ifaddrs_nsd_c.patch
 
 SPKG_CLASSES = none cswusergroup ugfiles cswcpsampleconf cswinitsmf
 PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnsd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/CSWnsd\/cswusergroup$$$$/ { $$$$2 = "cswusergroup" } $$$$3 ~ /\/nsd\/nsd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/nsd/ { $$$$2 = "ugfiles" }  $$$$3 ~ /\/var\/opt\/csw\/nsd/ { $$$$5 = "nsd" } $$$$3 ~ /\/var\/opt\/csw\/nsd/ { $$$$6 = "nsd" } $$$$3 ~ /\/var\/run/ { $$$$6 = "sys" } { print }'

Added: csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch	                        (rev 0)
+++ csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch	2021-02-08 19:15:24 UTC (rev 26732)
@@ -0,0 +1,25 @@
+From 462fc10c4b55b8275096742f907bc0fe1d3f8a49 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ihsan at opencsw.org>
+Date: Mon, 8 Feb 2021 19:59:06 +0100
+Subject: [PATCH] Fix ifaddrs.h compile error for Solaris
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 123e7f3..5f96bea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -449,7 +449,7 @@ fi
+ 
+ # Checks for header files.
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS([time.h arpa/inet.h signal.h string.h strings.h fcntl.h limits.h netinet/in.h netinet/tcp.h stddef.h sys/param.h sys/socket.h sys/un.h syslog.h unistd.h sys/select.h stdarg.h stdint.h netdb.h sys/bitypes.h tcpd.h glob.h grp.h endian.h sys/random.h])
++AC_CHECK_HEADERS([time.h arpa/inet.h signal.h string.h strings.h fcntl.h limits.h netinet/in.h netinet/tcp.h stddef.h sys/param.h sys/socket.h sys/un.h syslog.h unistd.h sys/select.h stdarg.h stdint.h netdb.h sys/bitypes.h tcpd.h glob.h grp.h endian.h sys/random.h ifaddrs.h])
+ 
+ AC_DEFUN([CHECK_VALIST_DEF],
+ [
+-- 
+2.4.0
+

Added: csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch	                        (rev 0)
+++ csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch	2021-02-08 19:15:24 UTC (rev 26732)
@@ -0,0 +1,26 @@
+From dc09e2e3a13295bf1f0a84dee33e67992f89440b Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ihsan at opencsw.org>
+Date: Mon, 8 Feb 2021 20:03:01 +0100
+Subject: [PATCH] Fix ifaddrs.h compile error for Solaris
+
+---
+ nsd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nsd.c b/nsd.c
+index e895146..9ed3fbd 100644
+--- a/nsd.c
++++ b/nsd.c
+@@ -41,7 +41,9 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#ifdef HAVE_IFADDRS_H
+ #include <ifaddrs.h>
++#endif
+ 
+ #include "nsd.h"
+ #include "options.h"
+-- 
+2.4.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.