Fri Jan 21 23:34:14 2011 UTC ()
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.


(wiz)
diff -r1.5 -r1.6 pkgsrc/www/w3m/DESCR
diff -r1.58 -r1.59 pkgsrc/www/w3m/Makefile
diff -r1.55 -r1.56 pkgsrc/www/w3m/Makefile.common
diff -r1.15 -r1.16 pkgsrc/www/w3m/PLIST
diff -r1.21 -r1.22 pkgsrc/www/w3m/distinfo
diff -r1.3 -r1.4 pkgsrc/www/w3m-img/DESCR
diff -r1.20 -r1.21 pkgsrc/www/w3m-img/Makefile
diff -r1.14 -r1.15 pkgsrc/www/w3m/patches/patch-ac
diff -r1.8 -r0 pkgsrc/www/w3m/patches/patch-ad
cvs diff -r1.5 -r1.6 pkgsrc/www/w3m/DESCR (expand / switch to unified diff)

--- pkgsrc/www/w3m/DESCR 2005/07/25 19:22:02 1.5
+++ pkgsrc/www/w3m/DESCR 2011/01/21 23:34:13 1.6
@@ -1,24 +1,2 @@ @@ -1,24 +1,2 @@
1W3m is a terminal-based WWW browser which supports HTML tables and frames. 1w3m is a pager and/or text-based browser. It can handle table,
2It's small, so faster than other WWW browsers. It also supports following 2cookies, authentication, and almost everything except JavaScript.
3URL by clicking mouse button on the anchor in xterm and its variants from 
4990526 version. 
5 
6It uses Boehm-GC to implement the table/frame parser. 
7 
8Quoted from README.m17n: 
9 
10Muntilingualizaion of w3m 
11 2002/02/16 
12 H. Sakamoto 
13 
14Introduction 
15 
16 I have tried the muntilingualization of w3m (w3m-m17n). 
17 The patch for w3m-0.2.1 is available on the following site. 
18 
19 http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n 
20 patch/w3m-0.3-m17n-20020316.tar.gz 
21 patch/README.m17n 
22 
23 It is a development version. And enough test is not preformed because 
24 I can understand Japanese only. Please use, test, and report bugs. 
cvs diff -r1.58 -r1.59 pkgsrc/www/w3m/Makefile (expand / switch to unified diff)

--- pkgsrc/www/w3m/Makefile 2010/07/01 18:50:14 1.58
+++ pkgsrc/www/w3m/Makefile 2011/01/21 23:34:13 1.59
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1# $NetBSD: Makefile,v 1.58 2010/07/01 18:50:14 tron Exp $ 1# $NetBSD: Makefile,v 1.59 2011/01/21 23:34:13 wiz Exp $
2 2
3PKGNAME= w3m-${W3M_VERS} 3PKGNAME= w3m-${W3M_VERS}
4PKGREVISION= 5 
5COMMENT= Multilingualized version of a pager/text-based browser w3m 4COMMENT= Multilingualized version of a pager/text-based browser w3m
6 5
7CONFLICTS+= w3m-img-[0-9]* 6CONFLICTS+= w3m-img-[0-9]*
8 7
9.include "../../www/w3m/Makefile.common" 8.include "../../www/w3m/Makefile.common"
cvs diff -r1.55 -r1.56 pkgsrc/www/w3m/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/w3m/Makefile.common 2009/09/02 08:34:16 1.55
+++ pkgsrc/www/w3m/Makefile.common 2011/01/21 23:34:13 1.56
@@ -1,33 +1,36 @@ @@ -1,33 +1,36 @@
1# $NetBSD: Makefile.common,v 1.55 2009/09/02 08:34:16 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.56 2011/01/21 23:34:13 wiz Exp $
2# 2#
 3# used by www/w3m/Makefile
 4# used by www/w3m-img/Makefile
3 5
4DISTNAME= w3m-${W3M_VERS} 6DISTNAME= w3m-${W3M_VERS}
5CATEGORIES= www 7CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=w3m/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=w3m/}
7 9
8MAINTAINER= uebayasi@NetBSD.org 10MAINTAINER= uebayasi@NetBSD.org
9HOMEPAGE= http://w3m.sourceforge.net/ 11HOMEPAGE= http://w3m.sourceforge.net/
10 12
11PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
12PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
13MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
14 16
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
 18USE_LANGUAGES= c c++
16USE_TOOLS+= gmake # Needed for some combinations of options... 19USE_TOOLS+= gmake # Needed for some combinations of options...
17USE_TOOLS+= msgfmt 20USE_TOOLS+= msgfmt
18USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
19 22
20W3M_VERS= 0.5.2 23W3M_VERS= 0.5.3
21 24
22# For w3mman, xface2xpm, cgi scripts. 25# For w3mman, xface2xpm, cgi scripts.
23USE_TOOLS+= perl:run pax 26USE_TOOLS+= perl:run pax
24 27
25DOCDIR= share/doc/w3m 28DOCDIR= share/doc/w3m
26 29
27_W3M_USE_IMAGE?= NO 30_W3M_USE_IMAGE?= NO
28 31
29.include "options.mk" 32.include "options.mk"
30 33
31.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
32 35
33# Configurable by environment variables at run-time. 36# Configurable by environment variables at run-time.
@@ -47,32 +50,32 @@ CONFIGURE_ARGS+= --with-termlib @@ -47,32 +50,32 @@ CONFIGURE_ARGS+= --with-termlib
47CONFIGURE_ARGS+= --with-editor=vi 50CONFIGURE_ARGS+= --with-editor=vi
48CONFIGURE_ARGS+= --with-gc=${BUILDLINK_PREFIX.boehm-gc:Q} 51CONFIGURE_ARGS+= --with-gc=${BUILDLINK_PREFIX.boehm-gc:Q}
49CONFIGURE_ARGS+= --with-mailer=${MAIL_CMD:Q} 52CONFIGURE_ARGS+= --with-mailer=${MAIL_CMD:Q}
50CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 53CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
51CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 54CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
52 55
53SUBST_CLASSES+= man-ja 56SUBST_CLASSES+= man-ja
54SUBST_MESSAGE.man-ja= Fixing the path to Japanese manual pages. 57SUBST_MESSAGE.man-ja= Fixing the path to Japanese manual pages.
55SUBST_STAGE.man-ja= post-patch 58SUBST_STAGE.man-ja= post-patch
56SUBST_FILES.man-ja= Makefile.in config.h.dist 59SUBST_FILES.man-ja= Makefile.in config.h.dist
57SUBST_SED.man-ja= -e 's|/ja/|/ja_JP.eucJP/|g' 60SUBST_SED.man-ja= -e 's|/ja/|/ja_JP.eucJP/|g'
58 61
59post-extract: 62post-extract:
60 @cd ${WRKSRC}/doc; ${RM} -fr CVS 63 cd ${WRKSRC}/doc; ${RM} -fr CVS
61 @cd ${WRKSRC}/doc-jp; ${RM} -fr CVS 64 cd ${WRKSRC}/doc-jp; ${RM} -fr CVS
62 @cd ${WRKSRC}; ${RM} -fr gc 65 cd ${WRKSRC}; ${RM} -fr gc
63 66
64INSTALLATION_DIRS+= ${DOCDIR} 67INSTALLATION_DIRS+= ${DOCDIR}
65 68
66INSTALL_TARGET= install install-helpfile 69INSTALL_TARGET= install install-helpfile
67 70
68post-install: 71post-install:
69 # Use pax to discard uid/gid. Exclude manuals (*.1). 72 # Use pax to discard uid/gid. Exclude manuals (*.1).
70 @cd ${WRKSRC}; pax -w -s ',.*\.1$$,,' doc doc-jp | \ 73 cd ${WRKSRC}; pax -w -s ',.*\.1$$,,' doc doc-jp | \
71 ( cd ${DESTDIR}${PREFIX}/${DOCDIR}; pax -r ) 74 ( cd ${DESTDIR}${PREFIX}/${DOCDIR}; pax -r )
72 75
73.include "../../devel/boehm-gc/buildlink3.mk" 76.include "../../devel/boehm-gc/buildlink3.mk"
74.include "../../devel/gettext-lib/buildlink3.mk" 77.include "../../devel/gettext-lib/buildlink3.mk"
75.include "../../devel/zlib/buildlink3.mk" 78.include "../../devel/zlib/buildlink3.mk"
76.include "../../security/openssl/buildlink3.mk" 79.include "../../security/openssl/buildlink3.mk"
77.include "../../mk/termcap.buildlink3.mk" 80.include "../../mk/termcap.buildlink3.mk"
78.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/www/w3m/PLIST (expand / switch to unified diff)

--- pkgsrc/www/w3m/PLIST 2009/06/14 22:00:39 1.15
+++ pkgsrc/www/w3m/PLIST 2011/01/21 23:34:13 1.16
@@ -1,67 +1,68 @@ @@ -1,67 +1,68 @@
1@comment $NetBSD: PLIST,v 1.15 2009/06/14 22:00:39 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.16 2011/01/21 23:34:13 wiz Exp $
2bin/w3m 2bin/w3m
3bin/w3mman 3bin/w3mman
 4libexec/w3m/cgi-bin/dirlist.cgi
 5libexec/w3m/cgi-bin/multipart.cgi
 6libexec/w3m/cgi-bin/w3mbookmark
 7libexec/w3m/cgi-bin/w3mhelp.cgi
 8libexec/w3m/cgi-bin/w3mhelperpanel
 9${PLIST.image}libexec/w3m/w3mimgdisplay
 10libexec/w3m/cgi-bin/w3mmail.cgi
 11libexec/w3m/cgi-bin/w3mman2html.cgi
 12libexec/w3m/inflate
 13libexec/w3m/xface2xpm
 14man/ja_JP.eucJP/man1/w3m.1
4man/man1/w3m.1 15man/man1/w3m.1
5man/man1/w3mman.1 16man/man1/w3mman.1
6man/ja_JP.eucJP/man1/w3m.1 
7@comment share/doc/w3m/doc 
8share/doc/w3m/doc/FAQ.html 
9share/doc/w3m/doc/HISTORY 
10share/doc/w3m/doc/MANUAL.html 
11share/doc/w3m/doc/README 
12share/doc/w3m/doc/README.cygwin 
13share/doc/w3m/doc/README.dict 
14share/doc/w3m/doc/README.func 
15share/doc/w3m/doc/README.img 
16share/doc/w3m/doc/README.m17n 
17share/doc/w3m/doc/README.mouse 
18share/doc/w3m/doc/README.pre_form 
19share/doc/w3m/doc/README.tab 
20share/doc/w3m/doc/STORY.html 
21share/doc/w3m/doc/keymap.default 
22share/doc/w3m/doc/keymap.lynx 
23share/doc/w3m/doc/menu.default 
24share/doc/w3m/doc/menu.submenu 
25@comment share/doc/w3m/doc-jp 
26share/doc/w3m/doc-jp/FAQ.html 17share/doc/w3m/doc-jp/FAQ.html
27share/doc/w3m/doc-jp/HISTORY 18share/doc/w3m/doc-jp/HISTORY
28share/doc/w3m/doc-jp/MANUAL.html 19share/doc/w3m/doc-jp/MANUAL.html
29share/doc/w3m/doc-jp/README 20share/doc/w3m/doc-jp/README
30share/doc/w3m/doc-jp/README.SSL 21share/doc/w3m/doc-jp/README.SSL
31share/doc/w3m/doc-jp/README.cookie 22share/doc/w3m/doc-jp/README.cookie
32share/doc/w3m/doc-jp/README.cygwin 23share/doc/w3m/doc-jp/README.cygwin
33share/doc/w3m/doc-jp/README.dict 24share/doc/w3m/doc-jp/README.dict
34share/doc/w3m/doc-jp/README.func 25share/doc/w3m/doc-jp/README.func
35share/doc/w3m/doc-jp/README.img 26share/doc/w3m/doc-jp/README.img
36share/doc/w3m/doc-jp/README.keymap 27share/doc/w3m/doc-jp/README.keymap
37share/doc/w3m/doc-jp/README.m17n 28share/doc/w3m/doc-jp/README.m17n
38share/doc/w3m/doc-jp/README.mailcap 29share/doc/w3m/doc-jp/README.mailcap
39share/doc/w3m/doc-jp/README.menu 30share/doc/w3m/doc-jp/README.menu
40share/doc/w3m/doc-jp/README.migemo 31share/doc/w3m/doc-jp/README.migemo
41share/doc/w3m/doc-jp/README.mouse 32share/doc/w3m/doc-jp/README.mouse
 33share/doc/w3m/doc-jp/README.passwd
42share/doc/w3m/doc-jp/README.pre_form 34share/doc/w3m/doc-jp/README.pre_form
43share/doc/w3m/doc-jp/README.tab 35share/doc/w3m/doc-jp/README.tab
44share/doc/w3m/doc-jp/STORY.html 36share/doc/w3m/doc-jp/STORY.html
45share/doc/w3m/doc-jp/keymap.default 37share/doc/w3m/doc-jp/keymap.default
46share/doc/w3m/doc-jp/keymap.lynx 38share/doc/w3m/doc-jp/keymap.lynx
47share/doc/w3m/doc-jp/menu.default 39share/doc/w3m/doc-jp/menu.default
48share/doc/w3m/doc-jp/menu.submenu 40share/doc/w3m/doc-jp/menu.submenu
 41share/doc/w3m/doc/FAQ.html
 42share/doc/w3m/doc/HISTORY
 43share/doc/w3m/doc/MANUAL.html
 44share/doc/w3m/doc/README
 45share/doc/w3m/doc/README.cookie
 46share/doc/w3m/doc/README.cygwin
 47share/doc/w3m/doc/README.dict
 48share/doc/w3m/doc/README.func
 49share/doc/w3m/doc/README.img
 50share/doc/w3m/doc/README.m17n
 51share/doc/w3m/doc/README.mouse
 52share/doc/w3m/doc/README.passwd
 53share/doc/w3m/doc/README.pre_form
 54share/doc/w3m/doc/README.tab
 55share/doc/w3m/doc/STORY.html
 56share/doc/w3m/doc/keymap.default
 57share/doc/w3m/doc/keymap.lynx
 58share/doc/w3m/doc/menu.default
 59share/doc/w3m/doc/menu.submenu
49share/locale/ja/LC_MESSAGES/w3m.mo 60share/locale/ja/LC_MESSAGES/w3m.mo
50share/w3m/w3mhelp-funcdesc.en.pl 61share/w3m/w3mhelp-funcdesc.en.pl
51share/w3m/w3mhelp-funcdesc.ja.pl 62share/w3m/w3mhelp-funcdesc.ja.pl
52share/w3m/w3mhelp-funcname.pl 63share/w3m/w3mhelp-funcname.pl
53share/w3m/w3mhelp-lynx_en.html 64share/w3m/w3mhelp-lynx_en.html
54share/w3m/w3mhelp-lynx_ja.html 65share/w3m/w3mhelp-lynx_ja.html
55share/w3m/w3mhelp-w3m_en.html 66share/w3m/w3mhelp-w3m_en.html
56share/w3m/w3mhelp-w3m_ja.html 67share/w3m/w3mhelp-w3m_ja.html
57share/w3m/w3mhelp.html 68share/w3m/w3mhelp.html
58libexec/w3m/inflate 
59${PLIST.image}libexec/w3m/w3mimgdisplay 
60libexec/w3m/cgi-bin/dirlist.cgi 
61libexec/w3m/cgi-bin/multipart.cgi 
62libexec/w3m/cgi-bin/w3mbookmark 
63libexec/w3m/cgi-bin/w3mhelp.cgi 
64libexec/w3m/cgi-bin/w3mhelperpanel 
65libexec/w3m/cgi-bin/w3mmail.cgi 
66libexec/w3m/cgi-bin/w3mman2html.cgi 
67libexec/w3m/xface2xpm 
cvs diff -r1.21 -r1.22 pkgsrc/www/w3m/distinfo (expand / switch to unified diff)

--- pkgsrc/www/w3m/distinfo 2010/07/01 18:50:14 1.21
+++ pkgsrc/www/w3m/distinfo 2011/01/21 23:34:13 1.22
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.21 2010/07/01 18:50:14 tron Exp $ 1$NetBSD: distinfo,v 1.22 2011/01/21 23:34:13 wiz Exp $
2 2
3SHA1 (w3m-0.5.2.tar.gz) = 484522547ae6dbb342d3858a2a53a65451e273f9 3SHA1 (w3m-0.5.3.tar.gz) = 444b6c8cf7094ee95f8e9de96b37f814b9d83237
4RMD160 (w3m-0.5.2.tar.gz) = 09ce72d8ef5e621a2e49496b63e22f2773edbe79 4RMD160 (w3m-0.5.3.tar.gz) = 6a0153bc53f7c107c700404262ce1b4d02e6dd91
5Size (w3m-0.5.2.tar.gz) = 1906812 bytes 5Size (w3m-0.5.3.tar.gz) = 2202328 bytes
6SHA1 (patch-aa) = 2de78a6db9bd483416895b393935ccadab879932 6SHA1 (patch-aa) = 2de78a6db9bd483416895b393935ccadab879932
7SHA1 (patch-ab) = 2d60d7a2946f13a185591c0b927cf0f8b5ea351b 7SHA1 (patch-ab) = 2d60d7a2946f13a185591c0b927cf0f8b5ea351b
8SHA1 (patch-ac) = 800d4b8c2ed93ccaa000564366ad07fabcc5bdc2 8SHA1 (patch-ac) = 37c6c78a208c50876641aa90164cc46106403260
9SHA1 (patch-ad) = 7a11f6f97fb5d01a420c95bcd03e577ffd3a241f 
10SHA1 (patch-ak) = ac0ee99d5ab49c431cfa496d0d2d509efd6b06fa 9SHA1 (patch-ak) = ac0ee99d5ab49c431cfa496d0d2d509efd6b06fa
cvs diff -r1.3 -r1.4 pkgsrc/www/w3m-img/DESCR (expand / switch to unified diff)

--- pkgsrc/www/w3m-img/DESCR 2003/06/07 15:59:30 1.3
+++ pkgsrc/www/w3m-img/DESCR 2011/01/21 23:34:14 1.4
@@ -1,22 +1,4 @@ @@ -1,22 +1,4 @@
1W3m is a terminal-based WWW browser which supports HTML tables and frames. 1w3m is a pager and/or text-based browser. It can handle table,
2It's small, so faster than other WWW browsers. It also supports following 2cookies, authentication, and almost everything except JavaScript.
3URL by clicking mouse button on the anchor in xterm and its variants from 
4990526 version. Additionally, this package enables inline-image support 
5which is added in version 0.3. 
6 3
7It uses Boehm-GC to implement the table/frame parser. 4Additionally, this package enables inline-image support.
8 
9Quoted from README.m17n: 
10 
11Multilingualization of w3m 
12 2002/02/16 
13 H. Sakamoto 
14Introduction 
15 I have tried the multilingualization of w3m (w3m-m17n). 
16 The patch for w3m-0.2.1 is available on the following site. 
17 
18 http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n 
19 patch/w3m-0.3-m17n-20020316.tar.gz 
20 patch/README.m17n 
21 It is a development version. And enough test is not preformed because 
22 I can understand Japanese only. Please use, test, and report bugs. 
cvs diff -r1.20 -r1.21 pkgsrc/www/w3m-img/Makefile (expand / switch to unified diff)

--- pkgsrc/www/w3m-img/Makefile 2010/07/01 18:50:15 1.20
+++ pkgsrc/www/w3m-img/Makefile 2011/01/21 23:34:14 1.21
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.20 2010/07/01 18:50:15 tron Exp $ 1# $NetBSD: Makefile,v 1.21 2011/01/21 23:34:14 wiz Exp $
2 2
3PKGNAME= w3m-img-${W3M_VERS} 3PKGNAME= w3m-img-${W3M_VERS}
4PKGREVISION= 5 
5COMMENT= Multilingualized version of a pager/text-based browser w3m with inline image support 4COMMENT= Multilingualized version of a pager/text-based browser w3m with inline image support
6 5
7CONFLICTS+= w3m-[0-9]* 6CONFLICTS+= w3m-[0-9]*
8 7
9DISTINFO_FILE= ${.CURDIR}/../../www/w3m/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../www/w3m/distinfo
10PATCHDIR= ${.CURDIR}/../../www/w3m/patches 9PATCHDIR= ${.CURDIR}/../../www/w3m/patches
11PLIST_SRC= ${.CURDIR}/../../www/w3m/PLIST 10PLIST_SRC= ${.CURDIR}/../../www/w3m/PLIST
12 11
13USE_TOOLS+= msgfmt 12USE_TOOLS+= msgfmt
14 13
15# Enable image support. 14# Enable image support.
16_W3M_USE_IMAGE= YES 15_W3M_USE_IMAGE= YES
17 16
cvs diff -r1.14 -r1.15 pkgsrc/www/w3m/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/www/w3m/patches/Attic/patch-ac 2010/07/01 18:50:15 1.14
+++ pkgsrc/www/w3m/patches/Attic/patch-ac 2011/01/21 23:34:14 1.15
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-ac,v 1.14 2010/07/01 18:50:15 tron Exp $ 1$NetBSD: patch-ac,v 1.15 2011/01/21 23:34:14 wiz Exp $
2 2
3Fix for CVE-2010-2074 taken from here: 3Fix for CVE-2010-2074 taken from here:
4 4
5http://www.openwall.com/lists/oss-security/2010/06/14/4 5http://www.openwall.com/lists/oss-security/2010/06/14/4
6 6
7--- fm.h.orig 2007-05-30 05:47:24.000000000 +0100 7--- fm.h.orig 2011-01-04 09:22:21.000000000 +0000
8+++ fm.h 2010-07-01 19:26:27.000000000 +0100 8+++ fm.h
9@@ -1119,7 +1119,7 @@ 9@@ -1135,7 +1135,7 @@ global int view_unseenobject init(TRUE);
10 #endif 10 #endif
11  11
12 #if defined(USE_SSL) && defined(USE_SSL_VERIFY) 12 #if defined(USE_SSL) && defined(USE_SSL_VERIFY)
13-global int ssl_verify_server init(FALSE); 13-global int ssl_verify_server init(FALSE);
14+global int ssl_verify_server init(TRUE); 14+global int ssl_verify_server init(TRUE);
15 global char *ssl_cert_file init(NULL); 15 global char *ssl_cert_file init(NULL);
16 global char *ssl_key_file init(NULL); 16 global char *ssl_key_file init(NULL);
17 global char *ssl_ca_path init(NULL); 17 global char *ssl_ca_path init(NULL);
18@@ -1128,7 +1128,7 @@ 18@@ -1144,7 +1144,7 @@ global int ssl_path_modified init(FALSE)
19 #endif /* defined(USE_SSL) && 19 #endif /* defined(USE_SSL) &&
20 * defined(USE_SSL_VERIFY) */ 20 * defined(USE_SSL_VERIFY) */
21 #ifdef USE_SSL 21 #ifdef USE_SSL
22-global char *ssl_forbid_method init(NULL); 22-global char *ssl_forbid_method init(NULL);
23+global char *ssl_forbid_method init("2"); 23+global char *ssl_forbid_method init("2");
24 #endif 24 #endif
25  25
26 global int is_redisplay init(FALSE); 26 global int is_redisplay init(FALSE);
File Deleted: pkgsrc/www/w3m/patches/Attic/patch-ad