Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/expat/dist import of expat 2.1.0
details: https://anonhg.NetBSD.org/src/rev/b643cf564f93
branches: trunk
changeset: 778600:b643cf564f93
user: spz <spz%NetBSD.org@localhost>
date: Fri Apr 06 10:22:52 2012 +0000
description:
import of expat 2.1.0
Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security
issues have been previously fixed in our tree)
relevant Changes:
Release 2.1.0 Sat March 24 2012
- Bug Fixes:
#1742315: Harmful XML_ParserCreateNS suggestion.
#2895533: CVE-2012-1147 - Resource leak in readfilemap.c.
#1785430: Expat build fails on linux-amd64 with gcc version>=4.1 -O3.
#1983953, 2517952, 2517962, 2649838:
Build modifications using autoreconf instead of buildconf.sh.
#2815947, #2884086: OBJEXT and EXEEXT support while building.
#1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences.
#2517938: xmlwf should return non-zero exit status if not well-formed.
#2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml.
#2855609: Dangling positionPtr after error.
#2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8().
#2958794: CVE-2012-1148 - Memory leak in poolGrow.
#2990652: CMake support.
#3010819: UNEXPECTED_STATE with a trailing "%" in entity value.
#3206497: Unitialized memory returned from XML_Parse.
#3287849: make check fails on mingw-w64.
#3496608: CVE-2012-0876 - Hash DOS attack.
- Patches:
#1749198: pkg-config support.
#3010222: Fix for bug #3010819.
#3312568: CMake support.
#3446384: Report byte offsets for attr names and values.
- New Features / API changes:
Added new API member XML_SetHashSalt() that allows setting an intial
value (salt) for hash calculations. This is part of the fix for
bug #3496608 to randomize hash parameters.
When compiled with XML_ATTR_INFO defined, adds new API member
XML_GetAttributeInfo() that allows retrieving the byte
offsets for attribute names and values (patch #3446384).
Added CMake build system.
See bug #2990652 and patch #3312568.
Added run-benchmark target to Makefile.in - relies on testdata module
present in the same relative location as in the repository.
diffstat:
external/mit/expat/dist/CMake.README | 42 +
external/mit/expat/dist/CMakeLists.txt | 111 +
external/mit/expat/dist/Changes | 80 +-
external/mit/expat/dist/ConfigureChecks.cmake | 44 +
external/mit/expat/dist/MANIFEST | 23 +-
external/mit/expat/dist/Makefile.in | 92 +-
external/mit/expat/dist/README | 14 +-
external/mit/expat/dist/aclocal.m4 | 8460 +++
external/mit/expat/dist/amiga/Makefile | 403 +-
external/mit/expat/dist/amiga/README.txt | 90 +-
external/mit/expat/dist/amiga/expat_68k.c | 939 +
external/mit/expat/dist/amiga/expat_68k.h | 94 +
external/mit/expat/dist/amiga/expat_68k_handler_stubs.c | 185 +
external/mit/expat/dist/amiga/expat_base.h | 40 +
external/mit/expat/dist/amiga/expat_lib.c | 114 +-
external/mit/expat/dist/amiga/expat_vectors.c | 6 +-
external/mit/expat/dist/amiga/launch.c | 29 +-
external/mit/expat/dist/configure | 29819 ++++++-------
external/mit/expat/dist/configure.in | 17 +-
external/mit/expat/dist/conftools/config.guess | 491 +-
external/mit/expat/dist/conftools/config.sub | 276 +-
external/mit/expat/dist/conftools/expat.m4 | 2 +-
external/mit/expat/dist/conftools/install-sh | 663 +-
external/mit/expat/dist/conftools/ltmain.sh | 10387 +++-
external/mit/expat/dist/doc/reference.html | 61 +-
external/mit/expat/dist/doc/xmlwf.sgml | 5 -
external/mit/expat/dist/examples/elements.dsp | 8 +-
external/mit/expat/dist/examples/outline.dsp | 8 +-
external/mit/expat/dist/expat.pc.in | 11 +
external/mit/expat/dist/expat_config.h.cmake | 91 +
external/mit/expat/dist/expat_config.h.in | 14 +-
external/mit/expat/dist/lib/expat.dsp | 8 +-
external/mit/expat/dist/lib/expat.h | 39 +-
external/mit/expat/dist/lib/expat_static.dsp | 2 +-
external/mit/expat/dist/lib/expatw.dsp | 8 +-
external/mit/expat/dist/lib/xmlrole.c | 2 +-
external/mit/expat/dist/lib/xmltok.c | 6 +-
external/mit/expat/dist/m4/libtool.m4 | 7851 +++
external/mit/expat/dist/m4/ltoptions.m4 | 369 +
external/mit/expat/dist/m4/ltsugar.m4 | 123 +
external/mit/expat/dist/m4/ltversion.m4 | 23 +
external/mit/expat/dist/m4/lt~obsolete.m4 | 98 +
external/mit/expat/dist/tests/README.txt | 5 +-
external/mit/expat/dist/tests/benchmark/benchmark.dsp | 8 +-
external/mit/expat/dist/tests/minicheck.h | 9 +-
external/mit/expat/dist/tests/runtests.c | 3 +-
external/mit/expat/dist/tests/xmltest.sh | 7 +-
external/mit/expat/dist/win32/README.txt | 2 +-
external/mit/expat/dist/win32/expat.iss | 14 +-
external/mit/expat/dist/xmlwf/readfilemap.c | 2 +
external/mit/expat/dist/xmlwf/xmlwf.c | 4 +-
external/mit/expat/dist/xmlwf/xmlwf.dsp | 8 +-
52 files changed, 39935 insertions(+), 21275 deletions(-)
diffs (truncated from 68661 to 300 lines):
diff -r 26f524f1b214 -r b643cf564f93 external/mit/expat/dist/CMake.README
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/expat/dist/CMake.README Fri Apr 06 10:22:52 2012 +0000
@@ -0,0 +1,42 @@
+== How to build expat with cmake (experimental) ==
+
+The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual
+Studio) and should work on all other platform cmake supports.
+
+Assuming ~/expat-2.1.0 is the source directory of expat, add a subdirectory
+build and change into that directory:
+~/expat-2.1.0$ mkdir build && cd build
+~/expat-2.1.0/build$
+
+From that directory, call cmake first, then call make, make test and
+make install in the usual way:
+~/expat-2.1.0/build$ cmake ..
+-- The C compiler identification is GNU
+-- The CXX compiler identification is GNU
+....
+-- Configuring done
+-- Generating done
+-- Build files have been written to: /home/patrick/expat-2.1.0/build
+
+If you want to specify the install location for your files, append
+-DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.
+
+~/expat-2.1.0/build$ make && make test && make install
+Scanning dependencies of target expat
+[ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o
+[ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o
+....
+-- Installing: /usr/local/lib/pkgconfig/expat.pc
+-- Installing: /usr/local/bin/xmlwf
+-- Installing: /usr/local/share/man/man1/xmlwf.1
+
+For Windows builds, you must make sure to call cmake from an environment where
+your compiler is reachable, that means either you call it from the
+Visual Studio Command Prompt or when using mingw, you must open a cmd.exe and
+make sure that gcc can be called. On Windows, you also might want to specify a
+special Generator for CMake:
+for Visual Studio builds do:
+cmake .. -G "Visual Studio 10" && vcexpress expat.sln
+for mingw builds do:
+cmake .. -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:\expat-install
+ && gmake && gmake install
diff -r 26f524f1b214 -r b643cf564f93 external/mit/expat/dist/CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/expat/dist/CMakeLists.txt Fri Apr 06 10:22:52 2012 +0000
@@ -0,0 +1,111 @@
+# This file is copyrighted under the BSD-license for buildsystem files of KDE
+# copyright 2010, Patrick Spendrin <ps_ml%gmx.de@localhost>
+
+project(expat)
+
+cmake_minimum_required(VERSION 2.6)
+set(PACKAGE_BUGREPORT "expat-bugs%libexpat.org@localhost")
+set(PACKAGE_NAME "expat")
+set(PACKAGE_VERSION "2.1.0")
+set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+set(PACKAGE_TARNAME "${PACKAGE_NAME}")
+
+option(BUILD_tools "build the xmlwf tool for expat library" ON)
+option(BUILD_examples "build the examples for expat library" ON)
+option(BUILD_tests "build the tests for expat library" ON)
+option(BUILD_shared "build a shared expat library" ON)
+
+# configuration options
+set(XML_CONTEXT_BYTES 1024 CACHE STRING "Define to specify how much context to retain around the current parse point")
+option(XML_DTD "Define to make parameter entity parsing functionality available" ON)
+option(XML_NS "Define to make XML Namespaces functionality available" ON)
+
+if(XML_DTD)
+ set(XML_DTD 1)
+else(XML_DTD)
+ set(XML_DTD 0)
+endif(XML_DTD)
+if(XML_NS)
+ set(XML_NS 1)
+else(XML_NS)
+ set(XML_NS 0)
+endif(XML_NS)
+
+if(BUILD_tests)
+ enable_testing()
+endif(BUILD_tests)
+
+include(ConfigureChecks.cmake)
+
+include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib)
+if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996)
+endif(MSVC)
+
+set(expat_SRCS
+ lib/xmlparse.c
+ lib/xmlrole.c
+ lib/xmltok.c
+ lib/xmltok_impl.c
+ lib/xmltok_ns.c
+)
+
+if(WIN32 AND BUILD_shared)
+ set(expat_SRCS ${expat_SRCS} lib/libexpat.def)
+endif(WIN32 AND BUILD_shared)
+
+if(BUILD_shared)
+ set(_SHARED SHARED)
+else(BUILD_shared)
+ set(_SHARED STATIC)
+endif(BUILD_shared)
+
+add_library(expat ${_SHARED} ${expat_SRCS})
+
+install(TARGETS expat RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix "\${prefix}/bin")
+set(libdir "\${prefix}/lib")
+set(includedir "\${prefix}/include")
+configure_file(expat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/expat.pc)
+
+install(FILES lib/expat.h lib/expat_external.h DESTINATION include)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig)
+
+
+
+if(BUILD_tools AND NOT WINCE)
+ set(xmlwf_SRCS
+ xmlwf/xmlwf.c
+ xmlwf/xmlfile.c
+ xmlwf/codepage.c
+ xmlwf/readfilemap.c
+ )
+
+ add_executable(xmlwf ${xmlwf_SRCS})
+ target_link_libraries(xmlwf expat)
+ install(TARGETS xmlwf DESTINATION bin)
+ install(FILES doc/xmlwf.1 DESTINATION share/man/man1)
+endif(BUILD_tools AND NOT WINCE)
+
+if(BUILD_examples)
+ add_executable(elements examples/elements.c)
+ target_link_libraries(elements expat)
+
+ add_executable(outline examples/outline.c)
+ target_link_libraries(outline expat)
+endif(BUILD_examples)
+
+if(BUILD_tests)
+ ## these are unittests that can be run on any platform
+ add_executable(runtests tests/runtests.c tests/chardata.c tests/minicheck.c)
+ target_link_libraries(runtests expat)
+ add_test(runtests runtests)
+
+ add_executable(runtestspp tests/runtestspp.cpp tests/chardata.c tests/minicheck.c)
+ target_link_libraries(runtestspp expat)
+ add_test(runtestspp runtestspp)
+endif(BUILD_tests)
diff -r 26f524f1b214 -r b643cf564f93 external/mit/expat/dist/Changes
--- a/external/mit/expat/dist/Changes Fri Apr 06 10:10:11 2012 +0000
+++ b/external/mit/expat/dist/Changes Fri Apr 06 10:22:52 2012 +0000
@@ -1,5 +1,41 @@
+Release 2.1.0 Sat March 24 2012
+ - Bug Fixes:
+ #1742315: Harmful XML_ParserCreateNS suggestion.
+ #2895533: CVE-2012-1147 - Resource leak in readfilemap.c.
+ #1785430: Expat build fails on linux-amd64 with gcc version>=4.1 -O3.
+ #1983953, 2517952, 2517962, 2649838:
+ Build modifications using autoreconf instead of buildconf.sh.
+ #2815947, #2884086: OBJEXT and EXEEXT support while building.
+ #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences.
+ #2517938: xmlwf should return non-zero exit status if not well-formed.
+ #2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml.
+ #2855609: Dangling positionPtr after error.
+ #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8().
+ #2958794: CVE-2012-1148 - Memory leak in poolGrow.
+ #2990652: CMake support.
+ #3010819: UNEXPECTED_STATE with a trailing "%" in entity value.
+ #3206497: Unitialized memory returned from XML_Parse.
+ #3287849: make check fails on mingw-w64.
+ #3496608: CVE-2012-0876 - Hash DOS attack.
+ - Patches:
+ #1749198: pkg-config support.
+ #3010222: Fix for bug #3010819.
+ #3312568: CMake support.
+ #3446384: Report byte offsets for attr names and values.
+ - New Features / API changes:
+ Added new API member XML_SetHashSalt() that allows setting an intial
+ value (salt) for hash calculations. This is part of the fix for
+ bug #3496608 to randomize hash parameters.
+ When compiled with XML_ATTR_INFO defined, adds new API member
+ XML_GetAttributeInfo() that allows retrieving the byte
+ offsets for attribute names and values (patch #3446384).
+ Added CMake build system.
+ See bug #2990652 and patch #3312568.
+ Added run-benchmark target to Makefile.in - relies on testdata module
+ present in the same relative location as in the repository.
+
Release 2.0.1 Tue June 5 2007
- - Fixed bugs #1515266, 1515600: The character data handler's calling
+ - Fixed bugs #1515266, #1515600: The character data handler's calling
of XML_StopParser() was not handled properly; if the parser was
stopped and the handler set to NULL, the parser would segfault.
- Fixed bug #1690883: Expat failed on EBCDIC systems as it assumed
@@ -8,7 +44,7 @@
- Fixed xmlwf bug #1513566: "out of memory" error on file size zero.
- Fixed outline.c bug #1543233: missing a final XML_ParserFree() call.
- Fixes and improvements for Windows platform:
- bugs #1409451, #1476160, 1548182, 1602769, 1717322.
+ bugs #1409451, #1476160, #1548182, #1602769, #1717322.
- Build fixes for various platforms:
HP-UX, Tru64, Solaris 9: patch #1437840, bug #1196180.
All Unix: #1554618 (refreshed config.sub/config.guess).
@@ -30,8 +66,8 @@
byte indexes and line/column numbers.
- Updated to use libtool 1.5.22 (the most recent).
- Added support for AmigaOS.
- - Some mostly minor bug fixes. SF issues include: 1006708,
- 1021776, 1023646, 1114960, 1156398, 1221160, 1271642.
+ - Some mostly minor bug fixes. SF issues include: #1006708,
+ #1021776, #1023646, #1114960, #1156398, #1221160, #1271642.
Release 1.95.8 Fri Jul 23 2004
- Major new feature: suspend/resume. Handlers can now request
@@ -40,8 +76,8 @@
documentation for more details.
- Some mostly minor bug fixes, but compilation should no
longer generate warnings on most platforms. SF issues
- include: 827319, 840173, 846309, 888329, 896188, 923913,
- 928113, 961698, 985192.
+ include: #827319, #840173, #846309, #888329, #896188, #923913,
+ #928113, #961698, #985192.
Release 1.95.7 Mon Oct 20 2003
- Fixed enum XML_Status issue (reported on SourceForge many
@@ -54,19 +90,19 @@
- Improved ability to build without the configure-generated
expat_config.h header. This is useful for applications
which embed Expat rather than linking in the library.
- - Fixed a variety of bugs: see SF issues 458907, 609603,
- 676844, 679754, 692878, 692964, 695401, 699323, 699487,
- 820946.
+ - Fixed a variety of bugs: see SF issues #458907, #609603,
+ #676844, #679754, #692878, #692964, #695401, #699323, #699487,
+ #820946.
- Improved hash table lookups.
- Added more regression tests and improved documentation.
Release 1.95.6 Tue Jan 28 2003
- Added XML_FreeContentModel().
- Added XML_MemMalloc(), XML_MemRealloc(), XML_MemFree().
- - Fixed a variety of bugs: see SF issues 615606, 616863,
- 618199, 653180, 673791.
+ - Fixed a variety of bugs: see SF issues #615606, #616863,
+ #618199, #653180, #673791.
- Enhanced the regression test suite.
- - Man page improvements: includes SF issue 632146.
+ - Man page improvements: includes SF issue #632146.
Release 1.95.5 Fri Sep 6 2002
- Added XML_UseForeignDTD() for improved SAX2 support.
@@ -84,9 +120,9 @@
- Reduced line-length for all source code and headers to be
no longer than 80 characters, to help with AS/400 support.
- Reduced memory copying during parsing (SF patch #600964).
- - Fixed a variety of bugs: see SF issues 580793, 434664,
- 483514, 580503, 581069, 584041, 584183, 584832, 585537,
- 596555, 596678, 598352, 598944, 599715, 600479, 600971.
+ - Fixed a variety of bugs: see SF issues #580793, #434664,
+ #483514, #580503, #581069, #584041, #584183, #584832, #585537,
+ #596555, #596678, #598352, #598944, #599715, #600479, #600971.
Release 1.95.4 Fri Jul 12 2002
- Added support for VMS, contributed by Craig Berry. See
@@ -95,14 +131,14 @@
contributed by Thomas Wegner and Daryle Walker.
- Added Borland C++ Builder 5 / BCC 5.5 support, contributed
by Patrick McConnell (SF patch #538032).
- - Fixed a variety of bugs: see SF issues 441449, 563184,
- 564342, 566334, 566901, 569461, 570263, 575168, 579196.
+ - Fixed a variety of bugs: see SF issues #441449, #563184,
+ #564342, #566334, #566901, #569461, #570263, #575168, #579196.
- Made skippedEntityHandler conform to SAX2 (see source comment)
- Re-implemented WFC: Entity Declared from XML 1.0 spec and
added a new error "entity declared in parameter entity":
- see SF bug report 569461 and SF patch 578161
+ see SF bug report #569461 and SF patch #578161
- Re-implemented section 5.1 from XML 1.0 spec:
- see SF bug report 570263 and SF patch 578161
+ see SF bug report #570263 and SF patch #578161
Release 1.95.3 Mon Jun 3 2002
- Added a project to the MSVC workspace to create a wchar_t
@@ -114,9 +150,9 @@
- Made the XML_UNICODE builds usable (thanks, Karl!).
- Allow xmlwf to read from standard input.
- Install a man page for xmlwf on Unix systems.
Home |
Main Index |
Thread Index |
Old Index