diff options
| -rw-r--r-- | expat/CMake.README | 12 | ||||
| -rw-r--r-- | expat/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | expat/Changes | 15 | ||||
| -rw-r--r-- | expat/Makefile.am | 1 | ||||
| -rw-r--r-- | expat/README.md | 2 | ||||
| -rw-r--r-- | expat/configure.ac | 2 | ||||
| -rw-r--r-- | expat/doc/reference.html | 3 | ||||
| -rw-r--r-- | expat/doc/xmlwf.xml | 2 | ||||
| -rw-r--r-- | expat/lib/expat.h | 3 | ||||
| -rw-r--r-- | expat/lib/xmlparse.c | 3 | ||||
| -rw-r--r-- | expat/tests/runtests.c | 2 | ||||
| -rw-r--r-- | expat/win32/expat.iss | 3 |
12 files changed, 36 insertions, 17 deletions
diff --git a/expat/CMake.README b/expat/CMake.README index 37f7c539..df40089e 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.6 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.7 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.6$ mkdir build && cd build -~/expat-2.4.6/build$ +~/expat-2.4.7$ mkdir build && cd build +~/expat-2.4.7/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.6/build$ cmake .. +~/expat-2.4.7/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.6/build +-- Build files have been written to: /home/patrick/expat-2.4.7/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.6/build$ make && make test && make install +~/expat-2.4.7/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 624771f4..665a5d88 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -29,6 +29,7 @@ # Copyright (c) 2020 Gulliver <gulliver@traumkristalle.net> # Copyright (c) 2020 Thomas Beutlich <tc@tbeu.de> # Copyright (c) 2021 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> +# Copyright (c) 2022 Johnny Jazeix <jazeix@gmail.com> # Unlike most of Expat, # this file is copyrighted under the BSD-license for buildsystem files of KDE. @@ -64,7 +65,7 @@ endif() project(expat VERSION - 2.4.6 + 2.4.7 LANGUAGES C ) @@ -413,7 +414,7 @@ if(EXPAT_WITH_LIBBSD) endif() set(LIBCURRENT 9) # sync -set(LIBREVISION 6) # with +set(LIBREVISION 7) # with set(LIBAGE 8) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/Changes b/expat/Changes index 5b0e333c..ff4ed87c 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.7 Fri March 4 2022 Bug fixes: #572 #577 Relax fix to CVE-2022-25236 (introduced with release 2.4.5) with regard to all valid URI characters (RFC 3986), @@ -11,6 +11,7 @@ Release x.x.x xxx xxxxxxxx xx xxxx 0123456789 % -._~ :/?#[]@ !$&'()*+,;= Other changes: + #555 #570 CMake|Windows: Store Expat version in the DLL #577 Document consequences of namespace separator choices not just in doc/reference.html but also in header <expat.h> #577 Document Expat's lack of validation of namespace URIs against @@ -20,8 +21,20 @@ Release x.x.x xxx xxxxxxxx xx xxxx If you find need for strict RFC 3986 URI validation on application level today, https://uriparser.github.io/ may be of interest. + #579 Fix documentation of XML_EndDoctypeDeclHandler in <expat.h> + #575 Document that a call to XML_FreeContentModel can be done at + a later time from outside the element declaration handler + #574 Make hardcoded namespace URIs easier to find in code + #573 Update documentation on use of XML_POOR_ENTOPY on Solaris #569 #571 tests: Resolve use of macros NAN and INFINITY for GNU G++ 4.8.2 on Solaris. + #578 #580 Version info bumped from 9:6:8 to 9:7:8; + see https://verbump.de/ for what these numbers do + + Special thanks to: + Jeffrey Walton + Johnny Jazeix + Thijs Schreijer Release 2.4.6 Sun February 20 2022 Bug fixes: diff --git a/expat/Makefile.am b/expat/Makefile.am index 9fc2e9d5..37ae3738 100644 --- a/expat/Makefile.am +++ b/expat/Makefile.am @@ -8,6 +8,7 @@ # # Copyright (c) 2017-2021 Sebastian Pipping <sebastian@pipping.org> # Copyright (c) 2018 KangLin <kl222@126.com> +# Copyright (c) 2022 Johnny Jazeix <jazeix@gmail.com> # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/README.md b/expat/README.md index 959c4a6e..6bfbf130 100644 --- a/expat/README.md +++ b/expat/README.md @@ -5,7 +5,7 @@ [](https://github.com/libexpat/libexpat/releases) -# Expat, Release 2.4.6 +# Expat, Release 2.4.7 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 5175487b..7a7f013f 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=6 # with +LIBREVISION=7 # with LIBAGE=8 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) diff --git a/expat/doc/reference.html b/expat/doc/reference.html index 20ece4d0..87ace02d 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -18,6 +18,7 @@ Copyright (c) 2017 Jakub Wilk <jwilk@jwilk.net> Copyright (c) 2021 Tomas Korbar <tkorbar@redhat.com> Copyright (c) 2021 Nicolas Cavallari <nicolas.cavallari@green-communications.fr> + Copyright (c) 2022 Thijs Schreijer <thijs@thijsschreijer.nl> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -49,7 +50,7 @@ <div> <h1> The Expat XML Parser - <small>Release 2.4.6</small> + <small>Release 2.4.7</small> </h1> </div> <div class="content"> diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 79ed5856..8b43a11e 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 20, 2022</date>"> + <!ENTITY dhdate "<date>March 4, 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 181fc960..c9214f64 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -15,6 +15,7 @@ Copyright (c) 2016 Cristian RodrÃguez <crrodriguez@opensuse.org> Copyright (c) 2016 Thomas Beutlich <tc@tbeu.de> Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk> + Copyright (c) 2022 Thijs Schreijer <thijs@thijsschreijer.nl> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -1054,7 +1055,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold( */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 4 -#define XML_MICRO_VERSION 6 +#define XML_MICRO_VERSION 7 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 6fe2cf1e..05216d99 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* a30d2613dcfdef81475a9d1a349134d2d42722172fdaa7d5bb12ed2aa74b9596 (2.4.6+) +/* fcb1a62fefa945567301146eb98e3ad3413e823a41c4378e84e8b6b6f308d824 (2.4.7+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| @@ -34,6 +34,7 @@ Copyright (c) 2019 Vadim Zeitlin <vadim@zeitlins.org> Copyright (c) 2021 Dong-hee Na <donghee.na@python.org> Copyright (c) 2022 Samanta Navarro <ferivoz@riseup.net> + Copyright (c) 2022 Jeffrey Walton <noloader@gmail.com> 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 712706c4..3309bbaa 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7589,7 +7589,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.6"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.7"))) /* 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 e4d82745..0c8f676b 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -15,6 +15,7 @@ ; Copyright (c) 2001-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net> ; Copyright (c) 2006-2017 Karl Waclawek <karl@waclawek.net> ; Copyright (c) 2007-2022 Sebastian Pipping <sebastian@pipping.org> +; Copyright (c) 2022 Johnny Jazeix <jazeix@gmail.com> ; Licensed under the MIT license: ; ; Permission is hereby granted, free of charge, to any person obtaining @@ -36,7 +37,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.6" +#define expatVer "2.4.7" [Setup] AppName=Expat |