diff --git a/.ci.sh b/.ci.sh index 64b680cc..374bc025 100755 --- a/.ci.sh +++ b/.ci.sh @@ -6,9 +6,10 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2022 Sebastian Pipping +# Copyright (c) 2017-2024 Sebastian Pipping # Copyright (c) 2017 Rolf Eike Beer # Copyright (c) 2019 Mohammed Khajapasha +# Copyright (c) 2019 Manish, Kumar # Copyright (c) 2019 Philippe Antoine # Licensed under the MIT license: # diff --git a/.github/workflows/autotools-cmake.yml b/.github/workflows/autotools-cmake.yml index ae0ef278..3713d0fe 100644 --- a/.github/workflows/autotools-cmake.yml +++ b/.github/workflows/autotools-cmake.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021-2022 Sebastian Pipping +# Copyright (c) 2021-2023 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 1bae16f3..6f8a6ddf 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2024 Sebastian Pipping +# Copyright (c) 2021-2024 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index a03c8702..17b8bf03 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2024 Sebastian Pipping +# Copyright (c) 2021-2024 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/cmake-required-version.yml b/.github/workflows/cmake-required-version.yml index f0fd4fa3..efbc40cd 100644 --- a/.github/workflows/cmake-required-version.yml +++ b/.github/workflows/cmake-required-version.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021-2022 Sebastian Pipping +# Copyright (c) 2021-2023 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 4c0a696b..ba71c821 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2023 Sebastian Pipping +# Copyright (c) 2021-2023 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 03110857..0f783a80 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021-2022 Sebastian Pipping +# Copyright (c) 2021-2023 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 0ba622d4..051756dc 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021-2022 Sebastian Pipping +# Copyright (c) 2021-2024 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/expat_config_h.yml b/.github/workflows/expat_config_h.yml index e4506f50..925c6d03 100644 --- a/.github/workflows/expat_config_h.yml +++ b/.github/workflows/expat_config_h.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2020-2022 Sebastian Pipping +# Copyright (c) 2020-2023 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml index 75fcf856..d6f67dd0 100644 --- a/.github/workflows/fuzzing.yml +++ b/.github/workflows/fuzzing.yml @@ -5,7 +5,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2024 Sebastian Pipping +# Copyright (c) 2024 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 f71ccc5b..b77ffbba 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -5,7 +5,9 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021-2022 Sebastian Pipping +# Copyright (c) 2021-2024 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum +# Copyright (c) 2023 Hanno Böck # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4a67a898..7df7971e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2020-2022 Sebastian Pipping +# Copyright (c) 2020-2023 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/scripts/list_exported_macros.sh b/.github/workflows/scripts/list_exported_macros.sh index 90824b59..0116cffe 100755 --- a/.github/workflows/scripts/list_exported_macros.sh +++ b/.github/workflows/scripts/list_exported_macros.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2020-2021 Sebastian Pipping +# Copyright (c) 2020-2023 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/scripts/mass-cppcheck.sh b/.github/workflows/scripts/mass-cppcheck.sh index 56c13de9..0eaa407e 100755 --- a/.github/workflows/scripts/mass-cppcheck.sh +++ b/.github/workflows/scripts/mass-cppcheck.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021 Sebastian Pipping +# Copyright (c) 2021-2024 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.github/workflows/valid-xml.yml b/.github/workflows/valid-xml.yml index 434af945..56864fc2 100644 --- a/.github/workflows/valid-xml.yml +++ b/.github/workflows/valid-xml.yml @@ -5,7 +5,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2021-2022 Sebastian Pipping +# Copyright (c) 2021-2023 Sebastian Pipping +# Copyright (c) 2023 Joyce Brum # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/.mailmap b/.mailmap index 7a25209a..abc06f99 100644 --- a/.mailmap +++ b/.mailmap @@ -5,10 +5,12 @@ Franek Korta Hanno Böck James Clark José Gutiérrez de la Concha +Joyce Brum Karl Waclawek Karl Waclawek Kishore Kunche Martin Ettl +Owain Davies Rhodri James Rolf Eike Beer Sebastian Pipping diff --git a/expat/CMake.README b/expat/CMake.README index 2b94fff5..f712dd7d 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.5.0 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.6.0 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.5.0$ mkdir build && cd build -~/expat-2.5.0/build$ +~/expat-2.6.0$ mkdir build && cd build +~/expat-2.6.0/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.5.0/build$ cmake .. +~/expat-2.6.0/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.5.0/build +-- Build files have been written to: /home/patrick/expat-2.6.0/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.5.0/build$ make && make test && make install +~/expat-2.6.0/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 d9219e8d..dd793188 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -7,12 +7,12 @@ # # Copyright (c) 2010 Patrick Spendrin # Copyright (c) 2012 Karl Waclawek -# Copyright (c) 2016-2022 Sebastian Pipping +# Copyright (c) 2016-2024 Sebastian Pipping # Copyright (c) 2016 Sergei Nikulov # Copyright (c) 2016 Björn Lindahl # Copyright (c) 2016 Tobias Taschner # Copyright (c) 2016 Ben Boeckel -# Copyright (c) 2017 Rhodri James +# Copyright (c) 2017-2022 Rhodri James # Copyright (c) 2017 Rolf Eike Beer # Copyright (c) 2017 Stephen Groat # Copyright (c) 2017 Franek Korta @@ -38,7 +38,7 @@ cmake_minimum_required(VERSION 3.5.0) project(expat VERSION - 2.5.0 + 2.6.0 LANGUAGES C ) @@ -465,9 +465,9 @@ foreach(build_type_upper set_property(TARGET expat PROPERTY ${build_type_upper}_POSTFIX ${EXPAT_${build_type_upper}_POSTFIX}) endforeach() -set(LIBCURRENT 9) # sync -set(LIBREVISION 10) # with -set(LIBAGE 8) # configure.ac! +set(LIBCURRENT 10) # sync +set(LIBREVISION 0) # with +set(LIBAGE 9) # configure.ac! math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") if(NOT WIN32) diff --git a/expat/Changes b/expat/Changes index 6e0403ea..a7d4caf9 100644 --- a/expat/Changes +++ b/expat/Changes @@ -2,13 +2,119 @@ 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 2.5.1 xxx xxxxxxx xx xxxx +Release 2.6.0 Tue February 6 2024 + Security fixes: + #789 #814 CVE-2023-52425 -- Fix quadratic runtime issues with big tokens + that can cause denial of service, in partial where + dealing with compressed XML input. Applications + that parsed a document in one go -- a single call to + functions XML_Parse or XML_ParseBuffer -- were not affected. + The smaller the chunks/buffers you use for parsing + previously, the bigger the problem prior to the fix. + Backporters should be careful to no omit parts of + pull request #789 and to include earlier pull request #771, + in order to not break the fix. + #777 CVE-2023-52426 -- Fix billion laughs attacks for users + compiling *without* XML_DTD defined (which is not common). + Users with XML_DTD defined have been protected since + Expat >=2.4.0 (and that was CVE-2013-0340 back then). + + Bug fixes: + #753 Fix parse-size-dependent "invalid token" error for + external entities that start with a byte order mark + #780 Fix NULL pointer dereference in setContext via + XML_ExternalEntityParserCreate for compilation with + XML_DTD undefined + #812 #813 Protect against closing entities out of order + Other changes: + #723 Improve support for arc4random/arc4random_buf + #771 #788 Improve buffer growth in XML_GetBuffer and XML_Parse + #761 #770 xmlwf: Support --help and --version + #759 #770 xmlwf: Support custom buffer size for XML_GetBuffer and read + #744 xmlwf: Improve language and URL clickability in help output #673 examples: Add new example "element_declarations.c" - #678 #706 #733 Autotools: Sync CMake templates with CMake 3.25 + #764 Be stricter about macro XML_CONTEXT_BYTES at build time + #765 Make inclusion to expat_config.h consistent + #726 #727 Autotools: configure.ac: Support --disable-maintainer-mode + #678 #705 .. + #706 #733 #792 Autotools: Sync CMake templates with CMake 3.26 + #795 Autotools: Make installation of shipped man page doc/xmlwf.1 + independent of docbook2man availability + #815 Autotools|CMake: Add missing -DXML_STATIC to pkg-config file + section "Cflags.private" in order to fix compilation + against static libexpat using pkg-config on Windows + #724 #751 Autotools|CMake: Require a C99 compiler + (a de-facto requirement already since Expat 2.2.2 of 2017) + #793 Autotools|CMake: Fix PACKAGE_BUGREPORT variable + #750 #786 Autotools|CMake: Make test suite require a C++11 compiler + #749 CMake: Require CMake >=3.5.0 + #672 CMake: Lowercase off_t and size_t to help a bug in Meson + #746 CMake: Sort xmlwf sources alphabetically + #785 CMake|Windows: Fix generation of DLL file version info + #790 CMake: Build tests/benchmark/benchmark.c as well for + a build with -DEXPAT_BUILD_TESTS=ON + #745 #757 docs: Document the importance of isFinal + adjust tests + accordingly + #736 docs: Improve use of "NULL" and "null" + #713 docs: Be specific about version of XML (XML 1.0r4) + and version of C (C99); (XML 1.0r5 will need a sponsor.) + #762 docs: reference.html: Promote function XML_ParseBuffer more + #779 docs: reference.html: Add HTML anchors to XML_* macros + #760 docs: reference.html: Upgrade to OK.css 1.2.0 + #763 #739 docs: Fix typos + #696 docs|CI: Use HTTPS URLs instead of HTTP at various places + #669 #670 .. + #692 #703 .. + #733 #772 Address compiler warnings + #798 #800 Address clang-tidy warnings + #775 #776 Version info bumped from 9:10:8 (libexpat*.so.1.8.10) + to 10:0:9 (libexpat*.so.1.9.0); see https://verbump.de/ + for what these numbers do Infrastructure: + #700 #701 docs: Document security policy in file SECURITY.md + #766 docs: Improve parse buffer variables in-code documentation + #674 #738 .. + #740 #747 .. + #748 #781 #782 Refactor coverage and conformance tests + #714 #716 Refactor debug level variables to unsigned long + #671 Improve handling of empty environment variable value + in function getDebugLevel (without visible user effect) + #755 #774 .. + #758 #783 .. + #784 #787 tests: Improve test coverage with regard to parse chunk size + #660 #797 #801 Fuzzing: Improve fuzzing coverage + #367 #799 Fuzzing|CI: Start running OSS-Fuzz fuzzing regression tests #698 #721 CI: Resolve some Travis CI leftovers + #669 CI: Be robust towards absence of Git tags + #693 #694 CI: Set permissions to "contents: read" for security + #709 CI: Pin all GitHub Actions to specific commits for security + #739 CI: Reject spelling errors using codespell + #798 CI: Enforce clang-tidy clean code + #773 #808 .. + #809 #810 CI: Upgrade Clang from 15 to 18 + #796 CI: Start using Clang's Control Flow Integrity sanitizer + #675 #720 #722 CI: Adapt to breaking changes in GitHub Actions Ubuntu images + #689 CI: Adapt to breaking changes in Clang/LLVM Debian packaging + #763 CI: Adapt to breaking changes in codespell + #803 CI: Adapt to breaking changes in Cppcheck + + Special thanks to: + Ivan Galkin + Joyce Brum + Philippe Antoine + Rhodri James + Snild Dolkow + spookyahell + Steven Garske + and + Clang AddressSanitizer + Clang UndefinedBehaviorSanitizer + codespell + GCC Farm Project + OSS-Fuzz + Sony Mobile Release 2.5.0 Tue October 25 2022 Security fixes: diff --git a/expat/Makefile.am b/expat/Makefile.am index de250a11..9c2259d2 100644 --- a/expat/Makefile.am +++ b/expat/Makefile.am @@ -6,9 +6,10 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2021 Sebastian Pipping +# Copyright (c) 2017-2023 Sebastian Pipping # Copyright (c) 2018 KangLin # Copyright (c) 2022 Johnny Jazeix +# Copyright (c) 2023 Sony Corporation / Snild Dolkow # 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 c991a404..43c4f4f3 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.5.0 +# Expat, Release 2.6.0 This is Expat, a C99 library for parsing [XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by diff --git a/expat/apply-clang-format.sh b/expat/apply-clang-format.sh index e5d927e4..8d2cf938 100755 --- a/expat/apply-clang-format.sh +++ b/expat/apply-clang-format.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2019-2022 Sebastian Pipping +# Copyright (c) 2019-2024 Sebastian Pipping # Copyright (c) 2022 Rosen Penev # Licensed under the MIT license: # diff --git a/expat/apply-clang-tidy.sh b/expat/apply-clang-tidy.sh index 31b6f94d..2e520bd0 100755 --- a/expat/apply-clang-tidy.sh +++ b/expat/apply-clang-tidy.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2024 Sebastian Pipping +# Copyright (c) 2024 Sebastian Pipping # Licensed under the MIT license: # # Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/configure.ac b/expat/configure.ac index addbb10b..a5d1ff93 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-2022 Sebastian Pipping +dnl Copyright (c) 2016-2024 Sebastian Pipping dnl Copyright (c) 2017 S. P. Zeidler dnl Copyright (c) 2017 Stephen Groat dnl Copyright (c) 2017-2020 Joe Orton @@ -82,9 +82,9 @@ dnl dnl If the API changes incompatibly set LIBAGE back to 0 dnl -LIBCURRENT=9 # sync -LIBREVISION=10 # with -LIBAGE=8 # CMakeLists.txt! +LIBCURRENT=10 # sync +LIBREVISION=0 # with +LIBAGE=9 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) AH_TOP([#ifndef EXPAT_CONFIG_H diff --git a/expat/coverage.sh b/expat/coverage.sh index 78282358..1689f5ce 100755 --- a/expat/coverage.sh +++ b/expat/coverage.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2022 Sebastian Pipping +# Copyright (c) 2017-2023 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 899bb534..898f03a3 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -14,11 +14,12 @@ Copyright (c) 2000 Clark Cooper Copyright (c) 2000-2004 Fred L. Drake, Jr. Copyright (c) 2002-2012 Karl Waclawek - Copyright (c) 2017-2022 Sebastian Pipping + Copyright (c) 2017-2024 Sebastian Pipping Copyright (c) 2017 Jakub Wilk Copyright (c) 2021 Tomas Korbar Copyright (c) 2021 Nicolas Cavallari Copyright (c) 2022 Thijs Schreijer + Copyright (c) 2023 Hanno Böck Copyright (c) 2023 Sony Corporation / Snild Dolkow Licensed under the MIT license: @@ -51,7 +52,7 @@

The Expat XML Parser - Release 2.5.0 + Release 2.6.0

diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml index 367ccf7e..2b3f1ccd 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-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2016 Ardo van Rangelrooij Copyright (c) 2017 Rhodri James Copyright (c) 2020 Joe Orton @@ -21,7 +21,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ Scott"> Bronson"> - October 25, 2022"> + February 6, 2024"> 1"> bronson@rinspin.com"> diff --git a/expat/examples/element_declarations.c b/expat/examples/element_declarations.c index b9aaa96c..7ce8544f 100644 --- a/expat/examples/element_declarations.c +++ b/expat/examples/element_declarations.c @@ -12,7 +12,7 @@ Copyright (c) 2001-2003 Fred L. Drake, Jr. Copyright (c) 2004-2006 Karl Waclawek Copyright (c) 2005-2007 Steven Solie - Copyright (c) 2016-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2019 Zhongyuan Zhou Licensed under the MIT license: diff --git a/expat/lib/expat.h b/expat/lib/expat.h index aed625f0..95464b0d 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -11,11 +11,12 @@ Copyright (c) 2000-2005 Fred L. Drake, Jr. Copyright (c) 2001-2002 Greg Stein Copyright (c) 2002-2016 Karl Waclawek - Copyright (c) 2016-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2016 Cristian Rodríguez Copyright (c) 2016 Thomas Beutlich Copyright (c) 2017 Rhodri James Copyright (c) 2022 Thijs Schreijer + Copyright (c) 2023 Hanno Böck Copyright (c) 2023 Sony Corporation / Snild Dolkow Licensed under the MIT license: @@ -1063,7 +1064,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); See https://semver.org */ #define XML_MAJOR_VERSION 2 -#define XML_MINOR_VERSION 5 +#define XML_MINOR_VERSION 6 #define XML_MICRO_VERSION 0 #ifdef __cplusplus diff --git a/expat/lib/internal.h b/expat/lib/internal.h index df838ce9..cce71e4c 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-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2018 Yury Gribov Copyright (c) 2019 David Loffredo Copyright (c) 2023 Sony Corporation / Snild Dolkow diff --git a/expat/lib/winconfig.h b/expat/lib/winconfig.h index 688b949c..05805514 100644 --- a/expat/lib/winconfig.h +++ b/expat/lib/winconfig.h @@ -9,7 +9,8 @@ Copyright (c) 2000 Clark Cooper Copyright (c) 2002 Greg Stein Copyright (c) 2005 Karl Waclawek - Copyright (c) 2017-2021 Sebastian Pipping + Copyright (c) 2017-2023 Sebastian Pipping + Copyright (c) 2023 Orgad Shaneh Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 256b4878..aaf0fa9c 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 5ab094ffadd6edfc94c3eee53af44a86951f9f1f0933ada3114bbce2bfb02c99 (2.5.0+) +/* 628e24d4966bedbd4800f6ed128d06d29703765b4bce12d3b7f099f90f842fc9 (2.6.0+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| @@ -13,7 +13,7 @@ Copyright (c) 2002-2016 Karl Waclawek Copyright (c) 2005-2009 Steven Solie Copyright (c) 2016 Eric Rahm - Copyright (c) 2016-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2016 Gaurav Copyright (c) 2016 Thomas Beutlich Copyright (c) 2016 Gustavo Grieco @@ -36,6 +36,8 @@ Copyright (c) 2022 Samanta Navarro Copyright (c) 2022 Jeffrey Walton Copyright (c) 2022 Jann Horn + Copyright (c) 2022 Sean McBride + Copyright (c) 2023 Owain Davies Copyright (c) 2023 Sony Corporation / Snild Dolkow Licensed under the MIT license: diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c index 5e92c036..2c48bf40 100644 --- a/expat/lib/xmlrole.c +++ b/expat/lib/xmlrole.c @@ -12,7 +12,7 @@ Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2005-2009 Steven Solie - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2019 David Loffredo Copyright (c) 2021 Donghee Na diff --git a/expat/lib/xmlrole.h b/expat/lib/xmlrole.h index 262eca1e..a7904274 100644 --- a/expat/lib/xmlrole.h +++ b/expat/lib/xmlrole.h @@ -10,7 +10,7 @@ Copyright (c) 2000 Clark Cooper Copyright (c) 2002 Karl Waclawek Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2017-2024 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c index 6e0d7017..29a66d72 100644 --- a/expat/lib/xmltok.c +++ b/expat/lib/xmltok.c @@ -12,7 +12,7 @@ Copyright (c) 2002 Greg Stein Copyright (c) 2002-2016 Karl Waclawek Copyright (c) 2005-2009 Steven Solie - Copyright (c) 2016-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2016 Pascal Cuoq Copyright (c) 2016 Don Lewis Copyright (c) 2017 Rhodri James @@ -22,6 +22,8 @@ Copyright (c) 2019 David Loffredo Copyright (c) 2021 Donghee Na Copyright (c) 2022 Martin Ettl + Copyright (c) 2022 Sean McBride + Copyright (c) 2023 Hanno Böck Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/lib/xmltok.h b/expat/lib/xmltok.h index bf3bb61d..c51fce1e 100644 --- a/expat/lib/xmltok.h +++ b/expat/lib/xmltok.h @@ -10,7 +10,7 @@ Copyright (c) 2000 Clark Cooper Copyright (c) 2002 Fred L. Drake, Jr. Copyright (c) 2002-2005 Karl Waclawek - Copyright (c) 2016-2017 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2017 Rhodri James Licensed under the MIT license: diff --git a/expat/qa.sh b/expat/qa.sh index 737e748d..a11a1bfa 100755 --- a/expat/qa.sh +++ b/expat/qa.sh @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2016-2022 Sebastian Pipping +# Copyright (c) 2016-2023 Sebastian Pipping # Copyright (c) 2019 Philippe Antoine # Copyright (c) 2019 Hanno Böck # Licensed under the MIT license: diff --git a/expat/tests/Makefile.am b/expat/tests/Makefile.am index a43eedaf..f949fe7f 100644 --- a/expat/tests/Makefile.am +++ b/expat/tests/Makefile.am @@ -6,8 +6,8 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2017-2021 Sebastian Pipping -# Copyright (c) 2017 Rhodri James +# Copyright (c) 2017-2023 Sebastian Pipping +# Copyright (c) 2017-2022 Rhodri James # Copyright (c) 2020 Jeffrey Walton # Licensed under the MIT license: # diff --git a/expat/tests/acc_tests.c b/expat/tests/acc_tests.c index 68c6512e..e1c4b7f7 100644 --- a/expat/tests/acc_tests.c +++ b/expat/tests/acc_tests.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-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/acc_tests_cxx.cpp b/expat/tests/acc_tests_cxx.cpp index 8e1b5661..01644991 100644 --- a/expat/tests/acc_tests_cxx.cpp +++ b/expat/tests/acc_tests_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/alloc_tests.c b/expat/tests/alloc_tests.c index 4f47fc8a..e5d46ebe 100644 --- a/expat/tests/alloc_tests.c +++ b/expat/tests/alloc_tests.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-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/alloc_tests_cxx.cpp b/expat/tests/alloc_tests_cxx.cpp index ba6fdf41..3270b1a6 100644 --- a/expat/tests/alloc_tests_cxx.cpp +++ b/expat/tests/alloc_tests_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/basic_tests.c b/expat/tests/basic_tests.c index 302af53d..7112a440 100644 --- a/expat/tests/basic_tests.c +++ b/expat/tests/basic_tests.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-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha @@ -18,7 +18,7 @@ Copyright (c) 2019 David Loffredo Copyright (c) 2020 Tim Gates Copyright (c) 2021 Donghee Na - Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/basic_tests_cxx.cpp b/expat/tests/basic_tests_cxx.cpp index 7b57e96a..d7e75a90 100644 --- a/expat/tests/basic_tests_cxx.cpp +++ b/expat/tests/basic_tests_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/benchmark/benchmark.c b/expat/tests/benchmark/benchmark.c index a611c571..355d83f8 100644 --- a/expat/tests/benchmark/benchmark.c +++ b/expat/tests/benchmark/benchmark.c @@ -8,7 +8,7 @@ Copyright (c) 2003-2006 Karl Waclawek Copyright (c) 2005-2007 Steven Solie - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2017-2023 Sebastian Pipping Copyright (c) 2017 Rhodri James Licensed under the MIT license: diff --git a/expat/tests/chardata.c b/expat/tests/chardata.c index b3006a96..2adb2c54 100644 --- a/expat/tests/chardata.c +++ b/expat/tests/chardata.c @@ -9,9 +9,10 @@ Copyright (c) 2002-2004 Fred L. Drake, Jr. Copyright (c) 2003 Greg Stein Copyright (c) 2016 Gilles Espinasse - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017 Joe Orton Copyright (c) 2017 Rhodri James + Copyright (c) 2022 Sean McBride Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/chardata_cxx.cpp b/expat/tests/chardata_cxx.cpp index 907065cd..81820c72 100644 --- a/expat/tests/chardata_cxx.cpp +++ b/expat/tests/chardata_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/common.c b/expat/tests/common.c index ccdc5973..26d0c547 100644 --- a/expat/tests/common.c +++ b/expat/tests/common.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-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha @@ -18,7 +18,7 @@ Copyright (c) 2019 David Loffredo Copyright (c) 2020 Tim Gates Copyright (c) 2021 Donghee Na - Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/common.h b/expat/tests/common.h index 412c84ec..52f00cc0 100644 --- a/expat/tests/common.h +++ b/expat/tests/common.h @@ -10,7 +10,7 @@ Copyright (c) 2003 Greg Stein Copyright (c) 2005-2007 Steven Solie Copyright (c) 2005-2012 Karl Waclawek - Copyright (c) 2016-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/common_cxx.cpp b/expat/tests/common_cxx.cpp index 761bce34..698a0ccf 100644 --- a/expat/tests/common_cxx.cpp +++ b/expat/tests/common_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/dummy_cxx.cpp b/expat/tests/dummy_cxx.cpp index f176eeba..27c9f431 100644 --- a/expat/tests/dummy_cxx.cpp +++ b/expat/tests/dummy_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/handlers.c b/expat/tests/handlers.c index d707b914..449ada70 100644 --- a/expat/tests/handlers.c +++ b/expat/tests/handlers.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-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha @@ -18,7 +18,7 @@ Copyright (c) 2019 David Loffredo Copyright (c) 2020 Tim Gates Copyright (c) 2021 Donghee Na - Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/handlers.h b/expat/tests/handlers.h index a72d0491..e1f0995f 100644 --- a/expat/tests/handlers.h +++ b/expat/tests/handlers.h @@ -10,7 +10,7 @@ Copyright (c) 2003 Greg Stein Copyright (c) 2005-2007 Steven Solie Copyright (c) 2005-2012 Karl Waclawek - Copyright (c) 2016-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/handlers_cxx.cpp b/expat/tests/handlers_cxx.cpp index 190e310e..86c62b15 100644 --- a/expat/tests/handlers_cxx.cpp +++ b/expat/tests/handlers_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/memcheck.c b/expat/tests/memcheck.c index 9928af40..de925499 100644 --- a/expat/tests/memcheck.c +++ b/expat/tests/memcheck.c @@ -6,8 +6,9 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2017 Rhodri James - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2017 Rhodri James + Copyright (c) 2017-2023 Sebastian Pipping + Copyright (c) 2022 Sean McBride Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/memcheck_cxx.cpp b/expat/tests/memcheck_cxx.cpp index 6d65075e..e62ac989 100644 --- a/expat/tests/memcheck_cxx.cpp +++ b/expat/tests/memcheck_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c index 44d10daa..baccd76b 100644 --- a/expat/tests/minicheck.c +++ b/expat/tests/minicheck.c @@ -11,11 +11,11 @@ |_| XML parser Copyright (c) 2004-2006 Fred L. Drake, Jr. - Copyright (c) 2016-2020 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2018 Marco Maggi Copyright (c) 2019 David Loffredo - Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/minicheck.h b/expat/tests/minicheck.h index 60612e18..3d888f8d 100644 --- a/expat/tests/minicheck.h +++ b/expat/tests/minicheck.h @@ -14,8 +14,9 @@ Copyright (c) 2004-2006 Fred L. Drake, Jr. Copyright (c) 2006-2012 Karl Waclawek - Copyright (c) 2016-2017 Sebastian Pipping - Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2016-2024 Sebastian Pipping + Copyright (c) 2022 Rhodri James + Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/minicheck_cxx.cpp b/expat/tests/minicheck_cxx.cpp index d96b6c63..58881c60 100644 --- a/expat/tests/minicheck_cxx.cpp +++ b/expat/tests/minicheck_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/misc_tests.c b/expat/tests/misc_tests.c index 89caf0da..b5212f58 100644 --- a/expat/tests/misc_tests.c +++ b/expat/tests/misc_tests.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-2022 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha @@ -208,7 +208,7 @@ START_TEST(test_misc_version) { if (! versions_equal(&read_version, &parsed_version)) fail("Version mismatch"); - if (xcstrcmp(version_text, XCS("expat_2.5.0"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.6.0"))) /* needs bump on releases */ fail("XML_*_VERSION in expat.h out of sync?\n"); } END_TEST diff --git a/expat/tests/misc_tests_cxx.cpp b/expat/tests/misc_tests_cxx.cpp index 77d76e4a..0b84c1b1 100644 --- a/expat/tests/misc_tests_cxx.cpp +++ b/expat/tests/misc_tests_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/ns_tests.c b/expat/tests/ns_tests.c index 84e5829b..411e1d3c 100644 --- a/expat/tests/ns_tests.c +++ b/expat/tests/ns_tests.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-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/ns_tests_cxx.cpp b/expat/tests/ns_tests_cxx.cpp index 24b7c309..b2fe187b 100644 --- a/expat/tests/ns_tests_cxx.cpp +++ b/expat/tests/ns_tests_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/nsalloc_tests.c b/expat/tests/nsalloc_tests.c index dc17cba3..ec88586a 100644 --- a/expat/tests/nsalloc_tests.c +++ b/expat/tests/nsalloc_tests.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-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha diff --git a/expat/tests/nsalloc_tests_cxx.cpp b/expat/tests/nsalloc_tests_cxx.cpp index 871bc36e..9ba75d1c 100644 --- a/expat/tests/nsalloc_tests_cxx.cpp +++ b/expat/tests/nsalloc_tests_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 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 7f4a438d..ecb1c36b 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-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017-2022 Rhodri James Copyright (c) 2017 Joe Orton Copyright (c) 2017 José Gutiérrez de la Concha @@ -18,6 +18,7 @@ Copyright (c) 2019 David Loffredo Copyright (c) 2020 Tim Gates Copyright (c) 2021 Donghee Na + Copyright (c) 2022 Sean McBride Copyright (c) 2023 Sony Corporation / Snild Dolkow Licensed under the MIT license: diff --git a/expat/tests/runtests_cxx.cpp b/expat/tests/runtests_cxx.cpp index 52f53052..39671456 100644 --- a/expat/tests/runtests_cxx.cpp +++ b/expat/tests/runtests_cxx.cpp @@ -9,8 +9,8 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2005 Fred L. Drake, Jr. - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2005 Fred L. Drake, Jr. + Copyright (c) 2017-2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/structdata.c b/expat/tests/structdata.c index 26596f74..e311f1fa 100644 --- a/expat/tests/structdata.c +++ b/expat/tests/structdata.c @@ -7,7 +7,8 @@ |_| XML parser Copyright (c) 2017 Rhodri James - Copyright (c) 2017-2021 Sebastian Pipping + Copyright (c) 2017-2023 Sebastian Pipping + Copyright (c) 2022 Sean McBride Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/tests/structdata_cxx.cpp b/expat/tests/structdata_cxx.cpp index 03ec271a..43448f63 100644 --- a/expat/tests/structdata_cxx.cpp +++ b/expat/tests/structdata_cxx.cpp @@ -6,7 +6,7 @@ \___/_/\_\ .__/ \__,_|\__| |_| XML parser - Copyright (c) 2023 Sebastian Pipping + Copyright (c) 2023 Sebastian Pipping 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 4116aa5b..90786bef 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-2022 Sebastian Pipping +; Copyright (c) 2007-2024 Sebastian Pipping ; Copyright (c) 2022 Johnny Jazeix ; Licensed under the MIT license: ; @@ -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.5.0" +#define expatVer "2.6.0" [Setup] AppName=Expat diff --git a/expat/xmlwf/readfilemap.c b/expat/xmlwf/readfilemap.c index 0d8e23a9..2cb53fee 100644 --- a/expat/xmlwf/readfilemap.c +++ b/expat/xmlwf/readfilemap.c @@ -13,6 +13,7 @@ Copyright (c) 2016-2017 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2017 Franek Korta + Copyright (c) 2022 Sean McBride Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c index f5cae910..0598b86b 100644 --- a/expat/xmlwf/xmlfile.c +++ b/expat/xmlwf/xmlfile.c @@ -11,7 +11,7 @@ Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2004-2006 Karl Waclawek Copyright (c) 2005-2007 Steven Solie - Copyright (c) 2016-2021 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2019 David Loffredo Copyright (c) 2021 Donghee Na diff --git a/expat/xmlwf/xmlfile.h b/expat/xmlwf/xmlfile.h index 014f1319..579201cc 100644 --- a/expat/xmlwf/xmlfile.h +++ b/expat/xmlwf/xmlfile.h @@ -10,7 +10,7 @@ Copyright (c) 2000 Clark Cooper Copyright (c) 2002 Fred L. Drake, Jr. Copyright (c) 2005 Karl Waclawek - Copyright (c) 2016-2019 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/xmlwf/xmlwf.c b/expat/xmlwf/xmlwf.c index df271534..7c0a8cd4 100644 --- a/expat/xmlwf/xmlwf.c +++ b/expat/xmlwf/xmlwf.c @@ -11,13 +11,14 @@ Copyright (c) 2001-2003 Fred L. Drake, Jr. Copyright (c) 2004-2009 Karl Waclawek Copyright (c) 2005-2007 Steven Solie - Copyright (c) 2016-2022 Sebastian Pipping + Copyright (c) 2016-2023 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2019 David Loffredo Copyright (c) 2020 Joe Orton Copyright (c) 2020 Kleber Tarcísio Copyright (c) 2021 Tim Bray Copyright (c) 2022 Martin Ettl + Copyright (c) 2022 Sean McBride Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining diff --git a/expat/xmlwf/xmlwf_helpgen.py b/expat/xmlwf/xmlwf_helpgen.py index a945f25c..3d32f5d1 100755 --- a/expat/xmlwf/xmlwf_helpgen.py +++ b/expat/xmlwf/xmlwf_helpgen.py @@ -6,7 +6,7 @@ # \___/_/\_\ .__/ \__,_|\__| # |_| XML parser # -# Copyright (c) 2019-2021 Sebastian Pipping +# Copyright (c) 2019-2023 Sebastian Pipping # Copyright (c) 2021 Tim Bray # Licensed under the MIT license: #