diff --git a/.github/workflows/cmake-required-version.yml b/.github/workflows/cmake-required-version.yml index 5b77e9ab..2705bf6c 100644 --- a/.github/workflows/cmake-required-version.yml +++ b/.github/workflows/cmake-required-version.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2022 Sebastian Pipping +# Copyright (c) 2021-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 138d05c8..fbe6c440 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021 Sebastian Pipping +# Copyright (c) 2021-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/CMake.README b/expat/CMake.README index 581b20b2..288fa5ab 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.2 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.3 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.2$ mkdir build && cd build -~/expat-2.4.2/build$ +~/expat-2.4.3$ mkdir build && cd build +~/expat-2.4.3/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.2/build$ cmake .. +~/expat-2.4.3/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.2/build +-- Build files have been written to: /home/patrick/expat-2.4.3/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.2/build$ make && make test && make install +~/expat-2.4.3/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 3edc70c8..e34044e1 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -7,7 +7,7 @@ # # Copyright (c) 2010 Patrick Spendrin # Copyright (c) 2012 Karl Waclawek -# Copyright (c) 2016-2021 Sebastian Pipping +# Copyright (c) 2016-2022 Sebastian Pipping # Copyright (c) 2016 Sergei Nikulov # Copyright (c) 2016 Björn Lindahl # Copyright (c) 2016 Tobias Taschner @@ -64,7 +64,7 @@ endif() project(expat VERSION - 2.4.2 + 2.4.3 LANGUAGES C ) @@ -408,7 +408,7 @@ if(EXPAT_WITH_LIBBSD) endif() set(LIBCURRENT 9) # sync -set(LIBREVISION 2) # with +set(LIBREVISION 3) # with set(LIBAGE 8) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/Changes b/expat/Changes index d035bad6..7540d38c 100644 --- a/expat/Changes +++ b/expat/Changes @@ -2,7 +2,7 @@ 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.3 Sun January 16 2022 Security fixes: #531 #534 CVE-2021-45960 -- Fix issues with left shifts by >=29 places resulting in @@ -33,12 +33,17 @@ Release x.x.x xxx xxxxxxxx xx xxxx Other changes: #535 CMake: Make call to file(GENERATE [..]) work for CMake <3.19 - #527 #528 Address compiler warnings #541 Autotools|CMake: MinGW: Make run.sh(.in) work for Cygwin and MSYS2 by not going through Wine on these platforms + #527 #528 Address compiler warnings + #533 #543 Version info bumped from 9:2:8 to 9:3:8; + see https://verbump.de/ for what these numbers do Infrastructure: #536 CI: Check for realistic minimum CMake version + #529 #539 CI: Cover compilation with -m32 + #529 CI: Store coverage reports as artifacts for download + #528 CI: Upgrade Clang from 11 to 13 Special thanks to: An anonymous whitehat diff --git a/expat/README.md b/expat/README.md index 55300829..6fdd6148 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.2 +# Expat, Release 2.4.3 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 e71bdbd2..c285a2b6 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -11,7 +11,7 @@ dnl Copyright (c) 2000 Clark Cooper dnl Copyright (c) 2000-2005 Fred L. Drake, Jr. dnl Copyright (c) 2001-2003 Greg Stein dnl Copyright (c) 2006-2012 Karl Waclawek -dnl Copyright (c) 2016-2021 Sebastian Pipping +dnl Copyright (c) 2016-2022 Sebastian Pipping dnl Copyright (c) 2017 S. P. Zeidler dnl Copyright (c) 2017 Stephen Groat dnl Copyright (c) 2017-2020 Joe Orton @@ -82,7 +82,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl LIBCURRENT=9 # sync -LIBREVISION=2 # with +LIBREVISION=3 # with LIBAGE=8 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) diff --git a/expat/coverage.sh b/expat/coverage.sh index 49642aec..4126b6d9 100755 --- a/expat/coverage.sh +++ b/expat/coverage.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2019 Sebastian Pipping +# Copyright (c) 2017-2021 Sebastian Pipping # Copyright (c) 2018 Marco Maggi # Copyright (c) 2019 Mohammed Khajapasha # Licensed under the MIT license: diff --git a/expat/doc/reference.html b/expat/doc/reference.html index 9f5bb9a9..1629413e 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -14,7 +14,7 @@ Copyright (c) 2000 Clark Cooper Copyright (c) 2000-2004 Fred L. Drake, Jr. Copyright (c) 2002-2012 Karl Waclawek - Copyright (c) 2017-2021 Sebastian Pipping + Copyright (c) 2017-2022 Sebastian Pipping Copyright (c) 2017 Jakub Wilk Copyright (c) 2021 Tomas Korbar Copyright (c) 2021 Nicolas Cavallari @@ -49,7 +49,7 @@

The Expat XML Parser - Release 2.4.2 + Release 2.4.3

diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 99197a08..804fc562 100644 --- a/expat/doc/xmlwf.xml +++ b/expat/doc/xmlwf.xml @@ -9,7 +9,7 @@ Copyright (c) 2001 Scott Bronson Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2009 Karl Waclawek - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2022 Sebastian Pipping Copyright (c) 2016 Ardo van Rangelrooij Copyright (c) 2017 Rhodri James Copyright (c) 2020 Joe Orton @@ -22,7 +22,7 @@ Scott"> Bronson"> - December 19, 2021"> + January 16, 2022"> 1"> bronson@rinspin.com"> diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 16bc92a2..0f021e25 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -11,7 +11,7 @@ Copyright (c) 2000-2005 Fred L. Drake, Jr. Copyright (c) 2001-2002 Greg Stein Copyright (c) 2002-2016 Karl Waclawek - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2022 Sebastian Pipping Copyright (c) 2016 Cristian Rodríguez Copyright (c) 2016 Thomas Beutlich Copyright (c) 2017 Rhodri James @@ -1041,7 +1041,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold( */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 4 -#define XML_MICRO_VERSION 2 +#define XML_MICRO_VERSION 3 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 575e73ee..b2f5fc6b 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 0550bc9a27b099d462d8d1007271cfeaa39852f20cd0d5d2caeadaeb39516fbe (2.4.2+) +/* 9ca2a2fedc35bcb13ba9a134ba5e173020bc2ff5f5a311abf742cec7da1ff26a (2.4.3+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| @@ -13,7 +13,7 @@ Copyright (c) 2002-2016 Karl Waclawek Copyright (c) 2005-2009 Steven Solie Copyright (c) 2016 Eric Rahm - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2022 Sebastian Pipping Copyright (c) 2016 Gaurav Copyright (c) 2016 Thomas Beutlich Copyright (c) 2016 Gustavo Grieco diff --git a/expat/lib/xmltok_ns.c b/expat/lib/xmltok_ns.c index 86ea6f0e..fbdd3e3c 100644 --- a/expat/lib/xmltok_ns.c +++ b/expat/lib/xmltok_ns.c @@ -11,7 +11,7 @@ Copyright (c) 2002 Greg Stein Copyright (c) 2002 Fred L. Drake, Jr. Copyright (c) 2002-2006 Karl Waclawek - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2017-2021 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/run.sh.in b/expat/run.sh.in index 396ff0d7..72f86b6d 100644 --- a/expat/run.sh.in +++ b/expat/run.sh.in @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017 Sebastian Pipping +# Copyright (c) 2017-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 6388d9d2..d2923ac1 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.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-2021 Sebastian Pipping + Copyright (c) 2016-2022 Sebastian Pipping Copyright (c) 2017-2018 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha @@ -7352,7 +7352,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.2"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.3"))) /* 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 13940d11..0f95462a 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -14,7 +14,7 @@ ; Copyright (c) 2001 Tim Peters ; Copyright (c) 2001-2005 Fred L. Drake, Jr. ; Copyright (c) 2006-2017 Karl Waclawek -; Copyright (c) 2007-2021 Sebastian Pipping +; Copyright (c) 2007-2022 Sebastian Pipping ; Licensed under the MIT license: ; ; Permission is hereby granted, free of charge, to any person obtaining @@ -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.2" +#define expatVer "2.4.3" [Setup] AppName=Expat