diff --git a/expat/CMake.README b/expat/CMake.README index 3741db5b..ba202e7a 100644 --- a/expat/CMake.README +++ b/expat/CMake.README @@ -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.7.0 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.7.1 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.7.0$ mkdir build && cd build -~/expat-2.7.0/build$ +~/expat-2.7.1$ mkdir build && cd build +~/expat-2.7.1/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.7.0/build$ cmake .. +~/expat-2.7.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.7.0/build +-- Build files have been written to: /home/patrick/expat-2.7.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.7.0/build$ make && make test && make install +~/expat-2.7.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 --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index b032c75a..4a5ea2b5 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -39,7 +39,7 @@ cmake_minimum_required(VERSION 3.13.0) project(expat VERSION - 2.7.0 + 2.7.1 LANGUAGES C ) @@ -472,7 +472,7 @@ foreach(build_type_upper endforeach() set(LIBCURRENT 11) # sync -set(LIBREVISION 1) # with +set(LIBREVISION 2) # with set(LIBAGE 10) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/COPYING b/expat/COPYING index ce9e5939..c6d184a8 100644 --- a/expat/COPYING +++ b/expat/COPYING @@ -1,5 +1,5 @@ Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper -Copyright (c) 2001-2022 Expat maintainers +Copyright (c) 2001-2025 Expat maintainers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/expat/Changes b/expat/Changes index b48ea9bb..9d6c64b6 100644 --- a/expat/Changes +++ b/expat/Changes @@ -37,7 +37,7 @@ !! THANK YOU! Sebastian Pipping -- Berlin, 2024-03-09 !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -Release 2.7.1 ??? ????? ?? ???? +Release 2.7.1 Thu March 27 2025 Bug fixes: #980 #989 Restore event pointer behavior from Expat 2.6.4 (that the fix to CVE-2024-8176 changed in 2.7.0); @@ -53,7 +53,11 @@ Release 2.7.1 ??? ????? ?? ???? with Automake that were missing from 2.7.0 release tarballs #983 #984 Fix printf format specifiers for 32bit Emscripten #992 docs: Promote OpenSSF Best Practices self-certification + #978 tests/benchmark: Resolve mistaken double close #986 Address compiler warnings + #990 #993 Version info bumped from 11:1:10 (libexpat*.so.1.10.1) + to 11:2:10 (libexpat*.so.1.10.2); see https://verbump.de/ + for what these numbers do Infrastructure: #982 CI: Start running Perl XML::Parser integration tests @@ -67,6 +71,7 @@ Release 2.7.1 ??? ????? ?? ???? Special thanks to: Berkay Eren Ürün + Matthew Fernandez and Perl XML::Parser diff --git a/expat/Makefile.am b/expat/Makefile.am index 733baf98..c20531a8 100644 --- a/expat/Makefile.am +++ b/expat/Makefile.am @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2023 Sebastian Pipping +# Copyright (c) 2017-2025 Sebastian Pipping # Copyright (c) 2018 KangLin # Copyright (c) 2022 Johnny Jazeix # Copyright (c) 2023 Sony Corporation / Snild Dolkow diff --git a/expat/README.md b/expat/README.md index c7b87790..77c6bf27 100644 --- a/expat/README.md +++ b/expat/README.md @@ -12,7 +12,7 @@ > at the top of the `Changes` file. -# Expat, Release 2.7.0 +# Expat, Release 2.7.1 This is Expat, a C99 library for parsing [XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by diff --git a/expat/apply-clang-tidy.sh b/expat/apply-clang-tidy.sh index 3d937df9..17246c40 100755 --- a/expat/apply-clang-tidy.sh +++ b/expat/apply-clang-tidy.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2024 Sebastian Pipping +# Copyright (c) 2024-2025 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/configure.ac b/expat/configure.ac index a07ebec1..0c88b886 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -85,7 +85,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl LIBCURRENT=11 # sync -LIBREVISION=1 # with +LIBREVISION=2 # with LIBAGE=10 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) diff --git a/expat/doc/reference.html b/expat/doc/reference.html index 26e7f211..2b3bd395 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -52,7 +52,7 @@

The Expat XML Parser - Release 2.7.0 + Release 2.7.1

diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 97df83aa..17e9cf51 100644 --- a/expat/doc/xmlwf.xml +++ b/expat/doc/xmlwf.xml @@ -21,7 +21,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ Scott"> Bronson"> - March 13, 2025"> + March 27, 2025"> 1"> bronson@rinspin.com"> diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 192cfd3f..610e1ddc 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1068,7 +1068,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 7 -#define XML_MICRO_VERSION 0 +#define XML_MICRO_VERSION 1 #ifdef __cplusplus } diff --git a/expat/lib/internal.h b/expat/lib/internal.h index f62b66e9..6bde6ae6 100644 --- a/expat/lib/internal.h +++ b/expat/lib/internal.h @@ -28,7 +28,7 @@ Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2003 Greg Stein - Copyright (c) 2016-2024 Sebastian Pipping + Copyright (c) 2016-2025 Sebastian Pipping Copyright (c) 2018 Yury Gribov Copyright (c) 2019 David Loffredo Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index f8ae864a..38a2d965 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 7d6840a33c250b74adb0ba295d6ec818dccebebaffc8c3ed27d0b29c28adbeb3 (2.7.0+) +/* d19ae032c224863c1527ba44d228cc34b99192c3a4c5a27af1f4e054d45ee031 (2.7.1+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/common.c b/expat/tests/common.c index 611959cf..b158385f 100644 --- a/expat/tests/common.c +++ b/expat/tests/common.c @@ -10,7 +10,7 @@ Copyright (c) 2003 Greg Stein Copyright (c) 2005-2007 Steven Solie Copyright (c) 2005-2012 Karl Waclawek - Copyright (c) 2016-2024 Sebastian Pipping + Copyright (c) 2016-2025 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/common.h b/expat/tests/common.h index 88711308..2d1a5f20 100644 --- a/expat/tests/common.h +++ b/expat/tests/common.h @@ -10,7 +10,7 @@ Copyright (c) 2003 Greg Stein Copyright (c) 2005-2007 Steven Solie Copyright (c) 2005-2012 Karl Waclawek - Copyright (c) 2016-2024 Sebastian Pipping + Copyright (c) 2016-2025 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/misc_tests.c b/expat/tests/misc_tests.c index a9f880c9..fb95014b 100644 --- a/expat/tests/misc_tests.c +++ b/expat/tests/misc_tests.c @@ -211,7 +211,7 @@ START_TEST(test_misc_version) { if (! versions_equal(&read_version, &parsed_version)) fail("Version mismatch"); - if (xcstrcmp(version_text, XCS("expat_2.7.0"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.7.1"))) /* needs bump on releases */ fail("XML_*_VERSION in expat.h out of sync?\n"); } END_TEST diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index b082292f..60159d8c 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -38,7 +38,7 @@ ; OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ; USE OR OTHER DEALINGS IN THE SOFTWARE. -#define expatVer "2.7.0" +#define expatVer "2.7.1" [Setup] AppName=Expat