CVS commit: pkgsrc/net/unbound

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Dec  3 08:08:59 UTC 2019

Modified Files:
        pkgsrc/net/unbound: Makefile distinfo
Added Files:
        pkgsrc/net/unbound/patches: patch-util_netevent.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/net/unbound/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/unbound/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unbound/patches/patch-util_netevent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/unbound/Makefile
diff -u pkgsrc/net/unbound/Makefile:1.72 pkgsrc/net/unbound/Makefile:1.73
--- pkgsrc/net/unbound/Makefile:1.72    Tue Nov 19 10:10:44 2019
+++ pkgsrc/net/unbound/Makefile Tue Dec  3 08:08:58 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2019/11/19 10:10:44 he Exp $
+# $NetBSD: Makefile,v 1.73 2019/12/03 08:08:58 he Exp $
 
 DISTNAME=      unbound-1.9.5
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://www.nlnetlabs.nl/downloads/unbound/
 

Index: pkgsrc/net/unbound/distinfo
diff -u pkgsrc/net/unbound/distinfo:1.54 pkgsrc/net/unbound/distinfo:1.55
--- pkgsrc/net/unbound/distinfo:1.54    Tue Nov 19 10:10:44 2019
+++ pkgsrc/net/unbound/distinfo Tue Dec  3 08:08:58 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.54 2019/11/19 10:10:44 he Exp $
+$NetBSD: distinfo,v 1.55 2019/12/03 08:08:58 he Exp $
 
 SHA1 (unbound-1.9.5.tar.gz) = e5a417fe46e5f2911b91e5ec6bbedc2ed14d9d0b
 RMD160 (unbound-1.9.5.tar.gz) = a49319ccc743709687792a57f1796acfa22e791e
 SHA512 (unbound-1.9.5.tar.gz) = 0b198b49165b25c93899ca41fead67c479e5b6fd255f7e2af6930f4b9898c73d8a72caf376fce9a2a33199d0764db58388371c3fdbd442999ddfdb0b8b5394ea
 Size (unbound-1.9.5.tar.gz) = 5686689 bytes
 SHA1 (patch-configure) = eabd0c478e92ebe37adf143849389e0e792dc77f
+SHA1 (patch-util_netevent.c) = 3fba509f23d74fce18e45ffe1fcdb97ad609be46

Added files:

Index: pkgsrc/net/unbound/patches/patch-util_netevent.c
diff -u /dev/null pkgsrc/net/unbound/patches/patch-util_netevent.c:1.1
--- /dev/null   Tue Dec  3 08:08:59 2019
+++ pkgsrc/net/unbound/patches/patch-util_netevent.c    Tue Dec  3 08:08:58 2019
@@ -0,0 +1,21 @@
+$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);
+       }
+ }
+