From 6c7c96d98c3cf40dc198f9c5787c00af234006f5 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 22:21:45 +0100 Subject: Changes: Document #546 --- expat/Changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/expat/Changes b/expat/Changes index ec1f7604..16da8ee7 100644 --- a/expat/Changes +++ b/expat/Changes @@ -19,7 +19,11 @@ Release x.x.x xxx xxxxxxx xx xxxx Bug fixes: #544 #545 xmlwf: Fix a memory leak on output file opening error + Other changes: + #546 Autotools: Fix broken CMake support under Cygwin + Special thanks to: + Carlo Bramini hwt0415 Roland Illig Samanta Navarro -- cgit v1.2.1 From 2a0add0a7a2b03af70b5d0db88baeec66d930ff5 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 22:27:41 +0100 Subject: Bump version info from 9:3:8 to 9:4:8 See https://verbump.de/ for what these numbers do --- expat/CMakeLists.txt | 2 +- expat/Changes | 2 ++ expat/configure.ac | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 9d182b30..e014e308 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -408,7 +408,7 @@ if(EXPAT_WITH_LIBBSD) endif() set(LIBCURRENT 9) # sync -set(LIBREVISION 3) # with +set(LIBREVISION 4) # with set(LIBAGE 8) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/Changes b/expat/Changes index 16da8ee7..be37463c 100644 --- a/expat/Changes +++ b/expat/Changes @@ -21,6 +21,8 @@ Release x.x.x xxx xxxxxxx xx xxxx Other changes: #546 Autotools: Fix broken CMake support under Cygwin + #552 #554 Version info bumped from 9:3:8 to 9:4:8; + see https://verbump.de/ for what these numbers do Special thanks to: Carlo Bramini diff --git a/expat/configure.ac b/expat/configure.ac index 9ce54f1d..a6573e81 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=3 # with +LIBREVISION=4 # with LIBAGE=8 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) -- cgit v1.2.1 From a445be8e0d15aff2d2cfcb58b18525b9b2eccc6a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 22:28:15 +0100 Subject: Bump version to 2.4.4 --- expat/CMake.README | 12 ++++++------ expat/CMakeLists.txt | 2 +- expat/README.md | 2 +- expat/doc/reference.html | 2 +- expat/lib/expat.h | 2 +- expat/lib/xmlparse.c | 2 +- expat/tests/runtests.c | 2 +- expat/win32/expat.iss | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/expat/CMake.README b/expat/CMake.README index 288fa5ab..586f5874 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.3 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.4 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.3$ mkdir build && cd build -~/expat-2.4.3/build$ +~/expat-2.4.4$ mkdir build && cd build +~/expat-2.4.4/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.3/build$ cmake .. +~/expat-2.4.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.4.3/build +-- Build files have been written to: /home/patrick/expat-2.4.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.4.3/build$ make && make test && make install +~/expat-2.4.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 diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index e014e308..23a8bb0f 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -64,7 +64,7 @@ endif() project(expat VERSION - 2.4.3 + 2.4.4 LANGUAGES C ) diff --git a/expat/README.md b/expat/README.md index 6fdd6148..00e6cca2 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.3 +# Expat, Release 2.4.4 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/doc/reference.html b/expat/doc/reference.html index 1629413e..fe09db32 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -49,7 +49,7 @@

The Expat XML Parser - Release 2.4.3 + Release 2.4.4

diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 0f021e25..4c5704fd 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 3 +#define XML_MICRO_VERSION 4 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 26d8ecbe..3c7a3a0d 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 9ca2a2fedc35bcb13ba9a134ba5e173020bc2ff5f5a311abf742cec7da1ff26a (2.4.3+) +/* 2e2c8ce5f11a473d65ec313ab20ceee6afefb355f5405afc06e7204e2e41c8c0 (2.4.4+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 579dad1a..4a9c5328 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7376,7 +7376,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.3"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.4"))) /* 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 0f95462a..7261fd99 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.3" +#define expatVer "2.4.4" [Setup] AppName=Expat -- cgit v1.2.1 From 039af6611d0c28e879196698ee0f6707d430d855 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 22:36:08 +0100 Subject: Sync file headers --- expat/lib/xmlparse.c | 1 + expat/win32/expat.iss | 2 +- expat/xmlwf/xmlwf.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 3c7a3a0d..4b43e613 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -33,6 +33,7 @@ Copyright (c) 2019-2020 Ben Wagner Copyright (c) 2019 Vadim Zeitlin Copyright (c) 2021 Dong-hee Na + Copyright (c) 2022 Samanta Navarro Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index 7261fd99..ae8ce7ef 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -43,7 +43,7 @@ AppName=Expat AppId=expat AppVersion={#expatVer} AppVerName=Expat {#expatVer} -AppCopyright=Copyright © 1997-2021 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers +AppCopyright=Copyright © 1997-2022 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers AppPublisher=The Expat Developers AppPublisherURL=https://libexpat.github.io/ AppSupportURL=https://libexpat.github.io/ diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c index b6f300b0..78573111 100644 --- a/expat/xmlwf/xmlwf.c +++ b/expat/xmlwf/xmlwf.c @@ -11,7 +11,7 @@ Copyright (c) 2001-2003 Fred L. Drake, Jr. Copyright (c) 2004-2009 Karl Waclawek Copyright (c) 2005-2007 Steven Solie - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2022 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2019 David Loffredo Copyright (c) 2020 Joe Orton -- cgit v1.2.1 From 0afb2df6a9d429a0a78d2d65a5cb72140ee9df3a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 22:38:42 +0100 Subject: Set expected release date for 2.4.4 --- expat/Changes | 2 +- expat/doc/xmlwf.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/expat/Changes b/expat/Changes index be37463c..737f010c 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 xxxxxxx xx xxxx +Release 2.4.4 Sun January 30 2022 Security fixes: #550 CVE-2022-23852 -- Fix signed integer overflow (undefined behavior) in function XML_GetBuffer diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 804fc562..4d13d615 100644 --- a/expat/doc/xmlwf.xml +++ b/expat/doc/xmlwf.xml @@ -22,7 +22,7 @@ Scott"> Bronson"> - January 16, 2022"> + January 30, 2022"> 1"> bronson@rinspin.com"> -- cgit v1.2.1 From da3dcd4ecfb41e825a66021b281cbaf07bbd6f3f Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 22:40:13 +0100 Subject: xmlwf.xml: Adapt note to current practice --- expat/doc/xmlwf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 4d13d615..c68aa1d8 100644 --- a/expat/doc/xmlwf.xml +++ b/expat/doc/xmlwf.xml @@ -21,8 +21,8 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ Scott"> Bronson"> - January 30, 2022"> + 1"> bronson@rinspin.com"> -- cgit v1.2.1 From 26b677744c2eff96ce619004473d8e7680d8c92f Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 22:46:52 +0100 Subject: .gitignore: Add missing --- .gitignore | 1 + expat/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3ff5a1f7..4c8703f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.idea/ # CVS default ignores begin tags TAGS diff --git a/expat/.gitignore b/expat/.gitignore index b45195b5..1556d70a 100644 --- a/expat/.gitignore +++ b/expat/.gitignore @@ -1,4 +1,5 @@ /autom4te.cache/ +/cmake-build-debug/ m4/ CMakeFiles/ Testing/ -- cgit v1.2.1 From c322e14f9f9c7203f058737cc02a001b3cd9a143 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 23:12:44 +0100 Subject: doc: Drop unused file valid-xhtml10.png Unused since commit 30c4aa85f530f279d8c9cc2f584fa9a9df7e2bf1 of 2.4.0 --- expat/doc/Makefile.am | 1 - expat/doc/valid-xhtml10.png | Bin 1981 -> 0 bytes expat/win32/expat.iss | 1 - 3 files changed, 2 deletions(-) delete mode 100644 expat/doc/valid-xhtml10.png diff --git a/expat/doc/Makefile.am b/expat/doc/Makefile.am index 16987e8d..dbcb0919 100644 --- a/expat/doc/Makefile.am +++ b/expat/doc/Makefile.am @@ -57,5 +57,4 @@ EXTRA_DIST = \ ok.min.css \ reference.html \ style.css \ - valid-xhtml10.png \ xmlwf.xml diff --git a/expat/doc/valid-xhtml10.png b/expat/doc/valid-xhtml10.png deleted file mode 100644 index 8b5f1bae..00000000 Binary files a/expat/doc/valid-xhtml10.png and /dev/null differ diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index ae8ce7ef..8e4257b6 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -73,7 +73,6 @@ Flags: ignoreversion; Source: COPYING; DestDir: "{app}"; De Flags: ignoreversion; Source: README.md; DestDir: "{app}"; DestName: README.txt Flags: ignoreversion; Source: doc\*.html; DestDir: "{app}\Doc" Flags: ignoreversion; Source: doc\*.css; DestDir: "{app}\Doc" -Flags: ignoreversion; Source: doc\*.png; DestDir: "{app}\Doc" Flags: ignoreversion; Source: win32\bin\Release\*.dll; DestDir: "{app}\Bin" Flags: ignoreversion; Source: win32\bin\Release\*.lib; DestDir: "{app}\Bin" Flags: ignoreversion; Source: win32\README.txt; DestDir: "{app}\Source" -- cgit v1.2.1 From 3ce557eecbe83499a214340a884a2d035d521f0e Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 29 Jan 2022 23:17:44 +0100 Subject: win32: Add missing files to the installer --- expat/Changes | 2 ++ expat/win32/expat.iss | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/expat/Changes b/expat/Changes index 737f010c..9c1b5c7b 100644 --- a/expat/Changes +++ b/expat/Changes @@ -21,6 +21,8 @@ Release 2.4.4 Sun January 30 2022 Other changes: #546 Autotools: Fix broken CMake support under Cygwin + #554 Windows: Add missing files to the installer to fix + compilation with CMake from installed sources #552 #554 Version info bumped from 9:3:8 to 9:4:8; see https://verbump.de/ for what these numbers do diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index 8e4257b6..e5e945b7 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -73,15 +73,20 @@ Flags: ignoreversion; Source: COPYING; DestDir: "{app}"; De Flags: ignoreversion; Source: README.md; DestDir: "{app}"; DestName: README.txt Flags: ignoreversion; Source: doc\*.html; DestDir: "{app}\Doc" Flags: ignoreversion; Source: doc\*.css; DestDir: "{app}\Doc" +Flags: ignoreversion; Source: doc\*.xml; DestDir: "{app}\Doc" Flags: ignoreversion; Source: win32\bin\Release\*.dll; DestDir: "{app}\Bin" Flags: ignoreversion; Source: win32\bin\Release\*.lib; DestDir: "{app}\Bin" Flags: ignoreversion; Source: win32\README.txt; DestDir: "{app}\Source" +Flags: ignoreversion; Source: AUTHORS; DestDir: "{app}\Source" Flags: ignoreversion; Source: Changes; DestDir: "{app}\Source" Flags: ignoreversion; Source: CMake.README; DestDir: "{app}\Source" Flags: ignoreversion; Source: CMakeLists.txt; DestDir: "{app}\Source" Flags: ignoreversion; Source: ConfigureChecks.cmake; DestDir: "{app}\Source" +Flags: ignoreversion; Source: expat.pc.cmake; DestDir: "{app}\Source" Flags: ignoreversion; Source: expat_config.h.cmake; DestDir: "{app}\Source" +Flags: ignoreversion; Source: run.sh.in; DestDir: "{app}\Source" Flags: ignoreversion; Source: cmake\expat-config.cmake.in; DestDir: "{app}\Source\cmake" +Flags: ignoreversion; Source: fuzz\*.c; DestDir: "{app}\Source\fuzz" Flags: ignoreversion; Source: lib\*.c; DestDir: "{app}\Source\lib" Flags: ignoreversion; Source: lib\*.h; DestDir: "{app}\Source\lib" Flags: ignoreversion; Source: lib\*.def; DestDir: "{app}\Source\lib" -- cgit v1.2.1