diff --git a/expat/CMake.README b/expat/CMake.README index bd7c51c5..99e7e696 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.0 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.1 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.0$ mkdir build && cd build -~/expat-2.4.0/build$ +~/expat-2.4.1$ mkdir build && cd build +~/expat-2.4.1/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.0/build$ cmake .. +~/expat-2.4.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.4.0/build +-- Build files have been written to: /home/patrick/expat-2.4.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.4.0/build$ make && make test && make install +~/expat-2.4.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 aa00c066..cd12a992 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -64,7 +64,7 @@ endif() project(expat VERSION - 2.4.0 + 2.4.1 LANGUAGES C ) @@ -387,7 +387,7 @@ if(EXPAT_WITH_LIBBSD) endif() set(LIBCURRENT 9) # sync -set(LIBREVISION 0) # with +set(LIBREVISION 1) # with set(LIBAGE 8) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/Changes b/expat/Changes index db4a396e..f7657898 100644 --- a/expat/Changes +++ b/expat/Changes @@ -2,11 +2,15 @@ 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 2.4.1 xxx xxx xx xxxx +Release 2.4.1 Sun May 23 2021 Bug fixes: #488 #490 Autotools: Fix installed header expat_config.h for multilib systems; regression introduced in 2.4.0 by pull request #486 + Other changes: + #491 #492 Version info bumped from 9:0:8 to 9:1:8; + see https://verbump.de/ for what these numbers do + Special thanks to: Gentoo's QA check "multilib_check_headers" diff --git a/expat/README.md b/expat/README.md index 94e0bb14..251dc8a1 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.0 +# Expat, Release 2.4.1 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 b038ee41..b27b59e8 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=0 # with +LIBREVISION=1 # with LIBAGE=8 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) diff --git a/expat/doc/reference.html b/expat/doc/reference.html index acedcf1c..309cb241 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -48,7 +48,7 @@

The Expat XML Parser - Release 2.4.0 + Release 2.4.1

diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 016c1c5f..b7d6d354 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 0 +#define XML_MICRO_VERSION 1 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 214c93fd..5ba56eae 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 40f0f9c2be99a31dd0c833cd7d5a1bbd825a95e241f6e6c689b69ce275aba9a9 (2.4.0+) +/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 8cee7ee8..45ba5d59 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7351,7 +7351,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.0"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.1"))) /* 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 4d37cd24..38790332 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.0" +#define expatVer "2.4.1" [Setup] AppName=Expat