Thu Dec 22 17:30:52 2016 UTC ()
Fix broken patch committed previously which resulted in lynx crashing.
Bump rev again.

Apologies to anyone caught out by this mistake.
Heads up by alnsn@


(sevan)
diff -r1.123 -r1.124 pkgsrc/www/lynx/Makefile
diff -r1.34 -r1.35 pkgsrc/www/lynx/distinfo
diff -r1.1 -r1.2 pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTCP.c
cvs diff -r1.123 -r1.124 pkgsrc/www/lynx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/lynx/Makefile 2016/12/21 11:25:25 1.123
+++ pkgsrc/www/lynx/Makefile 2016/12/22 17:30:51 1.124
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.123 2016/12/21 11:25:25 sevan Exp $ 1# $NetBSD: Makefile,v 1.124 2016/12/22 17:30:51 sevan Exp $
2 2
3DISTNAME= lynx2.8.8rel.2 3DISTNAME= lynx2.8.8rel.2
4PKGNAME= ${DISTNAME:S/lynx/lynx-/:S/rel//} 4PKGNAME= ${DISTNAME:S/lynx/lynx-/:S/rel//}
5PKGREVISION= 5 5PKGREVISION= 6
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://lynx.isc.org/${SUBDIR:Q}/ \ 7MASTER_SITES= http://lynx.isc.org/${SUBDIR:Q}/ \
8 ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/ 8 ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://lynx.isc.org/ 12HOMEPAGE= http://lynx.isc.org/
13COMMENT= Alphanumeric display oriented World-Wide Web Client 13COMMENT= Alphanumeric display oriented World-Wide Web Client
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16# problem with WWW/Library/Implementation 16# problem with WWW/Library/Implementation
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
cvs diff -r1.34 -r1.35 pkgsrc/www/lynx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/lynx/distinfo 2016/12/21 11:25:25 1.34
+++ pkgsrc/www/lynx/distinfo 2016/12/22 17:30:51 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.34 2016/12/21 11:25:25 sevan Exp $ 1$NetBSD: distinfo,v 1.35 2016/12/22 17:30:51 sevan Exp $
2 2
3SHA1 (lynx2.8.8rel.2.tar.bz2) = 65bbf95627c88723bbb5880155e5fe01c2753d0c 3SHA1 (lynx2.8.8rel.2.tar.bz2) = 65bbf95627c88723bbb5880155e5fe01c2753d0c
4RMD160 (lynx2.8.8rel.2.tar.bz2) = a683f9c163a6c343bde53ffde99dbecce4e41b02 4RMD160 (lynx2.8.8rel.2.tar.bz2) = a683f9c163a6c343bde53ffde99dbecce4e41b02
5SHA512 (lynx2.8.8rel.2.tar.bz2) = a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362 5SHA512 (lynx2.8.8rel.2.tar.bz2) = a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362
6Size (lynx2.8.8rel.2.tar.bz2) = 2587120 bytes 6Size (lynx2.8.8rel.2.tar.bz2) = 2587120 bytes
7SHA1 (patch-WWW_Library_Implementation_HTTCP.c) = 41bfcf7a2bee2d53cd811a710f782d108429c9f0 7SHA1 (patch-WWW_Library_Implementation_HTTCP.c) = 7449ad250c5971483aba8bd3c233080deafe7837
8SHA1 (patch-WWW_Library_Implementation_HTTP.c) = 3249d46c1494f7913da71c8d1f689d9f3523d0f3 8SHA1 (patch-WWW_Library_Implementation_HTTP.c) = 3249d46c1494f7913da71c8d1f689d9f3523d0f3
9SHA1 (patch-WWW_Library_Implementation_HTTP.h) = 4ad3a9cf309c7ef32d0a53df6f5840ed57c25a31 9SHA1 (patch-WWW_Library_Implementation_HTTP.h) = 4ad3a9cf309c7ef32d0a53df6f5840ed57c25a31
10SHA1 (patch-WWW_Library_Implementation_HTUTILS.h) = 654c4bd1be5e2d8c74efb44e2a5e996957bf7622 10SHA1 (patch-WWW_Library_Implementation_HTUTILS.h) = 654c4bd1be5e2d8c74efb44e2a5e996957bf7622
11SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9 11SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
12SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a 12SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
13SHA1 (patch-af) = 31399c0c3394b90c0680708fff06f6f9e19674b3 13SHA1 (patch-af) = 31399c0c3394b90c0680708fff06f6f9e19674b3
14SHA1 (patch-src_LYUtils.c) = fadef16c363b3e4327dd822f57b99274bcc6c6e3 14SHA1 (patch-src_LYUtils.c) = fadef16c363b3e4327dd822f57b99274bcc6c6e3
cvs diff -r1.1 -r1.2 pkgsrc/www/lynx/patches/Attic/patch-WWW_Library_Implementation_HTTCP.c (expand / switch to unified diff)

--- pkgsrc/www/lynx/patches/Attic/patch-WWW_Library_Implementation_HTTCP.c 2016/12/21 11:25:25 1.1
+++ pkgsrc/www/lynx/patches/Attic/patch-WWW_Library_Implementation_HTTCP.c 2016/12/22 17:30:51 1.2
@@ -3,29 +3,29 @@ $NetBSD$ @@ -3,29 +3,29 @@ $NetBSD$
3Fix CVE-2016-9179 3Fix CVE-2016-9179
4https://hg.java.net/hg/solaris-userland~gate/file/0a979060f73b/components/lynx/patches/05-fix-CVE-2016-9179.patch 4https://hg.java.net/hg/solaris-userland~gate/file/0a979060f73b/components/lynx/patches/05-fix-CVE-2016-9179.patch
5 5
6--- WWW/Library/Implementation/HTTCP.c.orig 2016-12-21 10:03:58.000000000 +0000 6--- WWW/Library/Implementation/HTTCP.c.orig 2016-12-21 10:03:58.000000000 +0000
7+++ WWW/Library/Implementation/HTTCP.c 7+++ WWW/Library/Implementation/HTTCP.c
8@@ -1792,7 +1792,6 @@ int HTDoConnect(const char *url, 8@@ -1792,7 +1792,6 @@ int HTDoConnect(const char *url,
9 int status = 0; 9 int status = 0;
10 char *line = NULL; 10 char *line = NULL;
11 char *p1 = NULL; 11 char *p1 = NULL;
12- char *at_sign = NULL; 12- char *at_sign = NULL;
13 char *host = NULL; 13 char *host = NULL;
14  14
15 #ifdef INET6 15 #ifdef INET6
16@@ -1814,14 +1813,7 @@ int HTDoConnect(const char *url, 16@@ -1814,14 +1813,8 @@ int HTDoConnect(const char *url,
17 * Get node name and optional port number. 17 * Get node name and optional port number.
18 */ 18 */
19 p1 = HTParse(url, "", PARSE_HOST); 19 p1 = HTParse(url, "", PARSE_HOST);
20- if ((at_sign = StrChr(p1, '@')) != NULL) { 20- if ((at_sign = StrChr(p1, '@')) != NULL) {
21- /* 21- /*
22- * If there's an @ then use the stuff after it as a hostname. 22- * If there's an @ then use the stuff after it as a hostname.
23- */ 23- */
24- StrAllocCopy(host, (at_sign + 1)); 24- StrAllocCopy(host, (at_sign + 1));
25- } else { 25- } else {
26- StrAllocCopy(host, p1); 26 StrAllocCopy(host, p1);
27- } 27- }
28+ strip_userid(host, FALSE); 28+ strip_userid(host, FALSE);
29 FREE(p1); 29 FREE(p1);
30  30
31 HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host); 31 HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host);