# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1426808604 25200
# Node ID 7d35330d300c82f2bf7c74261c0f94670c1d70dd
# Parent  0d77bb4904f84b22cd0e353eff9e8d77664722cf
20738232 w3m should be updated to version 0.5.3

diff -r 0d77bb4904f8 -r 7d35330d300c components/w3m/Makefile
--- a/components/w3m/Makefile	Thu Mar 19 16:10:56 2015 -0700
+++ b/components/w3m/Makefile	Thu Mar 19 16:43:24 2015 -0700
@@ -26,22 +26,22 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		w3m
-COMPONENT_VERSION=	0.5.2
+COMPONENT_VERSION=	0.5.3
 COMPONENT_PROJECT_URL=	http://w3m.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646
+    sha256:e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
 COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_SRC)/$(COMPONENT_ARCHIVE)/download
 COMPONENT_BUGDB=	utility/w3m
 
-TPNO=			9364
+TPNO=			21998
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-COMPONENT_PREP_ACTION = (cd $(@D) ; aclocal-1.11 ; autoconf)
+COMPONENT_PREP_ACTION = (cd $(@D) ; autoconf ; automake ; aclocal ; libtoolize )
 
 # install the bits in /usr/bin and /usr/lib
 CONFIGURE_BINDIR.64 = $(CONFIGURE_BINDIR.32)
diff -r 0d77bb4904f8 -r 7d35330d300c components/w3m/patches/01-libgc.patch
--- a/components/w3m/patches/01-libgc.patch	Thu Mar 19 16:10:56 2015 -0700
+++ b/components/w3m/patches/01-libgc.patch	Thu Mar 19 16:43:24 2015 -0700
@@ -3,30 +3,22 @@
 #
 # This patch needs to be evaluated to see if it needs to be passed upstream.
 
---- w3m-0.5.2.orig/acinclude.m4	Fri Apr  7 08:21:11 2006
-+++ w3m-0.5.2/acinclude.m4	Thu Dec  4 09:32:08 2014
-@@ -426,6 +426,7 @@
- # ----------------------------------------------------------------
- AC_DEFUN([AC_W3M_GC],
- [AC_MSG_CHECKING(GC library exists)
-+AC_SUBST(LIBGC)
- AC_ARG_WITH(gc,
-  [  --with-gc[=PREFIX]	  	libgc PREFIX],
-  [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
-@@ -456,7 +457,7 @@
+--- w3m-0.5.3/acinclude.m4.orig	2015-02-16 18:50:30.208808821 -0800
++++ w3m-0.5.3/acinclude.m4	2015-02-16 18:51:18.187408601 -0800
+@@ -445,7 +445,7 @@
     fi
   fi
   unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
+- AC_CHECK_LIB(gc, GC_init, [LIBGC="-lgc"])
 + AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"])
   if test x"$ac_cv_lib_gc_GC_init" = xno; then
      AC_MSG_CHECKING(GC library location)
      AC_MSG_RESULT($with_gc)
-@@ -466,7 +467,7 @@
+@@ -455,7 +455,7 @@
        LDFLAGS="$LDFLAGS -L$dir/lib"
        AC_MSG_CHECKING($dir)
        unset ac_cv_lib_gc_GC_init
--      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
+-      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break])
 +      AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break])
        LDFLAGS="$ldflags"
      done
diff -r 0d77bb4904f8 -r 7d35330d300c components/w3m/patches/02-autobits.patch
--- a/components/w3m/patches/02-autobits.patch	Thu Mar 19 16:10:56 2015 -0700
+++ b/components/w3m/patches/02-autobits.patch	Thu Mar 19 16:43:24 2015 -0700
@@ -1,22 +1,11 @@
-#
-# Use AC_W3M_SSL and AC_W3M_DIGEST_AUTH from acinclude.m4 instead of the
-# combined version in aclocal.m4, which gets overwritten when aclocal is run.
-#
 # Check for floor() instead of sqrt() to decide if we need libm
 #
-# use $(INSTALL) -d instead of @MKINSTALLDIR@ in po/Makefile...
-#
 # This patch needs to be evaluated to see if it needs to be passed upstream.
 
---- w3m-0.5.2.orig/configure.ac	Thu May 31 07:17:05 2007
-+++ w3m-0.5.2/configure.ac	Thu Dec  4 09:51:48 2014
-@@ -88,10 +88,11 @@
- done
- 
- AC_W3M_IPv6
--AC_W3M_SSL_DIGEST_AUTH
-+AC_W3M_SSL
-+AC_W3M_DIGEST_AUTH
+--- w3m-0.5.3/configure.ac.orig	2015-02-16 19:03:26.191283591 -0800
++++ w3m-0.5.3/configure.ac	2015-02-16 19:08:11.367778846 -0800
+@@ -91,7 +91,7 @@
+ AC_W3M_SSL_DIGEST_AUTH
  
  dnl Checks for libraries.
 -AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)])
@@ -24,17 +13,3 @@
  if test x"$enable_mouse" = xyes; then
   AC_SUBST(USE_W3M)
   AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM)
-
-
---- w3m-0.5.2.orig/po/Makefile.in.in	Tue May 29 22:15:13 2007
-+++ w3m-0.5.2/po/Makefile.in.in	Thu Dec  4 09:57:40 2014
-@@ -27,8 +27,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-+mkinstalldirs = $(INSTALL) -d
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
diff -r 0d77bb4904f8 -r 7d35330d300c components/w3m/patches/03-istream.patch
--- a/components/w3m/patches/03-istream.patch	Thu Mar 19 16:10:56 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-# Copied over from the desktop consolidation, which has the comment:
-# date:2011-02-16 owner:liyuan type bug bugster:7008664
-# Bugster CR #7008664 is now BugDB CR #15688660
-# 15688660 SUNBT7008664-SOLARIS_11 CVE-2010-2074 w3m problems handling x.509 data
-#
-# This patch needs to be evaluated to see if it needs to be passed upstream.
-
---- w3m-0.5.2/istream.c	2007-05-23 23:06:05.000000000 +0800
-+++ w3m-0.5.3/istream.c	2011-01-04 17:22:22.000000000 +0800
-@@ -1,4 +1,4 @@
--/* $Id: istream.c,v 1.26 2007/05/23 15:06:05 inu Exp $ */
-+/* $Id: istream.c,v 1.27 2010/07/18 13:43:23 htrb Exp $ */
- #include "fm.h"
- #include "myctype.h"
- #include "istream.h"
-@@ -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;
-     }