diff options
author | Sebastian Pipping <sebastian@pipping.org> | 2022-02-20 18:01:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-20 18:01:38 +0100 |
commit | 65a21f2b2a306d29b44e70264aca948aa0454219 (patch) | |
tree | a862310da186bd036092705b215e6e92b6883bc5 | |
parent | 9288cd5474bf6d3d0c037c247f9581d5e4df5097 (diff) | |
parent | 400e6955ff743bd4a6d98715cc7254a5814c4b2e (diff) | |
download | libexpat-git-65a21f2b2a306d29b44e70264aca948aa0454219.tar.gz |
Merge pull request #568 from libexpat/issue-567-prepare-releaseR_2_4_6
Prepare release 2.4.6 (part of #567)
-rw-r--r-- | expat/CMake.README | 12 | ||||
-rw-r--r-- | expat/CMakeLists.txt | 4 | ||||
-rw-r--r-- | expat/Changes | 8 | ||||
-rw-r--r-- | expat/README.md | 2 | ||||
-rw-r--r-- | expat/configure.ac | 2 | ||||
-rw-r--r-- | expat/doc/reference.html | 2 | ||||
-rw-r--r-- | expat/doc/xmlwf.xml | 2 | ||||
-rw-r--r-- | expat/lib/expat.h | 2 | ||||
-rw-r--r-- | expat/lib/xmlparse.c | 2 | ||||
-rw-r--r-- | expat/tests/runtests.c | 2 | ||||
-rw-r--r-- | expat/win32/expat.iss | 2 |
11 files changed, 22 insertions, 18 deletions
diff --git a/expat/CMake.README b/expat/CMake.README index e61aed1c..37f7c539 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.4.5 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.6 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.5$ mkdir build && cd build -~/expat-2.4.5/build$ +~/expat-2.4.6$ mkdir build && cd build +~/expat-2.4.6/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.5/build$ cmake .. +~/expat-2.4.6/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.4.5/build +-- Build files have been written to: /home/patrick/expat-2.4.6/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.4.5/build$ make && make test && make install +~/expat-2.4.6/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 5e339f99..a36b1d06 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -64,7 +64,7 @@ endif() project(expat VERSION - 2.4.5 + 2.4.6 LANGUAGES C ) @@ -408,7 +408,7 @@ if(EXPAT_WITH_LIBBSD) endif() set(LIBCURRENT 9) # sync -set(LIBREVISION 5) # with +set(LIBREVISION 6) # with set(LIBAGE 8) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/Changes b/expat/Changes index e3cf45a3..40127e1b 100644 --- a/expat/Changes +++ b/expat/Changes @@ -2,14 +2,18 @@ NOTE: We are looking for help with a few things: https://github.com/libexpat/libexpat/labels/help%20wanted If you can help, please get in touch. Thanks! -Release x.x.x xxx xxxxxxxx xx xxxx +Release 2.4.6 Sun February 20 2022 Bug fixes: - #??? Fix a regression intruced by the fix for CVE-2022-25313 + #566 Fix a regression introduced by the fix for CVE-2022-25313 in release 2.4.5 that affects applications that (1) call function XML_SetElementDeclHandler and (2) are parsing XML that contains nested element declarations (e.g. "<!ELEMENT junk ((bar|foo|xyz+), zebra*)>"). + Other changes: + #567 #568 Version info bumped from 9:5:8 to 9:6:8; + see https://verbump.de/ for what these numbers do + Special thanks to: Matt Sergeant Samanta Navarro diff --git a/expat/README.md b/expat/README.md index 469b1dd8..959c4a6e 100644 --- a/expat/README.md +++ b/expat/README.md @@ -5,7 +5,7 @@ [![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases) -# Expat, Release 2.4.5 +# Expat, Release 2.4.6 This is Expat, a C library for parsing XML, started by [James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997. diff --git a/expat/configure.ac b/expat/configure.ac index 2ccab028..5175487b 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -82,7 +82,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl LIBCURRENT=9 # sync -LIBREVISION=5 # with +LIBREVISION=6 # with LIBAGE=8 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) diff --git a/expat/doc/reference.html b/expat/doc/reference.html index ea8f7106..26db5a63 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -49,7 +49,7 @@ <div> <h1> The Expat XML Parser - <small>Release 2.4.5</small> + <small>Release 2.4.6</small> </h1> </div> <div class="content"> diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 7772bc8b..79ed5856 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" [ <!ENTITY dhfirstname "<firstname>Scott</firstname>"> <!ENTITY dhsurname "<surname>Bronson</surname>"> - <!ENTITY dhdate "<date>February 18, 2022</date>"> + <!ENTITY dhdate "<date>February 20, 2022</date>"> <!-- Please adjust this^^ date whenever cutting a new release. --> <!ENTITY dhsection "<manvolnum>1</manvolnum>"> <!ENTITY dhemail "<email>bronson@rinspin.com</email>"> diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 55e5131b..46a0e1bc 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1041,7 +1041,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold( */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 4 -#define XML_MICRO_VERSION 5 +#define XML_MICRO_VERSION 6 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 84885b5a..7db28d07 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 042615face2b8727e23bb27cf4f56baa292a1f91df47c1bca8f09dff49067888 (2.4.5+) +/* a30d2613dcfdef81475a9d1a349134d2d42722172fdaa7d5bb12ed2aa74b9596 (2.4.6+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index e28670d2..6d6f6690 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7588,7 +7588,7 @@ START_TEST(test_misc_version) { fail("Version mismatch"); #if ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T) - if (xcstrcmp(version_text, XCS("expat_2.4.5"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.6"))) /* needs bump on releases */ fail("XML_*_VERSION in expat.h out of sync?\n"); #else /* If we have XML_UNICODE defined but not XML_UNICODE_WCHAR_T diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index e04eaa52..2bbfdab7 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -36,7 +36,7 @@ ; OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ; USE OR OTHER DEALINGS IN THE SOFTWARE. -#define expatVer "2.4.5" +#define expatVer "2.4.6" [Setup] AppName=Expat |