diff options
| -rw-r--r-- | chromium/DEPS | 2 | ||||
| -rw-r--r-- | chromium/third_party/expat/README.chromium | 8 | ||||
| -rw-r--r-- | chromium/third_party/expat/include/expat_config/expat_config.h | 6 | ||||
| -rwxr-xr-x | 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 } |