7049760 Move libexpat to userland
authorPetr Sumbera <petr.sumbera@oracle.com>
Wed, 01 Jun 2011 01:18:02 -0700
changeset 274 816a4eb924b1
parent 273 cec58567b4f4
child 275 e703835db76d
7049760 Move libexpat to userland
components/libexpat/Makefile
components/libexpat/expat.p5m
components/libexpat/patches/CVE-2009-3560.patch
components/libexpat/patches/CVE-2009-3720.patch
components/meta-packages/history/SUNWlexpt.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libexpat/Makefile	Wed Jun 01 01:18:02 2011 -0700
@@ -0,0 +1,56 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		expat
+COMPONENT_VERSION=	2.0.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:663548c37b996082db1f2f2c32af060d7aa15c2d
+COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/project/expat/expat/2.0.1/$(COMPONENT_ARCHIVE)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+PATCH_LEVEL=0
+
+# To allow '__func__' usage in C++ code (runtestspp.cpp).
+CXXFLAGS += $(studio_FEATURES_EXTENSIONS)
+
+CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS) $(CPP_LARGEFILES)"
+CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)"
+
+# common targets
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:		$(TEST_32_and_64)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libexpat/expat.p5m	Wed Jun 01 01:18:02 2011 -0700
@@ -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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="libexpat - XML parser library"
+set name=pkg.description value="A fast, non-validating, stream-oriented XML parsing library"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://expat.sourceforge.net
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2007/378
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license COPYING license="expat license"
+
+dir path=usr
+dir path=usr/include
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+file path=usr/lib/libexpat.so.1.5.2
+file path=usr/lib/$(MACH64)/libexpat.so.1.5.2
+file path=usr/include/expat_external.h
+file path=usr/include/expat.h
+link path=usr/lib/$(MACH64)/libexpat.so.0 target=libexpat.so.1.5.2
+link path=usr/lib/$(MACH64)/libexpat.so.1 target=libexpat.so.1.5.2
+link path=usr/lib/$(MACH64)/libexpat.so target=libexpat.so.1.5.2
+link path=usr/lib/libexpat.so.0 target=libexpat.so.1.5.2
+link path=usr/lib/libexpat.so.1 target=libexpat.so.1.5.2
+link path=usr/lib/libexpat.so target=libexpat.so.1.5.2
+
+legacy pkg=SUNWlexpt \
+    name="libexpat - XML parser library" \
+    desc="libexpat - XML parser library 2.0.1"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libexpat/patches/CVE-2009-3560.patch	Wed Jun 01 01:18:02 2011 -0700
@@ -0,0 +1,12 @@
+--- lib/xmlparse.c	2009/09/29 02:49:16	1.164
++++ lib/xmlparse.c	2009/12/29 18:42:05	1.166
[email protected]@ -3701,6 +3701,9 @@
+         return XML_ERROR_UNCLOSED_TOKEN;
+       case XML_TOK_PARTIAL_CHAR:
+         return XML_ERROR_PARTIAL_CHAR;
++      case -XML_TOK_PROLOG_S:
++        tok = -tok;
++        break;
+       case XML_TOK_NONE:
+ #ifdef XML_DTD
+         /* for internal PE NOT referenced between declarations */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libexpat/patches/CVE-2009-3720.patch	Wed Jun 01 01:18:02 2011 -0700
@@ -0,0 +1,11 @@
+--- lib/xmltok_impl.c	2006/11/26 17:34:46	1.13
++++ lib/xmltok_impl.c	2008/06/13 13:18:44	1.15
[email protected]@ -1744,7 +1744,7 @@
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
++  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWlexpt.p5m	Wed Jun 01 01:18:02 2011 -0700
@@ -0,0 +1,29 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/[email protected] type=require
+