From a3da53001dffc3a43e7d2041111da122e346b4dc Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 5 Feb 2018 12:43:53 -0500 Subject: [PATCH 01/26] Package Node.js 9.5.0 Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 35 +++++++++++++++++++---------------- sources | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index ade8dc2..ebe89a5 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /node-v8.9.1-stripped.tar.gz /node-v8.9.3-stripped.tar.gz /node-v8.9.4-stripped.tar.gz +/node-v9.5.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 371b683..626cc98 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -20,19 +20,19 @@ # feature releases that are only supported for nine months, which is shorter # than a Fedora release lifecycle. %global nodejs_epoch 1 -%global nodejs_major 8 -%global nodejs_minor 9 -%global nodejs_patch 4 +%global nodejs_major 9 +%global nodejs_minor 5 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 2 +%global nodejs_release 1 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h %global v8_major 6 -%global v8_minor 1 -%global v8_build 534 -%global v8_patch 50 +%global v8_minor 2 +%global v8_build 414 +%global v8_patch 46 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -40,8 +40,8 @@ # c-ares - from deps/cares/include/ares_version.h # https://github.com/nodejs/node/pull/9332 %global c_ares_major 1 -%global c_ares_minor 10 -%global c_ares_patch 1 +%global c_ares_minor 13 +%global c_ares_patch 0 %global c_ares_version %{c_ares_major}.%{c_ares_minor}.%{c_ares_patch} # http-parser - from deps/http_parser/http_parser.h @@ -52,13 +52,13 @@ # libuv - from deps/uv/include/uv-version.h %global libuv_major 1 -%global libuv_minor 15 -%global libuv_patch 0 +%global libuv_minor 19 +%global libuv_patch 1 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch} # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h %global nghttp2_major 1 -%global nghttp2_minor 25 +%global nghttp2_minor 29 %global nghttp2_patch 0 %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch} @@ -134,11 +134,11 @@ BuildRequires: http-parser-devel >= 2.7.0 Requires: http-parser >= 2.7.0 BuildRequires: libuv-devel >= 1:1.9.1 Requires: libuv >= 1:1.9.1 -BuildRequires: libnghttp2-devel >= 1.25.0 -Requires: libnghttp2 >= 1.25.0 +BuildRequires: libnghttp2-devel >= %{nghttp2_version} +Requires: libnghttp2 >= %{nghttp2_version} %endif -BuildRequires: (openssl-devel <= 1:1.1.0 or compat-openssl10-devel) +BuildRequires: openssl-devel # we need the system certificate store when Patch2 is applied Requires: ca-certificates @@ -396,7 +396,7 @@ rm -f %{buildroot}/%{_defaultdocdir}/node/lldb_commands.py \ %check # Fail the build if the versions don't match %{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.node, '%{nodejs_version}')" -%{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.v8, '%{v8_version}')" +%{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.v8.replace(/-node\.\d+$/, ''), '%{v8_version}')" %{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.ares.replace(/-DEV$/, ''), '%{c_ares_version}')" # Ensure we have punycode and that the version matches @@ -459,6 +459,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Mon Feb 05 2018 Stephen Gallagher - 1:9.5.0-1 +- Package Node.js 9.5.0 + * Thu Jan 11 2018 Stephen Gallagher - 1:8.9.4-2 - Fix incorrect Requires: diff --git a/sources b/sources index 6320142..a8b491d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v8.9.4-stripped.tar.gz) = de10b27c87e2b4fd7a09f58921a7b4733e86cf41c0360f15f23f0d02a78830e34ae1360b6868124194d684de53f12c1f815b63283b062c76730b9c4165bc5224 +SHA512 (node-v9.5.0-stripped.tar.gz) = 72f584fd040f4e3bcef6ca81824240e83ad171db14bfdefdfd1c97d54d520bccfb9de504dc46dbe91caeb50a210883f47d344a9a17dc1bf6650a72730eee9a04 From dd9507e62e4e9e8be1c3ff63fe18b4b89a5edf6e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Sun, 25 Feb 2018 19:56:35 -0500 Subject: [PATCH 02/26] Update to 9.6.1 https://nodejs.org/en/blog/release/v9.6.1/ https://nodejs.org/en/blog/release/v9.6.0/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ebe89a5..96ed4be 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /node-v8.9.3-stripped.tar.gz /node-v8.9.4-stripped.tar.gz /node-v9.5.0-stripped.tar.gz +/node-v9.6.1-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 626cc98..f3d550e 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,8 +21,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 9 -%global nodejs_minor 5 -%global nodejs_patch 0 +%global nodejs_minor 6 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -459,6 +459,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Sun Feb 25 2018 Stephen Gallagher - 1:9.6.1-1 +- Update to 9.6.1 +- https://nodejs.org/en/blog/release/v9.6.1/ +- https://nodejs.org/en/blog/release/v9.6.0/ + * Mon Feb 05 2018 Stephen Gallagher - 1:9.5.0-1 - Package Node.js 9.5.0 diff --git a/sources b/sources index a8b491d..8ad63db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.5.0-stripped.tar.gz) = 72f584fd040f4e3bcef6ca81824240e83ad171db14bfdefdfd1c97d54d520bccfb9de504dc46dbe91caeb50a210883f47d344a9a17dc1bf6650a72730eee9a04 +SHA512 (node-v9.6.1-stripped.tar.gz) = b14fd53548f2a51699264a239814f9d6f2b5d64480a3dd4618c051dd8a387e8aa74a57822a6d547336bc2d7d289fb49e9dd1707148355b0d8bb0f064c30af92f From 6775e6863717e6dcbda44ed318d89e3fc1e9bd4f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 1 Mar 2018 08:25:32 -0500 Subject: [PATCH 03/26] Update to 9.7.0 - https://nodejs.org/en/blog/release/v9.7.0/ - Work around F28 build issue Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 21 ++++++++++++++++++--- sources | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 96ed4be..c1e6f38 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ /node-v8.9.4-stripped.tar.gz /node-v9.5.0-stripped.tar.gz /node-v9.6.1-stripped.tar.gz +/node-v9.7.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index f3d550e..78d5284 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,8 +21,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 9 -%global nodejs_minor 6 -%global nodejs_patch 1 +%global nodejs_minor 7 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -53,7 +53,7 @@ # libuv - from deps/uv/include/uv-version.h %global libuv_major 1 %global libuv_minor 19 -%global libuv_patch 1 +%global libuv_patch 2 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch} # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h @@ -283,6 +283,11 @@ export CXXFLAGS='%{optflags} -g \ export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')" export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')" +# Work around Fedora 28 issue: +# https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Quick_Opt-Out +# Tracking BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1550564 +export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 + #%if ! 0%%{?bootstrap} %if %{with bootstrap} ./configure --prefix=%{_prefix} \ @@ -316,6 +321,11 @@ make BUILDTYPE=Release %{?_smp_mflags} %install +# Work around Fedora 28 build issue: +# https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Quick_Opt-Out +# Tracking BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1550564 +export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 + rm -rf %{buildroot} ./tools/install.py install %{buildroot} %{_prefix} @@ -459,6 +469,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Thu Mar 01 2018 Stephen Gallagher - 1:9.7.0-1 +- Update to 9.7.0 +- https://nodejs.org/en/blog/release/v9.7.0/ +- Work around F28 build issue + * Sun Feb 25 2018 Stephen Gallagher - 1:9.6.1-1 - Update to 9.6.1 - https://nodejs.org/en/blog/release/v9.6.1/ diff --git a/sources b/sources index 8ad63db..7bb78fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.6.1-stripped.tar.gz) = b14fd53548f2a51699264a239814f9d6f2b5d64480a3dd4618c051dd8a387e8aa74a57822a6d547336bc2d7d289fb49e9dd1707148355b0d8bb0f064c30af92f +SHA512 (node-v9.7.0-stripped.tar.gz) = 99cb62e0be94689d5e665da94edc5f24fab135e7751a3501802ea902d20c2bca12e3368da5aec613e366b828f211e7f3b826b0f77ab734ffdf141f184de5aba7 From 65648a2672dc03641b9eaa4d25a8f19d94fd90c3 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 8 Mar 2018 09:17:54 -0500 Subject: [PATCH 04/26] Update to 9.8.0 https://nodejs.org/en/blog/release/v9.8.0/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c1e6f38..93945e9 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /node-v9.5.0-stripped.tar.gz /node-v9.6.1-stripped.tar.gz /node-v9.7.0-stripped.tar.gz +/node-v9.8.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 78d5284..62dabc6 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,7 +21,7 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 9 -%global nodejs_minor 7 +%global nodejs_minor 8 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} @@ -469,6 +469,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Thu Mar 08 2018 Stephen Gallagher - 1:9.8.0-1 +- Update to 9.8.0 +- https://nodejs.org/en/blog/release/v9.8.0/ + * Thu Mar 01 2018 Stephen Gallagher - 1:9.7.0-1 - Update to 9.7.0 - https://nodejs.org/en/blog/release/v9.7.0/ diff --git a/sources b/sources index 7bb78fc..2446b51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.7.0-stripped.tar.gz) = 99cb62e0be94689d5e665da94edc5f24fab135e7751a3501802ea902d20c2bca12e3368da5aec613e366b828f211e7f3b826b0f77ab734ffdf141f184de5aba7 +SHA512 (node-v9.8.0-stripped.tar.gz) = d0ea80716138447efd3044856fd3ad28f8538f06c24f150f1cc4b96ec710ca472daeeac291dde29a073c9ad003d6c846d9b66e7c0f5df00adb5f6cdc082b7816 From 9688d0951ec8af7521e5555ae218b8f5a791743f Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 21 Mar 2018 20:35:22 -0400 Subject: [PATCH 05/26] Update to 9.9.0 https://nodejs.org/en/blog/release/v9.9.0/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs-tarball.sh | 3 +++ nodejs.spec | 6 +++++- sources | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 93945e9..92678e5 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ /node-v9.6.1-stripped.tar.gz /node-v9.7.0-stripped.tar.gz /node-v9.8.0-stripped.tar.gz +/node-v9.9.0-stripped.tar.gz diff --git a/nodejs-tarball.sh b/nodejs-tarball.sh index e7e9613..20dab4b 100755 --- a/nodejs-tarball.sh +++ b/nodejs-tarball.sh @@ -5,3 +5,6 @@ wget http://nodejs.org/dist/v${version}/node-v${version}.tar.gz tar -zxf node-v${version}.tar.gz rm -rf node-v${version}/deps/openssl tar -zcf node-v${version}-stripped.tar.gz node-v${version} + +echo "Now make sure to run:" +echo "fedpkg new-sources node-v${version}-stripped.tar.gz" diff --git a/nodejs.spec b/nodejs.spec index 62dabc6..9d31c9a 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,7 +21,7 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 9 -%global nodejs_minor 8 +%global nodejs_minor 9 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} @@ -469,6 +469,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Wed Mar 21 2018 Stephen Gallagher - 1:9.9.0-1 +- Update to 9.9.0 +- https://nodejs.org/en/blog/release/v9.9.0/ + * Thu Mar 08 2018 Stephen Gallagher - 1:9.8.0-1 - Update to 9.8.0 - https://nodejs.org/en/blog/release/v9.8.0/ diff --git a/sources b/sources index 2446b51..028c930 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.8.0-stripped.tar.gz) = d0ea80716138447efd3044856fd3ad28f8538f06c24f150f1cc4b96ec710ca472daeeac291dde29a073c9ad003d6c846d9b66e7c0f5df00adb5f6cdc082b7816 +SHA512 (node-v9.9.0-stripped.tar.gz) = 047286a8fb85b049d5ec4b7597c032d863331cfbe139201d8523da240886ef7c30b6b1f08cbd735e01042cd2e0c34b11754f82469a417d8d218e359e38e5650d From 88fac04184d9a27130c99ba7269e22148f7f964b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 28 Mar 2018 14:09:14 -0400 Subject: [PATCH 06/26] Update to 9.10.0 https://nodejs.org/en/blog/release/v9.10.0/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 92678e5..cff7528 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /node-v9.7.0-stripped.tar.gz /node-v9.8.0-stripped.tar.gz /node-v9.9.0-stripped.tar.gz +/node-v9.10.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 9d31c9a..61dc634 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,7 +21,7 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 9 -%global nodejs_minor 9 +%global nodejs_minor 10 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} @@ -469,6 +469,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Wed Mar 28 2018 Stephen Gallagher - 1:9.10.0-1 +- Update to 9.10.0 +- https://nodejs.org/en/blog/release/v9.10.0/ + * Wed Mar 21 2018 Stephen Gallagher - 1:9.9.0-1 - Update to 9.9.0 - https://nodejs.org/en/blog/release/v9.9.0/ diff --git a/sources b/sources index 028c930..b7e2c69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.9.0-stripped.tar.gz) = 047286a8fb85b049d5ec4b7597c032d863331cfbe139201d8523da240886ef7c30b6b1f08cbd735e01042cd2e0c34b11754f82469a417d8d218e359e38e5650d +SHA512 (node-v9.10.0-stripped.tar.gz) = 2efdfdc66ba8acea3636b96cb958e98db2e7332d30eb2be2a08ed3f62f5c9079cf58277694318b8677c84c13bbf4e3fe79b76cd04277e5768d605d68810a3c1c From 2096fce045941d5908f7699a84326d557b5904ea Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 28 Mar 2018 14:35:03 -0400 Subject: [PATCH 07/26] Fix embedded http-parser version Signed-off-by: Stephen Gallagher --- nodejs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs.spec b/nodejs.spec index 61dc634..abf824d 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -46,7 +46,7 @@ # http-parser - from deps/http_parser/http_parser.h %global http_parser_major 2 -%global http_parser_minor 7 +%global http_parser_minor 8 %global http_parser_patch 0 %global http_parser_version %{http_parser_major}.%{http_parser_minor}.%{http_parser_patch} From cac139539ee78a1663661e6ea768a6f68ac4bdaf Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 5 Apr 2018 10:27:49 -0400 Subject: [PATCH 08/26] Update to 9.11.1 https://nodejs.org/en/blog/release/v9.11.0/ https://nodejs.org/en/blog/release/v9.11.1/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 25 ++++++++++++++++++------- sources | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cff7528..ce0f7db 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /node-v9.8.0-stripped.tar.gz /node-v9.9.0-stripped.tar.gz /node-v9.10.0-stripped.tar.gz +/node-v9.11.1.tar.gz diff --git a/nodejs.spec b/nodejs.spec index abf824d..b3892ce 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,8 +21,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 9 -%global nodejs_minor 10 -%global nodejs_patch 0 +%global nodejs_minor 11 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -62,6 +62,11 @@ %global nghttp2_patch 0 %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch} +# ICU - from configure in the configure_intl() function +%global icu_major 61 +%global icu_minor 1 +%global icu_version %{icu_major}.%{icu_minor} + # punycode - from lib/punycode.js # Note: this was merged into the mainline since 0.6.x # Note: this will be unmerged in an upcoming major release @@ -118,7 +123,6 @@ Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch Patch2: 0001-Fix-aarch64-debug.patch BuildRequires: python2-devel -BuildRequires: libicu-devel BuildRequires: zlib-devel BuildRequires: gcc >= 4.9.4 BuildRequires: gcc-c++ >= 4.9.4 @@ -183,6 +187,11 @@ Provides: bundled(c-ares) = %{c_ares_version} # See https://github.com/nodejs/node/commit/d726a177ed59c37cf5306983ed00ecd858cfbbef Provides: bundled(v8) = %{v8_version} +# Node.js is bound to a specific version of ICU which may not match the OS +# We cannot pin the OS to this version of ICU because every update includes +# an ABI-break, so we'll use the bundled copy. +Provides: bundled(icu) = %{icu_version} + # Make sure we keep NPM up to date when we update Node.js %if 0%{?epel} # EPEL doesn't support Recommends, so make it strict @@ -259,8 +268,7 @@ The API documentation for the Node.js JavaScript runtime. # remove bundled dependencies that we aren't building %patch1 -p1 -rm -rf deps/icu-small \ - deps/zlib +rm -rf deps/zlib %patch2 -p1 @@ -294,7 +302,6 @@ export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 --shared-openssl \ --shared-zlib \ --without-dtrace \ - --with-intl=system-icu \ --debug-http2 \ --debug-nghttp2 \ --openssl-use-def-ca-store @@ -306,7 +313,6 @@ export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 --shared-http-parser \ --shared-nghttp2 \ --with-dtrace \ - --with-intl=system-icu \ --debug-http2 \ --debug-nghttp2 \ --openssl-use-def-ca-store @@ -469,6 +475,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Thu Apr 05 2018 Stephen Gallagher - 1:9.11.1-1 +- Update to 9.11.1 +- https://nodejs.org/en/blog/release/v9.11.0/ +- https://nodejs.org/en/blog/release/v9.11.1/ + * Wed Mar 28 2018 Stephen Gallagher - 1:9.10.0-1 - Update to 9.10.0 - https://nodejs.org/en/blog/release/v9.10.0/ diff --git a/sources b/sources index b7e2c69..2082613 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.10.0-stripped.tar.gz) = 2efdfdc66ba8acea3636b96cb958e98db2e7332d30eb2be2a08ed3f62f5c9079cf58277694318b8677c84c13bbf4e3fe79b76cd04277e5768d605d68810a3c1c +SHA512 (node-v9.11.1.tar.gz) = 6bdd0afa3bdcc633075bbaf1c3a9b8c1a914a881da2dc942ff1477a2b000930a8777c0498db5edcb1eeaa7f13cff942ab88bf0764e296d49e0d1a9a677a52bb0 From 969079bd58403f302b9ea94a7629be1ebeb6806d Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 5 Apr 2018 13:53:15 -0400 Subject: [PATCH 09/26] Upload the correct source tarball Signed-off-by: Stephen Gallagher --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ce0f7db..b3022aa 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ /node-v9.9.0-stripped.tar.gz /node-v9.10.0-stripped.tar.gz /node-v9.11.1.tar.gz +/node-v9.11.1-stripped.tar.gz diff --git a/sources b/sources index 2082613..1071b0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.11.1.tar.gz) = 6bdd0afa3bdcc633075bbaf1c3a9b8c1a914a881da2dc942ff1477a2b000930a8777c0498db5edcb1eeaa7f13cff942ab88bf0764e296d49e0d1a9a677a52bb0 +SHA512 (node-v9.11.1-stripped.tar.gz) = d273432f867ff1bb864da2ebf4c964c894682cd6505abc6aa66672db112c1566dd9c533871b638b8b4921a6a77bfca9876939214f9ca962cfaf1bac164860d31 From 1e2b51b3b4798ad4fe9d793a1c4173ab6420bfd6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 9 Apr 2018 17:01:28 -0400 Subject: [PATCH 10/26] Suppress npm update message Signed-off-by: Stephen Gallagher --- no-npm-update-msg.patch | 16 ++++++++++++++++ nodejs.spec | 6 ++++++ 2 files changed, 22 insertions(+) create mode 100644 no-npm-update-msg.patch diff --git a/no-npm-update-msg.patch b/no-npm-update-msg.patch new file mode 100644 index 0000000..f16961a --- /dev/null +++ b/no-npm-update-msg.patch @@ -0,0 +1,16 @@ +diff '--color=auto' -ruN node-v9.11.1.orig/deps/npm/bin/npm-cli.js node-v9.11.1/deps/npm/bin/npm-cli.js +--- node-v9.11.1.orig/deps/npm/bin/npm-cli.js 2018-04-05 00:34:51.000000000 -0400 ++++ node-v9.11.1/deps/npm/bin/npm-cli.js 2018-04-09 16:57:31.595166069 -0400 +@@ -25,12 +25,6 @@ + + unsupported.checkForUnsupportedNode() + +- if (!unsupported.checkVersion(process.version).unsupported) { +- var updater = require('update-notifier') +- var pkg = require('../package.json') +- updater({pkg: pkg}).notify({defer: true}) +- } +- + var path = require('path') + var npm = require('../lib/npm.js') + var npmconf = require('../lib/config/core.js') diff --git a/nodejs.spec b/nodejs.spec index b3892ce..93233a6 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -122,6 +122,10 @@ Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch # Follow https://bugs.chromium.org/p/v8/issues/detail?id=6939 Patch2: 0001-Fix-aarch64-debug.patch +# Suppress the message from npm to run `npm -g update npm` +# This does bad things on an RPM-managed npm. +Patch3: no-npm-update-msg.patch + BuildRequires: python2-devel BuildRequires: zlib-devel BuildRequires: gcc >= 4.9.4 @@ -272,6 +276,8 @@ rm -rf deps/zlib %patch2 -p1 +%patch3 -p1 + %build # build with debugging symbols and add defines from libuv (#892601) # Node's v8 breaks with GCC 6 because of incorrect usage of methods on From e88700c9c23f494b9e4a4ad46773f7120816cf3b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 9 Apr 2018 17:12:47 -0400 Subject: [PATCH 11/26] Move bundled NPM deps If a user does `npm -g update npm` (not recommended), they can dangerously clobber their system because it will remove the .bundled directory. This patch moves it to a safer location. Resolves: rhbz#1565256 Signed-off-by: Stephen Gallagher --- nodejs.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 93233a6..b32dbce 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -380,16 +380,18 @@ mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit # can backtrack on this if we decide to. # Rename the npm node_modules directory to node_modules.bundled +mkdir -p %{buildroot}/%{_prefix}/lib/node/.bundled mv %{buildroot}/%{_prefix}/lib/node_modules/npm/node_modules \ - %{buildroot}/%{_prefix}/lib/node_modules/npm/node_modules.bundled + %{buildroot}/%{_prefix}/lib/node/.bundled/npm # Recreate all the symlinks mkdir -p %{buildroot}/%{_prefix}/lib/node_modules/npm/node_modules -FILES=%{buildroot}/%{_prefix}/lib/node_modules/npm/node_modules.bundled/* +FILES=%{buildroot}/%{_prefix}/lib/node/.bundled/npm/* for f in $FILES do module=`basename $f` - ln -s ../node_modules.bundled/$module %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/$module + ln -s %{_prefix}/lib/node/.bundled/npm/$module \ + %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/$module done # install NPM docs to mandir @@ -430,6 +432,8 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %files %{_bindir}/node %dir %{_prefix}/lib/node_modules +%dir %{_prefix}/lib/node +%dir %{_prefix}/lib/node/.bundled %dir %{_datadir}/node %dir %{_datadir}/systemtap %dir %{_datadir}/systemtap/tapset @@ -463,6 +467,7 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_bindir}/npm %{_bindir}/npx %{_prefix}/lib/node_modules/npm +%{_prefix}/lib/node/.bundled/npm %ghost %{_sysconfdir}/npmrc %ghost %{_sysconfdir}/npmignore %doc %{_mandir}/man*/npm* From e32bc066e3cf84078785ad37c67f4decca14537b Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Date: Fri, 13 Apr 2018 07:37:53 +0000 Subject: [PATCH 12/26] Use standard Fedora linker flags. - Resolves #1543859 Signed-off-by: Rafael dos Santos Signed-off-by: Stephen Gallagher --- nodejs.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nodejs.spec b/nodejs.spec index b32dbce..93ce5c7 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -25,7 +25,7 @@ %global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 1 +%global nodejs_release 2 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -297,6 +297,8 @@ export CXXFLAGS='%{optflags} -g \ export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')" export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')" +export LDFLAGS="%{build_ldflags}" + # Work around Fedora 28 issue: # https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Quick_Opt-Out # Tracking BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1550564 @@ -486,6 +488,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Fri Apr 13 2018 Rafael dos Santos - 1:9.11.1-2 +- Use standard Fedora linker flags (bug #1543859) + * Thu Apr 05 2018 Stephen Gallagher - 1:9.11.1-1 - Update to 9.11.1 - https://nodejs.org/en/blog/release/v9.11.0/ From b9473f5871ade07a77953a6e1409593b4b4ab6e3 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 26 Apr 2018 10:32:10 -0400 Subject: [PATCH 13/26] Update to 10.0.0 https://nodejs.org/en/blog/release/v10.0.0/ Drop workaround patch Temporarily disable debug build Signed-off-by: Stephen Gallagher --- .gitignore | 1 + ...e-running-gyp-files-for-bundled-deps.patch | 17 ++++--- 0001-Fix-aarch64-debug.patch | 34 ------------- nodejs.spec | 51 +++++++++---------- sources | 2 +- 5 files changed, 37 insertions(+), 68 deletions(-) delete mode 100644 0001-Fix-aarch64-debug.patch diff --git a/.gitignore b/.gitignore index b3022aa..81f645f 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /node-v9.10.0-stripped.tar.gz /node-v9.11.1.tar.gz /node-v9.11.1-stripped.tar.gz +/node-v10.0.0-stripped.tar.gz diff --git a/0001-Disable-running-gyp-files-for-bundled-deps.patch b/0001-Disable-running-gyp-files-for-bundled-deps.patch index 324a468..dcf8a64 100644 --- a/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ b/0001-Disable-running-gyp-files-for-bundled-deps.patch @@ -1,4 +1,4 @@ -From c2aff16cc196a61f4ab1cdae4a91c7926123c239 Mon Sep 17 00:00:00 2001 +From 078957089ba07fe1e31a3e5ef718bc37da6d911c Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH] Disable running gyp on shared deps @@ -8,22 +8,27 @@ Subject: [PATCH] Disable running gyp on shared deps 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 0a217bd893..e1229ad07f 100644 +index f499788d9d86cc9b7a06c5f918ea1aea2ebd3a8c..4b5b8c9834fa8389511d43ffead2b8233137c499 100644 --- a/Makefile +++ b/Makefile -@@ -79,10 +79,9 @@ $(NODE_G_EXE): config.gypi out/Makefile +@@ -89,14 +89,13 @@ $(NODE_EXE): config.gypi out/Makefile + + $(NODE_G_EXE): config.gypi out/Makefile $(MAKE) -C out BUILDTYPE=Debug V=$(V) if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi -out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \ - deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \ -- deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \ +- deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \ - config.gypi +out/Makefile: common.gypi deps/http_parser/http_parser.gyp \ + deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \ -+ deps/v8/src/v8.gyp node.gyp config.gypi ++ deps/v8/gypfiles/v8.gyp node.gyp config.gypi $(PYTHON) tools/gyp_node.py -f make config.gypi: configure + $(error Missing or stale $@, please run ./$<) + -- -2.12.2 +2.17.0 + diff --git a/0001-Fix-aarch64-debug.patch b/0001-Fix-aarch64-debug.patch deleted file mode 100644 index 00bae49..0000000 --- a/0001-Fix-aarch64-debug.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 058e4efd61c7c9ab4efd55bd9aa37e2184654050 Mon Sep 17 00:00:00 2001 -From: Zuzana Svetlikova -Date: Wed, 20 Sep 2017 13:05:01 +0200 -Subject: [PATCH] Fix aarch64 debug - ---- - deps/v8/src/v8.gyp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/deps/v8/src/v8.gyp b/deps/v8/src/v8.gyp -index c269f245aa..2ebbd393a9 100644 ---- a/deps/v8/src/v8.gyp -+++ b/deps/v8/src/v8.gyp -@@ -348,7 +348,7 @@ - '<(INTERMEDIATE_DIR)/snapshot.cc', - ], - 'variables': { -- 'mksnapshot_flags': [], -+ 'mksnapshot_flags': ['--nodebug_code'], - 'conditions': [ - ['v8_random_seed!=0', { - 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'], -@@ -449,7 +449,7 @@ - '<(mksnapshot_exec)', - ], - 'variables': { -- 'mksnapshot_flags': [], -+ 'mksnapshot_flags': ['--nodebug_code'], - 'conditions': [ - ['v8_random_seed!=0', { - 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'], --- -2.14.1 - diff --git a/nodejs.spec b/nodejs.spec index 93ce5c7..a5b8c4b 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,4 +1,6 @@ -%global with_debug 1 +# Debug builds are failing on GCC 8.0.2 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85587 +%global with_debug 0 # bundle dependencies that are not available as Fedora modules # %%{!?_with_bootstrap: %%global bootstrap 1} @@ -7,32 +9,25 @@ %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} -# ARM64 builds of 8.5.0 break on the Debug builds, so we'll just -# build the standard runtime until that gets sorted out. -# https://github.com/nodejs/node/issues/15395 -%ifarch aarch64 -%global with_debug 1 -%endif - # == Node.js Version == # Note: Fedora should only ship LTS versions of Node.js (currently expected # to be major versions with even numbers). The odd-numbered versions are new # feature releases that are only supported for nine months, which is shorter # than a Fedora release lifecycle. %global nodejs_epoch 1 -%global nodejs_major 9 -%global nodejs_minor 11 -%global nodejs_patch 1 +%global nodejs_major 10 +%global nodejs_minor 0 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 2 +%global nodejs_release 1 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h %global v8_major 6 -%global v8_minor 2 -%global v8_build 414 -%global v8_patch 46 +%global v8_minor 6 +%global v8_build 346 +%global v8_patch 24 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -40,7 +35,7 @@ # c-ares - from deps/cares/include/ares_version.h # https://github.com/nodejs/node/pull/9332 %global c_ares_major 1 -%global c_ares_minor 13 +%global c_ares_minor 14 %global c_ares_patch 0 %global c_ares_version %{c_ares_major}.%{c_ares_minor}.%{c_ares_patch} @@ -52,7 +47,7 @@ # libuv - from deps/uv/include/uv-version.h %global libuv_major 1 -%global libuv_minor 19 +%global libuv_minor 20 %global libuv_patch 2 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch} @@ -118,10 +113,6 @@ Source7: nodejs_native.attr # Disable running gyp on bundled deps we don't use Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch -# Being fixed upstream. -# Follow https://bugs.chromium.org/p/v8/issues/detail?id=6939 -Patch2: 0001-Fix-aarch64-debug.patch - # Suppress the message from npm to run `npm -g update npm` # This does bad things on an RPM-managed npm. Patch3: no-npm-update-msg.patch @@ -140,15 +131,15 @@ Provides: bundled(nghttp2) = %{nghttp2_version} BuildRequires: systemtap-sdt-devel BuildRequires: http-parser-devel >= 2.7.0 Requires: http-parser >= 2.7.0 -BuildRequires: libuv-devel >= 1:1.9.1 -Requires: libuv >= 1:1.9.1 +BuildRequires: libuv-devel >= 1:1.20.2 +Requires: libuv >= 1:1.20.2 BuildRequires: libnghttp2-devel >= %{nghttp2_version} Requires: libnghttp2 >= %{nghttp2_version} %endif BuildRequires: openssl-devel -# we need the system certificate store when Patch2 is applied +# we need the system certificate store Requires: ca-certificates #we need ABI virtual provides where SONAMEs aren't enough/not present so deps @@ -274,7 +265,6 @@ The API documentation for the Node.js JavaScript runtime. %patch1 -p1 rm -rf deps/zlib -%patch2 -p1 %patch3 -p1 @@ -392,7 +382,7 @@ FILES=%{buildroot}/%{_prefix}/lib/node/.bundled/npm/* for f in $FILES do module=`basename $f` - ln -s %{_prefix}/lib/node/.bundled/npm/$module \ + ln -s ../../../node/.bundled/npm/$module \ %{buildroot}%{_prefix}/lib/node_modules/npm/node_modules/$module done @@ -429,7 +419,7 @@ rm -f %{buildroot}/%{_defaultdocdir}/node/lldb_commands.py \ %{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"punycode\").version, '%{punycode_version}')" # Ensure we have npm and that the version matches -NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"npm\").version, '%{npm_version}')" +NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/node_modules/npm/node_modules %{buildroot}/%{_bindir}/node -e "require(\"assert\").equal(require(\"npm\").version, '%{npm_version}')" %files %{_bindir}/node @@ -488,6 +478,13 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Thu Apr 26 2018 Stephen Gallagher - 1:10.0.0-1 +- Update to 10.0.0 +- https://nodejs.org/en/blog/release/v10.0.0/ +- Drop workaround patch +- Temporarily drop node_g binary due to + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85587 + * Fri Apr 13 2018 Rafael dos Santos - 1:9.11.1-2 - Use standard Fedora linker flags (bug #1543859) diff --git a/sources b/sources index 1071b0b..60c5874 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v9.11.1-stripped.tar.gz) = d273432f867ff1bb864da2ebf4c964c894682cd6505abc6aa66672db112c1566dd9c533871b638b8b4921a6a77bfca9876939214f9ca962cfaf1bac164860d31 +SHA512 (node-v10.0.0-stripped.tar.gz) = dd1a1a966b8020a4fe82dadb21b0b9adc9f5656915d63e635bc913d3935529f48e535308440ef4961c791cb9cfb86a53c442c70d8b17b01a7d02d2c39fb30eff From f94eb9eb75d1070da264ddbe3bd9059dd8e9ba48 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 9 May 2018 11:00:25 -0400 Subject: [PATCH 14/26] Update to 10.1.0 - https://nodejs.org/en/blog/release/v10.1.0/ - Reenable node_g binary Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 81f645f..915abe0 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ /node-v9.11.1.tar.gz /node-v9.11.1-stripped.tar.gz /node-v10.0.0-stripped.tar.gz +/node-v10.1.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index a5b8c4b..28b00be 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,6 +1,4 @@ -# Debug builds are failing on GCC 8.0.2 -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85587 -%global with_debug 0 +%global with_debug 1 # bundle dependencies that are not available as Fedora modules # %%{!?_with_bootstrap: %%global bootstrap 1} @@ -16,7 +14,7 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 10 -%global nodejs_minor 0 +%global nodejs_minor 1 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} @@ -27,7 +25,7 @@ %global v8_major 6 %global v8_minor 6 %global v8_build 346 -%global v8_patch 24 +%global v8_patch 27 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -478,6 +476,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Wed May 09 2018 Stephen Gallagher - 1:10.1.0-1 +- Update to 10.1.0 +- https://nodejs.org/en/blog/release/v10.1.0/ +- Reenable node_g binary + * Thu Apr 26 2018 Stephen Gallagher - 1:10.0.0-1 - Update to 10.0.0 - https://nodejs.org/en/blog/release/v10.0.0/ diff --git a/sources b/sources index 60c5874..d2ca6fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v10.0.0-stripped.tar.gz) = dd1a1a966b8020a4fe82dadb21b0b9adc9f5656915d63e635bc913d3935529f48e535308440ef4961c791cb9cfb86a53c442c70d8b17b01a7d02d2c39fb30eff +SHA512 (node-v10.1.0-stripped.tar.gz) = 9b85f482cd947359cae98c2b2cfb364f89712ea75b2df47b7072bfbc63a6557f3e22c013ffe1ad8267065f32f9055e9d9edfa64682e0a3efe887e13a977b977e From 200f9491aa76ed7339f3beddababc274f671e026 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 10 May 2018 09:56:20 -0400 Subject: [PATCH 15/26] Include upstream v8 fix for ppc64[le] Disable debug build on ppc64[le] and s390x Signed-off-by: Stephen Gallagher --- ...-relative-address-to-init-constpool-.patch | 128 ++++++++++++++++++ nodejs.spec | 16 ++- 2 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch diff --git a/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch b/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch new file mode 100644 index 0000000..f3b8125 --- /dev/null +++ b/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch @@ -0,0 +1,128 @@ +From a0048de40ceb91e0bf7b0ffd6eb5054c41b3a4a6 Mon Sep 17 00:00:00 2001 +From: Junliang Yan +Date: Wed, 9 May 2018 18:39:49 -0400 +Subject: [PATCH 3/3] [PATCH] PPC: use pc-relative address to init constpool + reg + +R=joransiu@ca.ibm.com + +Change-Id: I67364f29d494b09786a14b13743f73bef4b64582 +Reviewed-on: https://chromium-review.googlesource.com/950242 +Commit-Queue: Junliang Yan +Reviewed-by: Joran Siu +Cr-Commit-Position: refs/heads/master@{#51750} + +Signed-off-by: Stephen Gallagher +--- + deps/v8/src/ppc/macro-assembler-ppc.cc | 14 ++++++++++---- + deps/v8/src/ppc/macro-assembler-ppc.h | 9 +++++---- + 2 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/deps/v8/src/ppc/macro-assembler-ppc.cc b/deps/v8/src/ppc/macro-assembler-ppc.cc +index 68efa84c72c7f6d781d508183b53ea83024944d1..3192e9cefb1c1b116c5e12b5c52e7971b92a111a 100644 +--- a/deps/v8/src/ppc/macro-assembler-ppc.cc ++++ b/deps/v8/src/ppc/macro-assembler-ppc.cc +@@ -166,11 +166,11 @@ void TurboAssembler::Call(Register target) { + + DCHECK_EQ(CallSize(target), SizeOfCodeGeneratedSince(&start)); + } + + void MacroAssembler::CallJSEntry(Register target) { +- DCHECK(target == ip); ++ CHECK(target == r5); + Call(target); + } + + int TurboAssembler::CallSize(Address target, RelocInfo::Mode rmode, + Condition cond) { +@@ -823,20 +823,27 @@ void TurboAssembler::ShiftRightAlgPair(Register dst_low, Register dst_high, + srawi(dst_high, src_high, shift); + } + } + #endif + +-void MacroAssembler::LoadConstantPoolPointerRegisterFromCodeTargetAddress( ++void TurboAssembler::LoadConstantPoolPointerRegisterFromCodeTargetAddress( + Register code_target_address) { + lwz(kConstantPoolRegister, + MemOperand(code_target_address, + Code::kConstantPoolOffset - Code::kHeaderSize)); + add(kConstantPoolRegister, kConstantPoolRegister, code_target_address); + } + ++void TurboAssembler::LoadPC(Register dst) { ++ b(4, SetLK); ++ mflr(dst); ++} ++ + void TurboAssembler::LoadConstantPoolPointerRegister() { +- mov_label_addr(kConstantPoolRegister, ConstantPoolPosition()); ++ LoadPC(kConstantPoolRegister); ++ add_label_offset(kConstantPoolRegister, kConstantPoolRegister, ++ ConstantPoolPosition(), -pc_offset() + 4); + } + + void TurboAssembler::StubPrologue(StackFrame::Type type) { + { + ConstantPoolUnavailableScope constant_pool_unavailable(this); +@@ -848,11 +855,10 @@ void TurboAssembler::StubPrologue(StackFrame::Type type) { + set_constant_pool_available(true); + } + } + + void TurboAssembler::Prologue() { +- DCHECK(base != no_reg); + PushStandardFrame(r4); + if (FLAG_enable_embedded_constant_pool) { + // base contains prologue address + LoadConstantPoolPointerRegister(); + set_constant_pool_available(true); +diff --git a/deps/v8/src/ppc/macro-assembler-ppc.h b/deps/v8/src/ppc/macro-assembler-ppc.h +index f4d9afd47f150f9cd2e840c20a61e965a5d8f5f5..32e6219c41bbbfe8427e05f2f9a02ff800efcffb 100644 +--- a/deps/v8/src/ppc/macro-assembler-ppc.h ++++ b/deps/v8/src/ppc/macro-assembler-ppc.h +@@ -214,10 +214,11 @@ class TurboAssembler : public Assembler { + + void LoadSingle(DoubleRegister dst, const MemOperand& mem, + Register scratch = no_reg); + void LoadSingleU(DoubleRegister dst, const MemOperand& mem, + Register scratch = no_reg); ++ void LoadPC(Register dst); + + void StoreDouble(DoubleRegister src, const MemOperand& mem, + Register scratch = no_reg); + void StoreDoubleU(DoubleRegister src, const MemOperand& mem, + Register scratch = no_reg); +@@ -639,10 +640,14 @@ class TurboAssembler : public Assembler { + + // Call a code stub. + void CallStubDelayed(CodeStub* stub); + + void LoadConstantPoolPointerRegister(); ++ ++ // Loads the constant pool pointer (kConstantPoolRegister). ++ void LoadConstantPoolPointerRegisterFromCodeTargetAddress( ++ Register code_target_address); + void AbortConstantPoolBuilding() { + #ifdef DEBUG + // Avoid DCHECK(!is_linked()) failure in ~Label() + bind(ConstantPoolPosition()); + #endif +@@ -733,14 +738,10 @@ class MacroAssembler : public TurboAssembler { + // Push and pop the registers that can hold pointers, as defined by the + // RegList constant kSafepointSavedRegisters. + void PushSafepointRegisters(); + void PopSafepointRegisters(); + +- // Loads the constant pool pointer (kConstantPoolRegister). +- void LoadConstantPoolPointerRegisterFromCodeTargetAddress( +- Register code_target_address); +- + // Flush the I-cache from asm code. You should use CpuFeatures::FlushICache + // from C. + // Does not handle errors. + void FlushICache(Register address, size_t size, Register scratch); + +-- +2.17.0 + diff --git a/nodejs.spec b/nodejs.spec index 28b00be..2924b31 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,5 +1,11 @@ %global with_debug 1 +# PowerPC and s390x segfault during Debug builds +# https://github.com/nodejs/node/issues/20642 +%ifarch %{ppc} s390x +%global with_debug 0 +%endif + # bundle dependencies that are not available as Fedora modules # %%{!?_with_bootstrap: %%global bootstrap 1} # use bcond for building modules @@ -18,7 +24,7 @@ %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 1 +%global nodejs_release 2 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -115,6 +121,9 @@ Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch # This does bad things on an RPM-managed npm. Patch3: no-npm-update-msg.patch +# Fix PowerPC builds +Patch4: 0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch + BuildRequires: python2-devel BuildRequires: zlib-devel BuildRequires: gcc >= 4.9.4 @@ -265,6 +274,7 @@ rm -rf deps/zlib %patch3 -p1 +%patch4 -p1 %build # build with debugging symbols and add defines from libuv (#892601) @@ -476,6 +486,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Thu May 10 2018 Stephen Gallagher - 1:10.1.0-2 +- Include upstream v8 fix for ppc64[le] +- Disable debug build on ppc64[le] and s390x + * Wed May 09 2018 Stephen Gallagher - 1:10.1.0-1 - Update to 10.1.0 - https://nodejs.org/en/blog/release/v10.1.0/ From 6c33c7f5304c66be9db31863e69d1e12bfe5f537 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 10 May 2018 12:33:20 -0400 Subject: [PATCH 16/26] Fix incorrect rpm macro Signed-off-by: Stephen Gallagher --- nodejs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 2924b31..3f4ce6f 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -2,7 +2,7 @@ # PowerPC and s390x segfault during Debug builds # https://github.com/nodejs/node/issues/20642 -%ifarch %{ppc} s390x +%ifarch %{power64} s390x %global with_debug 0 %endif @@ -24,7 +24,7 @@ %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 2 +%global nodejs_release 3 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -486,6 +486,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Thu May 10 2018 Stephen Gallagher - 1:10.1.0-3 +- Fix incorrect rpm macro + * Thu May 10 2018 Stephen Gallagher - 1:10.1.0-2 - Include upstream v8 fix for ppc64[le] - Disable debug build on ppc64[le] and s390x From 65be442ab169ceaf1827b550565166db06a9efa7 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 23 May 2018 21:40:27 -0400 Subject: [PATCH 17/26] Update to 10.2.0 https://nodejs.org/en/blog/release/v10.0.0/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 915abe0..af52030 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /node-v9.11.1-stripped.tar.gz /node-v10.0.0-stripped.tar.gz /node-v10.1.0-stripped.tar.gz +/node-v10.2.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 3f4ce6f..9494be4 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -20,18 +20,18 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 10 -%global nodejs_minor 1 +%global nodejs_minor 2 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 3 +%global nodejs_release 1 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h %global v8_major 6 %global v8_minor 6 %global v8_build 346 -%global v8_patch 27 +%global v8_patch 32 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -52,7 +52,7 @@ # libuv - from deps/uv/include/uv-version.h %global libuv_major 1 %global libuv_minor 20 -%global libuv_patch 2 +%global libuv_patch 3 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch} # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h @@ -486,6 +486,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Wed May 23 2018 Stephen Gallagher - 1:10.2.0-1 +- Update to 10.2.0 +- https://nodejs.org/en/blog/release/v10.0.0/ + * Thu May 10 2018 Stephen Gallagher - 1:10.1.0-3 - Fix incorrect rpm macro diff --git a/sources b/sources index d2ca6fa..4e5f3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v10.1.0-stripped.tar.gz) = 9b85f482cd947359cae98c2b2cfb364f89712ea75b2df47b7072bfbc63a6557f3e22c013ffe1ad8267065f32f9055e9d9edfa64682e0a3efe887e13a977b977e +SHA512 (node-v10.2.0-stripped.tar.gz) = 41f3e09adc104ca5fe264a0622013ab2667116384fc5f1018162b4bc5b7627b284926769de37b59eddb4e11ab90e61a20196469ad420707f9982d43aca1baae5 From ad36c3e56371ec8d28e415840d8dae56ab452142 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 25 May 2018 08:03:40 -0400 Subject: [PATCH 18/26] Update to 10.2.1 https://nodejs.org/en/blog/release/v10.2.1/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs-tarball.sh | 4 ++-- nodejs.spec | 8 ++++++-- sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index af52030..c5772f7 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ /node-v10.0.0-stripped.tar.gz /node-v10.1.0-stripped.tar.gz /node-v10.2.0-stripped.tar.gz +/node-v10.2.1-stripped.tar.gz diff --git a/nodejs-tarball.sh b/nodejs-tarball.sh index 20dab4b..237ae13 100755 --- a/nodejs-tarball.sh +++ b/nodejs-tarball.sh @@ -1,10 +1,10 @@ #!/bin/sh version=$(rpm -q --specfile --qf='%{version}\n' nodejs.spec | head -n1) +rm -f node-v${version}.tar.gz wget http://nodejs.org/dist/v${version}/node-v${version}.tar.gz tar -zxf node-v${version}.tar.gz rm -rf node-v${version}/deps/openssl tar -zcf node-v${version}-stripped.tar.gz node-v${version} -echo "Now make sure to run:" -echo "fedpkg new-sources node-v${version}-stripped.tar.gz" +fedpkg new-sources node-v${version}-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 9494be4..458378f 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,7 +21,7 @@ %global nodejs_epoch 1 %global nodejs_major 10 %global nodejs_minor 2 -%global nodejs_patch 0 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -486,9 +486,13 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Fri May 25 2018 Stephen Gallagher - 1:10.2.1-1 +- Update to 10.2.1 +- https://nodejs.org/en/blog/release/v10.2.1/ + * Wed May 23 2018 Stephen Gallagher - 1:10.2.0-1 - Update to 10.2.0 -- https://nodejs.org/en/blog/release/v10.0.0/ +- https://nodejs.org/en/blog/release/v10.2.0/ * Thu May 10 2018 Stephen Gallagher - 1:10.1.0-3 - Fix incorrect rpm macro diff --git a/sources b/sources index 4e5f3c9..db404d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v10.2.0-stripped.tar.gz) = 41f3e09adc104ca5fe264a0622013ab2667116384fc5f1018162b4bc5b7627b284926769de37b59eddb4e11ab90e61a20196469ad420707f9982d43aca1baae5 +SHA512 (node-v10.2.1-stripped.tar.gz) = 21c6e8d3eee67c0d4b0a7b456b7706fed924da388ddaf8c4987215df1402ca172f417c202cbf262f68454efdbde984455280c8f868ea1c1798f86325a04ed8b7 From e12c018b73d9aaff0706adf856258c93584edf32 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 29 May 2018 08:21:46 -0400 Subject: [PATCH 19/26] Fix up bare 'python' to be python2 Signed-off-by: Stephen Gallagher --- nodejs.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 458378f..957387e 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -276,6 +276,13 @@ rm -rf deps/zlib %patch3 -p1 %patch4 -p1 +# Replace any instances of unversioned python' with python2 +find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python2~" {} \; +find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python2~" {} \; +find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python2~" {} \; +find . -type f -exec sed -i "s~python -c~python2 -c~" {} \; +sed -i "s~which('python')~which('python2')~" configure + %build # build with debugging symbols and add defines from libuv (#892601) # Node's v8 breaks with GCC 6 because of incorrect usage of methods on @@ -297,11 +304,6 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')" export LDFLAGS="%{build_ldflags}" -# Work around Fedora 28 issue: -# https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Quick_Opt-Out -# Tracking BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1550564 -export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 - #%if ! 0%%{?bootstrap} %if %{with bootstrap} ./configure --prefix=%{_prefix} \ @@ -481,7 +483,6 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %files docs %dir %{_pkgdocdir} %{_pkgdocdir}/html -%{_pkgdocdir}/npm* %{_pkgdocdir}/npm/html %{_pkgdocdir}/npm/doc From 3c76939ae2b9d4fe0600971ae9db1bc76dd4900c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 29 May 2018 09:33:09 -0400 Subject: [PATCH 20/26] Add changelog entries Signed-off-by: Stephen Gallagher --- nodejs.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nodejs.spec b/nodejs.spec index 957387e..8081807 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -24,7 +24,7 @@ %global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 1 +%global nodejs_release 2 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -487,6 +487,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Tue May 29 2018 Stephen Gallagher - 1:10.2.1-2 +- Fix up bare 'python' to be python2 +- Drop redundant entry in docs section + * Fri May 25 2018 Stephen Gallagher - 1:10.2.1-1 - Update to 10.2.1 - https://nodejs.org/en/blog/release/v10.2.1/ From 22609d8c1bfeaa21fe0057645af20b3a2ccc7f53 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 30 May 2018 10:26:09 -0400 Subject: [PATCH 21/26] Update to 10.3.0 Update npm to 6.1.0 https://nodejs.org/en/blog/release/v10.3.0/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + ...1-Disable-running-gyp-on-shared-deps.patch | 6 +- ...ess-NPM-message-to-run-global-update.patch | 74 +++++++++++++++++++ ...-relative-address-to-init-constpool-.patch | 4 +- no-npm-update-msg.patch | 16 ---- nodejs.spec | 24 +++--- sources | 2 +- 7 files changed, 95 insertions(+), 32 deletions(-) rename 0001-Disable-running-gyp-files-for-bundled-deps.patch => 0001-Disable-running-gyp-on-shared-deps.patch (82%) create mode 100644 0002-Suppress-NPM-message-to-run-global-update.patch delete mode 100644 no-npm-update-msg.patch diff --git a/.gitignore b/.gitignore index c5772f7..9493b52 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /node-v10.1.0-stripped.tar.gz /node-v10.2.0-stripped.tar.gz /node-v10.2.1-stripped.tar.gz +/node-v10.3.0-stripped.tar.gz diff --git a/0001-Disable-running-gyp-files-for-bundled-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch similarity index 82% rename from 0001-Disable-running-gyp-files-for-bundled-deps.patch rename to 0001-Disable-running-gyp-on-shared-deps.patch index dcf8a64..712d413 100644 --- a/0001-Disable-running-gyp-files-for-bundled-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,14 +1,14 @@ -From 078957089ba07fe1e31a3e5ef718bc37da6d911c Mon Sep 17 00:00:00 2001 +From 03d9247890c2755710a8208974d2919b6a217a63 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 27 Apr 2017 14:25:42 +0200 -Subject: [PATCH] Disable running gyp on shared deps +Subject: [PATCH 1/4] Disable running gyp on shared deps --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index f499788d9d86cc9b7a06c5f918ea1aea2ebd3a8c..4b5b8c9834fa8389511d43ffead2b8233137c499 100644 +index a7099947c72a783a4b9d96c950ac084153532d94..bfd205d0992d4bb4b901a1f3d5595e01e6f88bf8 100644 --- a/Makefile +++ b/Makefile @@ -89,14 +89,13 @@ $(NODE_EXE): config.gypi out/Makefile diff --git a/0002-Suppress-NPM-message-to-run-global-update.patch b/0002-Suppress-NPM-message-to-run-global-update.patch new file mode 100644 index 0000000..b51bf87 --- /dev/null +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@ -0,0 +1,74 @@ +From 396550f6e26912fe6ef774bc60e24ef73e2f5366 Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Tue, 1 May 2018 08:05:30 -0400 +Subject: [PATCH 2/4] Suppress NPM message to run global update + +Signed-off-by: Stephen Gallagher +--- + deps/npm/bin/npm-cli.js | 46 ----------------------------------------- + 1 file changed, 46 deletions(-) + +diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js +index d7c14bc4b2cd0206448163c3a9bed765bde7fae7..98edb6f45fe073e03794a2ae6e7aa7f5500723ee 100755 +--- a/deps/npm/bin/npm-cli.js ++++ b/deps/npm/bin/npm-cli.js +@@ -72,56 +72,10 @@ + // now actually fire up npm and run the command. + // this is how to use npm programmatically: + conf._exit = true + npm.load(conf, function (er) { + if (er) return errorHandler(er) +- if (!unsupported.checkVersion(process.version).unsupported) { +- const pkg = require('../package.json') +- let notifier = require('update-notifier')({pkg}) +- if ( +- notifier.update && +- notifier.update.latest !== pkg.version +- ) { +- const color = require('ansicolors') +- const useColor = npm.config.get('color') +- const useUnicode = npm.config.get('unicode') +- const old = notifier.update.current +- const latest = notifier.update.latest +- let type = notifier.update.type +- if (useColor) { +- switch (type) { +- case 'major': +- type = color.red(type) +- break +- case 'minor': +- type = color.yellow(type) +- break +- case 'patch': +- type = color.green(type) +- break +- } +- } +- const changelog = `https://github.com/npm/npm/releases/tag/v${latest}` +- notifier.notify({ +- message: `New ${type} version of ${pkg.name} available! ${ +- useColor ? color.red(old) : old +- } ${useUnicode ? '→' : '->'} ${ +- useColor ? color.green(latest) : latest +- }\n` + +- `${ +- useColor ? color.yellow('Changelog:') : 'Changelog:' +- } ${ +- useColor ? color.cyan(changelog) : changelog +- }\n` + +- `Run ${ +- useColor +- ? color.green(`npm install -g ${pkg.name}`) +- : `npm i -g ${pkg.name}` +- } to update!` +- }) +- } +- } + npm.commands[npm.command](npm.argv, function (err) { + // https://genius.com/Lin-manuel-miranda-your-obedient-servant-lyrics + if ( + !err && + npm.config.get('ham-it-up') && +-- +2.17.0 + diff --git a/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch b/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch index f3b8125..0436f75 100644 --- a/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch +++ b/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch @@ -1,7 +1,7 @@ -From a0048de40ceb91e0bf7b0ffd6eb5054c41b3a4a6 Mon Sep 17 00:00:00 2001 +From cefa0fd937cb48a8431e62268b2c9500b104d4e5 Mon Sep 17 00:00:00 2001 From: Junliang Yan Date: Wed, 9 May 2018 18:39:49 -0400 -Subject: [PATCH 3/3] [PATCH] PPC: use pc-relative address to init constpool +Subject: [PATCH 3/4] [PATCH] PPC: use pc-relative address to init constpool reg R=joransiu@ca.ibm.com diff --git a/no-npm-update-msg.patch b/no-npm-update-msg.patch deleted file mode 100644 index f16961a..0000000 --- a/no-npm-update-msg.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff '--color=auto' -ruN node-v9.11.1.orig/deps/npm/bin/npm-cli.js node-v9.11.1/deps/npm/bin/npm-cli.js ---- node-v9.11.1.orig/deps/npm/bin/npm-cli.js 2018-04-05 00:34:51.000000000 -0400 -+++ node-v9.11.1/deps/npm/bin/npm-cli.js 2018-04-09 16:57:31.595166069 -0400 -@@ -25,12 +25,6 @@ - - unsupported.checkForUnsupportedNode() - -- if (!unsupported.checkVersion(process.version).unsupported) { -- var updater = require('update-notifier') -- var pkg = require('../package.json') -- updater({pkg: pkg}).notify({defer: true}) -- } -- - var path = require('path') - var npm = require('../lib/npm.js') - var npmconf = require('../lib/config/core.js') diff --git a/nodejs.spec b/nodejs.spec index 8081807..4149a60 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -20,11 +20,11 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 10 -%global nodejs_minor 2 -%global nodejs_patch 1 +%global nodejs_minor 3 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 2 +%global nodejs_release 1 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -76,8 +76,8 @@ # npm - from deps/npm/package.json %global npm_epoch 1 -%global npm_major 5 -%global npm_minor 6 +%global npm_major 6 +%global npm_minor 1 %global npm_patch 0 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch} @@ -115,14 +115,14 @@ Source100: %{name}-tarball.sh Source7: nodejs_native.attr # Disable running gyp on bundled deps we don't use -Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch +Patch1: 0001-Disable-running-gyp-on-shared-deps.patch # Suppress the message from npm to run `npm -g update npm` # This does bad things on an RPM-managed npm. -Patch3: no-npm-update-msg.patch +Patch2: 0002-Suppress-NPM-message-to-run-global-update.patch # Fix PowerPC builds -Patch4: 0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch +Patch3: 0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch BuildRequires: python2-devel BuildRequires: zlib-devel @@ -272,9 +272,8 @@ The API documentation for the Node.js JavaScript runtime. %patch1 -p1 rm -rf deps/zlib - +%patch2 -p1 %patch3 -p1 -%patch4 -p1 # Replace any instances of unversioned python' with python2 find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python2~" {} \; @@ -487,6 +486,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Wed May 30 2018 Stephen Gallagher - - +- Update to 10.3.0 +- Update npm to 6.1.0 +- https://nodejs.org/en/blog/release/v10.3.0/ + * Tue May 29 2018 Stephen Gallagher - 1:10.2.1-2 - Fix up bare 'python' to be python2 - Drop redundant entry in docs section diff --git a/sources b/sources index db404d0..8173400 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v10.2.1-stripped.tar.gz) = 21c6e8d3eee67c0d4b0a7b456b7706fed924da388ddaf8c4987215df1402ca172f417c202cbf262f68454efdbde984455280c8f868ea1c1798f86325a04ed8b7 +SHA512 (node-v10.3.0-stripped.tar.gz) = 0a2fed09a6d0e67288b90207ed85c331bc82655983d8e6c3df5173e6989ab1995fb4787837d5ade65fdb8728f943b2372bc86b3064b4f7270296e89218eff533 From 0ee60cf892459e5cc411ee4344d48ed59d37eb95 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 4 Jun 2018 13:25:44 -0400 Subject: [PATCH 22/26] Drop PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 Signed-off-by: Stephen Gallagher --- nodejs.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 4149a60..e0f05fa 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -334,11 +334,6 @@ make BUILDTYPE=Release %{?_smp_mflags} %install -# Work around Fedora 28 build issue: -# https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Quick_Opt-Out -# Tracking BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1550564 -export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 - rm -rf %{buildroot} ./tools/install.py install %{buildroot} %{_prefix} From 6bbcfaf555464c763ccda4459d83517eb54cbf63 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 7 Jun 2018 08:54:08 -0400 Subject: [PATCH 23/26] Update to 10.4.0 https://nodejs.org/en/blog/release/v10.4.0/ Signed-off-by: Stephen Gallagher --- .gitignore | 1 + 0001-Disable-running-gyp-on-shared-deps.patch | 6 +++--- ...ppress-NPM-message-to-run-global-update.patch | 4 ++-- nodejs.spec | 16 ++++++++-------- sources | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 9493b52..3827b7b 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ /node-v10.2.0-stripped.tar.gz /node-v10.2.1-stripped.tar.gz /node-v10.3.0-stripped.tar.gz +/node-v10.4.0-stripped.tar.gz diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index 712d413..54c26ad 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,14 +1,14 @@ -From 03d9247890c2755710a8208974d2919b6a217a63 Mon Sep 17 00:00:00 2001 +From b5b4b7f8acd2d67c79d1fc2c954aa88edff27511 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 27 Apr 2017 14:25:42 +0200 -Subject: [PATCH 1/4] Disable running gyp on shared deps +Subject: [PATCH 1/2] Disable running gyp on shared deps --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index a7099947c72a783a4b9d96c950ac084153532d94..bfd205d0992d4bb4b901a1f3d5595e01e6f88bf8 100644 +index b11168aaa456af019a32885f5495c4527a16e9a0..1297fbfc9f68261ea8ebfd1ac70f32581918d078 100644 --- a/Makefile +++ b/Makefile @@ -89,14 +89,13 @@ $(NODE_EXE): config.gypi out/Makefile diff --git a/0002-Suppress-NPM-message-to-run-global-update.patch b/0002-Suppress-NPM-message-to-run-global-update.patch index b51bf87..050485e 100644 --- a/0002-Suppress-NPM-message-to-run-global-update.patch +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@ -1,7 +1,7 @@ -From 396550f6e26912fe6ef774bc60e24ef73e2f5366 Mon Sep 17 00:00:00 2001 +From e84a42f54aa1dabc115a0c647af6aa1500a85f34 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 1 May 2018 08:05:30 -0400 -Subject: [PATCH 2/4] Suppress NPM message to run global update +Subject: [PATCH 2/2] Suppress NPM message to run global update Signed-off-by: Stephen Gallagher --- diff --git a/nodejs.spec b/nodejs.spec index e0f05fa..18acb88 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -20,7 +20,7 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 10 -%global nodejs_minor 3 +%global nodejs_minor 4 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} @@ -29,9 +29,9 @@ # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h %global v8_major 6 -%global v8_minor 6 -%global v8_build 346 -%global v8_patch 32 +%global v8_minor 7 +%global v8_build 288 +%global v8_patch 43 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -121,9 +121,6 @@ Patch1: 0001-Disable-running-gyp-on-shared-deps.patch # This does bad things on an RPM-managed npm. Patch2: 0002-Suppress-NPM-message-to-run-global-update.patch -# Fix PowerPC builds -Patch3: 0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch - BuildRequires: python2-devel BuildRequires: zlib-devel BuildRequires: gcc >= 4.9.4 @@ -273,7 +270,6 @@ The API documentation for the Node.js JavaScript runtime. rm -rf deps/zlib %patch2 -p1 -%patch3 -p1 # Replace any instances of unversioned python' with python2 find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python2~" {} \; @@ -481,6 +477,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Thu Jun 07 2018 Stephen Gallagher - - +- Update to 10.4.0 +- https://nodejs.org/en/blog/release/v10.4.0/ + * Wed May 30 2018 Stephen Gallagher - - - Update to 10.3.0 - Update npm to 6.1.0 diff --git a/sources b/sources index 8173400..64e702b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v10.3.0-stripped.tar.gz) = 0a2fed09a6d0e67288b90207ed85c331bc82655983d8e6c3df5173e6989ab1995fb4787837d5ade65fdb8728f943b2372bc86b3064b4f7270296e89218eff533 +SHA512 (node-v10.4.0-stripped.tar.gz) = 7119246769a71f6c2b8fb44b23003b6a6efcbdc3934e49523dba91c3c5dd91b9f6a193ce8121fbb35401467e970a6c3ac02a470485f992386cd1be849ba996d1 From ac33fdb3b3369887b7f60ee14fdc406287e5cbea Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 7 Jun 2018 09:04:01 -0400 Subject: [PATCH 24/26] Drop --debug-http2 Upstream removed this option. Signed-off-by: Stephen Gallagher --- nodejs.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 18acb88..ea55530 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -305,7 +305,6 @@ export LDFLAGS="%{build_ldflags}" --shared-openssl \ --shared-zlib \ --without-dtrace \ - --debug-http2 \ --debug-nghttp2 \ --openssl-use-def-ca-store %else @@ -316,7 +315,6 @@ export LDFLAGS="%{build_ldflags}" --shared-http-parser \ --shared-nghttp2 \ --with-dtrace \ - --debug-http2 \ --debug-nghttp2 \ --openssl-use-def-ca-store %endif From b944bdb7ecfb5d6aec7a65f9e33ca875f138bff0 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 14 Jun 2018 08:33:46 -0400 Subject: [PATCH 25/26] Update to 10.4.1 to address security issues https://nodejs.org/en/blog/release/v10.4.0/ Resolves: rhbz#1590801 Resolves: rhbz#1591014 Resolves: rhbz#1591019 Signed-off-by: Stephen Gallagher --- .gitignore | 1 + nodejs.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3827b7b..49ba7e5 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ /node-v10.2.1-stripped.tar.gz /node-v10.3.0-stripped.tar.gz /node-v10.4.0-stripped.tar.gz +/node-v10.4.1-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index ea55530..257ab3a 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -21,7 +21,7 @@ %global nodejs_epoch 1 %global nodejs_major 10 %global nodejs_minor 4 -%global nodejs_patch 0 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -31,7 +31,7 @@ %global v8_major 6 %global v8_minor 7 %global v8_build 288 -%global v8_patch 43 +%global v8_patch 45 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -57,7 +57,7 @@ # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h %global nghttp2_major 1 -%global nghttp2_minor 29 +%global nghttp2_minor 32 %global nghttp2_patch 0 %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch} @@ -475,11 +475,18 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog -* Thu Jun 07 2018 Stephen Gallagher - - +* Thu Jun 14 2018 Stephen Gallagher - 1:10.4.1-1 +- Update to 10.4.1 to address security issues +- https://nodejs.org/en/blog/release/v10.4.0/ +- Resolves: rhbz#1590801 +- Resolves: rhbz#1591014 +- Resolves: rhbz#1591019 + +* Thu Jun 07 2018 Stephen Gallagher - 1:10.4.0-1 - Update to 10.4.0 - https://nodejs.org/en/blog/release/v10.4.0/ -* Wed May 30 2018 Stephen Gallagher - - +* Wed May 30 2018 Stephen Gallagher - 1:10.3.0-1 - Update to 10.3.0 - Update npm to 6.1.0 - https://nodejs.org/en/blog/release/v10.3.0/ diff --git a/sources b/sources index 64e702b..a9936e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v10.4.0-stripped.tar.gz) = 7119246769a71f6c2b8fb44b23003b6a6efcbdc3934e49523dba91c3c5dd91b9f6a193ce8121fbb35401467e970a6c3ac02a470485f992386cd1be849ba996d1 +SHA512 (node-v10.4.1-stripped.tar.gz) = 6344c1a436a437ea52d50ef3f3cc66225e7b47612927c29660842c0a0f5293002bddd68935207599238504b027f64f7613f7ba667251a65bf8c4f81d6a26239b From 011878379b079f9dc7e8845e468bd2375b2d228b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 21 Jun 2018 21:04:36 -0400 Subject: [PATCH 26/26] Update to 10.5.0 https://nodejs.org/en/blog/release/v10.5.0/ --- .gitignore | 1 + nodejs.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 49ba7e5..586f147 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ /node-v10.3.0-stripped.tar.gz /node-v10.4.0-stripped.tar.gz /node-v10.4.1-stripped.tar.gz +/node-v10.5.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 257ab3a..948eaa7 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -20,8 +20,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 10 -%global nodejs_minor 4 -%global nodejs_patch 1 +%global nodejs_minor 5 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -31,7 +31,7 @@ %global v8_major 6 %global v8_minor 7 %global v8_build 288 -%global v8_patch 45 +%global v8_patch 46 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -475,9 +475,13 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod %{_pkgdocdir}/npm/doc %changelog +* Thu Jun 21 2018 Stephen Gallagher - 1:10.5.0-1 +- Update to 10.5.0 +- https://nodejs.org/en/blog/release/v10.5.0/ + * Thu Jun 14 2018 Stephen Gallagher - 1:10.4.1-1 - Update to 10.4.1 to address security issues -- https://nodejs.org/en/blog/release/v10.4.0/ +- https://nodejs.org/en/blog/release/v10.4.1/ - Resolves: rhbz#1590801 - Resolves: rhbz#1591014 - Resolves: rhbz#1591019 diff --git a/sources b/sources index a9936e3..842a96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v10.4.1-stripped.tar.gz) = 6344c1a436a437ea52d50ef3f3cc66225e7b47612927c29660842c0a0f5293002bddd68935207599238504b027f64f7613f7ba667251a65bf8c4f81d6a26239b +SHA512 (node-v10.5.0-stripped.tar.gz) = df9ec8923d5b6260a27b1794f6841a2eb8f08cd8a2a24958dc5d2e7698878337a014c582055cc9eb96dee6303bc5580c718bde8b86cdbde27c8f01f8cac12a31