Permalink
Browse files

Import of a new expat version. Upstream Changes:

Release 2.1.1 Sat March 12 2016
        Security fixes:
            #582: CVE-2015-1283 - Multiple integer overflows in XML_GetBuffer

        Bug fixes:
            #502: Fix potential null pointer dereference
            #520: Symbol XML_SetHashSalt was not exported
            Output of "xmlwf -h" was incomplete

        Other changes
            #503: Document behavior of calling XML_SetHashSalt with salt 0
            Minor improvements to man page xmlwf(1)
            Improvements to the experimental CMake build system
            libtool now invoked with --verbose
  • Loading branch information...
1 parent d8d2ac6 commit 882ebf1fab24362feacbbeff63401bfc343ababe spz committed May 14, 2016
Showing with 1,247 additions and 9,337 deletions.
  1. +6 −6 external/mit/expat/dist/CMake.README
  2. +8 −3 external/mit/expat/dist/CMakeLists.txt
  3. +16 −1 external/mit/expat/dist/Changes
  4. +1 −1 external/mit/expat/dist/MANIFEST
  5. +2 −2 external/mit/expat/dist/Makefile.in
  6. +1 −1 external/mit/expat/dist/README
  7. +9 −8,450 external/mit/expat/dist/aclocal.m4
  8. +1 −1 external/mit/expat/dist/bcb5/elements.bpr
  9. +1 −1 external/mit/expat/dist/bcb5/expat.bpr
  10. +1 −1 external/mit/expat/dist/bcb5/expat_static.bpr
  11. +1 −1 external/mit/expat/dist/bcb5/expatw.bpr
  12. +1 −1 external/mit/expat/dist/bcb5/expatw_static.bpr
  13. +1 −1 external/mit/expat/dist/bcb5/outline.bpr
  14. +1 −1 external/mit/expat/dist/bcb5/xmlwf.bpr
  15. +322 −286 external/mit/expat/dist/configure
  16. +155 −0 external/mit/expat/dist/configure.ac
  17. +1 −1 external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4
  18. +135 −232 external/mit/expat/dist/conftools/config.guess
  19. +106 −67 external/mit/expat/dist/conftools/config.sub
  20. +21 −14 external/mit/expat/dist/conftools/install-sh
  21. +57 −38 external/mit/expat/dist/conftools/ltmain.sh
  22. +1 −1 external/mit/expat/dist/conftools/mkinstalldirs
  23. BIN external/mit/expat/dist/doc/expat.png
  24. +6 −2 external/mit/expat/dist/doc/reference.html
  25. BIN external/mit/expat/dist/doc/valid-xhtml10.png
  26. +102 −107 external/mit/expat/dist/doc/xmlwf.1
  27. +3 −4 external/mit/expat/dist/doc/xmlwf.sgml
  28. +1 −1 external/mit/expat/dist/examples/elements.c
  29. +1 −1 external/mit/expat/dist/expat_config.h.in
  30. +0 −3 external/mit/expat/dist/lib/amigaconfig.h
  31. +1 −1 external/mit/expat/dist/lib/expat.h
  32. +3 −0 external/mit/expat/dist/lib/libexpat.def
  33. +3 −0 external/mit/expat/dist/lib/libexpatw.def
  34. +18 −3 external/mit/expat/dist/lib/xmlparse.c
  35. +230 −84 external/mit/expat/dist/m4/libtool.m4
  36. +17 −2 external/mit/expat/dist/m4/ltoptions.m4
  37. +5 −5 external/mit/expat/dist/m4/ltversion.m4
  38. +1 −1 external/mit/expat/dist/tests/benchmark/README.txt
  39. +0 −4 external/mit/expat/dist/tests/chardata.c
  40. +5 −5 external/mit/expat/dist/win32/expat.iss
  41. +2 −2 external/mit/expat/dist/xmlwf/unixfilemap.c
  42. +1 −2 external/mit/expat/dist/xmlwf/xmlwf.c
@@ -3,25 +3,25 @@
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
+Assuming ~/expat-2.1.1 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$
+~/expat-2.1.1$ mkdir build && cd build
+~/expat-2.1.1/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 ..
+~/expat-2.1.1/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
+-- Build files have been written to: /home/patrick/expat-2.1.1/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
+~/expat-2.1.1/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
@@ -6,7 +6,7 @@ project(expat)
cmake_minimum_required(VERSION 2.6)
set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")
set(PACKAGE_NAME "expat")
-set(PACKAGE_VERSION "2.1.0")
+set(PACKAGE_VERSION "2.1.1")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}")
@@ -86,26 +86,31 @@ if(BUILD_tools AND NOT WINCE)
)
add_executable(xmlwf ${xmlwf_SRCS})
+ set_property(TARGET xmlwf PROPERTY RUNTIME_OUTPUT_DIRECTORY xmlwf)
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)
+ set_property(TARGET elements PROPERTY RUNTIME_OUTPUT_DIRECTORY examples)
target_link_libraries(elements expat)
add_executable(outline examples/outline.c)
+ set_property(TARGET outline PROPERTY RUNTIME_OUTPUT_DIRECTORY examples)
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)
+ set_property(TARGET runtests PROPERTY RUNTIME_OUTPUT_DIRECTORY tests)
target_link_libraries(runtests expat)
- add_test(runtests runtests)
+ add_test(runtests tests/runtests)
add_executable(runtestspp tests/runtestspp.cpp tests/chardata.c tests/minicheck.c)
+ set_property(TARGET runtestspp PROPERTY RUNTIME_OUTPUT_DIRECTORY tests)
target_link_libraries(runtestspp expat)
- add_test(runtestspp runtestspp)
+ add_test(runtestspp tests/runtestspp)
endif(BUILD_tests)
@@ -1,3 +1,18 @@
+Release 2.1.1 Sat March 12 2016
+ Security fixes:
+ #582: CVE-2015-1283 - Multiple integer overflows in XML_GetBuffer
+
+ Bug fixes:
+ #502: Fix potential null pointer dereference
+ #520: Symbol XML_SetHashSalt was not exported
+ Output of "xmlwf -h" was incomplete
+
+ Other changes
+ #503: Document behavior of calling XML_SetHashSalt with salt 0
+ Minor improvements to man page xmlwf(1)
+ Improvements to the experimental CMake build system
+ libtool now invoked with --verbose
+
Release 2.1.0 Sat March 24 2012
- Bug Fixes:
#1742315: Harmful XML_ParserCreateNS suggestion.
@@ -23,7 +38,7 @@ Release 2.1.0 Sat March 24 2012
#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
+ Added new API member XML_SetHashSalt() that allows setting an initial
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
@@ -54,7 +54,7 @@ MANIFEST
Makefile.in
README
configure
-configure.in
+configure.ac
expat_config.h.in
expat_config.h.cmake
expat.pc.in
@@ -42,7 +42,7 @@ INSTALL_DATA = @INSTALL_DATA@
mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
MANFILE = $(srcdir)/doc/xmlwf.1
-APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
+APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h expat_config.h
LIBRARY = libexpat.la
DESTDIR = $(INSTALL_ROOT)
@@ -116,7 +116,7 @@ CXXFLAGS = @CXXFLAGS@
VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
### autoconf this?
-LTFLAGS = --silent
+LTFLAGS = --verbose
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)
@@ -1,5 +1,5 @@
- Expat, Release 2.1.0
+ Expat, Release 2.1.1
This is Expat, a C library for parsing XML, written by James Clark.
Expat is a stream-oriented XML parser. This means that you register
Oops, something went wrong.

0 comments on commit 882ebf1

Please sign in to comment.