From 26bb19f5c1f51b19380890feef7938c384c527e8 Mon Sep 17 00:00:00 2001 From: tuzi3040 <28290621+tuzi3040@users.noreply.github.com> Date: Wed, 10 Nov 2021 03:34:05 +0800 Subject: [PATCH 1/6] node 17.1.0 --- Formula/node.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/node.rb b/Formula/node.rb index 3c4207105919..79b9eca6e9e9 100644 --- a/Formula/node.rb +++ b/Formula/node.rb @@ -1,8 +1,8 @@ class Node < Formula desc "Platform built on V8 to build network applications" homepage "https://nodejs.org/" - url "https://nodejs.org/dist/v17.0.1/node-v17.0.1.tar.xz" - sha256 "6ec480f872cb7c34877044985e3d7bd89329ace5b8e2ad90b57980601786341c" + url "https://nodejs.org/dist/v17.1.0/node-v17.1.0.tar.xz" + sha256 "6b803f37eb92b009f9162a489d647611aa95393e488fff0fc4fd8efd2effcac7" license "MIT" head "https://github.com/nodejs/node.git", branch: "master" From e363cb4984994a1a58a91332caa50217ae0c87a5 Mon Sep 17 00:00:00 2001 From: tuzi3040 <28290621+tuzi3040@users.noreply.github.com> Date: Wed, 10 Nov 2021 03:40:36 +0800 Subject: [PATCH 2/6] npm 8.1.2 --- Formula/node.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/node.rb b/Formula/node.rb index 79b9eca6e9e9..61db43c9ea69 100644 --- a/Formula/node.rb +++ b/Formula/node.rb @@ -52,8 +52,8 @@ class Node < Formula # We track major/minor from upstream Node releases. # We will accept *important* npm patch releases when necessary. resource "npm" do - url "https://registry.npmjs.org/npm/-/npm-8.1.0.tgz" - sha256 "301ddf6bdbd6f6abb36de144902914c6bb4d6f7463758774fdd0a9ee7c597d34" + url "https://registry.npmjs.org/npm/-/npm-8.1.2.tgz" + sha256 "fd2ae0667209ab7110804be2009cfe59997e90c9e18545189e61552861661cfe" end def install From e4dc2b735a069bd7f38ccd870c90437fcee03d7c Mon Sep 17 00:00:00 2001 From: tuzi3040 <28290621+tuzi3040@users.noreply.github.com> Date: Wed, 10 Nov 2021 11:46:20 +0800 Subject: [PATCH 3/6] node: use openssl@3 --- Formula/node.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/node.rb b/Formula/node.rb index 61db43c9ea69..67d0d988d838 100644 --- a/Formula/node.rb +++ b/Formula/node.rb @@ -27,7 +27,7 @@ class Node < Formula depends_on "icu4c" depends_on "libnghttp2" depends_on "libuv" - depends_on "openssl@1.1" + depends_on "openssl@3" depends_on "python@3.9" uses_from_macos "zlib" @@ -79,8 +79,8 @@ def install --shared-libuv-libpath=#{Formula["libuv"].lib} --shared-nghttp2-includes=#{Formula["libnghttp2"].include} --shared-nghttp2-libpath=#{Formula["libnghttp2"].lib} - --shared-openssl-includes=#{Formula["openssl@1.1"].include} - --shared-openssl-libpath=#{Formula["openssl@1.1"].lib} + --shared-openssl-includes=#{Formula["openssl@3"].include} + --shared-openssl-libpath=#{Formula["openssl@3"].lib} --shared-brotli-includes=#{Formula["brotli"].include} --shared-brotli-libpath=#{Formula["brotli"].lib} --shared-cares-includes=#{Formula["c-ares"].include} From 566eae465be0e72d3d25b3324f8d68ca90ef1dc9 Mon Sep 17 00:00:00 2001 From: tuzi3040 <28290621+tuzi3040@users.noreply.github.com> Date: Wed, 10 Nov 2021 14:18:25 +0800 Subject: [PATCH 4/6] node: depend on python@3.9 on macos --- Formula/node.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Formula/node.rb b/Formula/node.rb index 67d0d988d838..d3950a8a4b3b 100644 --- a/Formula/node.rb +++ b/Formula/node.rb @@ -22,13 +22,13 @@ class Node < Formula end depends_on "pkg-config" => :build + depends_on "python@3.9" => :build depends_on "brotli" depends_on "c-ares" depends_on "icu4c" depends_on "libnghttp2" depends_on "libuv" depends_on "openssl@3" - depends_on "python@3.9" uses_from_macos "zlib" @@ -38,6 +38,7 @@ class Node < Formula on_linux do depends_on "gcc" + depends_on "python@3.9" end fails_with :clang do From f0ca245de8a895a7dcd54b41d9488d1b961a7892 Mon Sep 17 00:00:00 2001 From: tuzi3040 <28290621+tuzi3040@users.noreply.github.com> Date: Wed, 10 Nov 2021 14:19:39 +0800 Subject: [PATCH 5/6] update versioned dependencies conflicts allowlist for openssl@1.1 & openssl@3 --- .../versioned_dependencies_conflicts_allowlist.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audit_exceptions/versioned_dependencies_conflicts_allowlist.json b/audit_exceptions/versioned_dependencies_conflicts_allowlist.json index d5a6a952dd97..ee0b73580e62 100644 --- a/audit_exceptions/versioned_dependencies_conflicts_allowlist.json +++ b/audit_exceptions/versioned_dependencies_conflicts_allowlist.json @@ -1,7 +1,12 @@ [ "anjuta", + "anime-downloader", + "emscripten", "fdroidserver", "hive", + "joplin-cli", + "jupyterlab", + "lanraragi", "predictionio", "sqoop", "visp" From 259c72aa9f85f037b860187d692e0a924d79cf95 Mon Sep 17 00:00:00 2001 From: tuzi3040 <28290621+tuzi3040@users.noreply.github.com> Date: Wed, 10 Nov 2021 16:31:39 +0800 Subject: [PATCH 6/6] node: use python3 from CLT since Catalina --- Formula/node.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/node.rb b/Formula/node.rb index d3950a8a4b3b..b483636083b4 100644 --- a/Formula/node.rb +++ b/Formula/node.rb @@ -30,6 +30,7 @@ class Node < Formula depends_on "libuv" depends_on "openssl@3" + uses_from_macos "python", since: :catalina uses_from_macos "zlib" on_macos do @@ -38,7 +39,6 @@ class Node < Formula on_linux do depends_on "gcc" - depends_on "python@3.9" end fails_with :clang do