diff options
author | Sebastian Pipping <sebastian@pipping.org> | 2022-01-30 01:09:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-30 01:09:37 +0100 |
commit | 81b89678e200820271b72cacdd45fb5868855765 (patch) | |
tree | 61a2c2864451f17df958ccc173b30385eaca36ef | |
parent | d97a123d0b48f6a36f3bcc1984b4c287243718fc (diff) | |
parent | 3ce557eecbe83499a214340a884a2d035d521f0e (diff) | |
download | libexpat-git-81b89678e200820271b72cacdd45fb5868855765.tar.gz |
Merge pull request #554 from libexpat/issue-552-prepare-releaseR_2_4_4
Prepare release 2.4.4 (part of #552)
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | expat/.gitignore | 1 | ||||
-rw-r--r-- | expat/CMake.README | 12 | ||||
-rw-r--r-- | expat/CMakeLists.txt | 4 | ||||
-rw-r--r-- | expat/Changes | 10 | ||||
-rw-r--r-- | expat/README.md | 2 | ||||
-rw-r--r-- | expat/configure.ac | 2 | ||||
-rw-r--r-- | expat/doc/Makefile.am | 1 | ||||
-rw-r--r-- | expat/doc/reference.html | 2 | ||||
-rw-r--r-- | expat/doc/valid-xhtml10.png | bin | 1981 -> 0 bytes | |||
-rw-r--r-- | expat/doc/xmlwf.xml | 4 | ||||
-rw-r--r-- | expat/lib/expat.h | 2 | ||||
-rw-r--r-- | expat/lib/xmlparse.c | 3 | ||||
-rw-r--r-- | expat/tests/runtests.c | 2 | ||||
-rw-r--r-- | expat/win32/expat.iss | 10 | ||||
-rw-r--r-- | expat/xmlwf/xmlwf.c | 2 |
16 files changed, 36 insertions, 22 deletions
@@ -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/ 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 9d182b30..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 ) @@ -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 ec1f7604..9c1b5c7b 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 @@ -19,7 +19,15 @@ 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 + #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 + Special thanks to: + Carlo Bramini hwt0415 Roland Illig Samanta Navarro 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/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]) 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/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 @@ <div> <h1> The Expat XML Parser - <small>Release 2.4.3</small> + <small>Release 2.4.4</small> </h1> </div> <div class="content"> diff --git a/expat/doc/valid-xhtml10.png b/expat/doc/valid-xhtml10.png Binary files differdeleted file mode 100644 index 8b5f1bae..00000000 --- a/expat/doc/valid-xhtml10.png +++ /dev/null diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 804fc562..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" [ <!ENTITY dhfirstname "<firstname>Scott</firstname>"> <!ENTITY dhsurname "<surname>Bronson</surname>"> - <!-- Please adjust the date whenever revising the manpage. --> - <!ENTITY dhdate "<date>January 16, 2022</date>"> + <!ENTITY dhdate "<date>January 30, 2022</date>"> + <!-- Please adjust this^^ date whenever cutting a new release. --> <!ENTITY dhsection "<manvolnum>1</manvolnum>"> <!ENTITY dhemail "<email>bronson@rinspin.com</email>"> <!ENTITY dhusername "Scott Bronson"> 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..4b43e613 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 9ca2a2fedc35bcb13ba9a134ba5e173020bc2ff5f5a311abf742cec7da1ff26a (2.4.3+) +/* 2e2c8ce5f11a473d65ec313ab20ceee6afefb355f5405afc06e7204e2e41c8c0 (2.4.4+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| @@ -33,6 +33,7 @@ Copyright (c) 2019-2020 Ben Wagner <bungeman@chromium.org> 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> 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 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..e5e945b7 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -36,14 +36,14 @@ ; 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 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/ @@ -73,16 +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\*.png; 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" 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. <fdrake@users.sourceforge.net> Copyright (c) 2004-2009 Karl Waclawek <karl@waclawek.net> Copyright (c) 2005-2007 Steven Solie <ssolie@users.sourceforge.net> - Copyright (c) 2016-2021 Sebastian Pipping <sebastian@pipping.org> + Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org> Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk> Copyright (c) 2019 David Loffredo <loffredo@steptools.com> Copyright (c) 2020 Joe Orton <jorton@redhat.com> |