From 9d1f359b0af97b73917e2865436de94fe530c673 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 25 May 2021 14:26:03 +0000 Subject: [Backport] Roll src/third_party/expat/src/ e976867fb..a28238bde (182 commits) https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git/+log/e976867fb57a..a28238bdeebc $ git log e976867fb..a28238bde --date=short --no-merges --format='%ad %ae %s' 2021-05-23 sebastian Set expected release date for 2.4.1 2021-05-23 sebastian Bump version info from 9:0:8 to 9:1:8 2021-05-23 sebastian Bump version to 2.4.1 2021-05-23 sebastian Keep macro SIZEOF_VOID_P out of expat_config.h(.in) for multilib support 2021-05-23 sebastian Actions: Avoid error "would clobber existing tag" when pushing new tags 2021-05-11 sebastian Set expected release date for 2.4.0 2021-05-11 sebastian Bump version info from 8:0:7 to 9:0:8 2021-05-11 sebastian Bump version to 2.4.0 2021-05-11 sebastian Changes: Extend section on upcoming release 2.4.0 2021-05-21 sebastian Changes: Document new XML_FEATURE_ constants 2021-05-21 sebastian Changes: Combine notes on billion laughs attack protection 2021-05-22 sebastian README.md: Mention Windos binaries zip download option 2021-05-22 sebastian README.md: Fix a URL for some markdown interpreters 2021-05-22 sebastian README.md: Document where generated CMake files need >=2.4.0 to work 2021-05-22 sebastian README.md: Make CMake config mode example more clear 2021-05-20 sebastian Changes: Document Autotools CMake file fixes 2021-05-20 sebastian autotools-cmake.yml: Cover macOS and MinGW 2021-05-20 sebastian cmake/autotools: Fix generated expat-noconfig.cmake for macOS and MinGW 2021-05-20 sebastian cmake/autotools: Use AC_CHECK_SIZEOF to fix 32bit support 2021-05-14 sebastian expat.iss: Use URLs with SSL 2021-05-13 sebastian Increase precision in existing MIT headers based on Git history 2021-05-13 sebastian doc/xmlwf.xml: Drop two XML comments of little value 2021-05-13 sebastian doc/xmlwf.xml: Add GNU FDL 1.1 copyright header 2021-05-14 sebastian expat.iss: Add MIT header 2021-05-13 sebastian CMake: Streamline existing copyright header 2021-05-14 sebastian tests: Cover accounting of CDATA sections inside of general entities 2021-05-14 sebastian lib: Fix accounting of CDATA sections inside of general entities 2021-05-13 sebastian README.md: Add total download count badges 2021-05-13 sebastian Revert ".github/workflows: Re-add repo ppa:ondrej/php(!) to fix wine32 installation" 2021-05-12 sebastian Changes: Document support for CMake variable BUILD_SHARED_LIBS 2021-05-12 sebastian CMake: Support standard variable BUILD_SHARED_LIBS 2021-05-08 sebastian doc/reference.html: Upgrade to OK.css 1.0.3 2021-04-19 sebastian Changes: Document protection against billion laughs attacks 2021-04-26 sebastian tests: Cover helper unsignedCharToPrintable 2021-04-26 sebastian tests: Cover billion laughs attack protection API 2021-04-25 sebastian doc/reference.html: Document billion laughs attack protection API 2021-04-25 sebastian xmlwf.1: Document arguments -a and -b 2021-04-17 sebastian xmlwf: Add support for custom attack protection parameters 2021-04-18 sebastian xmlwf: Include expat_config.h so we can check for macro XML_DTD 2021-04-21 sebastian tests: Cover accounting 2021-04-19 sebastian lib: Make EXPAT_ENTROPY_DEBUG consistent with other EXPAT_*_DEBUG variables 2021-04-14 sebastian lib: Add prefix "expat: " to EXPAT_ENTROPY_DEBUG=1 stderr output 2021-04-19 sebastian lib: Allow test suite to access raw accounting values 2021-04-20 sebastian lib: Address Cppcheck 2.4.1 warning "uninitvar" 2021-04-19 sebastian lib: Protect against billion laughs attacks (approach 3.0.21) 2021-04-20 sebastian Autotools|CMake: Suppress -Wpedantic-ms-format false positives 2021-04-20 sebastian mass-cppcheck.sh: Suppress warning "unknownMacro" 2021-05-07 sebastian Actions: Ensure well-formed and valid XML 2021-05-07 sebastian doc/reference.html: Fix XML validity 2021-05-07 sebastian xmlwf.1: Fix DocBook validity (...) 2021-03-16 Alexander.Richardson CMake: Only set CMAKE_CXX_FLAGS after enable_language(CXX) 2021-03-10 sebastian fuzzers: Address Clang warning -Wunused-parameter 2021-02-24 sebastian .travis.yml: Install llvm-11 for llvm-symbolizer 2021-02-23 sebastian .travis.yml: Upgrade to Ubuntu Bionic 18.04.x LTS and Clang 11 2021-02-23 sebastian apply-clang-format.sh: Report on clang-format version 2021-02-24 sebastian xmlparse.c: Reject missing call to XML_GetBuffer in XML_ParseBuffer 2020-12-29 sebastian configure.ac: Drop obsolescent macro AC_HEADER_STDC (#436) 2020-12-29 sebastian Actions: Cover list of symbols exported by installed expat_config.h 2020-12-27 sebastian Use GitHub Actions to run current macOS Travis CI tasks 2020-12-27 tc Detect unsupported VS at configure time (and not at compile time) 2020-12-17 tim.gates docs: fix simple typo, wtihout -> without 2020-10-30 sebastian Changes: Document #382 and #428 2020-10-25 sebastian tests: Show failure location for normal mode output as well 2020-10-25 sebastian Travis: Add CTEST_OUTPUT_ON_FAILURE=1 where missing 2020-10-25 sebastian tests: Make argument -v more useful 2020-10-25 sebastian tests: Report actual failure location 2020-10-25 sebastian tests: Make check for silence explain itself better 2020-10-03 sebastian Drop remaining support for Visual Studio 2008, 2010, 2012 (#422) 2020-10-03 sebastian Revert "AppVeyor: Be explicit about build script to support msbuild 3.5" 2020-10-03 sebastian Revert "AppVeyor: Cover 32bit Visual Studio 9 2008 using MSBuild 3.5" 2020-10-03 sebastian CMake: Remove unused variable 2020-10-03 sebastian Set release date for 2.2.10 2020-10-02 sebastian Bump version info from 7:11:6 to 7:12:6 2020-10-02 sebastian Bump version from 2.2.9 to 2.2.10 2020-10-02 sebastian Changes: Document #405 #356 #359 #394 #366 #412 #368 #369 2020-10-02 sebastian CMake: Turn endif(..) into endif(), and else(..) into else() 2020-10-03 sebastian tests: Add missing static to address compiler warning 2020-10-01 sebastian Changes: Document #424 2020-09-30 sebastian CMake: Support "make package" based on CPack 2020-09-26 sebastian Changes: Document #419 2019-08-03 sebastian qa.sh: Enable LeakSanitizer 2020-09-15 sebastian AppVeyor: Cover Visual Studio 16 2019 2020-09-18 gulliver added "new" behaviour for Policy CMP0077 which allows to control the build options by variables if lib is used by FetchContent of a super project 2020-09-09 sebastian installer: Add missing file to fix build from installed sources (#409) 2020-08-20 sebastian readme: Sync list of CMake options 2020-08-20 sebastian CMake: Introduce option EXPAT_BUILD_PKGCONFIG (#413) 2020-08-12 boris Get rid of unsigned integer overflow in column calculation 2020-07-16 sebastian CMake: Consider use of CMAKE_{EXE,MODULE,SHARED}_LINKER_FLAGS 2020-07-16 sebastian Be more correct about const correctness on the inside 2020-07-15 sebastian Changes: Document #408 2020-07-10 sebastian CMake: Get expat target name back to constant "expat" 2020-06-22 sebastian Changes: Document #406 2020-06-22 klebertarcisio xmlwf: Checks value after calling malloc 2020-05-28 sebastian Travis: Limit Cppcheck to macOS 2020-05-27 sebastian xmlparse.c: Fix reading uninitialized variable (#404) 2020-05-12 sebastian Travis: Improve call to cppcheck 2020-05-12 sebastian Travis: Install a find(1) better than that of macOS 2020-05-13 sebastian Changes: Document #403 2020-05-13 jorton Update xmlwf to exit with 3 if an output file could not be opened. Update xmlwf exit code docs per review. 2020-05-12 jorton Document the exit codes for xmlwf. Backport review link: https://chromium-review.googlesource.com/c/chromium/src/+/2915493 Bug: chromium:1212733 Change-Id: Ie33cd8b4663eb8461650e082549f3058e142df96 Reviewed-by: Allan Sandfeld Jensen --- chromium/DEPS | 2 +- chromium/third_party/expat/README.chromium | 8 ++++---- chromium/third_party/expat/include/expat_config/expat_config.h | 6 +++--- chromium/third_party/expat/roll-expat.sh | 7 +++++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/chromium/DEPS b/chromium/DEPS index 9a138f5e0db..dd20d04e69d 100644 --- a/chromium/DEPS +++ b/chromium/DEPS @@ -336,7 +336,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libexpat # and whatever else without interference from each other. - 'libexpat_revision': 'e976867fb57a0cd87e3b0fe05d59e0ed63c6febb', + 'libexpat_revision': 'a28238bdeebc087071777001245df1876a11f5ee', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling wuffs # and whatever else without interference from each other. diff --git a/chromium/third_party/expat/README.chromium b/chromium/third_party/expat/README.chromium index e10862aa3c0..79d7ccb3cdc 100644 --- a/chromium/third_party/expat/README.chromium +++ b/chromium/third_party/expat/README.chromium @@ -1,10 +1,10 @@ Name: Expat XML Parser Short Name: expat URL: https://github.com/libexpat/libexpat -Version: R_2_2_9-91-ge976867 -CPEPrefix: cpe:/a:libexpat:expat:2.2.9 -Date: 20200420 -Revision: e976867fb57a0cd87e3b0fe05d59e0ed63c6febb +Version: R_2_4_1-0-ga28238bd +CPEPrefix: cpe:/a:libexpat:expat:2.4.1 +Date: 20210524 +Revision: a28238bdeebc087071777001245df1876a11f5ee Security Critical: yes License: MIT License File: src/expat/COPYING diff --git a/chromium/third_party/expat/include/expat_config/expat_config.h b/chromium/third_party/expat/include/expat_config/expat_config.h index b1fe3091d90..61834da850e 100644 --- a/chromium/third_party/expat/include/expat_config/expat_config.h +++ b/chromium/third_party/expat/include/expat_config/expat_config.h @@ -77,7 +77,7 @@ #define PACKAGE_NAME "expat" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "expat 2.2.9" +#define PACKAGE_STRING "expat 2.4.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "expat" @@ -86,13 +86,13 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.2.9" +#define PACKAGE_VERSION "2.4.1" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "2.2.9" +#define VERSION "2.4.1" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/chromium/third_party/expat/roll-expat.sh b/chromium/third_party/expat/roll-expat.sh index 18d17372a80..45458713e5c 100755 --- a/chromium/third_party/expat/roll-expat.sh +++ b/chromium/third_party/expat/roll-expat.sh @@ -10,10 +10,13 @@ update_readme() { STEP="update README.chromium" && EXPAT_VERSION=$(git -C third_party/expat/src/ describe --long) && EXPAT_COMMIT=$(git -C third_party/expat/src/ rev-parse HEAD) && - EXPAT_DATE=$(date "+%Y%m%d") + EXPAT_DATE=$(date "+%Y%m%d") && + EXPAT_CPE_VERSION=$(echo ${EXPAT_VERSION} | sed -r -e's/^R_([0-9]+)_([0-9]+)_([0-9]+)-[0-9]+-g[0-9a-f]+$/\1.\2.\3/') && + [ ${EXPAT_VERSION} != ${EXPAT_CPE_VERSION} ] && sed -i'' -e "s/^Version: .*\$/Version: ${EXPAT_VERSION}/" third_party/expat/README.chromium && - sed -i'' -e "s/^Revision: .*\$/Revision: ${EXPAT_COMMIT}/" third_party/expat/README.chromium && + sed -i'' -e "s@^CPEPrefix: cpe:/a:libexpat:expat:.*\$@CPEPrefix: cpe:/a:libexpat:expat:${EXPAT_CPE_VERSION}@" third_party/expat/README.chromium && sed -i'' -e "s/^Date: .*\$/Date: ${EXPAT_DATE}/" third_party/expat/README.chromium && + sed -i'' -e "s/^Revision: .*\$/Revision: ${EXPAT_COMMIT}/" third_party/expat/README.chromium && git add third_party/expat/README.chromium } -- cgit v1.2.1