Merge pull request #993 from libexpat/issue-990-prepare-release

Prepare release 2.7.1 (part of #990, ETA 2025-03-27)
This commit is contained in:
Sebastian Pipping 2025-03-27 19:40:10 +01:00 committed by GitHub
commit f9a3eeb3e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 28 additions and 23 deletions

View file

@ -3,25 +3,25 @@
The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual
Studio) and should work on all other platform cmake supports. 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: build and change into that directory:
~/expat-2.7.0$ mkdir build && cd build ~/expat-2.7.1$ mkdir build && cd build
~/expat-2.7.0/build$ ~/expat-2.7.1/build$
From that directory, call cmake first, then call make, make test and From that directory, call cmake first, then call make, make test and
make install in the usual way: 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 C compiler identification is GNU
-- The CXX compiler identification is GNU -- The CXX compiler identification is GNU
.... ....
-- Configuring done -- Configuring done
-- Generating 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 If you want to specify the install location for your files, append
-DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call. -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 Scanning dependencies of target expat
[ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o [ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o
[ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o [ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o

View file

@ -39,7 +39,7 @@ cmake_minimum_required(VERSION 3.13.0)
project(expat project(expat
VERSION VERSION
2.7.0 2.7.1
LANGUAGES LANGUAGES
C C
) )
@ -472,7 +472,7 @@ foreach(build_type_upper
endforeach() endforeach()
set(LIBCURRENT 11) # sync set(LIBCURRENT 11) # sync
set(LIBREVISION 1) # with set(LIBREVISION 2) # with
set(LIBAGE 10) # configure.ac! set(LIBAGE 10) # configure.ac!
math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")

View file

@ -1,5 +1,5 @@
Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper 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 Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the

View file

@ -37,7 +37,7 @@
!! THANK YOU! Sebastian Pipping -- Berlin, 2024-03-09 !! !! THANK YOU! Sebastian Pipping -- Berlin, 2024-03-09 !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Release 2.7.1 ??? ????? ?? ???? Release 2.7.1 Thu March 27 2025
Bug fixes: Bug fixes:
#980 #989 Restore event pointer behavior from Expat 2.6.4 #980 #989 Restore event pointer behavior from Expat 2.6.4
(that the fix to CVE-2024-8176 changed in 2.7.0); (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 with Automake that were missing from 2.7.0 release tarballs
#983 #984 Fix printf format specifiers for 32bit Emscripten #983 #984 Fix printf format specifiers for 32bit Emscripten
#992 docs: Promote OpenSSF Best Practices self-certification #992 docs: Promote OpenSSF Best Practices self-certification
#978 tests/benchmark: Resolve mistaken double close
#986 Address compiler warnings #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: Infrastructure:
#982 CI: Start running Perl XML::Parser integration tests #982 CI: Start running Perl XML::Parser integration tests
@ -67,6 +71,7 @@ Release 2.7.1 ??? ????? ?? ????
Special thanks to: Special thanks to:
Berkay Eren Ürün Berkay Eren Ürün
Matthew Fernandez
and and
Perl XML::Parser Perl XML::Parser

View file

@ -6,7 +6,7 @@
# \___/_/\_\ .__/ \__,_|\__| # \___/_/\_\ .__/ \__,_|\__|
# |_| XML parser # |_| XML parser
# #
# Copyright (c) 2017-2023 Sebastian Pipping <sebastian@pipping.org> # Copyright (c) 2017-2025 Sebastian Pipping <sebastian@pipping.org>
# Copyright (c) 2018 KangLin <kl222@126.com> # Copyright (c) 2018 KangLin <kl222@126.com>
# Copyright (c) 2022 Johnny Jazeix <jazeix@gmail.com> # Copyright (c) 2022 Johnny Jazeix <jazeix@gmail.com>
# Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com> # Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com>

View file

@ -12,7 +12,7 @@
> at the top of the `Changes` file. > 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 This is Expat, a C99 library for parsing
[XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by [XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by

View file

@ -6,7 +6,7 @@
# \___/_/\_\ .__/ \__,_|\__| # \___/_/\_\ .__/ \__,_|\__|
# |_| XML parser # |_| XML parser
# #
# Copyright (c) 2024 Sebastian Pipping <sebastian@pipping.org> # Copyright (c) 2024-2025 Sebastian Pipping <sebastian@pipping.org>
# Licensed under the MIT license: # Licensed under the MIT license:
# #
# Permission is hereby granted, free of charge, to any person obtaining # Permission is hereby granted, free of charge, to any person obtaining

View file

@ -85,7 +85,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0
dnl dnl
LIBCURRENT=11 # sync LIBCURRENT=11 # sync
LIBREVISION=1 # with LIBREVISION=2 # with
LIBAGE=10 # CMakeLists.txt! LIBAGE=10 # CMakeLists.txt!
AC_CONFIG_HEADERS([expat_config.h]) AC_CONFIG_HEADERS([expat_config.h])

View file

@ -52,7 +52,7 @@
<div> <div>
<h1> <h1>
The Expat XML Parser The Expat XML Parser
<small>Release 2.7.0</small> <small>Release 2.7.1</small>
</h1> </h1>
</div> </div>
<div class="content"> <div class="content">

View file

@ -21,7 +21,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY dhfirstname "<firstname>Scott</firstname>"> <!ENTITY dhfirstname "<firstname>Scott</firstname>">
<!ENTITY dhsurname "<surname>Bronson</surname>"> <!ENTITY dhsurname "<surname>Bronson</surname>">
<!ENTITY dhdate "<date>March 13, 2025</date>"> <!ENTITY dhdate "<date>March 27, 2025</date>">
<!-- Please adjust this^^ date whenever cutting a new release. --> <!-- Please adjust this^^ date whenever cutting a new release. -->
<!ENTITY dhsection "<manvolnum>1</manvolnum>"> <!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>bronson@rinspin.com</email>"> <!ENTITY dhemail "<email>bronson@rinspin.com</email>">

View file

@ -1068,7 +1068,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
*/ */
#define XML_MAJOR_VERSION 2 #define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 7 #define XML_MINOR_VERSION 7
#define XML_MICRO_VERSION 0 #define XML_MICRO_VERSION 1
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -28,7 +28,7 @@
Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net> Copyright (c) 2002-2003 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net> Copyright (c) 2002-2006 Karl Waclawek <karl@waclawek.net>
Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net> Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net>
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org> Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com> Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com>
Copyright (c) 2019 David Loffredo <loffredo@steptools.com> Copyright (c) 2019 David Loffredo <loffredo@steptools.com>
Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com>

View file

@ -1,4 +1,4 @@
/* 7d6840a33c250b74adb0ba295d6ec818dccebebaffc8c3ed27d0b29c28adbeb3 (2.7.0+) /* d19ae032c224863c1527ba44d228cc34b99192c3a4c5a27af1f4e054d45ee031 (2.7.1+)
__ __ _ __ __ _
___\ \/ /_ __ __ _| |_ ___\ \/ /_ __ __ _| |_
/ _ \\ /| '_ \ / _` | __| / _ \\ /| '_ \ / _` | __|

View file

@ -10,7 +10,7 @@
Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net> Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net>
Copyright (c) 2005-2007 Steven Solie <steven@solie.ca> Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
Copyright (c) 2005-2012 Karl Waclawek <karl@waclawek.net> Copyright (c) 2005-2012 Karl Waclawek <karl@waclawek.net>
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org> Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk> Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
Copyright (c) 2017 Joe Orton <jorton@redhat.com> Copyright (c) 2017 Joe Orton <jorton@redhat.com>
Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com> Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com>

View file

@ -10,7 +10,7 @@
Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net> Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net>
Copyright (c) 2005-2007 Steven Solie <steven@solie.ca> Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
Copyright (c) 2005-2012 Karl Waclawek <karl@waclawek.net> Copyright (c) 2005-2012 Karl Waclawek <karl@waclawek.net>
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org> Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk> Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
Copyright (c) 2017 Joe Orton <jorton@redhat.com> Copyright (c) 2017 Joe Orton <jorton@redhat.com>
Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com> Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com>

View file

@ -211,7 +211,7 @@ START_TEST(test_misc_version) {
if (! versions_equal(&read_version, &parsed_version)) if (! versions_equal(&read_version, &parsed_version))
fail("Version mismatch"); 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"); fail("XML_*_VERSION in expat.h out of sync?\n");
} }
END_TEST END_TEST

View file

@ -38,7 +38,7 @@
; OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ; OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
; USE OR OTHER DEALINGS IN THE SOFTWARE. ; USE OR OTHER DEALINGS IN THE SOFTWARE.
#define expatVer "2.7.0" #define expatVer "2.7.1"
[Setup] [Setup]
AppName=Expat AppName=Expat