21616551 EOF of w3m
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Sun, 25 Sep 2016 23:15:04 -0700
changeset 7220 69d9c93534a6
parent 7219 ed371e14667e
child 7221 0e3ebbcfc116
21616551 EOF of w3m PSARC/2015/360 EOF of w3m
components/meta-packages/history/history
components/w3m/Makefile
components/w3m/patches/01-libgc.patch
components/w3m/patches/02-autobits.patch
components/w3m/patches/04-get_warn_proc.patch
components/w3m/patches/05-init-openssl.patch
components/w3m/test/results-64.master
components/w3m/w3m.license
components/w3m/w3m.p5m
--- a/components/meta-packages/history/history	Thu Oct 13 09:15:47 2016 -0700
+++ b/components/meta-packages/history/history	Sun Sep 25 23:15:04 2016 -0700
@@ -732,7 +732,7 @@
 [email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 desktop/remote-desktop/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 web/browser/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 web/analytics/[email protected]
 [email protected],5.11-0.133 web/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
@@ -1183,6 +1183,7 @@
 web/browser/firefox/plugin/[email protected],5.11-0.175.1.0.0.20.0
 web/browser/firefox/plugin/[email protected],5.12-5.12.0.0.0.90.0
 web/browser/firefox/plugin/[email protected],5.12-5.12.0.0.0.90.0
+web/browser/[email protected],5.12-5.12.0.0.0.112.0
 web/editor/[email protected],5.12-5.12.0.0.0.90.0
 web/firefox/plugin/[email protected],5.11-2
 web/java-servlet/[email protected],5.12-5.12.0.0.0.82.0
--- a/components/w3m/Makefile	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-#
-# 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, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-BUILD_BITS= 64
-COMPILER= gcc
-include ../../make-rules/shared-macros.mk
-
-COMPONENT_NAME=		w3m
-COMPONENT_VERSION=	0.5.3
-COMPONENT_PROJECT_URL=	http://w3m.sourceforge.net/
-COMPONENT_ARCHIVE_HASH=	\
-    sha256:e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_SRC)/$(COMPONENT_ARCHIVE)/download
-
-TPNO=			21998
-
-SYSTEM_TEST_TARGET= $(SYSTEM_TEST_64)
-
-# Depends on newer cairo, which cannot be updated in S11.
-include $(WS_MAKE_RULES)/no-evaluation.mk
-
-include $(WS_MAKE_RULES)/common.mk
-
-COMPONENT_PREP_ACTION = (cd $(@D) ; autoconf ; automake ; aclocal ; libtoolize )
-
-# install the bits in /usr/bin and /usr/lib
-CONFIGURE_LIBDIR.64= $(CONFIGURE_LIBDIR.32)
-
-CONFIGURE_OPTIONS +=	--libexecdir=$(CONFIGURE_LIBDIR.32)
-CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)
-CONFIGURE_OPTIONS +=	--with-browser=$(USRBINDIR)/firefox
-CONFIGURE_OPTIONS +=	LIBS="-lX11"
-
-# Use the HTML and CSS styling external test suite as referenced at
-# http://www.w3.org/2005/MWI/Tests/
-COMPONENT_TEST_CMD = $(@D)/w3m
-COMPONENT_TEST_ARGS = -dump \
-	http://www.cameronmoll.com/mobile/mkp/pg1.html \
-	http://www.cameronmoll.com/mobile/mkp/pg2.html \
-	http://www.cameronmoll.com/mobile/mkp/pg3.html \
-	http://www.cameronmoll.com/mobile/mkp/pg4.html
-COMPONENT_TEST_TARGETS =
-
-COMPONENT_SYSTEM_TEST_DIR =
-COMPONENT_SYSTEM_TEST_CMD =		$(USRBINDIR)/w3m
-COMPONENT_SYSTEM_TEST_ARGS =		-dump \
-	http://www.cameronmoll.com/mobile/mkp/pg1.html \
-	http://www.cameronmoll.com/mobile/mkp/pg2.html \
-	http://www.cameronmoll.com/mobile/mkp/pg3.html \
-	http://www.cameronmoll.com/mobile/mkp/pg4.html
-COMPONENT_SYSTEM_TEST_TARGETS =
-
-# The desktop packages differ between S11 and S12; list both for normal
-# and BUILD_TYPE=evaluation builds.
-REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
-REQUIRED_PACKAGES += library/desktop/gtk2
-REQUIRED_PACKAGES += library/gc
-REQUIRED_PACKAGES += library/glib2
-REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
-REQUIRED_PACKAGES += library/zlib
-REQUIRED_PACKAGES += $(PERL_PKG)
-REQUIRED_PACKAGES += system/library/math
-REQUIRED_PACKAGES += x11/library/libx11
--- a/components/w3m/patches/01-libgc.patch	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#
-# 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.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
[email protected]@ -445,7 +445,7 @@
-    fi
-  fi
-  unset ac_cv_lib_gc_GC_init
-- 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)
[email protected]@ -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"; 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
-     if test x"$gclibdir" = xno; then
--- a/components/w3m/patches/02-autobits.patch	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# Check for floor() instead of sqrt() to decide if we need libm
-#
-# This patch needs to be evaluated to see if it needs to be passed upstream.
-
---- 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
[email protected]@ -91,7 +91,7 @@
- AC_W3M_SSL_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)
--- a/components/w3m/patches/04-get_warn_proc.patch	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# 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
[email protected]@ -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 */
--- a/components/w3m/patches/05-init-openssl.patch	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Disable SSLv2 and SSLv3 in w3m to "mitigate POODLE vulnerability".
-
-This change will be passed upstream.
-
---- w3m-0.5.2/url.c.orig	2015-01-29 08:37:04.156739107 -0800
-+++ w3m-0.5.2/url.c	2015-01-29 08:48:24.055383389 -0800
[email protected]@ -337,6 +337,8 @@
- 		option |= SSL_OP_NO_TLSv1;
- 	}
- 	SSL_CTX_set_options(ssl_ctx, option);
-+	/* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */
-+	SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
- #ifdef USE_SSL_VERIFY
- 	/* derived from openssl-0.9.5/apps/s_{client,cb}.c */
- #if 1				/* use SSL_get_verify_result() to verify cert */
--- a/components/w3m/test/results-64.master	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-Markup Test Page 1
-
-Typography
-
--------------------------------------------------------------------------------
-
-H1 Heading
-
-H2 Heading
-
-H3 Heading
-
-H4 Heading
-
-H5 Heading
-
-H6 Heading
-
-This is a paragraph.
-
-    This is a blockquote.
-
-    This is a cite.
-
-Strong <strong> and Bold <b>
-
-Emphasis <em> and Italic <i>
-
-This is a serif typeface.
-
-This is a sans-serif typeface.
-
-Font size 6px
-
-Font size 8px
-
-Font size 10px
-
-Font size 11px
-
-Font size 12px
-
-Font size 14px
-
-Font size 18px
-
-Font size .5em
-
-Font size .75em
-
-Font size .9em
-
-Font size 1em
-
-Font size 1.5em
-
-Font size 2em
-
-Back to home
-
--------------------------------------------------------------------------------
-
-(C) 2006 Cameron Moll.
-
-Markup Test Page 2
-
-Lists
-
--------------------------------------------------------------------------------
-
-  * This is an unordered list <ul>
-  * List item number two.
-
- 1. This is an ordered list <ol>
- 2. List item number two.
- 3. List item number three.
-
- 1. Use keypad 1 to access this link
- 2. Use keypad 2 to access this link
- 3. Use keypad 3 to access this link
-
-This is a term <dt>
-    This is the definition of that term.
-
-Back to home
-
--------------------------------------------------------------------------------
-
-(C) 2006 Cameron Moll.
-
-Markup Test Page 3
-
-Images, Tables
-
--------------------------------------------------------------------------------
-
-Small image (120x60)
-[sm]
-
-Medium image (250x60)
-[md]
-
-Large image (460x60)
-[lg]
-
-   Two-column table
-+---------------------+
-|Col 1 head|Col 2 head|
-|----------+----------|
-|Col 1 data|Col 2 data|
-+---------------------+
-
-Back to home
-
--------------------------------------------------------------------------------
-
-(C) 2006 Cameron Moll.
-
-Markup Test Page 4
-
-Advanced
-
--------------------------------------------------------------------------------
-
-Box with a solid border
-
-Box with a dotted (...) border
-
-Box with a dashed (- - -) border
-
-Box with a double (=) border
-
-Box with solid red background
-
-Box with background image (slanted blue lines)
-
-45% float left
-
-45% float right
-
-
-This is center-aligned text (text-align: center).
-
-This is right-aligned text (text-align: right).
-
-This is an ABBR.
-
-This is an ACRONYM
-
-This is code.
-
-This is a [DEL:del:DEL] (strike-through).
-
-Today's date generated with JavaScript: ( )
-
-Back to home
-
--------------------------------------------------------------------------------
-
-(C) 2005 Cameron Moll.
-
--- a/components/w3m/w3m.license	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-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.
- */
--- a/components/w3m/w3m.p5m	Thu Oct 13 09:15:47 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# 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/[email protected]$(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