Update w3m and w3m-img to 0.5.3. Some pkglint cleanup and DESCR

rewording while here.

XXX: I don't see what w3m-img does differently?

Changes:

w3m 0.5.3 - 2011-01-15

* security fix
 - fix vulnerabilities indicated by bugs.debian.org.
 - suppress sending Referer, if https:// -> http://
* new features
 - adapt w3mimg to native windows on MS Windows.
 - support xterm-incompatible terminals without gpm.
 - add "xhtml" to default guess.
 - introduce option pseudo_inlines.
 - add option to avoid "wrong number of dots" error in cookies.
* other bug fixes
 - fix "important" bugs from bugs.debian.org
 - preserve spaces in multibyte context.
 - fix proxy authentication.

9 files changed, 58 insertions, 155 deletions

diff --git a/www/w3m-img/DESCR b/www/w3m-img/DESCR
index fb816bfadfc..806ab6819b5 100644
--- a/www/w3m-img/DESCR
+++ b/www/w3m-img/DESCR
@@ -1,22 +1,4 @@
-W3m is a terminal-based WWW browser which supports HTML tables and frames.
-It's small, so faster than other WWW browsers.  It also supports following
-URL by clicking mouse button on the anchor in xterm and its variants from
-990526 version.  Additionally, this package enables inline-image support
-which is added in version 0.3.
+w3m is a pager and/or text-based browser. It can handle table,
+cookies, authentication, and almost everything except JavaScript.
 
-It uses Boehm-GC to implement the table/frame parser.
-
-Quoted from README.m17n:
-
-Multilingualization of w3m
-                                                              2002/02/16
-                                                              H. Sakamoto
-Introduction
-  I have tried the multilingualization of w3m (w3m-m17n).
-  The patch for w3m-0.2.1 is available on the following site.
-
-    http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n
-                                          patch/w3m-0.3-m17n-20020316.tar.gz
-                                          patch/README.m17n
-  It is a development version. And enough test is not preformed because
-  I can understand Japanese only. Please use, test, and report bugs.
+Additionally, this package enables inline-image support.
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index ad6e2aa0a49..4b7f678666a 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2010/07/01 18:50:15 tron Exp $
+# $NetBSD: Makefile,v 1.21 2011/01/21 23:34:14 wiz Exp $
 
 PKGNAME=	w3m-img-${W3M_VERS}
-PKGREVISION=	5
 COMMENT=	Multilingualized version of a pager/text-based browser w3m with inline image support
 
 CONFLICTS+=	w3m-[0-9]*
diff --git a/www/w3m/DESCR b/www/w3m/DESCR
index f64a9cab39e..99cdd82e7c7 100644
--- a/www/w3m/DESCR
+++ b/www/w3m/DESCR
@@ -1,24 +1,2 @@
-W3m is a terminal-based WWW browser which supports HTML tables and frames.
-It's small, so faster than other WWW browsers.  It also supports following
-URL by clicking mouse button on the anchor in xterm and its variants from
-990526 version.
-
-It uses Boehm-GC to implement the table/frame parser.
-
-Quoted from README.m17n:
-
-Muntilingualizaion of w3m
-                                                              2002/02/16
-                                                              H. Sakamoto
-
-Introduction
-
-  I have tried the muntilingualization of w3m (w3m-m17n).
-  The patch for w3m-0.2.1 is available on the following site.
-
-    http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n
-                                          patch/w3m-0.3-m17n-20020316.tar.gz
-                                          patch/README.m17n
-
-  It is a development version. And enough test is not preformed because
-  I can understand Japanese only. Please use, test, and report bugs.
+w3m is a pager and/or text-based browser. It can handle table,
+cookies, authentication, and almost everything except JavaScript.
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 9499696c602..dad127a6d5c 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2010/07/01 18:50:14 tron Exp $
+# $NetBSD: Makefile,v 1.59 2011/01/21 23:34:13 wiz Exp $
 
 PKGNAME=	w3m-${W3M_VERS}
-PKGREVISION=	5
 COMMENT=	Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=	w3m-img-[0-9]*
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 5e278c67110..5bc8759643a 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.common,v 1.55 2009/09/02 08:34:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.56 2011/01/21 23:34:13 wiz Exp $
 #
+# used by www/w3m/Makefile
+# used by www/w3m-img/Makefile
 
 DISTNAME=	w3m-${W3M_VERS}
 CATEGORIES=	www
@@ -13,11 +15,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake	# Needed for some combinations of options...
 USE_TOOLS+=	msgfmt
 USE_PKGLOCALEDIR=       yes
 
-W3M_VERS=	0.5.2
+W3M_VERS=	0.5.3
 
 # For w3mman, xface2xpm, cgi scripts.
 USE_TOOLS+=	perl:run pax
@@ -57,9 +60,9 @@ SUBST_FILES.man-ja=	Makefile.in config.h.dist
 SUBST_SED.man-ja=	-e 's|/ja/|/ja_JP.eucJP/|g'
 
 post-extract:
-	@cd ${WRKSRC}/doc; ${RM} -fr CVS
-	@cd ${WRKSRC}/doc-jp; ${RM} -fr CVS
-	@cd ${WRKSRC}; ${RM} -fr gc
+	cd ${WRKSRC}/doc; ${RM} -fr CVS
+	cd ${WRKSRC}/doc-jp; ${RM} -fr CVS
+	cd ${WRKSRC}; ${RM} -fr gc
 
 INSTALLATION_DIRS+=	${DOCDIR}
 
@@ -67,7 +70,7 @@ INSTALL_TARGET=		install install-helpfile
 
 post-install:
 	# Use pax to discard uid/gid.  Exclude manuals (*.1).
-	@cd ${WRKSRC}; pax -w -s ',.*\.1$$,,' doc doc-jp | \
+	cd ${WRKSRC}; pax -w -s ',.*\.1$$,,' doc doc-jp | \
 	    ( cd ${DESTDIR}${PREFIX}/${DOCDIR}; pax -r )
 
 .include "../../devel/boehm-gc/buildlink3.mk"
diff --git a/www/w3m/PLIST b/www/w3m/PLIST
index 178fb5f4e7e..c456352852e 100644
--- a/www/w3m/PLIST
+++ b/www/w3m/PLIST
@@ -1,28 +1,19 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 22:00:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/01/21 23:34:13 wiz Exp $
 bin/w3m
 bin/w3mman
+libexec/w3m/cgi-bin/dirlist.cgi
+libexec/w3m/cgi-bin/multipart.cgi
+libexec/w3m/cgi-bin/w3mbookmark
+libexec/w3m/cgi-bin/w3mhelp.cgi
+libexec/w3m/cgi-bin/w3mhelperpanel
+${PLIST.image}libexec/w3m/w3mimgdisplay
+libexec/w3m/cgi-bin/w3mmail.cgi
+libexec/w3m/cgi-bin/w3mman2html.cgi
+libexec/w3m/inflate
+libexec/w3m/xface2xpm
+man/ja_JP.eucJP/man1/w3m.1
 man/man1/w3m.1
 man/man1/w3mman.1
-man/ja_JP.eucJP/man1/w3m.1
-@comment share/doc/w3m/doc
-share/doc/w3m/doc/FAQ.html
-share/doc/w3m/doc/HISTORY
-share/doc/w3m/doc/MANUAL.html
-share/doc/w3m/doc/README
-share/doc/w3m/doc/README.cygwin
-share/doc/w3m/doc/README.dict
-share/doc/w3m/doc/README.func
-share/doc/w3m/doc/README.img
-share/doc/w3m/doc/README.m17n
-share/doc/w3m/doc/README.mouse
-share/doc/w3m/doc/README.pre_form
-share/doc/w3m/doc/README.tab
-share/doc/w3m/doc/STORY.html
-share/doc/w3m/doc/keymap.default
-share/doc/w3m/doc/keymap.lynx
-share/doc/w3m/doc/menu.default
-share/doc/w3m/doc/menu.submenu
-@comment share/doc/w3m/doc-jp
 share/doc/w3m/doc-jp/FAQ.html
 share/doc/w3m/doc-jp/HISTORY
 share/doc/w3m/doc-jp/MANUAL.html
@@ -39,6 +30,7 @@ share/doc/w3m/doc-jp/README.mailcap
 share/doc/w3m/doc-jp/README.menu
 share/doc/w3m/doc-jp/README.migemo
 share/doc/w3m/doc-jp/README.mouse
+share/doc/w3m/doc-jp/README.passwd
 share/doc/w3m/doc-jp/README.pre_form
 share/doc/w3m/doc-jp/README.tab
 share/doc/w3m/doc-jp/STORY.html
@@ -46,6 +38,25 @@ share/doc/w3m/doc-jp/keymap.default
 share/doc/w3m/doc-jp/keymap.lynx
 share/doc/w3m/doc-jp/menu.default
 share/doc/w3m/doc-jp/menu.submenu
+share/doc/w3m/doc/FAQ.html
+share/doc/w3m/doc/HISTORY
+share/doc/w3m/doc/MANUAL.html
+share/doc/w3m/doc/README
+share/doc/w3m/doc/README.cookie
+share/doc/w3m/doc/README.cygwin
+share/doc/w3m/doc/README.dict
+share/doc/w3m/doc/README.func
+share/doc/w3m/doc/README.img
+share/doc/w3m/doc/README.m17n
+share/doc/w3m/doc/README.mouse
+share/doc/w3m/doc/README.passwd
+share/doc/w3m/doc/README.pre_form
+share/doc/w3m/doc/README.tab
+share/doc/w3m/doc/STORY.html
+share/doc/w3m/doc/keymap.default
+share/doc/w3m/doc/keymap.lynx
+share/doc/w3m/doc/menu.default
+share/doc/w3m/doc/menu.submenu
 share/locale/ja/LC_MESSAGES/w3m.mo
 share/w3m/w3mhelp-funcdesc.en.pl
 share/w3m/w3mhelp-funcdesc.ja.pl
@@ -55,13 +66,3 @@ share/w3m/w3mhelp-lynx_ja.html
 share/w3m/w3mhelp-w3m_en.html
 share/w3m/w3mhelp-w3m_ja.html
 share/w3m/w3mhelp.html
-libexec/w3m/inflate
-${PLIST.image}libexec/w3m/w3mimgdisplay
-libexec/w3m/cgi-bin/dirlist.cgi
-libexec/w3m/cgi-bin/multipart.cgi
-libexec/w3m/cgi-bin/w3mbookmark
-libexec/w3m/cgi-bin/w3mhelp.cgi
-libexec/w3m/cgi-bin/w3mhelperpanel
-libexec/w3m/cgi-bin/w3mmail.cgi
-libexec/w3m/cgi-bin/w3mman2html.cgi
-libexec/w3m/xface2xpm
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index f89d4bc45f0..43db534e0d4 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.21 2010/07/01 18:50:14 tron Exp $
+$NetBSD: distinfo,v 1.22 2011/01/21 23:34:13 wiz Exp $
 
-SHA1 (w3m-0.5.2.tar.gz) = 484522547ae6dbb342d3858a2a53a65451e273f9
-RMD160 (w3m-0.5.2.tar.gz) = 09ce72d8ef5e621a2e49496b63e22f2773edbe79
-Size (w3m-0.5.2.tar.gz) = 1906812 bytes
+SHA1 (w3m-0.5.3.tar.gz) = 444b6c8cf7094ee95f8e9de96b37f814b9d83237
+RMD160 (w3m-0.5.3.tar.gz) = 6a0153bc53f7c107c700404262ce1b4d02e6dd91
+Size (w3m-0.5.3.tar.gz) = 2202328 bytes
 SHA1 (patch-aa) = 2de78a6db9bd483416895b393935ccadab879932
 SHA1 (patch-ab) = 2d60d7a2946f13a185591c0b927cf0f8b5ea351b
-SHA1 (patch-ac) = 800d4b8c2ed93ccaa000564366ad07fabcc5bdc2
-SHA1 (patch-ad) = 7a11f6f97fb5d01a420c95bcd03e577ffd3a241f
+SHA1 (patch-ac) = 37c6c78a208c50876641aa90164cc46106403260
 SHA1 (patch-ak) = ac0ee99d5ab49c431cfa496d0d2d509efd6b06fa
diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac
index 72bd7607ffa..d201243cc0c 100644
--- a/www/w3m/patches/patch-ac
+++ b/www/w3m/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.14 2010/07/01 18:50:15 tron Exp $
+$NetBSD: patch-ac,v 1.15 2011/01/21 23:34:14 wiz Exp $
 
 Fix for CVE-2010-2074 taken from here:
 
 http://www.openwall.com/lists/oss-security/2010/06/14/4
 
---- fm.h.orig	2007-05-30 05:47:24.000000000 +0100
-+++ fm.h	2010-07-01 19:26:27.000000000 +0100
-@@ -1119,7 +1119,7 @@
+--- fm.h.orig	2011-01-04 09:22:21.000000000 +0000
++++ fm.h
+@@ -1135,7 +1135,7 @@ global int view_unseenobject init(TRUE);
  #endif
  
  #if defined(USE_SSL) && defined(USE_SSL_VERIFY)
@@ -15,7 +15,7 @@ http://www.openwall.com/lists/oss-security/2010/06/14/4
  global char *ssl_cert_file init(NULL);
  global char *ssl_key_file init(NULL);
  global char *ssl_ca_path init(NULL);
-@@ -1128,7 +1128,7 @@
+@@ -1144,7 +1144,7 @@ global int ssl_path_modified init(FALSE)
  #endif				/* defined(USE_SSL) &&
  				 * defined(USE_SSL_VERIFY) */
  #ifdef USE_SSL
diff --git a/www/w3m/patches/patch-ad b/www/w3m/patches/patch-ad
deleted file mode 100644
index f07418010e9..00000000000
--- a/www/w3m/patches/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2010/07/01 18:50:15 tron Exp $
-
-Fix for CVE-2010-2074 taken from here:
-
-http://www.openwall.com/lists/oss-security/2010/06/14/4
-
---- istream.c.orig	2007-05-23 16:06:05.000000000 +0100
-+++ istream.c	2010-07-01 19:31:00.000000000 +0100
-@@ -447,8 +447,17 @@
- 
- 		    if (!seen_dnsname)
- 			seen_dnsname = Strnew();
-+		    /* replace \0 to make full string visible to user */
-+		    if (sl != strlen(sn)) {
-+			int i;
-+			for (i = 0; i < sl; ++i) {
-+			    if (!sn[i])
-+				sn[i] = '!';
-+			}
-+		    }
- 		    Strcat_m_charp(seen_dnsname, sn, " ", NULL);
--		    if (ssl_match_cert_ident(sn, sl, hostname))
-+		    if (sl == strlen(sn) /* catch \0 in SAN */
-+			&& ssl_match_cert_ident(sn, sl, hostname))
- 			break;
- 		}
- 	    }
-@@ -466,16 +475,27 @@
-     if (match_ident == FALSE && ret == NULL) {
- 	X509_NAME *xn;
- 	char buf[2048];
-+	int slen;
- 
- 	xn = X509_get_subject_name(x);
- 
--	if (X509_NAME_get_text_by_NID(xn, NID_commonName,
--				      buf, sizeof(buf)) == -1)
-+	slen = X509_NAME_get_text_by_NID(xn, NID_commonName, buf, sizeof(buf));
-+	if ( slen == -1)
- 	    /* FIXME: gettextize? */
- 	    ret = Strnew_charp("Unable to get common name from peer cert");
--	else if (!ssl_match_cert_ident(buf, strlen(buf), hostname))
-+	else if (slen != strlen(buf)
-+		|| !ssl_match_cert_ident(buf, strlen(buf), hostname)) {
-+	    /* replace \0 to make full string visible to user */
-+	    if (slen != strlen(buf)) {
-+		int i;
-+		for (i = 0; i < slen; ++i) {
-+		    if (!buf[i])
-+			buf[i] = '!';
-+		}
-+	    }
- 	    /* FIXME: gettextize? */
- 	    ret = Sprintf("Bad cert ident %s from %s", buf, hostname);
-+	}
- 	else
- 	    match_ident = TRUE;
-     }