CVS commit: pkgsrc/www/lynx

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Thu Dec 22 17:30:52 UTC 2016

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/www/lynx/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/lynx/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTCP.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.123 pkgsrc/www/lynx/Makefile:1.124
--- pkgsrc/www/lynx/Makefile:1.123      Wed Dec 21 11:25:25 2016
+++ pkgsrc/www/lynx/Makefile    Thu Dec 22 17:30:51 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.123 2016/12/21 11:25:25 sevan Exp $
+# $NetBSD: Makefile,v 1.124 2016/12/22 17:30:51 sevan Exp $
 
 DISTNAME=      lynx2.8.8rel.2
 PKGNAME=       ${DISTNAME:S/lynx/lynx-/:S/rel//}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    www
 MASTER_SITES=  http://lynx.isc.org/${SUBDIR:Q}/ \
                ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/

Index: pkgsrc/www/lynx/distinfo
diff -u pkgsrc/www/lynx/distinfo:1.34 pkgsrc/www/lynx/distinfo:1.35
--- pkgsrc/www/lynx/distinfo:1.34       Wed Dec 21 11:25:25 2016
+++ pkgsrc/www/lynx/distinfo    Thu Dec 22 17:30:51 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.34 2016/12/21 11:25:25 sevan Exp $
+$NetBSD: distinfo,v 1.35 2016/12/22 17:30:51 sevan Exp $
 
 SHA1 (lynx2.8.8rel.2.tar.bz2) = 65bbf95627c88723bbb5880155e5fe01c2753d0c
 RMD160 (lynx2.8.8rel.2.tar.bz2) = a683f9c163a6c343bde53ffde99dbecce4e41b02
 SHA512 (lynx2.8.8rel.2.tar.bz2) = a475fb7b79641ddd7c20861e16d3d71ccb1a5ae33247cce0b9e73690dd664ebf129964c026bc33b0f082a7585e5a6acae9afc9a65f308e19b49fa0a8bebc0362
 Size (lynx2.8.8rel.2.tar.bz2) = 2587120 bytes
-SHA1 (patch-WWW_Library_Implementation_HTTCP.c) = 41bfcf7a2bee2d53cd811a710f782d108429c9f0
+SHA1 (patch-WWW_Library_Implementation_HTTCP.c) = 7449ad250c5971483aba8bd3c233080deafe7837
 SHA1 (patch-WWW_Library_Implementation_HTTP.c) = 3249d46c1494f7913da71c8d1f689d9f3523d0f3
 SHA1 (patch-WWW_Library_Implementation_HTTP.h) = 4ad3a9cf309c7ef32d0a53df6f5840ed57c25a31
 SHA1 (patch-WWW_Library_Implementation_HTUTILS.h) = 654c4bd1be5e2d8c74efb44e2a5e996957bf7622

Index: pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTCP.c
diff -u pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTCP.c:1.1 pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTCP.c:1.2
--- pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTCP.c:1.1        Wed Dec 21 11:25:25 2016
+++ pkgsrc/www/lynx/patches/patch-WWW_Library_Implementation_HTTCP.c    Thu Dec 22 17:30:51 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-WWW_Library_Implementation_HTTCP.c,v 1.1 2016/12/21 11:25:25 sevan Exp $
+$NetBSD: patch-WWW_Library_Implementation_HTTCP.c,v 1.2 2016/12/22 17:30:51 sevan Exp $
 
 Fix CVE-2016-9179
 https://hg.java.net/hg/solaris-userland~gate/file/0a979060f73b/components/lynx/patches/05-fix-CVE-2016-9179.patch
@@ -13,7 +13,7 @@ https://hg.java.net/hg/solaris-userland~
      char *host = NULL;
  
  #ifdef INET6
-@@ -1814,14 +1813,7 @@ int HTDoConnect(const char *url,
+@@ -1814,14 +1813,8 @@ int HTDoConnect(const char *url,
       * Get node name and optional port number.
       */
      p1 = HTParse(url, "", PARSE_HOST);
@@ -23,7 +23,7 @@ https://hg.java.net/hg/solaris-userland~
 -       */
 -      StrAllocCopy(host, (at_sign + 1));
 -    } else {
--      StrAllocCopy(host, p1);
+       StrAllocCopy(host, p1);
 -    }
 +    strip_userid(host, FALSE);
      FREE(p1);