Mercurial Mercurial > sustaining > oi_151a > sfw-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump libexpat to 2.1.0 oi_151a
authorJon Tibble <meths@btinternet.com>
Tue, 12 Feb 2013 19:48:26 +0000
branchoi_151a
changeset 196 17f11e9406aa
parent 195 7a28aa6136c4
child 197 b08b49a811fe
Bump libexpat to 2.1.0
usr/src/lib/libexpat/CVE-2009-3560.patch file | annotate | diff | comparison | revisions
usr/src/lib/libexpat/CVE-2009-3720.patch file | annotate | diff | comparison | revisions
usr/src/lib/libexpat/METADATA file | annotate | diff | comparison | revisions
usr/src/lib/libexpat/Makefile.sfw file | annotate | diff | comparison | revisions
usr/src/lib/libexpat/expat-2.0.1.tar.gz file | annotate | diff | comparison | revisions
usr/src/lib/libexpat/expat-2.1.0.tar.gz file | annotate | diff | comparison | revisions
usr/src/lib/libexpat/install-sfw file | annotate | diff | comparison | revisions
usr/src/lib/libexpat/install-sfw-64 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWlexpt/pkginfo.tmpl file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWlexpt/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWlexpt/prototype_i386 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWlexpt/prototype_sparc file | annotate | diff | comparison | revisions 
--- a/usr/src/lib/libexpat/CVE-2009-3560.patch	Sun Feb 10 22:45:27 2013 +0000
+++ /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
-@@ -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/usr/src/lib/libexpat/CVE-2009-3720.patch	Sun Feb 10 22:45:27 2013 +0000
+++ /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
-@@ -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: \
--- a/usr/src/lib/libexpat/METADATA	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/lib/libexpat/METADATA	Tue Feb 12 19:48:26 2013 +0000
@@ -1,10 +1,10 @@
 NAME:             expat
-VERSION:          2.0.1
+VERSION:          2.1.0
 DESCRIPTION:      A fast, non-validating, stream-oriented XML parsing library
 LICENSE:          BSD-like
 PACKAGE:          SUNWlexpt
 PROJECT_URL:      http://expat.sourceforge.net
-SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
+SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz
 SUPPORT:          B
 BUGTRAQ:          solaris/library/libexpat
 OSR:              6651
--- a/usr/src/lib/libexpat/Makefile.sfw	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/lib/libexpat/Makefile.sfw	Tue Feb 12 19:48:26 2013 +0000
@@ -24,7 +24,7 @@
 #
 #ident	"@(#)Makefile.sfw	1.10	09/11/30 SMI"
 
-VER=expat-2.0.1
+VER=expat-2.1.0
 VER64=$(VER)-64
 
 LARGEFILES=     -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -75,8 +75,6 @@
 
 $(VER)/configure: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
-	(cd $(VER); gpatch -p0 < ../CVE-2009-3560.patch)
-	(cd $(VER); gpatch -p0 < ../CVE-2009-3720.patch)
 	touch $(VER)/configure
 
 $(VER64)/configure: $(VER).tar.gz
@@ -84,8 +82,6 @@
 	gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
 	rm -rf $(VER64)
 	mv tmp/$(VER) $(VER64); rmdir tmp
-	(cd $(VER64); gpatch -p0 < ../CVE-2009-3560.patch)
-	(cd $(VER64); gpatch -p0 < ../CVE-2009-3720.patch)
 	touch $(VER64)/configure
 clean:
 	-rm -rf $(VER)
Binary file usr/src/lib/libexpat/expat-2.0.1.tar.gz has changed
Binary file usr/src/lib/libexpat/expat-2.1.0.tar.gz has changed
--- a/usr/src/lib/libexpat/install-sfw	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/lib/libexpat/install-sfw	Tue Feb 12 19:48:26 2013 +0000
@@ -25,7 +25,7 @@
 #
 #ident	"@(#)install-sfw	1.6	07/08/31 SMI"
 
-VERS=expat-2.0.1
+VERS=expat-2.1.0
 
 PREFIX=${ROOT}/usr
 LIBDIR=${PREFIX}/lib
@@ -35,11 +35,11 @@
 
 cd ${VERS}
 
-_install D .libs/libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1.5.2 555
+_install D .libs/libexpat.so.1.6.0 ${LIBDIR}/libexpat.so.1.6.0 555
 _install N lib/expat.h ${INCDIR}/expat.h 444
 _install N lib/expat_external.h ${INCDIR}/expat_external.h 444
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.0
+_install L libexpat.so.1.6.0 ${LIBDIR}/libexpat.so
+_install L libexpat.so.1.6.0 ${LIBDIR}/libexpat.so.1
+_install L libexpat.so.1.6.0 ${LIBDIR}/libexpat.so.0
 
 exit 0
--- a/usr/src/lib/libexpat/install-sfw-64	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/lib/libexpat/install-sfw-64	Tue Feb 12 19:48:26 2013 +0000
@@ -25,7 +25,7 @@
 #
 #ident	"@(#)install-sfw-64	1.7	07/08/31 SMI"
 
-VERS=expat-2.0.1-64
+VERS=expat-2.1.0-64
 
 PREFIX=${ROOT}/usr
 LIBDIR=${PREFIX}/lib/${MACH64}
@@ -35,9 +35,9 @@
 
 cd ${VERS}
 
-_install D .libs/libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1.5.2 555
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.1
-_install L libexpat.so.1.5.2 ${LIBDIR}/libexpat.so.0
+_install D .libs/libexpat.so.1.6.0 ${LIBDIR}/libexpat.so.1.6.0 555
+_install L libexpat.so.1.6.0 ${LIBDIR}/libexpat.so
+_install L libexpat.so.1.6.0 ${LIBDIR}/libexpat.so.1
+_install L libexpat.so.1.6.0 ${LIBDIR}/libexpat.so.0
 
 exit 0
--- a/usr/src/pkgdefs/SUNWlexpt/pkginfo.tmpl	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWlexpt/pkginfo.tmpl	Tue Feb 12 19:48:26 2013 +0000
@@ -37,7 +37,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="libexpat - XML parser library 2.0.1"
+DESC="libexpat - XML parser library 2.1.0"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWlexpt/prototype_com	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWlexpt/prototype_com	Tue Feb 12 19:48:26 2013 +0000
@@ -49,7 +49,7 @@
 f none usr/include/expat.h 444 root bin
 f none usr/include/expat_external.h 444 root bin
 d none usr/lib 0755 root bin
-f none usr/lib/libexpat.so.1.5.2 555 root bin
-s none usr/lib/libexpat.so=libexpat.so.1.5.2 555 root bin
-s none usr/lib/libexpat.so.0=libexpat.so.1.5.2 555 root bin
-s none usr/lib/libexpat.so.1=libexpat.so.1.5.2 555 root bin
+f none usr/lib/libexpat.so.1.6.0 555 root bin
+s none usr/lib/libexpat.so=libexpat.so.1.6.0 555 root bin
+s none usr/lib/libexpat.so.0=libexpat.so.1.6.0 555 root bin
+s none usr/lib/libexpat.so.1=libexpat.so.1.6.0 555 root bin
--- a/usr/src/pkgdefs/SUNWlexpt/prototype_i386	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWlexpt/prototype_i386	Tue Feb 12 19:48:26 2013 +0000
@@ -49,8 +49,8 @@
 # SUNWlexpt
 #
 d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/libexpat.so.1.5.2 555 root bin
-s none usr/lib/amd64/libexpat.so=libexpat.so.1.5.2 555 root bin
-s none usr/lib/amd64/libexpat.so.0=libexpat.so.1.5.2 555 root bin
-s none usr/lib/amd64/libexpat.so.1=libexpat.so.1.5.2 555 root bin
+f none usr/lib/amd64/libexpat.so.1.6.0 555 root bin
+s none usr/lib/amd64/libexpat.so=libexpat.so.1.6.0 555 root bin
+s none usr/lib/amd64/libexpat.so.0=libexpat.so.1.6.0 555 root bin
+s none usr/lib/amd64/libexpat.so.1=libexpat.so.1.6.0 555 root bin
 
--- a/usr/src/pkgdefs/SUNWlexpt/prototype_sparc	Sun Feb 10 22:45:27 2013 +0000
+++ b/usr/src/pkgdefs/SUNWlexpt/prototype_sparc	Tue Feb 12 19:48:26 2013 +0000
@@ -49,7 +49,7 @@
 # SUNWlexpt
 #
 d none usr/lib/sparcv9 0755 root bin
-f none usr/lib/sparcv9/libexpat.so.1.5.2 555 root bin
-s none usr/lib/sparcv9/libexpat.so=libexpat.so.1.5.2 555 root bin
-s none usr/lib/sparcv9/libexpat.so.0=libexpat.so.1.5.2 555 root bin
-s none usr/lib/sparcv9/libexpat.so.1=libexpat.so.1.5.2 555 root bin
+f none usr/lib/sparcv9/libexpat.so.1.6.0 555 root bin
+s none usr/lib/sparcv9/libexpat.so=libexpat.so.1.6.0 555 root bin
+s none usr/lib/sparcv9/libexpat.so.0=libexpat.so.1.6.0 555 root bin
+s none usr/lib/sparcv9/libexpat.so.1=libexpat.so.1.6.0 555 root bin
sustaining/oi_151a/sfw-gate