From 7430d287693592bf06d16dbb293466150114ed16 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 21 Mar 2021 16:31:27 +0100 Subject: win32/build_expat_iss.bat: Add -DEXPAT_WARNINGS_AS_ERRORS=ON --- expat/win32/build_expat_iss.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/expat/win32/build_expat_iss.bat b/expat/win32/build_expat_iss.bat index 2e2d6fd8..c33838de 100644 --- a/expat/win32/build_expat_iss.bat +++ b/expat/win32/build_expat_iss.bat @@ -43,7 +43,7 @@ MD %BINDIR% || EXIT /b 1 MD build_shared_char || EXIT /b 1 CD build_shared_char || EXIT /b 1 - cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF .. || EXIT /b 1 + cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF .. || EXIT /b 1 msbuild /m expat.sln || EXIT /b 1 DIR %CONFIGURATION% || EXIT /b 1 CD .. || EXIT /b 1 @@ -53,7 +53,7 @@ COPY build_shared_char\%CONFIGURATION%\libexpat.lib %BINDIR%\ || EXIT /b 1 MD build_static_char || EXIT /b 1 CD build_static_char || EXIT /b 1 - cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_SHARED_LIBS=OFF .. || EXIT /b 1 + cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_SHARED_LIBS=OFF .. || EXIT /b 1 msbuild /m expat.sln || EXIT /b 1 DIR %CONFIGURATION% || EXIT /b 1 CD .. || EXIT /b 1 @@ -63,7 +63,7 @@ COPY build_static_char\xmlwf\%CONFIGURATION%\xmlwf.exe %BINDIR%\ || EXIT /b 1 MD build_shared_wchar_t || EXIT /b 1 CD build_shared_wchar_t || EXIT /b 1 - cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1 + cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1 msbuild /m expat.sln || EXIT /b 1 DIR %CONFIGURATION% || EXIT /b 1 CD .. || EXIT /b 1 @@ -73,7 +73,7 @@ COPY build_shared_wchar_t\%CONFIGURATION%\libexpatw.lib %BINDIR%\ || EXIT /b 1 MD build_static_wchar_t || EXIT /b 1 CD build_static_wchar_t || EXIT /b 1 - cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1 + cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1 msbuild /m expat.sln || EXIT /b 1 DIR %CONFIGURATION% || EXIT /b 1 CD .. || EXIT /b 1 -- cgit v1.2.1 From 86a4093aabe398a3d25aa775408592e63c29b204 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 15 Sep 2022 15:55:55 +0200 Subject: Resolve use of deprecated "fgrep" by "grep -F" Related: https://lists.gnu.org/archive/html/info-gnu/2022-09/msg00001.html --- .github/workflows/coverage.yml | 6 +++--- .github/workflows/linux.yml | 6 +++--- .github/workflows/scripts/list-shared-library-symbols.sh | 2 +- expat/Changes | 1 + expat/buildconf.sh | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 3de03475..03eefe9c 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -66,11 +66,11 @@ jobs: # 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, e.g. everything PHP # 2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version # 3. Assert that no packages from ppa:ondrej/php are left installed - dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | grep '^php' \ + dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | grep '^php' \ | xargs -r -t sudo apt-get remove --yes libpcre2-posix3 libzip4 - dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \ + dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \ | xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V - ! dpkg -l | grep '^ii' | fgrep deb.sury.org + ! dpkg -l | grep '^ii' | grep -F deb.sury.org # Install 32bit Wine sudo dpkg --add-architecture i386 # for wine32 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6d88ae3c..68d2c06a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -93,11 +93,11 @@ jobs: # 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, e.g. everything PHP # 2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version # 3. Assert that no packages from ppa:ondrej/php are left installed - dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | grep '^php' \ + dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | grep '^php' \ | xargs -r -t sudo apt-get remove --yes libpcre2-posix3 libzip4 - dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \ + dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \ | xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V - ! dpkg -l | grep '^ii' | fgrep deb.sury.org + ! dpkg -l | grep '^ii' | grep -F deb.sury.org # Install 32bit Wine sudo dpkg --add-architecture i386 # for wine32 diff --git a/.github/workflows/scripts/list-shared-library-symbols.sh b/.github/workflows/scripts/list-shared-library-symbols.sh index 88df4789..21a3ff74 100755 --- a/.github/workflows/scripts/list-shared-library-symbols.sh +++ b/.github/workflows/scripts/list-shared-library-symbols.sh @@ -33,4 +33,4 @@ if [[ $# -ne 1 ]]; then echo "usage: $(basename "$0") SO_FILE_PATH" >&2 exit 1 fi -nm -D -p "${1}" | fgrep ' T ' | awk '{print $3}' | sort -f -d +nm -D -p "${1}" | grep -F ' T ' | awk '{print $3}' | sort -f -d diff --git a/expat/Changes b/expat/Changes index a57f0981..4965b783 100644 --- a/expat/Changes +++ b/expat/Changes @@ -33,6 +33,7 @@ Release x.x.x xxx xxxxx xx xxxx set(.. FORCE) in projects using Expat by means of add_subdirectory(..) off Expat's users' shoulders #626 #641 Stop exporting API symbols when building a static library + #644 Resolve use of deprecated "fgrep" by "grep -F" #620 CMake: Make documentation on variables a bit more consistent #610 Address Cppcheck 2.8.1 warning #643 Address Clang 15 compiler warnings diff --git a/expat/buildconf.sh b/expat/buildconf.sh index 5edbc565..381d25a6 100755 --- a/expat/buildconf.sh +++ b/expat/buildconf.sh @@ -40,7 +40,7 @@ set -e # not put SIZEOF_VOID_P in the eventual expat_config.h. patch_expat_config_h_in() { local filename="$1" - local sizeof_void_p_line_number="$(fgrep -n SIZEOF_VOID_P "${filename}" | awk -F: '{print $1}')" + local sizeof_void_p_line_number="$(grep -F -n SIZEOF_VOID_P "${filename}" | awk -F: '{print $1}')" [[ ${sizeof_void_p_line_number} =~ ^[0-9]+$ ]] # cheap assert local first_line_to_delete=$(( sizeof_void_p_line_number - 1 )) local last_line_to_delete=$(( sizeof_void_p_line_number + 1 )) -- cgit v1.2.1 From 55b79f4d8816568a9a3a66b3619c54b794fcf2a7 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 15 Sep 2022 16:06:35 +0200 Subject: Sync file headers --- .github/workflows/scripts/list-shared-library-symbols.sh | 2 +- expat/CMakeLists.txt | 1 + expat/apply-clang-format.sh | 3 ++- expat/buildconf.sh | 2 +- expat/coverage.sh | 2 +- expat/fix-xmltest-log.sh | 2 +- expat/lib/Makefile.am | 2 +- expat/lib/internal.h | 2 +- expat/lib/xmlparse.c | 2 +- expat/qa.sh | 2 +- expat/win32/build_expat_iss.bat | 2 +- expat/xmlwf/win32filemap.c | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/scripts/list-shared-library-symbols.sh b/.github/workflows/scripts/list-shared-library-symbols.sh index 21a3ff74..eeef949d 100755 --- a/.github/workflows/scripts/list-shared-library-symbols.sh +++ b/.github/workflows/scripts/list-shared-library-symbols.sh @@ -6,7 +6,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/CMakeLists.txt b/expat/CMakeLists.txt index 9702824b..7b68b9d7 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -30,6 +30,7 @@ # Copyright (c) 2020 Thomas Beutlich # Copyright (c) 2021 Alex Richardson # Copyright (c) 2022 Johnny Jazeix +# Copyright (c) 2022 David Faure # Unlike most of Expat, # this file is copyrighted under the BSD-license for buildsystem files of KDE. diff --git a/expat/apply-clang-format.sh b/expat/apply-clang-format.sh index a073eee9..d13b4321 100755 --- a/expat/apply-clang-format.sh +++ b/expat/apply-clang-format.sh @@ -6,7 +6,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2019-2021 Sebastian Pipping +# Copyright (c) 2019-2022 Sebastian Pipping +# Copyright (c) 2022 Rosen Penev # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/buildconf.sh b/expat/buildconf.sh index 381d25a6..5e2b3269 100755 --- a/expat/buildconf.sh +++ b/expat/buildconf.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2021 Sebastian Pipping +# Copyright (c) 2017-2022 Sebastian Pipping # Copyright (c) 2018 Marco Maggi # Licensed under the MIT license: # diff --git a/expat/coverage.sh b/expat/coverage.sh index 10512111..29855cc0 100755 --- a/expat/coverage.sh +++ b/expat/coverage.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2021 Sebastian Pipping +# Copyright (c) 2017-2022 Sebastian Pipping # Copyright (c) 2018 Marco Maggi # Copyright (c) 2019 Mohammed Khajapasha # Licensed under the MIT license: diff --git a/expat/fix-xmltest-log.sh b/expat/fix-xmltest-log.sh index 8213196f..7981cf3b 100755 --- a/expat/fix-xmltest-log.sh +++ b/expat/fix-xmltest-log.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2019 Sebastian Pipping +# Copyright (c) 2019-2022 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/lib/Makefile.am b/expat/lib/Makefile.am index 822a1389..0e0185b5 100644 --- a/expat/lib/Makefile.am +++ b/expat/lib/Makefile.am @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2021 Sebastian Pipping +# Copyright (c) 2017-2022 Sebastian Pipping # Copyright (c) 2017 Tomasz Kłoczko # Copyright (c) 2019 David Loffredo # Licensed under the MIT license: diff --git a/expat/lib/internal.h b/expat/lib/internal.h index 08d030f9..e09f533b 100644 --- a/expat/lib/internal.h +++ b/expat/lib/internal.h @@ -28,7 +28,7 @@ Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2003 Greg Stein - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2022 Sebastian Pipping Copyright (c) 2018 Yury Gribov Copyright (c) 2019 David Loffredo Licensed under the MIT license: diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index d73f419c..325f588a 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -19,7 +19,7 @@ Copyright (c) 2016 Gustavo Grieco Copyright (c) 2016 Pascal Cuoq Copyright (c) 2016 Ed Schouten - Copyright (c) 2017-2018 Rhodri James + Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Václav Slavík Copyright (c) 2017 Viktor Szakats Copyright (c) 2017 Chanho Park diff --git a/expat/qa.sh b/expat/qa.sh index cb1eb5f9..525deb3c 100755 --- a/expat/qa.sh +++ b/expat/qa.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2016-2021 Sebastian Pipping +# Copyright (c) 2016-2022 Sebastian Pipping # Copyright (c) 2019 Philippe Antoine # Copyright (c) 2019 Hanno Böck # Licensed under the MIT license: diff --git a/expat/win32/build_expat_iss.bat b/expat/win32/build_expat_iss.bat index c33838de..53e4351f 100644 --- a/expat/win32/build_expat_iss.bat +++ b/expat/win32/build_expat_iss.bat @@ -7,7 +7,7 @@ REM | __// \| |_) | (_| | |_ REM \___/_/\_\ .__/ \__,_|\__| REM |_| XML parser REM -REM Copyright (c) 2019 Sebastian Pipping +REM Copyright (c) 2019-2021 Sebastian Pipping REM Licensed under the MIT license: REM REM Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/xmlwf/win32filemap.c b/expat/xmlwf/win32filemap.c index a0ed75be..a2db8eaf 100644 --- a/expat/xmlwf/win32filemap.c +++ b/expat/xmlwf/win32filemap.c @@ -9,7 +9,7 @@ Copyright (c) 1997-2000 Thai Open Source Software Center Ltd Copyright (c) 2000 Clark Cooper Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2016-2017 Sebastian Pipping + Copyright (c) 2016-2022 Sebastian Pipping Copyright (c) 2022 Martin Ettl Licensed under the MIT license: -- cgit v1.2.1 From f70d53f2f5f2130cafbc41f4ced08d0f20dffb1c Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 15 Sep 2022 16:58:33 +0200 Subject: Changes: Document #592 #593 #594 #614 #619 #627 #633 #635 #636 #637 --- expat/Changes | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/expat/Changes b/expat/Changes index 4965b783..1c266146 100644 --- a/expat/Changes +++ b/expat/Changes @@ -10,6 +10,8 @@ Release x.x.x xxx xxxxx xx xxxx Bug fixes: #634 MinGW: Fix mis-compilation for -D__USE_MINGW_ANSI_STDIO=0 + #614 docs: Fix documentation on effect of switch XML_DTD on + symbol visibility in doc/reference.html Other changes: #638 MinGW: Make fix-xmltest-log.sh drop more Wine bug output @@ -28,20 +30,27 @@ Release x.x.x xxx xxxxx xx xxxx #632 MinGW|CMake: Set missing variable CMAKE_RC_COMPILER in toolchain file "cmake/mingw-toolchain.cmake" to avoid error "windres: Command not found" on e.g. Ubuntu 20.04 - #597 #626 CMake: Unify inconsistent use of set() and option() in + #597 #627 CMake: Unify inconsistent use of set() and option() in context of public build time options to take need for set(.. FORCE) in projects using Expat by means of add_subdirectory(..) off Expat's users' shoulders #626 #641 Stop exporting API symbols when building a static library #644 Resolve use of deprecated "fgrep" by "grep -F" #620 CMake: Make documentation on variables a bit more consistent - #610 Address Cppcheck 2.8.1 warning + #636 CMake: Drop leading whitespace from a #cmakedefine line in + file expat_config.h.cmake + #594 xmlwf: Fix harmless variable mix-up in function nsattcmp + #592 #593 #610 Address Cppcheck warnings #643 Address Clang 15 compiler warnings Infrastructure: #597 #598 CI: Windows: Start covering MSVC 2022 + #619 CI: macOS: Migrate off deprecated macOS 10.15 #632 CI: Linux: Make migration off deprecated Ubuntu 18.04 work #643 CI: Upgrade Clang from 14 to 15 + #637 apply-clang-format.sh: Add support for BSD find + #633 coverage.sh: Exclude MinGW headers + #635 coverage.sh: Fix name collision for -funsigned-char Special thanks to: David Faure @@ -49,6 +58,7 @@ Release x.x.x xxx xxxxx xx xxxx Frank Bergmann Rhodri James Rosen Penev + Thijs Schreijer Vincent Torri and Google Project Zero -- cgit v1.2.1 From 88462ba0fa9d5e817996a32a800cbd448d6427e0 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 15 Sep 2022 16:12:09 +0200 Subject: Bump version info from 9:8:8 to 9:9: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 7b68b9d7..2f49048d 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -437,7 +437,7 @@ foreach(build_type_upper endforeach() set(LIBCURRENT 9) # sync -set(LIBREVISION 8) # with +set(LIBREVISION 9) # with set(LIBAGE 8) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") diff --git a/expat/Changes b/expat/Changes index 1c266146..0b6251f3 100644 --- a/expat/Changes +++ b/expat/Changes @@ -42,6 +42,8 @@ Release x.x.x xxx xxxxx xx xxxx #594 xmlwf: Fix harmless variable mix-up in function nsattcmp #592 #593 #610 Address Cppcheck warnings #643 Address Clang 15 compiler warnings + #642 #644 Version info bumped from 9:8:8 to 9:9:8; + see https://verbump.de/ for what these numbers do Infrastructure: #597 #598 CI: Windows: Start covering MSVC 2022 diff --git a/expat/configure.ac b/expat/configure.ac index 0364c5fb..47216941 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=8 # with +LIBREVISION=9 # with LIBAGE=8 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) -- cgit v1.2.1 From a7103d40d87e9deec49f3eb0c186a683a8921574 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 15 Sep 2022 15:57:59 +0200 Subject: Bump version to 2.4.9 --- 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 be805e45..a0502305 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.8 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.9 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.8$ mkdir build && cd build -~/expat-2.4.8/build$ +~/expat-2.4.9$ mkdir build && cd build +~/expat-2.4.9/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.8/build$ cmake .. +~/expat-2.4.9/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.8/build +-- Build files have been written to: /home/patrick/expat-2.4.9/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.8/build$ make && make test && make install +~/expat-2.4.9/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 2f49048d..170ff187 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -38,7 +38,7 @@ cmake_minimum_required(VERSION 3.1.3) project(expat VERSION - 2.4.8 + 2.4.9 LANGUAGES C ) diff --git a/expat/README.md b/expat/README.md index d2b866db..c0ac8b0f 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.8 +# Expat, Release 2.4.9 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 bbde0829..4ab8d5a7 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -50,7 +50,7 @@

The Expat XML Parser - Release 2.4.8 + Release 2.4.9

diff --git a/expat/lib/expat.h b/expat/lib/expat.h index e2020a4a..2b47ce2a 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1055,7 +1055,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold( */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 4 -#define XML_MICRO_VERSION 8 +#define XML_MICRO_VERSION 9 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 325f588a..c0bece51 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 2722de33b8d95adcfb16db05afdec6ed1d40d51565cda2176c61806b5350eafe (2.4.8+) +/* 90815a2b2c80c03b2b889fe1d427bb2b9e3282aa065e42784e001db4f23de324 (2.4.9+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 9a1dc934..530f1844 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7661,7 +7661,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.8"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.9"))) /* 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 d57fd777..5b234ecb 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -37,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.8" +#define expatVer "2.4.9" [Setup] AppName=Expat -- cgit v1.2.1 From 869b3dea1cdc7c99e0302e9ba8145ea9fcd29489 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 15 Sep 2022 16:03:31 +0200 Subject: Set release date for version 2.4.9 --- expat/Changes | 2 +- expat/doc/xmlwf.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/expat/Changes b/expat/Changes index 0b6251f3..cfc83a09 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 xxxxx xx xxxx +Release 2.4.9 Tue September 20 2022 Security fixes: #629 #640 CVE-2022-40674 -- Heap use-after-free vulnerability in function doContent. Expected impact is denial of service diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 48714b8c..09d8dc89 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" [ Scott"> Bronson"> - March 28, 2022"> + September 20, 2022"> 1"> bronson@rinspin.com"> -- cgit v1.2.1