23632809 Upgrade Expat to version 2.2.0 s11u3-sru
authorPetr Sumbera <petr.sumbera@oracle.com>
Wed, 20 Jul 2016 06:05:37 -0700
branchs11u3-sru
changeset 6461 8afd558769c1
parent 6460 fa4a58170e16
child 6462 c7683bfb0dab
23632809 Upgrade Expat to version 2.2.0 23554695 problem in LIBRARY/LIBEXPAT 23305021 problem in LIBRARY/LIBEXPAT 23303853 problem in LIBRARY/LIBEXPAT
components/libexpat/Makefile
components/libexpat/expat.p5m
--- a/components/libexpat/Makefile	Fri Jul 15 08:40:02 2016 -0700
+++ b/components/libexpat/Makefile	Wed Jul 20 06:05:37 2016 -0700
@@ -20,24 +20,24 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libexpat
-COMPONENT_VERSION=	2.1.0
+COMPONENT_VERSION=	2.2.0
 COMPONENT_PROJECT_URL=	http://expat.sourceforge.net/
 COMPONENT_SRC_NAME=	expat
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
+    sha256:d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff
 COMPONENT_ARCHIVE_URL= \
     http://downloads.sourceforge.net/project/expat/expat/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libexpat
 
-TPNO=			5498
+TPNO=			29609
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
--- a/components/libexpat/expat.p5m	Fri Jul 15 08:40:02 2016 -0700
+++ b/components/libexpat/expat.p5m	Wed Jul 20 06:05:37 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -34,23 +34,18 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/378
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr
-dir  path=usr/include
 file path=usr/include/expat.h
+file path=usr/include/expat_config.h
 file path=usr/include/expat_external.h
-dir  path=usr/lib
-dir  path=usr/lib/$(MACH64)
-link path=usr/lib/$(MACH64)/libexpat.so target=libexpat.so.1.6.0
-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
-file path=usr/lib/$(MACH64)/libexpat.so.1.6.0
-dir  path=usr/lib/$(MACH64)/pkgconfig
+link path=usr/lib/$(MACH64)/libexpat.so target=libexpat.so.1.6.2
+link path=usr/lib/$(MACH64)/libexpat.so.0 target=libexpat.so.1.6.2
+link path=usr/lib/$(MACH64)/libexpat.so.1 target=libexpat.so.1.6.2
+file path=usr/lib/$(MACH64)/libexpat.so.1.6.2
 file path=usr/lib/$(MACH64)/pkgconfig/expat.pc
-link path=usr/lib/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
-file path=usr/lib/libexpat.so.1.6.0
-dir  path=usr/lib/pkgconfig
+link path=usr/lib/libexpat.so target=libexpat.so.1.6.2
+link path=usr/lib/libexpat.so.0 target=libexpat.so.1.6.2
+link path=usr/lib/libexpat.so.1 target=libexpat.so.1.6.2
+file path=usr/lib/libexpat.so.1.6.2
 file path=usr/lib/pkgconfig/expat.pc
 legacy pkg=SUNWlexpt desc="libexpat - XML parser library" \
     name="libexpat - XML parser library"