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 a new expat version. Upstr...
details: https://anonhg.NetBSD.org/src/rev/4a2076cdfb08
branches: trunk
changeset: 345248:4a2076cdfb08
user: spz <spz%NetBSD.org@localhost>
date: Sat May 14 14:30:18 2016 +0000
description:
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
diffstat:
external/mit/expat/dist/CMake.README | 12 +-
external/mit/expat/dist/CMakeLists.txt | 11 +-
external/mit/expat/dist/Changes | 17 +-
external/mit/expat/dist/MANIFEST | 2 +-
external/mit/expat/dist/Makefile.in | 4 +-
external/mit/expat/dist/README | 2 +-
external/mit/expat/dist/aclocal.m4 | 8459 +-------------------
external/mit/expat/dist/bcb5/elements.bpr | 2 +-
external/mit/expat/dist/bcb5/expat.bpr | 2 +-
external/mit/expat/dist/bcb5/expat_static.bpr | 2 +-
external/mit/expat/dist/bcb5/expatw.bpr | 2 +-
external/mit/expat/dist/bcb5/expatw_static.bpr | 2 +-
external/mit/expat/dist/bcb5/outline.bpr | 2 +-
external/mit/expat/dist/bcb5/xmlwf.bpr | 2 +-
external/mit/expat/dist/configure | 624 +-
external/mit/expat/dist/configure.ac | 155 +
external/mit/expat/dist/conftools/config.guess | 367 +-
external/mit/expat/dist/conftools/config.sub | 173 +-
external/mit/expat/dist/conftools/install-sh | 35 +-
external/mit/expat/dist/conftools/ltmain.sh | 95 +-
external/mit/expat/dist/doc/expat.png | Bin
external/mit/expat/dist/doc/reference.html | 8 +-
external/mit/expat/dist/doc/valid-xhtml10.png | Bin
external/mit/expat/dist/doc/xmlwf.1 | 209 +-
external/mit/expat/dist/doc/xmlwf.sgml | 7 +-
external/mit/expat/dist/examples/elements.c | 2 +-
external/mit/expat/dist/expat_config.h.in | 2 +-
external/mit/expat/dist/lib/amigaconfig.h | 3 -
external/mit/expat/dist/lib/expat.h | 2 +-
external/mit/expat/dist/lib/libexpat.def | 3 +
external/mit/expat/dist/lib/libexpatw.def | 3 +
external/mit/expat/dist/m4/libtool.m4 | 314 +-
external/mit/expat/dist/m4/ltoptions.m4 | 19 +-
external/mit/expat/dist/m4/ltversion.m4 | 10 +-
external/mit/expat/dist/tests/benchmark/README.txt | 2 +-
external/mit/expat/dist/tests/chardata.c | 4 -
external/mit/expat/dist/win32/expat.iss | 10 +-
external/mit/expat/dist/xmlwf/unixfilemap.c | 4 +-
external/mit/expat/dist/xmlwf/xmlwf.c | 3 +-
39 files changed, 1235 insertions(+), 9340 deletions(-)
diffs (truncated from 13427 to 300 lines):
diff -r 2c359046fa3d -r 4a2076cdfb08 external/mit/expat/dist/CMake.README
--- a/external/mit/expat/dist/CMake.README Sat May 14 13:35:40 2016 +0000
+++ b/external/mit/expat/dist/CMake.README Sat May 14 14:30:18 2016 +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.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
diff -r 2c359046fa3d -r 4a2076cdfb08 external/mit/expat/dist/CMakeLists.txt
--- a/external/mit/expat/dist/CMakeLists.txt Sat May 14 13:35:40 2016 +0000
+++ b/external/mit/expat/dist/CMakeLists.txt Sat May 14 14:30:18 2016 +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.0")
+set(PACKAGE_VERSION "2.1.1")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}")
@@ -86,6 +86,7 @@
)
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)
@@ -93,19 +94,23 @@
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)
diff -r 2c359046fa3d -r 4a2076cdfb08 external/mit/expat/dist/Changes
--- a/external/mit/expat/dist/Changes Sat May 14 13:35:40 2016 +0000
+++ b/external/mit/expat/dist/Changes Sat May 14 14:30:18 2016 +0000
@@ -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 @@
#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
diff -r 2c359046fa3d -r 4a2076cdfb08 external/mit/expat/dist/MANIFEST
--- a/external/mit/expat/dist/MANIFEST Sat May 14 13:35:40 2016 +0000
+++ b/external/mit/expat/dist/MANIFEST Sat May 14 14:30:18 2016 +0000
@@ -54,7 +54,7 @@
Makefile.in
README
configure
-configure.in
+configure.ac
expat_config.h.in
expat_config.h.cmake
expat.pc.in
diff -r 2c359046fa3d -r 4a2076cdfb08 external/mit/expat/dist/Makefile.in
--- a/external/mit/expat/dist/Makefile.in Sat May 14 13:35:40 2016 +0000
+++ b/external/mit/expat/dist/Makefile.in Sat May 14 14:30:18 2016 +0000
@@ -42,7 +42,7 @@
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 @@
VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
### autoconf this?
-LTFLAGS = --silent
+LTFLAGS = --verbose
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)
diff -r 2c359046fa3d -r 4a2076cdfb08 external/mit/expat/dist/README
--- a/external/mit/expat/dist/README Sat May 14 13:35:40 2016 +0000
+++ b/external/mit/expat/dist/README Sat May 14 14:30:18 2016 +0000
@@ -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
diff -r 2c359046fa3d -r 4a2076cdfb08 external/mit/expat/dist/aclocal.m4
--- a/external/mit/expat/dist/aclocal.m4 Sat May 14 13:35:40 2016 +0000
+++ b/external/mit/expat/dist/aclocal.m4 Sat May 14 14:30:18 2016 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,8450 +11,9 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
- [m4_fatal([Libtool version $1 or higher is required],
- 63)])],
- [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\ *)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
Home |
Main Index |
Thread Index |
Old Index