Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v10.x] deps: backport ICU-20958 to fix CVE-2020-10531 #33572

Closed
wants to merge 3 commits into from
Closed

[v10.x] deps: backport ICU-20958 to fix CVE-2020-10531 #33572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b5adbc
build: allow clang 10+ in configure.py
krytarowski Sep 13, 2019
a85721a
build: move doc versions JSON file out of out/doc
richardlau Apr 8, 2020
530dea3
deps: backport ICU-20958 to fix CVE-2020-10531
richardlau May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -649,7 +649,7 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets
run-npm-ci = $(PWD)/$(NPM) ci

LINK_DATA = out/doc/apilinks.json
VERSIONS_DATA = out/doc/previous-versions.json
VERSIONS_DATA = out/previous-doc-versions.json
gen-api = tools/doc/generate.js --node-version=$(FULLVERSION) \
--apilinks=$(LINK_DATA) $< --output-directory=out/doc/api \
--versions-file=$(VERSIONS_DATA)
Expand Down Expand Up @@ -681,6 +681,7 @@ docopen: $(apidocs_html)
.PHONY: docclean
docclean:
$(RM) -r out/doc
$(RM) "$(VERSIONS_DATA)"

RAWVER=$(shell $(PYTHON) tools/getnodeversion.py)
VERSION=v$(RAWVER)
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Expand Up @@ -705,7 +705,7 @@ def get_nasm_version(asm):

def get_llvm_version(cc):
return get_version_helper(
cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)")
cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([0-9]+\.[0-9]+)")

def get_xcode_version(cc):
return get_version_helper(
Expand Down