[pkgsrc/trunk]: pkgsrc/net/bind99 bind99: Make ENOBUFS a soft error. Needed f...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9649350834ba
branches:  trunk
changeset: 311520:9649350834ba
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Aug 13 13:36:25 2018 +0000

description:
bind99: Make ENOBUFS a soft error. Needed for netbsd>=8.
See https://gitlab.isc.org/isc-projects/bind9/issues/462
bump PKGREVISION

diffstat:

 net/bind99/Makefile                            |   3 +-
 net/bind99/distinfo                            |   3 +-
 net/bind99/patches/patch-lib_isc_unix_socket.c |  33 ++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r 8c1aaab30522 -r 9649350834ba net/bind99/Makefile
--- a/net/bind99/Makefile       Mon Aug 13 13:09:38 2018 +0000
+++ b/net/bind99/Makefile       Mon Aug 13 13:36:25 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2018/08/09 14:51:24 taca Exp $
+# $NetBSD: Makefile,v 1.76 2018/08/13 13:36:25 maya Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
diff -r 8c1aaab30522 -r 9649350834ba net/bind99/distinfo
--- a/net/bind99/distinfo       Mon Aug 13 13:09:38 2018 +0000
+++ b/net/bind99/distinfo       Mon Aug 13 13:36:25 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2018/08/09 14:51:24 taca Exp $
+$NetBSD: distinfo,v 1.54 2018/08/13 13:36:25 maya Exp $
 
 SHA1 (bind-9.9.13-P1.tar.gz) = fdc8572a5bde8c25054924cacc8e21f342ff3231
 RMD160 (bind-9.9.13-P1.tar.gz) = 105a3364bd076d9ba59b64fc4571a397b0d4fa12
@@ -11,5 +11,6 @@
 SHA1 (patch-configure) = 1e86fab1a82f237dfc7f1a3c09e4ef6095bf973e
 SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f
 SHA1 (patch-lib_dns_rbt.c) = 267ecae3de33297b18faff46c9855c1ce64b4856
+SHA1 (patch-lib_isc_unix_socket.c) = 7d7db24573d3cca85370b99f3e0e7406bbcc9325
 SHA1 (patch-lib_lwres_getaddrinfo.c) = cda91b6d1afa02de2c59d51490090ef4ab7f1a41
 SHA1 (patch-lib_lwres_getnameinfo.c) = 7ded70795a9001cce5c8094ef3f70ac787a6d43d
diff -r 8c1aaab30522 -r 9649350834ba net/bind99/patches/patch-lib_isc_unix_socket.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/bind99/patches/patch-lib_isc_unix_socket.c    Mon Aug 13 13:36:25 2018 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-lib_isc_unix_socket.c,v 1.1 2018/08/13 13:36:25 maya Exp $
+
+Make ENOBUFS a soft error
+https://gitlab.isc.org/isc-projects/bind9/issues/462
+
+--- lib/isc/unix/socket.c.orig 2018-07-24 17:26:35.000000000 +0000
++++ lib/isc/unix/socket.c
+@@ -236,6 +236,7 @@ typedef enum { poll_idle, poll_active, p
+ #define SOFT_ERROR(e) ((e) == EAGAIN || \
+                        (e) == EWOULDBLOCK || \
+                        (e) == EINTR || \
++                       (e) == ENOBUFS || \
+                        (e) == 0)
+ 
+ #define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x)
+@@ -1743,7 +1744,7 @@ doio_recv(isc__socket_t *sock, isc_socke
+               SOFT_OR_HARD(EHOSTDOWN, ISC_R_HOSTDOWN);
+               /* HPUX 11.11 can return EADDRNOTAVAIL. */
+               SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
+-              ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
++              SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
+               /* Should never get this one but it was seen. */
+ #ifdef ENOPROTOOPT
+               SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH);
+@@ -1939,7 +1940,7 @@ doio_send(isc__socket_t *sock, isc_socke
+               ALWAYS_HARD(EHOSTDOWN, ISC_R_HOSTUNREACH);
+ #endif
+               ALWAYS_HARD(ENETUNREACH, ISC_R_NETUNREACH);
+-              ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
++              SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
+               ALWAYS_HARD(EPERM, ISC_R_HOSTUNREACH);
+               ALWAYS_HARD(EPIPE, ISC_R_NOTCONNECTED);
+               ALWAYS_HARD(ECONNRESET, ISC_R_CONNECTIONRESET);