mirror of
https://github.com/libexpat/libexpat.git
synced 2025-04-04 21:04:57 +00:00
Merge pull request #920 from libexpat/issue-919-prepare-release
Prepare release 2.6.4 (part of #919, ETA 2024-11-xx)
This commit is contained in:
Sebastian Pipping
GitHub
commit
2691aff430
16 changed files with 57 additions and 22 deletions
1
.mailmap
1
.mailmap
|
|
@ -3,6 +3,7 @@ Ben Wagner <bungeman@chromium.org>
|
|||
Donghee Na <donghee.na@python.org>
|
||||
Franek Korta <fkorta@gmail.com>
|
||||
Hanno Böck <hanno@gentoo.org>
|
||||
Hanno Böck <hanno@gentoo.org> <990588+hannob@users.noreply.github.com>
|
||||
James Clark <jjc@jclark.com> <jclark@users.sourceforge.net>
|
||||
José Gutiérrez de la Concha <jose@zeroc.com>
|
||||
Joyce Brum <joycebrum@google.com>
|
||||
|
|
|
|||
|
|
@ -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.6.3 is the source directory of expat, add a subdirectory
|
||||
Assuming ~/expat-2.6.4 is the source directory of expat, add a subdirectory
|
||||
build and change into that directory:
|
||||
~/expat-2.6.3$ mkdir build && cd build
|
||||
~/expat-2.6.3/build$
|
||||
~/expat-2.6.4$ mkdir build && cd build
|
||||
~/expat-2.6.4/build$
|
||||
|
||||
From that directory, call cmake first, then call make, make test and
|
||||
make install in the usual way:
|
||||
~/expat-2.6.3/build$ cmake ..
|
||||
~/expat-2.6.4/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.6.3/build
|
||||
-- Build files have been written to: /home/patrick/expat-2.6.4/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.6.3/build$ make && make test && make install
|
||||
~/expat-2.6.4/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
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ cmake_minimum_required(VERSION 3.5.0)
|
|||
|
||||
project(expat
|
||||
VERSION
|
||||
2.6.3
|
||||
2.6.4
|
||||
LANGUAGES
|
||||
C
|
||||
)
|
||||
|
|
@ -466,9 +466,9 @@ foreach(build_type_upper
|
|||
set_property(TARGET expat PROPERTY ${build_type_upper}_POSTFIX ${EXPAT_${build_type_upper}_POSTFIX})
|
||||
endforeach()
|
||||
|
||||
set(LIBCURRENT 10) # sync
|
||||
set(LIBREVISION 3) # with
|
||||
set(LIBAGE 9) # configure.ac!
|
||||
set(LIBCURRENT 11) # sync
|
||||
set(LIBREVISION 0) # with
|
||||
set(LIBAGE 10) # configure.ac!
|
||||
math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")
|
||||
|
||||
if(NOT WIN32)
|
||||
|
|
|
|||
|
|
@ -30,6 +30,37 @@
|
|||
!! THANK YOU! Sebastian Pipping -- Berlin, 2024-03-09 !!
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
Release 2.6.4 Wed November 6 2024
|
||||
Security fixes:
|
||||
#915 CVE-2024-50602 -- Fix crash within function XML_ResumeParser
|
||||
from a NULL pointer dereference by disallowing function
|
||||
XML_StopParser to (stop or) suspend an unstarted parser.
|
||||
A new error code XML_ERROR_NOT_STARTED was introduced to
|
||||
properly communicate this situation. // CWE-476 CWE-754
|
||||
|
||||
Other changes:
|
||||
#903 CMake: Add alias target "expat::expat"
|
||||
#905 docs: Document use via CMake >=3.18 with FetchContent
|
||||
and SOURCE_SUBDIR and its consequences
|
||||
#902 tests: Reduce use of global parser instance
|
||||
#904 tests: Resolve duplicate handler
|
||||
#317 #918 tests: Improve tests on doctype closing (ex CVE-2019-15903)
|
||||
#914 Fix signedness of format strings
|
||||
#919 #920 Version info bumped from 10:3:9 (libexpat*.so.1.9.3)
|
||||
to 11:0:10 (libexpat*.so.1.10.0); see https://verbump.de/
|
||||
for what these numbers do
|
||||
|
||||
Infrastructure:
|
||||
#907 CI: Upgrade Clang from 18 to 19
|
||||
#913 CI: Drop macos-12 and add macos-15
|
||||
#910 CI: Adapt to breaking changes in GitHub Actions
|
||||
#898 Add missing entries to .gitignore
|
||||
|
||||
Special thanks to:
|
||||
Hanno Böck
|
||||
José Eduardo Gutiérrez Conejo
|
||||
José Ricardo Cardona Quesada
|
||||
|
||||
Release 2.6.3 Wed September 4 2024
|
||||
Security fixes:
|
||||
#887 #890 CVE-2024-45490 -- Calling function XML_ParseBuffer with
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
> at the top of the `Changes` file.
|
||||
|
||||
|
||||
# Expat, Release 2.6.3
|
||||
# Expat, Release 2.6.4
|
||||
|
||||
This is Expat, a C99 library for parsing
|
||||
[XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by
|
||||
|
|
|
|||
|
|
@ -84,9 +84,9 @@ dnl
|
|||
dnl If the API changes incompatibly set LIBAGE back to 0
|
||||
dnl
|
||||
|
||||
LIBCURRENT=10 # sync
|
||||
LIBREVISION=3 # with
|
||||
LIBAGE=9 # CMakeLists.txt!
|
||||
LIBCURRENT=11 # sync
|
||||
LIBREVISION=0 # with
|
||||
LIBAGE=10 # CMakeLists.txt!
|
||||
|
||||
AC_CONFIG_HEADERS([expat_config.h])
|
||||
AH_TOP([#ifndef EXPAT_CONFIG_H
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
<div>
|
||||
<h1>
|
||||
The Expat XML Parser
|
||||
<small>Release 2.6.3</small>
|
||||
<small>Release 2.6.4</small>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="content">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
|
||||
<!ENTITY dhfirstname "<firstname>Scott</firstname>">
|
||||
<!ENTITY dhsurname "<surname>Bronson</surname>">
|
||||
<!ENTITY dhdate "<date>September 4, 2024</date>">
|
||||
<!ENTITY dhdate "<date>November 6, 2024</date>">
|
||||
<!-- Please adjust this^^ date whenever cutting a new release. -->
|
||||
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
|
||||
<!ENTITY dhemail "<email>bronson@rinspin.com</email>">
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
|
||||
Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk>
|
||||
Copyright (c) 2019 Zhongyuan Zhou <zhouzhongyuan@huawei.com>
|
||||
Copyright (c) 2024 Hanno Böck <hanno@gentoo.org>
|
||||
Licensed under the MIT license:
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
|
|
|
|||
|
|
@ -1068,7 +1068,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
|
|||
*/
|
||||
#define XML_MAJOR_VERSION 2
|
||||
#define XML_MINOR_VERSION 6
|
||||
#define XML_MICRO_VERSION 3
|
||||
#define XML_MICRO_VERSION 4
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* ba4cdf9bdb534f355a9def4c9e25d20ee8e72f95b0a4d930be52e563f5080196 (2.6.3+)
|
||||
/* c5625880f4bf417c1463deee4eb92d86ff413f802048621c57e25fe483eb59e4 (2.6.4+)
|
||||
__ __ _
|
||||
___\ \/ /_ __ __ _| |_
|
||||
/ _ \\ /| '_ \ / _` | __|
|
||||
|
|
@ -40,6 +40,7 @@
|
|||
Copyright (c) 2023 Owain Davies <owaind@bath.edu>
|
||||
Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com>
|
||||
Copyright (c) 2024 Berkay Eren Ürün <berkay.ueruen@siemens.com>
|
||||
Copyright (c) 2024 Hanno Böck <hanno@gentoo.org>
|
||||
Licensed under the MIT license:
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net>
|
||||
Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
|
||||
Copyright (c) 2005-2012 Karl Waclawek <karl@waclawek.net>
|
||||
Copyright (c) 2016-2023 Sebastian Pipping <sebastian@pipping.org>
|
||||
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
|
||||
Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
|
||||
Copyright (c) 2017 Joe Orton <jorton@redhat.com>
|
||||
Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
Copyright (c) 2003 Greg Stein <gstein@users.sourceforge.net>
|
||||
Copyright (c) 2005-2007 Steven Solie <steven@solie.ca>
|
||||
Copyright (c) 2005-2012 Karl Waclawek <karl@waclawek.net>
|
||||
Copyright (c) 2016-2023 Sebastian Pipping <sebastian@pipping.org>
|
||||
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
|
||||
Copyright (c) 2017-2022 Rhodri James <rhodri@wildebeest.org.uk>
|
||||
Copyright (c) 2017 Joe Orton <jorton@redhat.com>
|
||||
Copyright (c) 2017 José Gutiérrez de la Concha <jose@zeroc.com>
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ START_TEST(test_misc_version) {
|
|||
if (! versions_equal(&read_version, &parsed_version))
|
||||
fail("Version mismatch");
|
||||
|
||||
if (xcstrcmp(version_text, XCS("expat_2.6.3"))) /* needs bump on releases */
|
||||
if (xcstrcmp(version_text, XCS("expat_2.6.4"))) /* needs bump on releases */
|
||||
fail("XML_*_VERSION in expat.h out of sync?\n");
|
||||
}
|
||||
END_TEST
|
||||
|
|
|
|||
|
|
@ -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.6.3"
|
||||
#define expatVer "2.6.4"
|
||||
|
||||
[Setup]
|
||||
AppName=Expat
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk>
|
||||
Copyright (c) 2019 David Loffredo <loffredo@steptools.com>
|
||||
Copyright (c) 2021 Donghee Na <donghee.na@python.org>
|
||||
Copyright (c) 2024 Hanno Böck <hanno@gentoo.org>
|
||||
Licensed under the MIT license:
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue