Tue Dec 3 08:08:59 2019 UTC ()
Apply a fix from upstream:
  https://github.com/NLnetLabs/unbound/pull/122
which fixes
  https://github.com/NLnetLabs/unbound/issues/125

Briefly: TCP socket timeouts would effectively be disabled after
the exchange of the initial DNS query/response.

Bump PKGREVISION.


(he)
diff -r1.72 -r1.73 pkgsrc/net/unbound/Makefile
diff -r1.54 -r1.55 pkgsrc/net/unbound/distinfo
diff -r0 -r1.1 pkgsrc/net/unbound/patches/patch-util_netevent.c
cvs diff -r1.72 -r1.73 pkgsrc/net/unbound/Makefile (expand / switch to unified diff)

--- pkgsrc/net/unbound/Makefile 2019/11/19 10:10:44 1.72
+++ pkgsrc/net/unbound/Makefile 2019/12/03 08:08:58 1.73
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.72 2019/11/19 10:10:44 he Exp $ 1# $NetBSD: Makefile,v 1.73 2019/12/03 08:08:58 he Exp $
2 2
3DISTNAME= unbound-1.9.5 3DISTNAME= unbound-1.9.5
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://www.nlnetlabs.nl/downloads/unbound/ 6MASTER_SITES= http://www.nlnetlabs.nl/downloads/unbound/
6 7
7MAINTAINER= pettai@NetBSD.org 8MAINTAINER= pettai@NetBSD.org
8HOMEPAGE= http://www.unbound.net/ 9HOMEPAGE= http://www.unbound.net/
9COMMENT= DNS resolver and recursive server 10COMMENT= DNS resolver and recursive server
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12BUILD_DEFS+= VARBASE UNBOUND_USER UNBOUND_GROUP 13BUILD_DEFS+= VARBASE UNBOUND_USER UNBOUND_GROUP
13FILES_SUBST+= UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP} 14FILES_SUBST+= UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP}
14 15
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16CONFIGURE_ARGS+= --enable-allsymbols 17CONFIGURE_ARGS+= --enable-allsymbols
cvs diff -r1.54 -r1.55 pkgsrc/net/unbound/distinfo (expand / switch to unified diff)

--- pkgsrc/net/unbound/distinfo 2019/11/19 10:10:44 1.54
+++ pkgsrc/net/unbound/distinfo 2019/12/03 08:08:58 1.55
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.54 2019/11/19 10:10:44 he Exp $ 1$NetBSD: distinfo,v 1.55 2019/12/03 08:08:58 he Exp $
2 2
3SHA1 (unbound-1.9.5.tar.gz) = e5a417fe46e5f2911b91e5ec6bbedc2ed14d9d0b 3SHA1 (unbound-1.9.5.tar.gz) = e5a417fe46e5f2911b91e5ec6bbedc2ed14d9d0b
4RMD160 (unbound-1.9.5.tar.gz) = a49319ccc743709687792a57f1796acfa22e791e 4RMD160 (unbound-1.9.5.tar.gz) = a49319ccc743709687792a57f1796acfa22e791e
5SHA512 (unbound-1.9.5.tar.gz) = 0b198b49165b25c93899ca41fead67c479e5b6fd255f7e2af6930f4b9898c73d8a72caf376fce9a2a33199d0764db58388371c3fdbd442999ddfdb0b8b5394ea 5SHA512 (unbound-1.9.5.tar.gz) = 0b198b49165b25c93899ca41fead67c479e5b6fd255f7e2af6930f4b9898c73d8a72caf376fce9a2a33199d0764db58388371c3fdbd442999ddfdb0b8b5394ea
6Size (unbound-1.9.5.tar.gz) = 5686689 bytes 6Size (unbound-1.9.5.tar.gz) = 5686689 bytes
7SHA1 (patch-configure) = eabd0c478e92ebe37adf143849389e0e792dc77f 7SHA1 (patch-configure) = eabd0c478e92ebe37adf143849389e0e792dc77f
 8SHA1 (patch-util_netevent.c) = 3fba509f23d74fce18e45ffe1fcdb97ad609be46
File Added: pkgsrc/net/unbound/patches/Attic/patch-util_netevent.c
$NetBSD: patch-util_netevent.c,v 1.1 2019/12/03 08:08:58 he Exp $

Apply fix from
  https://github.com/NLnetLabs/unbound/pull/122
which fixes
  https://github.com/NLnetLabs/unbound/issues/125

Briefly: TCP socket timeouts would effectively be disabled after
the exchange of the initial DNS query/response.

--- util/netevent.c.orig	2019-11-19 06:51:50.000000000 +0000
+++ util/netevent.c
@@ -1001,7 +1001,7 @@ tcp_callback_writer(struct comm_point* c
 		tcp_req_info_handle_writedone(c->tcp_req_info);
 	} else {
 		comm_point_stop_listening(c);
-		comm_point_start_listening(c, -1, -1);
+		comm_point_start_listening(c, -1, c->tcp_timeout_msec);
 	}
 }