CVS commit: pkgsrc/www/lynx

["Tim Zingelman" <tez%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tez
Date:           Fri Jun 15 22:24:39 UTC 2018

Modified Files:
        pkgsrc/www/lynx: Makefile distinfo
Added Files:
        pkgsrc/www/lynx/patches: patch-src_HTML.c

Log Message:
lynx: update to 2.8.8.2nb9

Patch for CVE-2017-1000211 from:
https://github.com/ThomasDickey/lynx-snapshots/commit/280a61b300a1614f6037efc0902ff7ecf17146e9?diff=unified


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 pkgsrc/www/lynx/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/lynx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/lynx/patches/patch-src_HTML.c

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

Modified files:

Index: pkgsrc/www/lynx/Makefile
diff -u pkgsrc/www/lynx/Makefile:1.130 pkgsrc/www/lynx/Makefile:1.131
--- pkgsrc/www/lynx/Makefile:1.130      Thu May 17 10:16:25 2018
+++ pkgsrc/www/lynx/Makefile    Fri Jun 15 22:24:38 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2018/05/17 10:16:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.131 2018/06/15 22:24:38 tez Exp $
 
 DISTNAME=      lynx2.8.8rel.2
 PKGNAME=       ${DISTNAME:S/lynx/lynx-/:S/rel//}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    www
 MASTER_SITES=  https://invisible-mirror.net/archives/lynx/tarballs/
 MASTER_SITES+= ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/

Index: pkgsrc/www/lynx/distinfo
diff -u pkgsrc/www/lynx/distinfo:1.37 pkgsrc/www/lynx/distinfo:1.38
--- pkgsrc/www/lynx/distinfo:1.37       Thu May 17 10:16:25 2018
+++ pkgsrc/www/lynx/distinfo    Fri Jun 15 22:24:38 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2018/05/17 10:16:25 jperkin Exp $
+$NetBSD: distinfo,v 1.38 2018/06/15 22:24:38 tez Exp $
 
 SHA1 (lynx2.8.8rel.2.tar.bz2) = 65bbf95627c88723bbb5880155e5fe01c2753d0c
 RMD160 (lynx2.8.8rel.2.tar.bz2) = a683f9c163a6c343bde53ffde99dbecce4e41b02
@@ -11,6 +11,7 @@ SHA1 (patch-WWW_Library_Implementation_H
 SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
 SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
 SHA1 (patch-af) = 31399c0c3394b90c0680708fff06f6f9e19674b3
+SHA1 (patch-src_HTML.c) = 466ad0025bed3f3868e23867a83df405f20b9576
 SHA1 (patch-src_LYCurses.c) = 66f416fd17cdb7a00beb4b850be711faf0afb605
 SHA1 (patch-src_LYStrings.c) = 7472abbb8dd864f9361b0371c5ceff9a1e257ed6
 SHA1 (patch-src_LYUtils.c) = fadef16c363b3e4327dd822f57b99274bcc6c6e3

Added files:

Index: pkgsrc/www/lynx/patches/patch-src_HTML.c
diff -u /dev/null pkgsrc/www/lynx/patches/patch-src_HTML.c:1.1
--- /dev/null   Fri Jun 15 22:24:39 2018
+++ pkgsrc/www/lynx/patches/patch-src_HTML.c    Fri Jun 15 22:24:39 2018
@@ -0,0 +1,73 @@
+$NetBSD: patch-src_HTML.c,v 1.1 2018/06/15 22:24:39 tez Exp $
+
+--- src/HTML.c.orig    2018-06-15 21:56:18.188943200 +0000
++++ src/HTML.c
+@@ -505,6 +505,8 @@ void HTML_put_character(HTStructured * m
+  */
+ void HTML_put_string(HTStructured * me, const char *s)
+ {
++    HTChunk *target = NULL;
++
+ #ifdef USE_PRETTYSRC
+     char *translated_string = NULL;
+ #endif
+@@ -525,15 +527,15 @@ void HTML_put_string(HTStructured * me,
+       break;                  /* Do Nothing */
+ 
+     case HTML_TITLE:
+-      HTChunkPuts(&me->title, s);
++      target = &me->title;
+       break;
+ 
+     case HTML_STYLE:
+-      HTChunkPuts(&me->style_block, s);
++      target = &me->style_block;
+       break;
+ 
+     case HTML_SCRIPT:
+-      HTChunkPuts(&me->script, s);
++      target = &me->script;
+       break;
+ 
+     case HTML_PRE:            /* Formatted text */
+@@ -547,20 +549,20 @@ void HTML_put_string(HTStructured * me,
+       break;
+ 
+     case HTML_OBJECT:
+-      HTChunkPuts(&me->object, s);
++      target = &me->object;
+       break;
+ 
+     case HTML_TEXTAREA:
+-      HTChunkPuts(&me->textarea, s);
++      target = &me->textarea;
+       break;
+ 
+     case HTML_SELECT:
+     case HTML_OPTION:
+-      HTChunkPuts(&me->option, s);
++      target = &me->option;
+       break;
+ 
+     case HTML_MATH:
+-      HTChunkPuts(&me->math, s);
++      target = &me->math;
+       break;
+ 
+     default:                  /* Free format text? */
+@@ -651,6 +653,15 @@ void HTML_put_string(HTStructured * me,
+           }                   /* for */
+       }
+     }                         /* end switch */
++
++    if (target != NULL) {
++      if (target->data == s) {
++          CTRACE((tfp, "BUG: appending chunk to itself: `%.*s'\n",
++                  target->size, target->data));
++      } else {
++          HTChunkPuts(target, s);
++      }
++    }
+ #ifdef USE_PRETTYSRC
+     if (psrc_convert_string) {
+       psrc_convert_string = FALSE;