--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/diffstat/Makefile	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		diffstat
+COMPONENT_VERSION=	1.51
+COMPONENT_PROJECT_URL=	http://invisible-island.net/diffstat/
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:c0c83c6eea054cbf0a3a9c0621ae3bef1a9a33914d417f08569159c975644075
+COMPONENT_ARCHIVE_URL=	ftp://invisible-island.net/diffstat/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/diffstat
+
+TPNO=			5494
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+CC += $(CC_BITS)
+
+ASLR_MODE = $(ASLR_ENABLE)
+
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
+
+test:		$(TEST_64)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/diffstat/diffstat.license	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,21 @@
+*****************************************************************************
+ Copyright 1994-2008,2009 by Thomas E. Dickey                               *
+ All Rights Reserved.                                                       *
+                                                                            *
+ Permission to use, copy, modify, and distribute this software and its      *
+ documentation for any purpose and without fee is hereby granted, provided  *
+ that the above copyright notice appear in all copies and that both that    *
+ copyright notice and this permission notice appear in supporting           *
+ documentation, and that the name of the above listed copyright holder(s)   *
+ not be used in advertising or publicity pertaining to distribution of the  *
+ software without specific, written prior permission.                       *
+                                                                            *
+ THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD   *
+ TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND  *
+ FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE  *
+ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES          *
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN      *
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR *
+ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.                *
+ *****************************************************************************
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/diffstat/diffstat.p5m	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/text/diffstat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A utility which provides statistics based on the output of diff"
+set name=pkg.description \
+    value="The diff command compares files line by line. Diffstat reads the output of the diff command and displays a histogram of the insertions, deletions and modifications in each file. Diffstat is commonly used to provide a summary of the changes in large, complex patch files. Install diffstat if you need a program which provides a summary of the diff command's output."
+set name=com.oracle.info.description value="the diffstat utility"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Text Tools"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/114
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file usr/bin/$(MACH64)/diffstat path=usr/bin/diffstat
+file path=usr/share/man/man1/diffstat.1
+license diffstat.license license=MIT

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/diffstat/resolve.deps	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,1 @@
+system/library

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lynx/Makefile	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,66 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		lynx
+COMPONENT_VERSION=	2.8.7
+COMPONENT_PROJECT_URL=	http://lynx.isc.org/
+COMPONENT_SRC=		$(COMPONENT_NAME)2-8-7
+COMPONENT_ARCHIVE=	$(COMPONENT_NAME)$(COMPONENT_VERSION).tar.bz2
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:301bda96ad3cd5032805e8d5315a42061a11e472e3d3a7baee3a2879517ef627
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_NAME)$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/lynx
+
+TPNO=			9373
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+# Needed to successfully find lynx.pot.
+COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+
+CFLAGS +=	-I/usr/include/ncurses
+
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS +=	--enable-nls
+CONFIGURE_OPTIONS +=	--enable-japanese-utf8
+CONFIGURE_OPTIONS +=	--enable-widec
+CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)/lynx
+CONFIGURE_OPTIONS +=	--with-ssl
+CONFIGURE_OPTIONS +=	--with-screen=ncurses
+
+ASLR_MODE = $(ASLR_ENABLE)
+
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lynx/lynx.p5m	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,88 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/web/browser/lynx@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Text-mode web browser"
+set name=pkg.description \
+    value="Lynx is a highly configurable text-based web browser for use on cursor-addressable character cell terminals. It is the oldest web browser currently in general use and development."
+set name=com.oracle.info.description value="the lynx web browser"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/700 value=PSARC/2000/488
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=etc/lynx/lynx.cfg
+file path=etc/lynx/lynx.lss
+file usr/bin/$(MACH64)/lynx path=usr/bin/lynx
+file path=usr/share/locale/ca/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/ca/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/cs/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/cs/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/da/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/da/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/de/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/de/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/en/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/en/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/et/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/et/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/fi/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/fi/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/fr/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/fr/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/hu/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/hu/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/id/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/id/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/it/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/it/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/ja/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/ja/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/nl/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/nl/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/ru/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/ru/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/sl/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/sl/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/sv/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/sv/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/tr/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/tr/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/uk/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/uk/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/vi/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/vi/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/lynx.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/lynx.mo
+file path=usr/share/man/man1/lynx.1
+license COPYING license=GPLv2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lynx/patches/01-locale.patch	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,14 @@
+# Copied over from the desktop consolidation, which has the comment:
+# date:2010-01-27 owner:yippi type:bug state:upstream
+
+--- lynx2-8-7/src/LYMain.c-orig	2010-12-30 16:59:09.933129015 -0600
++++ lynx2-8-7/src/LYMain.c	2010-12-30 16:59:56.506438066 -0600
+@@ -57,7 +57,7 @@
+ #include <io.h>
+ #endif
+ 
+-#if defined(LOCALE) && !defined(HAVE_LIBINTL_H)
++#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL))
+ #undef gettext			/* Solaris locale.h prototypes gettext() */
+ #include <locale.h>
+ #ifndef HAVE_GETTEXT

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lynx/resolve.deps	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,4 @@
+library/ncurses
+library/security/openssl
+library/security/openssl/openssl-fips-140
+system/library

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/Makefile	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,66 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		w3m
+COMPONENT_VERSION=	0.5.2
+COMPONENT_PROJECT_URL=	http://w3m.sourceforge.net/
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646
+COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_SRC)/$(COMPONENT_ARCHIVE)/download
+COMPONENT_BUGDB=	utility/w3m
+
+TPNO=			9364
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+COMPILER = gcc
+
+COMPONENT_PREP_ACTION = (cd $(@D) ; aclocal-1.11 ; autoconf)
+
+# install the bits in /usr/bin and /usr/lib
+CONFIGURE_BINDIR.64 = $(CONFIGURE_BINDIR.32)
+CONFIGURE_LIBDIR.64 = $(CONFIGURE_LIBDIR.32)
+
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS +=	--libexecdir=$(CONFIGURE_LIBDIR.32)
+CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)
+CONFIGURE_OPTIONS +=	--with-browser=/usr/bin/firefox
+
+ASLR_MODE = $(ASLR_ENABLE)
+
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/patches/01-libgc.patch	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,33 @@
+#
+# Find bgc on Solaris using pkg-config
+#
+# 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 @@
+    fi
+  fi
+  unset ac_cv_lib_gc_GC_init
+- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -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 @@
+       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(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break])
+       LDFLAGS="$ldflags"
+     done
+     if test x"$gclibdir" = xno; then

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/patches/02-autobits.patch	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,40 @@
+#
+# 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
+ 
+ dnl Checks for libraries.
+-AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)])
++AC_CHECK_FUNC(floor,,[AC_CHECK_LIB(m, floor)])
+ 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@

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/patches/03-istream.patch	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,65 @@
+# 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;
+     }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/patches/04-get_warn_proc.patch	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,19 @@
+# Copied over from the desktop consolidation, which has the comment:
+# date:2012-08-09 owner:davelam type bug bugster:555467
+# Unfortunately there is no such bug in BugDB
+#
+# This patch needs to be evaluated to see if it needs to be passed upstream.
+
+--- w3m-0.5.2/main.c.ori	2012-08-09 10:33:36.510910856 +0800
++++ w3m-0.5.2/main.c	2012-08-09 10:34:03.817856620 +0800
+@@ -842,7 +842,9 @@
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
+-    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++    orig_GC_warn_proc = GC_get_warn_proc();
++    GC_set_warn_proc(wrap_GC_warn_proc);
++
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/resolve.deps	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,11 @@
+library/desktop/gtk2
+library/gc
+library/glib2
+library/security/openssl
+library/security/openssl/openssl-fips-140
+library/zlib
+runtime/perl-512
+system/library
+system/library/math
+system/linker
+x11/library/libx11

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/w3m.license	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,36 @@
+Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+
+In scrsize.c
+/*
+ * Copyright (c) 1999, [email protected]
+ *
+ * To compile this program:
+ *      gcc -D__ST_MT_ERRNO__ -O2 -s -Zomf -Zmtd -lX11 scrsize.c
+ *
+ * When I wrote this routine, I consulted some part of the source code of the
+ * xwininfo utility by X Consortium.
+ *
+ * Copyright (c) 1987, X Consortium
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the X Consortium shall not
+ * be used in advertising or otherwise to promote the sale, use or other
+ * dealings in this Software without prior written authorization from the X
+ * Consortium.
+ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/w3m/w3m.p5m	Wed Feb 18 12:08:43 2015 -0800
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/web/browser/w3m@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A text-based web browser"
+set name=pkg.description \
+    value="w3m is a pager and/or text-based browser. It can handle table, cookies, authentication, and almost everything except JavaScript."
+set name=com.oracle.info.description value="the w3m test-based web browser"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/346
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/w3m
+file path=usr/bin/w3mman
+file path=usr/lib/w3m/cgi-bin/dirlist.cgi
+file path=usr/lib/w3m/cgi-bin/multipart.cgi
+file path=usr/lib/w3m/cgi-bin/w3mbookmark
+file path=usr/lib/w3m/cgi-bin/w3mhelp.cgi
+file path=usr/lib/w3m/cgi-bin/w3mhelperpanel
+file path=usr/lib/w3m/cgi-bin/w3mmail.cgi
+file path=usr/lib/w3m/cgi-bin/w3mman2html.cgi
+file path=usr/lib/w3m/inflate
+file path=usr/lib/w3m/w3mimgdisplay
+file path=usr/lib/w3m/xface2xpm
+file path=usr/share/locale/ja/LC_MESSAGES/w3m.mo
+file path=usr/share/man/ja/man1/w3m.1
+file path=usr/share/man/man1/w3m.1
+file path=usr/share/man/man1/w3mman.1
+file path=usr/share/w3m/w3mhelp-funcdesc.en.pl
+file path=usr/share/w3m/w3mhelp-funcdesc.ja.pl
+file path=usr/share/w3m/w3mhelp-funcname.pl
+file path=usr/share/w3m/w3mhelp.html
+license w3m.license license=MIT