CVS commit: pkgsrc/net/ldns

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

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Feb 13 14:59:15 UTC 2018

Modified Files:
        pkgsrc/net/ldns: Makefile distinfo
Added Files:
        pkgsrc/net/ldns/patches: patch-parse.c

Log Message:
Apply fix for CVE-2017-10002, via
https://git.nlnetlabs.nl/ldns/commit/?id=c8391790
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/ldns/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/ldns/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ldns/patches/patch-parse.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/ldns/Makefile
diff -u pkgsrc/net/ldns/Makefile:1.36 pkgsrc/net/ldns/Makefile:1.37
--- pkgsrc/net/ldns/Makefile:1.36       Sat Jul  9 06:38:42 2016
+++ pkgsrc/net/ldns/Makefile    Tue Feb 13 14:59:14 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2016/07/09 06:38:42 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2018/02/13 14:59:14 he Exp $
 
 DISTNAME=      ldns-1.6.17
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net
 MASTER_SITES=  http://www.nlnetlabs.nl/downloads/ldns/
 

Index: pkgsrc/net/ldns/distinfo
diff -u pkgsrc/net/ldns/distinfo:1.20 pkgsrc/net/ldns/distinfo:1.21
--- pkgsrc/net/ldns/distinfo:1.20       Wed Nov  4 00:35:08 2015
+++ pkgsrc/net/ldns/distinfo    Tue Feb 13 14:59:14 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2015/11/04 00:35:08 agc Exp $
+$NetBSD: distinfo,v 1.21 2018/02/13 14:59:14 he Exp $
 
 SHA1 (ldns-1.6.17.tar.gz) = 4218897b3c002aadfc7280b3f40cda829e05c9a4
 RMD160 (ldns-1.6.17.tar.gz) = 5382cfaafa7ec1fadcf390f804fbf14e04d7c03a
@@ -6,3 +6,4 @@ SHA512 (ldns-1.6.17.tar.gz) = 5de42b4b86
 Size (ldns-1.6.17.tar.gz) = 1315403 bytes
 SHA1 (patch-doc_doxyparse.pl) = 8d21d6f1c2e5e8d9ecc16a23dc7a462f0c54b5f7
 SHA1 (patch-examples_ldns-keygen.c) = 12ab1cb2c74f09d763969298a21c9470b748d292
+SHA1 (patch-parse.c) = 206e12c806854b652a799e98efd86c5e15f8024d

Added files:

Index: pkgsrc/net/ldns/patches/patch-parse.c
diff -u /dev/null pkgsrc/net/ldns/patches/patch-parse.c:1.1
--- /dev/null   Tue Feb 13 14:59:15 2018
+++ pkgsrc/net/ldns/patches/patch-parse.c       Tue Feb 13 14:59:15 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-parse.c,v 1.1 2018/02/13 14:59:15 he Exp $
+
+Apply fix for CVE-2017-10002, via
+https://git.nlnetlabs.nl/ldns/commit/?id=c8391790
+
+--- parse.c.orig       2014-01-10 21:04:41.000000000 +0000
++++ parse.c
+@@ -118,6 +118,10 @@ ldns_fget_token_l(FILE *f, char *token, 
+                       if (line_nr) {
+                               *line_nr = *line_nr + 1;
+                       }
++                      if (limit > 0 && (i >= limit || (size_t)(t-token) >= limit)) {
++                              *t = '\0';
++                              return -1;
++                      }
+                       *t++ = ' ';
+                       prev_c = c;
+                       continue;