7168923 Upgrade Expat to version 2.1.0
authorPetr Sumbera <petr.sumbera@oracle.com>
Mon, 21 May 2012 01:44:27 -0700
changeset 824 3c0f8247e0cd
parent 823 dc5bf8bfadaa
child 825 78809aba88fe
7168923 Upgrade Expat to version 2.1.0 7154639 Problem with library/libexpat
components/libexpat/Makefile
components/libexpat/expat.p5m
components/libexpat/patches/CVE-2009-3560.patch
components/libexpat/patches/CVE-2009-3720.patch
--- a/components/libexpat/Makefile	Fri May 18 10:35:58 2012 -0700
+++ b/components/libexpat/Makefile	Mon May 21 01:44:27 2012 -0700
@@ -26,23 +26,19 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		expat
-COMPONENT_VERSION=	2.0.1
+COMPONENT_VERSION=	2.1.0
 COMPONENT_PROJECT_URL=	http://expat.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
-COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/project/expat/expat/2.0.1/$(COMPONENT_ARCHIVE)
+    sha256:823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
+COMPONENT_ARCHIVE_URL= \
+    http://downloads.sourceforge.net/project/expat/expat/$(COMPONENT_VERSION)/$(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)"
 
--- a/components/libexpat/expat.p5m	Fri May 18 10:35:58 2012 -0700
+++ b/components/libexpat/expat.p5m	Mon May 21 01:44:27 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -39,16 +39,20 @@
 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
+dir path=usr/lib/$(MACH64)/pkgconfig
+dir path=usr/lib/pkgconfig
+file path=usr/lib/libexpat.so.1.6.0
+file path=usr/lib/$(MACH64)/libexpat.so.1.6.0
+file path=usr/lib/$(MACH64)/pkgconfig/expat.pc
+file path=usr/lib/pkgconfig/expat.pc
 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
+link path=usr/lib/$(MACH64)/libexpat.so.0 target=libexpat.so.1.6.0
+link path=usr/lib/$(MACH64)/libexpat.so.1 target=libexpat.so.1.6.0
+link path=usr/lib/$(MACH64)/libexpat.so target=libexpat.so.1.6.0
+link path=usr/lib/libexpat.so.0 target=libexpat.so.1.6.0
+link path=usr/lib/libexpat.so.1 target=libexpat.so.1.6.0
+link path=usr/lib/libexpat.so target=libexpat.so.1.6.0
 
 legacy pkg=SUNWlexpt \
     name="libexpat - XML parser library" \
--- a/components/libexpat/patches/CVE-2009-3560.patch	Fri May 18 10:35:58 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- 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 */
--- a/components/libexpat/patches/CVE-2009-3720.patch	Fri May 18 10:35:58 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- 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: \