SF.net SVN: gar:[26755] csw/mgar/pkg/nsd/trunk
idogan23 at users.sourceforge.net
idogan23 at users.sourceforge.net
Wed Jun 2 10:53:56 CEST 2021
Revision: 26755
http://sourceforge.net/p/gar/code/26755
Author: idogan23
Date: 2021-06-02 08:53:55 +0000 (Wed, 02 Jun 2021)
Log Message:
-----------
nsd: Bump Version to 4.3.6 & remove not needed patches
Modified Paths:
--------------
csw/mgar/pkg/nsd/trunk/Makefile
csw/mgar/pkg/nsd/trunk/checksums
Removed 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
csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch
csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch
csw/mgar/pkg/nsd/trunk/files/0005-ifaddrs_nsd_c.patch
Modified: csw/mgar/pkg/nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nsd/trunk/Makefile 2021-05-26 08:44:31 UTC (rev 26754)
+++ csw/mgar/pkg/nsd/trunk/Makefile 2021-06-02 08:53:55 UTC (rev 26755)
@@ -1,5 +1,5 @@
NAME = nsd
-VERSION = 4.3.5
+VERSION = 4.3.6
GARTYPE = v2
DESCRIPTION = An authoritative only non-recursive name server
@@ -30,12 +30,6 @@
DISTFILES += cswusergroup
DISTFILES += cswnsd
-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
-PATCHFILES += 0005-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 }'
Modified: csw/mgar/pkg/nsd/trunk/checksums
===================================================================
--- csw/mgar/pkg/nsd/trunk/checksums 2021-05-26 08:44:31 UTC (rev 26754)
+++ csw/mgar/pkg/nsd/trunk/checksums 2021-06-02 08:53:55 UTC (rev 26755)
@@ -1 +1 @@
-d760bdbf752e01d9c59426693b26d30f nsd-4.3.5.tar.gz
+3f9d72d68b1df9e0648ae37715393b83 nsd-4.3.6.tar.gz
Deleted: 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 2021-05-26 08:44:31 UTC (rev 26754)
+++ csw/mgar/pkg/nsd/trunk/files/0001-Fix-AF_LOCAL_nsd_c.patch 2021-06-02 08:53:55 UTC (rev 26755)
@@ -1,27 +0,0 @@
-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
-
Deleted: 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 2021-05-26 08:44:31 UTC (rev 26754)
+++ csw/mgar/pkg/nsd/trunk/files/0002-Fix-AF_LOCAL_remote_c.patch 2021-06-02 08:53:55 UTC (rev 26755)
@@ -1,27 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch 2021-05-26 08:44:31 UTC (rev 26754)
+++ csw/mgar/pkg/nsd/trunk/files/0003-ifaddrs_configure_ac.patch 2021-06-02 08:53:55 UTC (rev 26755)
@@ -1,25 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch 2021-05-26 08:44:31 UTC (rev 26754)
+++ csw/mgar/pkg/nsd/trunk/files/0004-ifaddrs_nsd_c.patch 2021-06-02 08:53:55 UTC (rev 26755)
@@ -1,26 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/nsd/trunk/files/0005-ifaddrs_nsd_c.patch
===================================================================
--- csw/mgar/pkg/nsd/trunk/files/0005-ifaddrs_nsd_c.patch 2021-05-26 08:44:31 UTC (rev 26754)
+++ csw/mgar/pkg/nsd/trunk/files/0005-ifaddrs_nsd_c.patch 2021-06-02 08:53:55 UTC (rev 26755)
@@ -1,79 +0,0 @@
-From 140dfd990fa681777fc05596b9b4bee88ea0ed26 Mon Sep 17 00:00:00 2001
-From: Ihsan Dogan <ihsan at opencsw.org>
-Date: Tue, 9 Feb 2021 10:27:28 +0100
-Subject: [PATCH] Fix ifaddrs compile error
-
----
- nsd.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/nsd.c b/nsd.c
-index 9ed3fbd..cb4b037 100644
---- a/nsd.c
-+++ b/nsd.c
-@@ -467,6 +467,7 @@ figure_default_sockets(
- figure_socket_servers(&(*tcp)[i], NULL);
- }
-
-+#ifdef HAVE_GETIFADDRS
- static int
- find_device(
- struct nsd_socket *sock,
-@@ -515,6 +516,7 @@ find_device(
-
- return 0;
- }
-+#endif /* HAVE_GETIFADDRS */
-
- static void
- figure_sockets(
-@@ -526,7 +528,9 @@ figure_sockets(
- size_t i = 0;
- struct addrinfo ai = *hints;
- struct ip_address_option *ip;
-+#ifdef HAVE_GETIFADDRS
- struct ifaddrs *ifa = NULL;
-+#endif
- int bind_device = 0;
-
- if(!ips) {
-@@ -541,9 +545,11 @@ figure_sockets(
- bind_device |= (ip->dev != 0);
- }
-
-+#ifdef HAVE_GETIFADDRS
- if(bind_device && getifaddrs(&ifa) == -1) {
- error("getifaddrs failed: %s", strerror(errno));
- }
-+#endif
-
- *udp = xalloc_zero((*ifs + 1) * sizeof(struct nsd_socket));
- *tcp = xalloc_zero((*ifs + 1) * sizeof(struct nsd_socket));
-@@ -562,6 +568,7 @@ figure_sockets(
- (*udp)[i].fib = ip->fib;
- (*tcp)[i].fib = ip->fib;
- }
-+#ifdef HAVE_GETIFADDRS
- if(ip->dev != 0) {
- (*udp)[i].flags |= NSD_BIND_DEVICE;
- (*tcp)[i].flags |= NSD_BIND_DEVICE;
-@@ -572,13 +579,16 @@ figure_sockets(
- ip->address);
- }
- }
-+#endif
- }
-
- assert(i == *ifs);
-
-+#ifdef HAVE_GETIFADDRS
- if(ifa != NULL) {
- freeifaddrs(ifa);
- }
-+#endif
- }
-
- /* print server affinity for given socket. "*" if socket has no affinity with
---
-2.4.0
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list