diff --git a/create_tarball.sh b/create_tarball.sh index 39d8b3e..690e3be 100644 --- a/create_tarball.sh +++ b/create_tarball.sh @@ -59,7 +59,7 @@ solutions = [ EOF echo ">>>>>> Downloading electron-${ELECTRON_PKGVERSION}" -gclient sync --jobs 4 --nohooks --no-history --shallow --revision=v"${ELECTRON_PKGVERSION}" +gclient sync -v --jobs $(nproc) --nohooks --no-history --shallow --revision=v"${ELECTRON_PKGVERSION}" if [ $? -ne 0 ]; then echo "ERROR: gclient sync failed" cleanup_and_exit 1 @@ -102,6 +102,10 @@ python3 src/tools/update_pgo_profiles.py \ update \ --gs-url-base=chromium-optimization-profiles/pgo_profiles + +#The following commands overwrite this file which is needed during build. +#The precise content is unimportant, but we cache the original one for reproducibility. +mv -v src/third_party/node/node_modules.tar.gz.sha1{,.bak} # Needed to get typescript compiler echo ">>>>>> Get node modules for third_party/node" bash src/third_party/node/update_npm_deps @@ -109,6 +113,9 @@ if [ $? -ne 0 ]; then echo "ERROR: npm ci failed" cleanup_and_exit 1 fi +mv -v src/third_party/node/node_modules.tar.gz.sha1{.bak,} +# Remove unnecessary repack of node_modules +rm -v src/third_party/node/node_modules.tar.gz echo ">>>>>> Get node modules for electron" pushd src/electron || cleanup_and_exit 1 @@ -375,10 +382,13 @@ fi rm -rf third_party/blink/web_tests # 1.6GB rm -rf third_party/catapult/tracing/test_data # 200MB find . -type d -name .git -print0 | xargs -0 rm -rf +# Remove generatted python bytecode +find . -type d -name __pycache__ -print0 | xargs -0 rm -rvf +find . -type f -name '*.pyc' -print -delete popd || cleanup_and_exit 1 echo ">>>>>> Create tarball" -XZ_OPT="-T$(nproc)" tar cJf "${ELECTRON_PKGDIR}/${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}.tar.xz" "${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}" +XZ_OPT="-T$(nproc) -e9" tar -vcJf "${ELECTRON_PKGDIR}/${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}.tar.xz" "${ELECTRON_PKGNAME}-${ELECTRON_PKGVERSION}" if [ $? -ne 0 ]; then echo "ERROR: tar cJf failed" cleanup_and_exit 1 diff --git a/electron-17.4.4.tar.xz b/electron-17.4.4.tar.xz deleted file mode 100644 index b98fd05..0000000 --- a/electron-17.4.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9b4a65b565ab0975efb636f8f101f8cf04f3d831d746e4f15a85958cd0fabd6 -size 1201481424 diff --git a/electron-17.4.5.tar.xz b/electron-17.4.5.tar.xz new file mode 100644 index 0000000..35994e3 --- /dev/null +++ b/electron-17.4.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88a85916266185e64655bf082492439654ec30f6afb5f958c9b6d61754a46154 +size 1108075600 diff --git a/nodejs-electron.changes b/nodejs-electron.changes index 3399545..6a4abc0 100644 --- a/nodejs-electron.changes +++ b/nodejs-electron.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 19 10:08:10 UTC 2022 - Bruno Pitrus +- New upstream release 17.4.5: + * Fixed a crash when calling loadExtension on an extension directory that's missing a manifest file. #34193 (Also in 16) + * SIGUSR1 is no longer handled when the node_cli_inspect fuse is disabled. + * Backported security fixes: CVE-2022-1637, CVE-2022-1638, CVE-2022-1639. +- Remove some spurious generated files from the tarball. + ------------------------------------------------------------------- Wed May 11 21:05:41 UTC 2022 - Bruno Pitrus - New upstream release 17.4.4: diff --git a/nodejs-electron.spec b/nodejs-electron.spec index 6e72c32..16ae4d6 100644 --- a/nodejs-electron.spec +++ b/nodejs-electron.spec @@ -74,7 +74,7 @@ ExcludeArch: %{ix86} %{arm} %endif %bcond_without system_ffmpeg Name: nodejs-electron -Version: 17.4.4 +Version: 17.4.5 Release: 0 Summary: Build cross platform desktop apps with JavaScript, HTML, and CSS License: MIT