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

[idogan23 at users.sourceforge.net]

Revision: 26731
          http://sourceforge.net/p/gar/code/26731
Author:   idogan23
Date:     2021-02-08 15:42:31 +0000 (Mon, 08 Feb 2021)
Log Message:
-----------
nsd: Solaris compatibilty fix. https://github.com/NLnetLabs/nsd/commit/58dddc3f99964d1d0b0bd6ee77b92b629dbad5fc

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

Added Paths:
-----------
    csw/mgar/pkg/nsd/trunk/files/0001-Fix-AF_LOCAL_nsd_c.patch
    csw/mgar/pkg/nsd/trunk/files/0002-Fix-AF_LOCAL_remote_c.patch

Modified: csw/mgar/pkg/nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nsd/trunk/Makefile	2021-02-08 14:49:20 UTC (rev 26730)
+++ csw/mgar/pkg/nsd/trunk/Makefile	2021-02-08 15:42:31 UTC (rev 26731)
@@ -30,6 +30,9 @@
 DISTFILES += cswusergroup
 DISTFILES += cswnsd
 
+PATCHFILES += 0001-Fix-AF_LOCAL_nsd_c.patch
+PATCHFILES += 0002-Fix-AF_LOCAL_remote_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/0001-Fix-AF_LOCAL_nsd_c.patch
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/0001-Fix-AF_LOCAL_nsd_c.patch	                        (rev 0)
+++ csw/mgar/pkg/nsd/trunk/files/0001-Fix-AF_LOCAL_nsd_c.patch	2021-02-08 15:42:31 UTC (rev 26731)
@@ -0,0 +1,27 @@
+From 0f8e9d9326f653be69dfaaae12a0571bf9f83e66 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ihsan at opencsw.org>
+Date: Mon, 8 Feb 2021 15:51:41 +0100
+Subject: [PATCH] Fix AF_LOCAL compile error for Solaris
+ https://github.com/NLnetLabs/nsd/commit/58dddc3f99964d1d0b0bd6ee77b92b629dbad5fc
+
+---
+ nsd-control.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/nsd-control.c b/nsd-control.c
+index 5a5f476..cb77dd0 100644
+--- a/nsd-control.c
++++ b/nsd-control.c
+@@ -60,6 +60,9 @@
+ #include <sys/un.h>
+ #endif
+ #include <fcntl.h>
++#ifndef AF_LOCAL
++#define AF_LOCAL AF_UNIX
++#endif
+ #include "util.h"
+ #include "tsig.h"
+ #include "options.h"
+-- 
+2.4.0
+

Added: csw/mgar/pkg/nsd/trunk/files/0002-Fix-AF_LOCAL_remote_c.patch
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/0002-Fix-AF_LOCAL_remote_c.patch	                        (rev 0)
+++ csw/mgar/pkg/nsd/trunk/files/0002-Fix-AF_LOCAL_remote_c.patch	2021-02-08 15:42:31 UTC (rev 26731)
@@ -0,0 +1,27 @@
+From b4e499f649ffc7359a0b617b35ed43212e8acbe0 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ihsan at opencsw.org>
+Date: Mon, 8 Feb 2021 15:57:04 +0100
+Subject: [PATCH] Fix AF_LOCAL compile error for Solaris
+ https://github.com/NLnetLabs/nsd/commit/58dddc3f99964d1d0b0bd6ee77b92b629dbad5fc
+
+---
+ remote.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/remote.c b/remote.c
+index 8774424..139ad4d 100644
+--- a/remote.c
++++ b/remote.c
+@@ -91,6 +91,9 @@
+ #ifdef HAVE_SYS_UN_H
+ #  include <sys/un.h>
+ #endif
++#ifndef AF_LOCAL
++#define AF_LOCAL AF_UNIX
++#endif
+ 
+ /** number of seconds timeout on incoming remote control handshake */
+ #define REMOTE_CONTROL_TCP_TIMEOUT 120
+-- 
+2.4.0
+

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