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 from Changes:
details: https://anonhg.NetBSD.org/src/rev/4471f2800766
branches: trunk
changeset: 821413:4471f2800766
user: spz <spz%NetBSD.org@localhost>
date: Sat Feb 04 10:15:47 2017 +0000
description:
from Changes:
Release 2.2.0 Tue June 21 2016
Security fixes:
#537 CVE-2016-0718 -- Fix crash on malformed input
CVE-2016-4472 -- Improve insufficient fix to CVE-2015-1283 /
CVE-2015-2716 introduced with Expat 2.1.1
#499 CVE-2016-5300 -- Use more entropy for hash initialization
than the original fix to CVE-2012-0876
#519 CVE-2012-6702 -- Resolve troublesome internal call to srand
that was introduced with Expat 2.1.0
when addressing CVE-2012-0876 (issue #496)
Bug fixes:
Fix uninitialized reads of size 1
(e.g. in little2_updatePosition)
Fix detection of UTF-8 character boundaries
Other changes:
#532 Fix compilation for Visual Studio 2010 (keyword "C99")
Autotools: Resolve use of "$<" to better support bmake
Autotools: Add QA script "qa.sh" (and make target "qa")
Autotools: Respect CXXFLAGS if given
Autotools: Fix "make run-xmltest"
Autotools: Have "make run-xmltest" check for expected output
p90 CMake: Fix static build (BUILD_shared=OFF) on Windows
#536 CMake: Add soversion, support -DNO_SONAME=yes to bypass
#323 CMake: Add suffix "d" to differentiate debug from release
CMake: Define WIN32 with CMake on Windows
Annotate memory allocators for GCC
Address all currently known compile warnings
Make sure that API symbols remain visible despite
-fvisibility=hidden
Remove executable flag from source files
Resolve COMPILED_FROM_DSP in favor of WIN32
diffstat:
external/mit/expat/dist/CMake.README | 12 +-
external/mit/expat/dist/CMakeLists.txt | 28 +-
external/mit/expat/dist/COPYING | 5 +-
external/mit/expat/dist/Changes | 51 +-
external/mit/expat/dist/MANIFEST | 2 +-
external/mit/expat/dist/Makefile.in | 25 +-
external/mit/expat/dist/README | 4 +-
external/mit/expat/dist/aclocal.m4 | 4 +-
external/mit/expat/dist/bcb5/expat.bpr | 18 +-
external/mit/expat/dist/bcb5/expat.mak | 2 +-
external/mit/expat/dist/bcb5/expat_static.bpr | 16 +-
external/mit/expat/dist/bcb5/expat_static.mak | 2 +-
external/mit/expat/dist/bcb5/expatw.bpr | 20 +-
external/mit/expat/dist/bcb5/expatw.mak | 2 +-
external/mit/expat/dist/bcb5/expatw_static.bpr | 32 +-
external/mit/expat/dist/bcb5/expatw_static.mak | 2 +-
external/mit/expat/dist/bcb5/xmlwf.bpr | 14 +-
external/mit/expat/dist/bcb5/xmlwf.mak | 2 +-
external/mit/expat/dist/configure | 3324 +++++++-----
external/mit/expat/dist/configure.ac | 10 +-
external/mit/expat/dist/conftools/install-sh | 354 +-
external/mit/expat/dist/conftools/ltmain.sh | 5899 +++++++++++++++--------
external/mit/expat/dist/doc/xmlwf.1 | 5 +
external/mit/expat/dist/doc/xmlwf.xml | 440 +
external/mit/expat/dist/examples/elements.c | 7 +
external/mit/expat/dist/examples/outline.c | 7 +
external/mit/expat/dist/expat_config.h.in | 3 +-
external/mit/expat/dist/lib/expat.dsp | 4 +-
external/mit/expat/dist/lib/expat.h | 15 +-
external/mit/expat/dist/lib/expat_external.h | 14 +
external/mit/expat/dist/lib/expat_static.dsp | 4 +-
external/mit/expat/dist/lib/expatw.dsp | 4 +-
external/mit/expat/dist/lib/expatw_static.dsp | 4 +-
external/mit/expat/dist/lib/internal.h | 22 +
external/mit/expat/dist/lib/xmlrole.c | 224 +-
external/mit/expat/dist/m4/libtool.m4 | 2583 ++++++----
external/mit/expat/dist/m4/ltoptions.m4 | 127 +-
external/mit/expat/dist/m4/ltsugar.m4 | 7 +-
external/mit/expat/dist/m4/ltversion.m4 | 12 +-
external/mit/expat/dist/m4/lt~obsolete.m4 | 7 +-
external/mit/expat/dist/tests/chardata.c | 4 +-
external/mit/expat/dist/tests/minicheck.c | 7 +-
external/mit/expat/dist/tests/minicheck.h | 15 +-
external/mit/expat/dist/tests/runtests.c | 479 +-
external/mit/expat/dist/tests/xmltest.sh | 8 +-
external/mit/expat/dist/win32/README.txt | 8 +
external/mit/expat/dist/win32/expat.iss | 25 +-
external/mit/expat/dist/xmlwf/codepage.c | 5 +-
external/mit/expat/dist/xmlwf/readfilemap.c | 9 +-
external/mit/expat/dist/xmlwf/xmlfile.c | 9 +-
external/mit/expat/dist/xmlwf/xmlwf.c | 45 +-
external/mit/expat/dist/xmlwf/xmlwf.dsp | 4 +-
52 files changed, 8615 insertions(+), 5320 deletions(-)
diffs (truncated from 26511 to 300 lines):
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/CMake.README
--- a/external/mit/expat/dist/CMake.README Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/CMake.README Sat Feb 04 10:15:47 2017 +0000
@@ -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.1 is the source directory of expat, add a subdirectory
+Assuming ~/expat-2.2.0 is the source directory of expat, add a subdirectory
build and change into that directory:
-~/expat-2.1.1$ mkdir build && cd build
-~/expat-2.1.1/build$
+~/expat-2.2.0$ mkdir build && cd build
+~/expat-2.2.0/build$
From that directory, call cmake first, then call make, make test and
make install in the usual way:
-~/expat-2.1.1/build$ cmake ..
+~/expat-2.2.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.1/build
+-- Build files have been written to: /home/patrick/expat-2.2.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.1/build$ make && make test && make install
+~/expat-2.2.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
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/CMakeLists.txt
--- a/external/mit/expat/dist/CMakeLists.txt Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/CMakeLists.txt Sat Feb 04 10:15:47 2017 +0000
@@ -6,7 +6,7 @@
cmake_minimum_required(VERSION 2.6)
set(PACKAGE_BUGREPORT "expat-bugs%libexpat.org@localhost")
set(PACKAGE_NAME "expat")
-set(PACKAGE_VERSION "2.1.1")
+set(PACKAGE_VERSION "2.2.0")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}")
@@ -41,6 +41,10 @@
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996)
endif(MSVC)
+if(WIN32)
+ add_definitions(-DWIN32)
+ set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Add a suffix, usually d on Windows")
+endif(WIN32)
set(expat_SRCS
lib/xmlparse.c
@@ -50,18 +54,31 @@
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)
+ if(WIN32)
+ set(expat_SRCS ${expat_SRCS} lib/libexpat.def)
+ endif(WIN32)
else(BUILD_shared)
set(_SHARED STATIC)
+ if(WIN32)
+ add_definitions(-DXML_STATIC)
+ endif(WIN32)
endif(BUILD_shared)
add_library(expat ${_SHARED} ${expat_SRCS})
+set(LIBCURRENT 7) # sync
+set(LIBREVISION 2) # with
+set(LIBAGE 6) # configure.ac!
+math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")
+
+if(NOT WIN32)
+ set_property(TARGET expat PROPERTY VERSION ${LIBCURRENT_MINUS_AGE}.${LIBAGE}.${LIBREVISION})
+ set_property(TARGET expat PROPERTY SOVERSION ${LIBCURRENT_MINUS_AGE})
+ set_property(TARGET expat PROPERTY NO_SONAME ${NO_SONAME})
+endif(NOT WIN32)
+
install(TARGETS expat RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
@@ -76,6 +93,7 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig)
+add_custom_command(TARGET expat PRE_BUILD COMMAND $(MAKE) -C doc xmlwf.1)
if(BUILD_tools AND NOT WINCE)
set(xmlwf_SRCS
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/COPYING
--- a/external/mit/expat/dist/COPYING Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/COPYING Sat Feb 04 10:15:47 2017 +0000
@@ -1,6 +1,5 @@
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
+Copyright (c) 2001-2016 Expat maintainers
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/Changes
--- a/external/mit/expat/dist/Changes Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/Changes Sat Feb 04 10:15:47 2017 +0000
@@ -1,3 +1,52 @@
+Release 2.2.0 Tue June 21 2016
+ Security fixes:
+ #537 CVE-2016-0718 -- Fix crash on malformed input
+ CVE-2016-4472 -- Improve insufficient fix to CVE-2015-1283 /
+ CVE-2015-2716 introduced with Expat 2.1.1
+ #499 CVE-2016-5300 -- Use more entropy for hash initialization
+ than the original fix to CVE-2012-0876
+ #519 CVE-2012-6702 -- Resolve troublesome internal call to srand
+ that was introduced with Expat 2.1.0
+ when addressing CVE-2012-0876 (issue #496)
+
+ Bug fixes:
+ Fix uninitialized reads of size 1
+ (e.g. in little2_updatePosition)
+ Fix detection of UTF-8 character boundaries
+
+ Other changes:
+ #532 Fix compilation for Visual Studio 2010 (keyword "C99")
+ Autotools: Resolve use of "$<" to better support bmake
+ Autotools: Add QA script "qa.sh" (and make target "qa")
+ Autotools: Respect CXXFLAGS if given
+ Autotools: Fix "make run-xmltest"
+ Autotools: Have "make run-xmltest" check for expected output
+ p90 CMake: Fix static build (BUILD_shared=OFF) on Windows
+ #536 CMake: Add soversion, support -DNO_SONAME=yes to bypass
+ #323 CMake: Add suffix "d" to differentiate debug from release
+ CMake: Define WIN32 with CMake on Windows
+ Annotate memory allocators for GCC
+ Address all currently known compile warnings
+ Make sure that API symbols remain visible despite
+ -fvisibility=hidden
+ Remove executable flag from source files
+ Resolve COMPILED_FROM_DSP in favor of WIN32
+
+ Special thanks to:
+ Björn Lindahl
+ Christian Heimes
+ Cristian RodrÃguez
+ Daniel Krügler
+ Gustavo Grieco
+ Karl Waclawek
+ László Böszörményi
+ Marco Grassi
+ Pascal Cuoq
+ Sergei Nikulov
+ Thomas Beutlich
+ Warren Young
+ Yann Droneaud
+
Release 2.1.1 Sat March 12 2016
Security fixes:
#582: CVE-2015-1283 - Multiple integer overflows in XML_GetBuffer
@@ -7,7 +56,7 @@
#520: Symbol XML_SetHashSalt was not exported
Output of "xmlwf -h" was incomplete
- Other changes
+ 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
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/MANIFEST
--- a/external/mit/expat/dist/MANIFEST Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/MANIFEST Sat Feb 04 10:15:47 2017 +0000
@@ -44,7 +44,7 @@
doc/style.css
doc/valid-xhtml10.png
doc/xmlwf.1
-doc/xmlwf.sgml
+doc/xmlwf.xml
CMakeLists.txt
CMake.README
COPYING
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/Makefile.in
--- a/external/mit/expat/dist/Makefile.in Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/Makefile.in Sat Feb 04 10:15:47 2017 +0000
@@ -51,7 +51,7 @@
buildlib: $(LIBRARY) expat.pc
-all: $(LIBRARY) expat.pc xmlwf/xmlwf@EXEEXT@ examples/elements examples/outline
+all: $(LIBRARY) expat.pc xmlwf/xmlwf@EXEEXT@ examples/elements examples/outline $(MANFILE)
clean:
cd lib && rm -f $(LIBRARY) *.@OBJEXT@ *.lo && rm -rf .libs _libs
@@ -77,7 +77,10 @@
tests/runtests
tests/runtestspp
-install: xmlwf/xmlwf@EXEEXT@ installlib
+$(MANFILE):
+ $(MAKE) -C doc xmlwf.1
+
+install: xmlwf/xmlwf@EXEEXT@ installlib $(MANFILE)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf@EXEEXT@ $(DESTDIR)$(bindir)/xmlwf
$(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
@@ -154,11 +157,11 @@
examples/elements.@OBJEXT@: examples/elements.c
examples/elements: examples/elements.@OBJEXT@ $(LIBRARY)
- $(LINK_EXE) $< $(LIBRARY)
+ $(LINK_EXE) examples/elements.@OBJEXT@ $(LIBRARY)
examples/outline.@OBJEXT@: examples/outline.c
examples/outline: examples/outline.@OBJEXT@ $(LIBRARY)
- $(LINK_EXE) $< $(LIBRARY)
+ $(LINK_EXE) examples/outline.@OBJEXT@ $(LIBRARY)
tests/chardata.@OBJEXT@: tests/chardata.c tests/chardata.h
tests/minicheck.@OBJEXT@: tests/minicheck.c tests/minicheck.h
@@ -180,11 +183,19 @@
wget --output-document=tests/xmlts.zip \
http://www.w3.org/XML/Test/xmlts20080827.zip
-tests/XML-Test-Suite: tests/xmlts.zip
+tests/xmlconf: tests/xmlts.zip
cd tests && unzip -q xmlts.zip
-run-xmltest: xmlwf/xmlwf@EXEEXT@ tests/XML-Test-Suite
- tests/xmltest.sh
+run-xmltest: xmlwf/xmlwf@EXEEXT@ tests/xmlconf
+ tests/xmltest.sh 2>&1 | tee tests/xmltest.log
+ diff -u tests/xmltest.log.expected tests/xmltest.log
+
+.PHONY: qa
+qa:
+ ./qa.sh address
+ ./qa.sh memory
+ ./qa.sh undefined
+ ./qa.sh coverage
.SUFFIXES: .c .cpp .lo .@OBJEXT@
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/README
--- a/external/mit/expat/dist/README Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/README Sat Feb 04 10:15:47 2017 +0000
@@ -1,5 +1,5 @@
- Expat, Release 2.1.1
+ Expat, Release 2.2.0
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
@@ -114,7 +114,7 @@
"/usr/ccs/bin", which is not in the default PATH. You will need to
add this to your path for the "make" command, and probably also switch
to GNU make (the "make" found in /usr/ccs/bin does not seem to work
-properly -- appearantly it does not understand .PHONY directives). If
+properly -- apparently it does not understand .PHONY directives). If
you're using ksh or bash, use this command to build:
PATH=/usr/ccs/bin:$PATH make
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/aclocal.m4
--- a/external/mit/expat/dist/aclocal.m4 Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/aclocal.m4 Sat Feb 04 10:15:47 2017 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -r b5700db5d155 -r 4471f2800766 external/mit/expat/dist/bcb5/expat.bpr
--- a/external/mit/expat/dist/bcb5/expat.bpr Sat Feb 04 08:03:40 2017 +0000
+++ b/external/mit/expat/dist/bcb5/expat.bpr Sat Feb 04 10:15:47 2017 +0000
@@ -25,7 +25,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS"/>
+ <USERDEFINES value="_WINDOWS;WIN32;NDEBUG;_USRDLL;EXPAT_EXPORTS"/>
<SYSDEFINES value="_NO_VCL;_ASSERTE;NO_STRICT;_RTLDLL"/>
<MAINSOURCE value="expat.bpf"/>
<INCLUDEPATH value="..\lib;$(BCB)\include"/>
@@ -94,14 +94,14 @@
[HistoryLists\hlConditionals]
Count=8
-Item0=_WINDOWS;WIN32;NDEBUG;_USRDLL;COMPILED_FROM_DSP;EXPAT_EXPORTS
Home |
Main Index |
Thread Index |
Old Index