The package rpms/nodejs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nodejs.git/commit/?id=9f1a56347d4...
https://src.fedoraproject.org/cgit/rpms/nodejs.git/commit/?id=a042b795522....
Change:
-%ifarch aarch64
+%ifarch aarch64
Thanks.
Full change:
============
commit 4ff0a33f15f6f65156dbe88f19b64349509a2efc
Merge: 5b26c0e 3d8af66
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Mon May 17 12:01:20 2021 -0400
Merge branch '14' into f33
commit 3d8af661ad151c39ed6fefb311b3d4723433126c
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Mon May 17 11:17:58 2021 -0400
Update to 14.17.0
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.m...
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/0001-Disable-running-gyp-on-shared-deps.patch
b/0001-Disable-running-gyp-on-shared-deps.patch
index 1b5cf73..962763f 100644
--- a/0001-Disable-running-gyp-on-shared-deps.patch
+++ b/0001-Disable-running-gyp-on-shared-deps.patch
@@ -1,4 +1,4 @@
-From 0a889af5ee18290d833f7f63742d5b714bdb1a40 Mon Sep 17 00:00:00 2001
+From 867d8911b63b9837d89cd6ba65ea6ebccd7f77e7 Mon Sep 17 00:00:00 2001
From: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Fri, 17 Apr 2020 12:59:44 +0200
Subject: [PATCH 1/3] Disable running gyp on shared deps
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] Disable running gyp on shared deps
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 93d63110ae2e3928a95d24036b86d11885ab240f..79caaec2112cefa8f6a1c947375b517e9676f176
100644
+index 5bb5d7df5f87e2b1d640e027fd4d0c21975959f7..fc812607ac76fadbbc9f4670a479a040a5024780
100644
--- a/Makefile
+++ b/Makefile
@@ -136,11 +136,11 @@ endif
diff --git a/0002-Install-both-binaries-and-use-libdir.patch
b/0002-Install-both-binaries-and-use-libdir.patch
index 9679f8b..94943d1 100644
--- a/0002-Install-both-binaries-and-use-libdir.patch
+++ b/0002-Install-both-binaries-and-use-libdir.patch
@@ -1,4 +1,4 @@
-From 4012d5b9ae521f36c8b0155f591a38383e84407b Mon Sep 17 00:00:00 2001
+From ea59ced68789dc24c95572b84091afcebe9acb98 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue, 19 Mar 2019 23:22:40 -0400
Subject: [PATCH 2/3] Install both binaries and use libdir.
@@ -13,7 +13,7 @@ Signed-off-by: Elliott Sales de Andrade
<quantum.analyst(a)gmail.com>
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/configure.py b/configure.py
-index e6f7e4db0040dda00e432352afa7576535d9b672..6cf5c45dde79ce355b532c2f11b5b7ed80fde88a
100755
+index a477bd1c9578d03cd81456c513486620435749ee..3067eb9fc3e5c3eb22eb4ff3d20f87415b115bb8
100755
--- a/configure.py
+++ b/configure.py
@@ -624,10 +624,16 @@ parser.add_option('--shared',
@@ -46,7 +46,7 @@ index
e6f7e4db0040dda00e432352afa7576535d9b672..6cf5c45dde79ce355b532c2f11b5b7ed
shlib_suffix = 'so'
elif sys.platform == 'darwin':
diff --git a/tools/install.py b/tools/install.py
-index 729b416fc47d3ff3317ae3671dee977c719a8841..9bfc6234edb7732f9b90f063c2ee4a276e840636
100755
+index 693faff4c37ac4d83a47e818f4412900497a2b62..7c0b1ba999cdeacd3431b5334d650677754a9752
100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -119,26 +119,23 @@ def subdir_files(path, dest, action):
diff --git a/0003-src-add-.note.GNU-stack-section.patch
b/0003-src-add-.note.GNU-stack-section.patch
index 74fd28f..f943f9c 100644
--- a/0003-src-add-.note.GNU-stack-section.patch
+++ b/0003-src-add-.note.GNU-stack-section.patch
@@ -1,4 +1,4 @@
-From 6aa11a8cf48463432c0b5c6bfca5c2a5b18b1cc7 Mon Sep 17 00:00:00 2001
+From 7388d30b111414507b1353da12529f23daec4ee3 Mon Sep 17 00:00:00 2001
From: James Addison <jay(a)jp-hosting.net>
Date: Tue, 9 Mar 2021 13:08:47 +0000
Subject: [PATCH 3/3] src: add .note.GNU-stack section
@@ -24,22 +24,22 @@ Related:
https://github.com/nodejs/node/pull/37688
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
---
- src/large_pages/node_text_start.S | 3 +++
- 1 file changed, 3 insertions(+)
+ src/large_pages/node_text_start.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/large_pages/node_text_start.S b/src/large_pages/node_text_start.S
-index 1609b254f0495a32f8896ba96d96bad03f6f2321..d27dd39cc236f0e6be4e68113bfff7b531a37455
100644
+index 3227b62464932ced6d42916a4300ddbd9b4a4fbb..d27dd39cc236f0e6be4e68113bfff7b531a37455
100644
--- a/src/large_pages/node_text_start.S
+++ b/src/large_pages/node_text_start.S
-@@ -1,5 +1,8 @@
-+#if defined(__ELF__)
+@@ -1,7 +1,7 @@
+ #if defined(__ELF__)
+-.section .note.GNU-stack,"",@progbits
+.section .note.GNU-stack,"",%progbits
-+#endif
+ #endif
.text
.align 0x2000
.global __node_text_start
.hidden __node_text_start
- __node_text_start:
--
2.31.1
diff --git a/nodejs.spec b/nodejs.spec
index 4993651..e55b7e4 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -8,7 +8,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 2
+%global baserelease 1
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -19,8 +19,8 @@
# than a Fedora release lifecycle.
%global nodejs_epoch 1
%global nodejs_major 14
-%global nodejs_minor 16
-%global nodejs_patch 1
+%global nodejs_minor 17
+%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 83
@@ -36,7 +36,7 @@
%global v8_major 8
%global v8_minor 4
%global v8_build 371
-%global v8_patch 19
+%global v8_patch 23
# 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}
@@ -45,7 +45,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 16
+%global c_ares_minor 17
%global c_ares_patch 1
%global c_ares_version %{c_ares_major}.%{c_ares_minor}.%{c_ares_patch}
@@ -57,19 +57,19 @@
# libuv - from deps/uv/include/uv/version.h
%global libuv_major 1
-%global libuv_minor 40
+%global libuv_minor 41
%global libuv_patch 0
%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 41
+%global nghttp2_minor 42
%global nghttp2_patch 0
%global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch}
# ICU - from tools/icu/current_ver.dep
-%global icu_major 67
-%global icu_minor 1
+%global icu_major 68
+%global icu_minor 2
%global icu_version %{icu_major}.%{icu_minor}
%global icudatadir %{nodejs_datadir}/icudata
@@ -92,7 +92,7 @@
%global npm_epoch 1
%global npm_major 6
%global npm_minor 14
-%global npm_patch 12
+%global npm_patch 13
%global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
# uvwasi - from deps/uvwasi/include/uvwasi.h
@@ -669,6 +669,10 @@ end
%changelog
+* Mon May 17 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.17.0-2
+- Update to 14.17.0
+-
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.m...
+
* Tue Apr 20 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.1-2
- Disable stack execution (bz#1950528)
diff --git a/sources b/sources
index 96692c4..db3ba87 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.16.1-stripped.tar.gz) =
1ec3f503ecd6f8ffa24c3abc04e4e33758e1d577f645dc9c3a22282e3f4755e44169ca54a178fb90e8edb8ef6490d65edc4fd7fcf6ec9b5445d38630b9861a29
-SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
+SHA512 (node-v14.17.0-stripped.tar.gz) =
eb1109d13da376df49f3d0b25c21573585c9aec589e9175e182491211bc5b3fd54980f8002ae85544fa9127b95584c030c8f121b6e2520d5f0feb84ef6dab104
+SHA512 (icu4c-68_2-src.tgz) =
24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
commit b3a32a173864e60e3e3c88c81079b93ec1d44988
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Apr 20 09:43:10 2021 -0400
Truncate %changelog
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index e807c09..4993651 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -686,9 +686,6 @@ end
* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.0-1
- Update to 14.16.0
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:14.15.4-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.15.4-1
- Update to 14.15.4
@@ -750,414 +747,3 @@ end
- Update to 14.0.0
- v14.x should be python3 compatible, so commented out py sed scripts
-* Wed Apr 15 2020 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:13.13.0-1
-- Update to 13.13.0
-- Add bundled uvwasi and histogram_c provides
-- Add shared brotli dependency
-- Remove icustrip.py patch, which was merged in upstream
-
-* Tue Mar 17 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:13.11.0-2
-- Fix python3 issue in icustrip.py
-
-* Mon Mar 16 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:13.11.0-1
-- Update to 13.11.0
-
-* Wed Feb 26 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:13.9.0-2
-- Build with python 3 only
-
-* Tue Feb 25 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:13.9.0-1
-- Release Node.js 13.9.0
-
-* Tue Feb 25 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.16.1-1
-- Update to 12.16.1
-- Fixes six regressions introduced in 12.16.0
-
-* Fri Feb 14 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.16.0-1
-- Update to 12.16.0
-- Drop upstreamed patch
-
-* Thu Feb 06 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.15.0-1
-- Update to 12.15.0
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:12.14.1-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 13 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.14.1-3
-- Fix issue with header symlinks in v8-devel
-
-* Tue Jan 07 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.14.1-2
-- Drop unneeded dependency on http-parser-devel
-
-* Tue Jan 07 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.14.1-1
-- Update to 12.14.1
--
https://github.com/nodejs/node/blob/v12.14.1/doc/changelogs/CHANGELOG_V12.md
-
-* Mon Jan 06 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.14.0-2
-- Update to 12.14.0
--
https://github.com/nodejs/node/blob/v12.14.0/doc/changelogs/CHANGELOG_V12.md
-- Add new subpackage nodejs-full-i18n to enable optional non-English locale
- support
-- Update documentation packaging for NPM
-
-* Mon Dec 02 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.13.1-1
-- Update to 12.13.1
--
https://github.com/nodejs/node/blob/v12.13.1/doc/changelogs/CHANGELOG_V12.md
-
-* Tue Oct 29 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.13.0-6
-- Add proper i18n support
-
-* Tue Oct 29 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.13.0-5
-- Fix issue with NPM docs being replaced with a symlink
-
-* Mon Oct 28 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.13.0-2
-- Simplify npmrc default configuration
-
-* Mon Oct 28 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.13.0-1
-- Update to 12.13.0 (LTS)
--
https://github.com/nodejs/node/blob/v12.13.0/doc/changelogs/CHANGELOG_V12.md
-- NPM no longer clobbers RPM-installed Node.js modules
-- Drop no-longer needed patch to suppress `npm update -g npm` message
-
-* Wed Sep 04 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.10.0-1
-- Update to 12.10.0
--
https://github.com/nodejs/node/blob/v12.10.0/doc/changelogs/CHANGELOG_V12...
-
-* Wed Aug 21 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.9.0-1
-- Update to 12.9.0
--
https://github.com/nodejs/node/blob/v12.9.0/doc/changelogs/CHANGELOG_V12....
-
-* Thu Aug 15 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.8.2-1
-- Update to 12.8.1
-- Resolves: CVE-2019-9511 "Data Dribble"
-- Resolves: CVE-2019-9512 "Ping Flood"
-- Resolves: CVE-2019-9513 "Resource Loop"
-- Resolves: CVE-2019-9514 "Reset Flood"
-- Resolves: CVE-2019-9515 "Settings Flood"
-- Resolves: CVE-2019-9516 "0-Length Headers Leak"
-- Resolves: CVE-2019-9517 "Internal Data Buffering"
-- Resolves: CVE-2019-9518 "Empty Frames Flood"
--
https://github.com/nodejs/node/blob/v12.8.1/doc/changelogs/CHANGELOG_V12....
-
-* Mon Aug 05 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.7.0-3
-- Fix epoch dependencies
-- Carry data files for ICU
-
-* Fri Aug 02 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.7.0-2
-- Change v8-devel release field to avoid duplicated package names
-
-* Thu Aug 01 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.7.0-1
-- Update to 12.7.0
--
https://nodejs.org/en/blog/release/v12.7.0/
-
-* Tue Jul 30 2019 Tom Hughes <tom(a)compton.nu> - 1:12.6.0-2
-- Bump release to fix dependencies
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:12.6.0-1.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.6.0-1
-- Update to 12.6.0
--
https://nodejs.org/en/blog/release/v12.6.0/
--
https://nodejs.org/en/blog/release/v12.5.0/
-
-* Tue Jun 04 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.4.0-1
-- Update to 12.4.0
--
https://nodejs.org/en/blog/release/v12.4.0/
-
-* Fri May 24 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.3.1-1
-- Update to 12.3.1
--
https://nodejs.org/en/blog/release/v12.3.1/
--
https://nodejs.org/en/blog/release/v12.3.0/
-
-* Wed May 15 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.2.0-1
-- Update to 12.2.0
--
https://nodejs.org/en/blog/release/v12.2.0/
-
-* Tue Apr 30 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.1.0-1
-- Update to 12.1.0
--
https://nodejs.org/en/blog/release/v12.1.0/
-
-* Wed Apr 24 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.0.0-3
-- Fix upgrade bug for v8-devel (BZ #1702609)
-
-* Tue Apr 23 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.0.0-2
-- Node.js 12.x requires OpenSSL 1.1.1+
-
-* Tue Apr 23 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:12.0.0-1
-- Release 12.0.0
--
https://nodejs.org/en/blog/release/v12.0.0/
-
-* Thu Apr 11 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:11.13.0-1
-- Update to 11.13.0
--
https://nodejs.org/en/blog/release/v11.13.0/
--
https://nodejs.org/en/blog/release/v11.12.0/
--
https://nodejs.org/en/blog/release/v11.11.0/
-
-* Fri Mar 01 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:11.10.1-1
-- Update to 11.10.1
--
https://nodejs.org/en/blog/release/v11.10.1/
--
https://nodejs.org/en/blog/release/v11.10.0/
--
https://nodejs.org/en/blog/release/v11.9.0/
--
https://nodejs.org/en/blog/release/v11.8.0/
-
-* Fri Jan 18 2019 Stephen Gallagher <sgallagh(a)redhat.com> - 1:11.7.0-1
-- Update to 11.7.0
--
https://nodejs.org/en/blog/release/v11.7.0/
--
https://nodejs.org/en/blog/release/v11.6.0/
--
https://nodejs.org/en/blog/release/v11.5.0/
--
https://nodejs.org/en/blog/release/v11.4.0/
-
-* Thu Nov 29 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:11.3.0-1
-- Update to 11.3.0
--
https://nodejs.org/en/blog/release/v11.2.0/
--
https://nodejs.org/en/blog/release/v11.3.0/
-
-* Fri Nov 02 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:11.1.0-1
-- Update to 11.1.0
--
https://nodejs.org/en/blog/release/v11.1.0/
-
-* Thu Nov 01 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:11.0.0-1
-- Update to 11.0.0
--
https://nodejs.org/en/blog/release/v11.0.0/
-
-* Thu Nov 01 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.13.0-1
-- Update to 10.13.0
--
https://nodejs.org/en/blog/release/v10.13.0/
-
-* Thu Oct 11 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.12.0-1
-- Update to 10.12.0
--
https://nodejs.org/en/blog/release/v10.12.0/
-
-* Wed Oct 10 2018 Jan Staněk <jstanek(a)redhat.com> - 1:10.11.0-2
-- Add non-bootstrap BR for nodejs-packaging
-
-* Thu Sep 20 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.11.0-1
-- Update to 10.11.0
--
https://nodejs.org/en/blog/release/v10.11.0/
-
-* Wed Sep 19 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.10.0-2
-- Really, finally fix npm dep executable permissions
-
-* Tue Sep 11 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.10.0-1
-- Update to 10.10.0
--
https://nodejs.org/en/blog/release/v10.10.0/
-- Fix issue with npm permissions
-
-* Tue Aug 21 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.9.0-2
-- Clean up automatic dependencies for npm
-
-* Thu Aug 16 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.9.0-1
-- Update to 10.9.0
--
https://nodejs.org/en/blog/release/v10.9.0/
-
-* Tue Aug 07 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.8.0-1
-- Update to 10.8.0
--
https://nodejs.org/en/blog/release/v10.8.0/
-
-* Fri Jul 20 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.7.0-4
-- Fix npm upgrade scriptlet
-- Fix unexpected trailing .1 in npm release field
-
-* Fri Jul 20 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.7.0-3
-- Restore annotations to binaries
-- Fix unexpected trailing .1 in release field
-
-* Thu Jul 19 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.7.0-2
-- Update to 10.7.0
--
https://nodejs.org/en/blog/release/v10.7.0/
--
https://nodejs.org/en/blog/release/v10.6.0/
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:10.5.0-1.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 21 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 1:10.4.1-1
-- Update to 10.4.1 to address security issues
--
https://nodejs.org/en/blog/release/v10.4.1/
-- Resolves: rhbz#1590801
-- Resolves: rhbz#1591014
-- Resolves: rhbz#1591019
-
-* Thu Jun 07 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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/
-
-* Tue May 29 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.2.1-2
-- Fix up bare 'python' to be python2
-- Drop redundant entry in docs section
-
-* Fri May 25 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 1:10.2.0-1
-- Update to 10.2.0
--
https://nodejs.org/en/blog/release/v10.2.0/
-
-* Thu May 10 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:10.1.0-3
-- Fix incorrect rpm macro
-
-* Thu May 10 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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 <rdossant(a)redhat.com> - 1:9.11.1-2
-- Use standard Fedora linker flags (bug #1543859)
-
-* Thu Apr 05 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 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 <sgallagh(a)redhat.com> - 1:9.5.0-1
-- Package Node.js 9.5.0
-
-* Thu Jan 11 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.9.4-2
-- Fix incorrect Requires:
-
-* Thu Jan 11 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.9.4-1
-- Update to 8.9.4
--
https://nodejs.org/en/blog/release/v8.9.4/
-- Switch to system copy of nghttp2
-
-* Fri Dec 08 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.9.3-2
-- Update to 8.9.3
--
https://nodejs.org/en/blog/release/v8.9.3/
--
https://nodejs.org/en/blog/release/v8.9.2/
-
-* Thu Nov 30 2017 Pete Walter <pwalter(a)fedoraproject.org> - 1:8.9.1-2
-- Rebuild for ICU 60.1
-
-* Thu Nov 09 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.9.1-1
-- Update to 8.9.1
-
-* Tue Oct 31 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.9.0-1
-- Update to 8.9.0
-- Drop upstreamed patch
-
-* Thu Oct 26 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.8.1-1
-- Update to 8.8.1 to fix a regression
-
-* Wed Oct 25 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.8.0-1
-- Security update to 8.8.0
--
https://nodejs.org/en/blog/release/v8.8.0/
-
-* Sun Oct 15 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.7.0-1
-- Update to 8.7.0
--
https://nodejs.org/en/blog/release/v8.7.0/
-
-* Fri Oct 06 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.6.0-2
-- Use bcond macro instead of bootstrap conditional
-
-* Wed Sep 27 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.6.0-1
-- Fix nghttp2 version
-- Update to 8.6.0
--
https://nodejs.org/en/blog/release/v8.6.0/
-
-* Wed Sep 20 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.5.0-3
-- Build with bootstrap + bundle libuv for modularity
-- backport patch for aarch64 debug build
-
-* Wed Sep 13 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.5.0-2
-- Disable debug builds on aarch64 due to
https://github.com/nodejs/node/issues/15395
-
-* Tue Sep 12 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.5.0-1
-- Update to v8.5.0
--
https://nodejs.org/en/blog/release/v8.5.0/
-
-* Thu Sep 07 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.4.0-2
-- Refactor openssl BR
-
-* Wed Aug 16 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.4.0-1
-- Update to v8.4.0
--
https://nodejs.org/en/blog/release/v8.4.0/
-- http2 is now supported, add bundled nghttp2
-- remove openssl 1.0.1 patches, we won't be using them in fedora
-
-* Thu Aug 10 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.3.0-1
-- Update to v8.3.0
--
https://nodejs.org/en/blog/release/v8.3.0/
-- update V8 to 6.0
-- update minimal gcc and g++ requirements to 4.9.4
-
-* Wed Aug 09 2017 Tom Hughes <tom(a)compton.nu> - 1:8.2.1-2
-- Bump release to fix broken dependencies
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:8.2.1-1.2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:8.2.1-1.1
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Jul 21 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.2.1-1
-- Update to v8.2.1
--
https://nodejs.org/en/blog/release/v8.2.1/
-
-* Thu Jul 20 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.2.0-1
-- Update to v8.2.0
--
https://nodejs.org/en/blog/release/v8.2.0/
-- Update npm to 5.3.0
-- Adds npx command
-
-* Tue Jul 18 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 1:8.1.4-3
-- s/BuildRequires/Requires/ for http-parser-devel%%{?_isa}
-
-* Mon Jul 17 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.1.4-2
-- Rename python-devel to python2-devel
-- own %%{_pkgdocdir}/npm
-
-* Tue Jul 11 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.1.4-1
-- Update to v8.1.4
--
https://nodejs.org/en/blog/release/v8.1.4/
-- Drop upstreamed c-ares patch
-
-* Thu Jun 29 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.1.3-1
-- Update to v8.1.3
--
https://nodejs.org/en/blog/release/v8.1.3/
-
-* Wed Jun 28 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.1.2-1
-- Update to v8.1.2
-- remove GCC 7 patch, as it is now fixed in node >= 6.12
-
commit 32edd143c20830bf393c7563daa1a2ca024b0eb2
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Apr 20 09:35:18 2021 -0400
Disable stack execution
Resolves: rhbz#1950528
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/0001-Disable-running-gyp-on-shared-deps.patch
b/0001-Disable-running-gyp-on-shared-deps.patch
index 361ea08..1b5cf73 100644
--- a/0001-Disable-running-gyp-on-shared-deps.patch
+++ b/0001-Disable-running-gyp-on-shared-deps.patch
@@ -1,7 +1,7 @@
-From b0b4d1ddbc720db73fb8ab13cdbbf1ce6524eebd Mon Sep 17 00:00:00 2001
+From 0a889af5ee18290d833f7f63742d5b714bdb1a40 Mon Sep 17 00:00:00 2001
From: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Fri, 17 Apr 2020 12:59:44 +0200
-Subject: [PATCH 1/2] Disable running gyp on shared deps
+Subject: [PATCH 1/3] Disable running gyp on shared deps
---
Makefile | 2 +-
@@ -25,5 +25,5 @@ index
93d63110ae2e3928a95d24036b86d11885ab240f..79caaec2112cefa8f6a1c947375b517e
# node_version.h is listed because the N-API version is taken from there
--
-2.29.2
+2.31.1
diff --git a/0002-Install-both-binaries-and-use-libdir.patch
b/0002-Install-both-binaries-and-use-libdir.patch
index 1dc8b12..9679f8b 100644
--- a/0002-Install-both-binaries-and-use-libdir.patch
+++ b/0002-Install-both-binaries-and-use-libdir.patch
@@ -1,7 +1,7 @@
-From 45a9bca165f6ed76c4e43cc2cc3fdf596814bc77 Mon Sep 17 00:00:00 2001
+From 4012d5b9ae521f36c8b0155f591a38383e84407b Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue, 19 Mar 2019 23:22:40 -0400
-Subject: [PATCH 2/2] Install both binaries and use libdir.
+Subject: [PATCH 2/3] Install both binaries and use libdir.
This allows us to build with a shared library for other users while
still providing the normal executable.
@@ -86,5 +86,5 @@ index
729b416fc47d3ff3317ae3671dee977c719a8841..9bfc6234edb7732f9b90f063c2ee4a27
# behave similarly for systemtap
--
-2.29.2
+2.31.1
diff --git a/0003-src-add-.note.GNU-stack-section.patch
b/0003-src-add-.note.GNU-stack-section.patch
new file mode 100644
index 0000000..74fd28f
--- /dev/null
+++ b/0003-src-add-.note.GNU-stack-section.patch
@@ -0,0 +1,45 @@
+From 6aa11a8cf48463432c0b5c6bfca5c2a5b18b1cc7 Mon Sep 17 00:00:00 2001
+From: James Addison <jay(a)jp-hosting.net>
+Date: Tue, 9 Mar 2021 13:08:47 +0000
+Subject: [PATCH 3/3] src: add .note.GNU-stack section
+
+This indicates to GNU binutils that it can unset the executable stack
+flag on the binary that it is building.
+
+PR-URL:
https://github.com/nodejs/node/pull/37688
+Refs:
https://github.com/nodejs/node/issues/17933
+Reviewed-By: Daniel Bevenius <daniel.bevenius(a)gmail.com>
+
+src: Use %progbits instead of @progbits
+
+While @progbits is preferred for most architectures, there are some
+(notably 32-bit ARM) for which it does not. %progbits is effective
+everywhere.
+
+See
https://bugzilla.redhat.com/show_bug.cgi?id=1950528 for more
+details.
+
+Related:
https://github.com/nodejs/node/issues/17933
+Related:
https://github.com/nodejs/node/pull/37688
+
+Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
+---
+ src/large_pages/node_text_start.S | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/large_pages/node_text_start.S b/src/large_pages/node_text_start.S
+index 1609b254f0495a32f8896ba96d96bad03f6f2321..d27dd39cc236f0e6be4e68113bfff7b531a37455
100644
+--- a/src/large_pages/node_text_start.S
++++ b/src/large_pages/node_text_start.S
+@@ -1,5 +1,8 @@
++#if defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+ .text
+ .align 0x2000
+ .global __node_text_start
+ .hidden __node_text_start
+ __node_text_start:
+--
+2.31.1
+
diff --git a/nodejs.spec b/nodejs.spec
index a4eb5e2..e807c09 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -8,7 +8,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 1
+%global baserelease 2
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -145,6 +145,10 @@ Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
# Patch to install both node and libnode.so, using the correct libdir
Patch2: 0002-Install-both-binaries-and-use-libdir.patch
+# Patch to disable stack execution. Merged from one upstream patch and
+# one upstream proposed patch
+Patch3: 0003-src-add-.note.GNU-stack-section.patch
+
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: python3-setuptools
@@ -665,6 +669,9 @@ end
%changelog
+* Tue Apr 20 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.1-2
+- Disable stack execution (bz#1950528)
+
* Thu Apr 08 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.1-1
- Update to 14.16.1
commit 4fb06444126942877fd999911ffdc1edde41a5e2
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Mon Jan 18 12:47:39 2021 -0500
Simplify handling of unversioned python
Now that /usr/bin/python == python3, we can just BR: the
python-unversioned-command package instead of doing a complicated
search and replace through the codebase.
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index 10fdeaa..a4eb5e2 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -1,6 +1,5 @@
# bundle dependencies that are not available as Fedora modules
%bcond_with bootstrap
-%bcond_without python3_fixup
# LTO is currently broken on Node.js builds
%define _lto_cflags %{nil}
@@ -149,6 +148,7 @@ Patch2: 0002-Install-both-binaries-and-use-libdir.patch
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: python3-setuptools
+BuildRequires: python-unversioned-command
BuildRequires: zlib-devel
BuildRequires: brotli-devel
BuildRequires: gcc >= 6.3.0
@@ -358,16 +358,6 @@ The API documentation for the Node.js JavaScript runtime.
rm -rf deps/zlib
rm -rf deps/brotli
-# Replace any instances of unversioned python' with python3
-%if %{with python3_fixup}
-pathfix.py -i %{__python3} -pn $(find -type f ! -name "*.js")
-find . -type f -exec sed -i "s~/usr\/bin\/env python~/usr/bin/python3~" {} \;
-find . -type f -exec sed -i "s~/usr\/bin\/python\W~/usr/bin/python3~" {} \;
-sed -i "s~python~python3~" $(find . -type f | grep "gyp$")
-sed -i "s~usr\/bin\/python2~usr\/bin\/python3~"
./deps/v8/tools/gen-inlining-tests.py
-sed -i "s~usr\/bin\/python.*$~usr\/bin\/python3~"
./deps/v8/tools/mb/mb_unittest.py
-find . -type f -exec sed -i "s~python -c~python3 -c~" {} \;
-%endif
%build
# When compiled on armv7hl this package generates an out of range
commit 3ce811c32fe85e6689e386345f72b30127321727
Merge: d51feae 0e63a14
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Thu Apr 8 12:26:38 2021 -0400
Merge branch '14' into rawhide
diff --cc nodejs.spec
index 80b9828,c2d4caf..10fdeaa
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -675,9 -675,9 +675,12 @@@ en
%changelog
+ * Thu Apr 08 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.1-1
+ - Update to 14.16.1
+
+* Wed Mar 31 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1:14.16.0-4
+- Rebuilt for removed libstdc++ symbols (#1937698)
+
* Tue Mar 09 2021 Zuzana Svetlikova <zsvetlik(a)redhat.com - 1:14.16.0-3
- Only require nodejs-packaging on Fedora
- remove --debug-nghttp2 (#1930775)
commit 0e63a1498397f5001f7298bc5f7c5ba39563d17c
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Thu Apr 8 12:25:10 2021 -0400
Fix package.cfg
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/package.cfg b/package.cfg
index ceab82f..5e7e859 100644
--- a/package.cfg
+++ b/package.cfg
@@ -1,2 +1,2 @@
[koji]
-targets = master f34 f33
+targets = rawhide f34 f33
commit 37e035e7684ee405ab3b90e4f6cc2ffe0940faa5
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Thu Apr 8 12:23:11 2021 -0400
Update to 14.16.1
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index 730889d..c2d4caf 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -9,7 +9,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 3
+%global baserelease 1
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -21,7 +21,7 @@
%global nodejs_epoch 1
%global nodejs_major 14
%global nodejs_minor 16
-%global nodejs_patch 0
+%global nodejs_patch 1
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 83
@@ -93,7 +93,7 @@
%global npm_epoch 1
%global npm_major 6
%global npm_minor 14
-%global npm_patch 11
+%global npm_patch 12
%global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
# uvwasi - from deps/uvwasi/include/uvwasi.h
@@ -675,6 +675,9 @@ end
%changelog
+* Thu Apr 08 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.1-1
+- Update to 14.16.1
+
* Tue Mar 09 2021 Zuzana Svetlikova <zsvetlik(a)redhat.com - 1:14.16.0-3
- Only require nodejs-packaging on Fedora
- remove --debug-nghttp2 (#1930775)
diff --git a/sources b/sources
index b355517..96692c4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.16.0-stripped.tar.gz) =
817683b85eb47aa976f90b26e6e4a582ad67e7a2f48841be7ca378af46e87434d55fbc894e262889d07283775946348cb3fad152c488ce0c2199eba742018094
+SHA512 (node-v14.16.1-stripped.tar.gz) =
1ec3f503ecd6f8ffa24c3abc04e4e33758e1d577f645dc9c3a22282e3f4755e44169ca54a178fb90e8edb8ef6490d65edc4fd7fcf6ec9b5445d38630b9861a29
SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
commit d51feaec0d8b415a6392576bc5790ede5a994a98
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Wed Mar 31 17:35:43 2021 +0100
Rebuilt for removed libstdc++ symbols (#1937698)
diff --git a/nodejs.spec b/nodejs.spec
index 730889d..80b9828 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -9,7 +9,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 3
+%global baserelease 4
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -675,6 +675,9 @@ end
%changelog
+* Wed Mar 31 2021 Jonathan Wakely <jwakely(a)redhat.com> - 1:14.16.0-4
+- Rebuilt for removed libstdc++ symbols (#1937698)
+
* Tue Mar 09 2021 Zuzana Svetlikova <zsvetlik(a)redhat.com - 1:14.16.0-3
- Only require nodejs-packaging on Fedora
- remove --debug-nghttp2 (#1930775)
commit 562828877ed4f5cfa589da19a7001785f8b22008
Author: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Tue Mar 9 18:26:30 2021 +0100
Only require nodejs-packaging on Fedora
remove --debug-nghttp2 (#1930775)
always build with systemtap
diff --git a/nodejs.spec b/nodejs.spec
index dabb932..730889d 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -9,7 +9,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 2
+%global baserelease 3
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -159,12 +159,12 @@ BuildRequires: gcc-c++ >= 6.3.0
BuildRequires: nodejs-packaging
BuildRequires: chrpath
BuildRequires: libatomic
+BuildRequires: systemtap-sdt-devel
%if %{with bootstrap}
Provides: bundled(libuv) = %{libuv_version}
Provides: bundled(nghttp2) = %{nghttp2_version}
%else
-BuildRequires: systemtap-sdt-devel
BuildRequires: libuv-devel >= 1:%{libuv_version}
Requires: libuv >= 1:%{libuv_version}
BuildRequires: libnghttp2-devel >= %{nghttp2_version}
@@ -235,8 +235,10 @@ Provides: bundled(icu) = %{icu_version}
Provides: bundled(uvwasi) = %{uvwasi_version}
Provides: bundled(histogram) = %{histogram_version}
+%if 0%{?fedora}
# Make sure to pull in the appropriate packaging macros when building RPMs
Requires: (nodejs-packaging if rpm-build)
+%endif
# Make sure we keep NPM up to date when we update Node.js
Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
@@ -412,7 +414,6 @@ export LDFLAGS="%{build_ldflags}"
--shared-brotli \
--without-dtrace \
--with-intl=small-icu \
- --debug-nghttp2 \
--openssl-use-def-ca-store
%else
%{__python3} configure.py --prefix=%{_prefix} \
@@ -426,7 +427,6 @@ export LDFLAGS="%{build_ldflags}"
--with-dtrace \
--with-intl=small-icu \
--with-icu-default-data-dir=%{icudatadir} \
- --debug-nghttp2 \
--openssl-use-def-ca-store
%endif
@@ -675,6 +675,11 @@ end
%changelog
+* Tue Mar 09 2021 Zuzana Svetlikova <zsvetlik(a)redhat.com - 1:14.16.0-3
+- Only require nodejs-packaging on Fedora
+- remove --debug-nghttp2 (#1930775)
+- always build with systemtap
+
* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.0-1
- Update to 14.16.0
commit 095039c5a9ea57e731cd96b54d204dec1ca29333
Author: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Tue Mar 9 18:26:30 2021 +0100
Only require nodejs-packaging on Fedora
remove --debug-nghttp2 (#1930775)
always build with systemtap
diff --git a/nodejs.spec b/nodejs.spec
index dabb932..730889d 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -9,7 +9,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 2
+%global baserelease 3
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -159,12 +159,12 @@ BuildRequires: gcc-c++ >= 6.3.0
BuildRequires: nodejs-packaging
BuildRequires: chrpath
BuildRequires: libatomic
+BuildRequires: systemtap-sdt-devel
%if %{with bootstrap}
Provides: bundled(libuv) = %{libuv_version}
Provides: bundled(nghttp2) = %{nghttp2_version}
%else
-BuildRequires: systemtap-sdt-devel
BuildRequires: libuv-devel >= 1:%{libuv_version}
Requires: libuv >= 1:%{libuv_version}
BuildRequires: libnghttp2-devel >= %{nghttp2_version}
@@ -235,8 +235,10 @@ Provides: bundled(icu) = %{icu_version}
Provides: bundled(uvwasi) = %{uvwasi_version}
Provides: bundled(histogram) = %{histogram_version}
+%if 0%{?fedora}
# Make sure to pull in the appropriate packaging macros when building RPMs
Requires: (nodejs-packaging if rpm-build)
+%endif
# Make sure we keep NPM up to date when we update Node.js
Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
@@ -412,7 +414,6 @@ export LDFLAGS="%{build_ldflags}"
--shared-brotli \
--without-dtrace \
--with-intl=small-icu \
- --debug-nghttp2 \
--openssl-use-def-ca-store
%else
%{__python3} configure.py --prefix=%{_prefix} \
@@ -426,7 +427,6 @@ export LDFLAGS="%{build_ldflags}"
--with-dtrace \
--with-intl=small-icu \
--with-icu-default-data-dir=%{icudatadir} \
- --debug-nghttp2 \
--openssl-use-def-ca-store
%endif
@@ -675,6 +675,11 @@ end
%changelog
+* Tue Mar 09 2021 Zuzana Svetlikova <zsvetlik(a)redhat.com - 1:14.16.0-3
+- Only require nodejs-packaging on Fedora
+- remove --debug-nghttp2 (#1930775)
+- always build with systemtap
+
* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.0-1
- Update to 14.16.0
commit 867d4da14b272bfdc3514a5decad078503d06328
Merge: 44f3bfe a630cd6
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Feb 23 13:57:03 2021 -0500
Merge branch '14' into rawhide
diff --cc nodejs.spec
index 210889e,8c8be0a..dabb932
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -675,9 -674,9 +675,12 @@@ en
%changelog
+ * Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.0-1
+ - Update to 14.16.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:14.15.4-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.15.4-1
- Update to 14.15.4
commit a630cd6af9c313edbebc198215cc87e4e96f9c24
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Feb 23 13:53:36 2021 -0500
Update to 14.16.0
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index 6717f99..8c8be0a 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -20,8 +20,8 @@
# than a Fedora release lifecycle.
%global nodejs_epoch 1
%global nodejs_major 14
-%global nodejs_minor 15
-%global nodejs_patch 4
+%global nodejs_minor 16
+%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 83
@@ -93,7 +93,7 @@
%global npm_epoch 1
%global npm_major 6
%global npm_minor 14
-%global npm_patch 10
+%global npm_patch 11
%global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
# uvwasi - from deps/uvwasi/include/uvwasi.h
@@ -674,6 +674,9 @@ end
%changelog
+* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.16.0-1
+- Update to 14.16.0
+
* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.15.4-1
- Update to 14.15.4
diff --git a/package.cfg b/package.cfg
index dfe80fb..ceab82f 100644
--- a/package.cfg
+++ b/package.cfg
@@ -1,2 +1,2 @@
[koji]
-targets = master f33
+targets = master f34 f33
diff --git a/sources b/sources
index 3547e12..b355517 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.15.4-stripped.tar.gz) =
2c1d9b67e6b9bbdd960eeb82edfb02c237a7c7190407cf60bf14b02eb2b6143159b6f45e7bddb7c97120eab4faa37455534ab8b90bd4161b6d66dab0a72b122e
+SHA512 (node-v14.16.0-stripped.tar.gz) =
817683b85eb47aa976f90b26e6e4a582ad67e7a2f48841be7ca378af46e87434d55fbc894e262889d07283775946348cb3fad152c488ce0c2199eba742018094
SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
commit 44f3bfe9c7a4919bd088aa95b52546960aa030fb
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 21:35:49 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/nodejs.spec b/nodejs.spec
index 00a12d8..210889e 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -9,7 +9,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 1
+%global baserelease 2
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -675,6 +675,9 @@ end
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:14.15.4-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.15.4-1
- Update to 14.15.4
commit c2e87c433405746eed5667023febc41fd04dc08a
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Thu Jan 7 05:55:20 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/nodejs.spec b/nodejs.spec
index 6717f99..00a12d8 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -146,6 +146,7 @@ Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
# Patch to install both node and libnode.so, using the correct libdir
Patch2: 0002-Install-both-binaries-and-use-libdir.patch
+BuildRequires: make
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: zlib-devel
commit 9f1a56347d44c7841a0d9615b0cdcbd7c17d66c1
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Mon Jan 4 15:58:35 2021 -0500
Disable LTO
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index dcc511d..6717f99 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -2,11 +2,8 @@
%bcond_with bootstrap
%bcond_without python3_fixup
-# LTO is currently broken on aarch64 builds
-%ifarch aarch64
+# LTO is currently broken on Node.js builds
%define _lto_cflags %{nil}
-%endif
-
# == Master Relase ==
# This is used by both the nodejs package and the npm subpackage thar
commit 74b49c257f94c38b880f43e7e44d4439da4a65fe
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Mon Jan 4 15:18:59 2021 -0500
Update to 14.15.4
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/0001-Disable-running-gyp-on-shared-deps.patch
b/0001-Disable-running-gyp-on-shared-deps.patch
index ef45163..361ea08 100644
--- a/0001-Disable-running-gyp-on-shared-deps.patch
+++ b/0001-Disable-running-gyp-on-shared-deps.patch
@@ -1,18 +1,20 @@
-From 65f5eb67f4691ab535cc00240a00bd33efe29969 Mon Sep 17 00:00:00 2001
+From b0b4d1ddbc720db73fb8ab13cdbbf1ce6524eebd Mon Sep 17 00:00:00 2001
From: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Fri, 17 Apr 2020 12:59:44 +0200
-Subject: [PATCH] 0001
+Subject: [PATCH 1/2] Disable running gyp on shared deps
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 34cdec7f7767b5152678adaeea10a8cf711fb9a8..3b548907033108831e99e054bc84d3ce91daa25c
100644
+index 93d63110ae2e3928a95d24036b86d11885ab240f..79caaec2112cefa8f6a1c947375b517e9676f176
100644
--- a/Makefile
+++ b/Makefile
-@@ -141,7 +141,7 @@ test-code-cache: with-code-cache
- echo "'test-code-cache' target is a noop"
+@@ -136,11 +136,11 @@ endif
+ .PHONY: test-code-cache
+ with-code-cache test-code-cache:
+ $(warning '$@' target is a noop)
out/Makefile: config.gypi common.gypi node.gyp \
- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
@@ -20,6 +22,8 @@ index
34cdec7f7767b5152678adaeea10a8cf711fb9a8..3b548907033108831e99e054bc84d3ce
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
$(PYTHON) tools/gyp_node.py -f make
+
+ # node_version.h is listed because the N-API version is taken from there
--
-2.25.2
+2.29.2
diff --git a/0002-Install-both-binaries-and-use-libdir.patch
b/0002-Install-both-binaries-and-use-libdir.patch
index b3441a7..1dc8b12 100644
--- a/0002-Install-both-binaries-and-use-libdir.patch
+++ b/0002-Install-both-binaries-and-use-libdir.patch
@@ -1,4 +1,4 @@
-From 0b315d55b13d098ce8f3e96d501aeb33152a9e00 Mon Sep 17 00:00:00 2001
+From 45a9bca165f6ed76c4e43cc2cc3fdf596814bc77 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue, 19 Mar 2019 23:22:40 -0400
Subject: [PATCH 2/2] Install both binaries and use libdir.
@@ -9,14 +9,16 @@ still providing the normal executable.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
---
configure.py | 7 +++++++
- tools/install.py | 29 +++++++++++++----------------
- 2 files changed, 20 insertions(+), 16 deletions(-)
+ tools/install.py | 21 +++++++++------------
+ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/configure.py b/configure.py
-index beb08df0884f7693b6c07d7fb5e85ae7bdcd1d7d..9e364586d4f79322fe53f41915ed7aad0e23a30d
100755
+index e6f7e4db0040dda00e432352afa7576535d9b672..6cf5c45dde79ce355b532c2f11b5b7ed80fde88a
100755
--- a/configure.py
+++ b/configure.py
-@@ -582,6 +582,12 @@ parser.add_option('--shared',
+@@ -624,10 +624,16 @@ parser.add_option('--shared',
+ action='store_true',
+ dest='shared',
help='compile shared library for embedding node in another project. ' +
'(This mode is not officially supported for regular applications)')
@@ -29,7 +31,11 @@ index
beb08df0884f7693b6c07d7fb5e85ae7bdcd1d7d..9e364586d4f79322fe53f41915ed7aad
parser.add_option('--without-v8-platform',
action='store_true',
dest='without_v8_platform',
-@@ -1124,6 +1130,7 @@ def configure_node(o):
+ default=False,
+ help='do not initialize v8 platform during node.js startup. ' +
+@@ -1200,10 +1206,11 @@ def configure_node(o):
+ o['variables']['debug_nghttp2'] = 'false'
+
o['variables']['node_no_browser_globals'] =
b(options.no_browser_globals)
o['variables']['node_shared'] = b(options.shared)
@@ -37,11 +43,15 @@ index
beb08df0884f7693b6c07d7fb5e85ae7bdcd1d7d..9e364586d4f79322fe53f41915ed7aad
node_module_version = getmoduleversion.get_version()
if options.dest_os == 'android':
+ shlib_suffix = 'so'
+ elif sys.platform == 'darwin':
diff --git a/tools/install.py b/tools/install.py
-index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..fe4723bf15012c8aacacb0393dc8294c049b0503
100755
+index 729b416fc47d3ff3317ae3671dee977c719a8841..9bfc6234edb7732f9b90f063c2ee4a276e840636
100755
--- a/tools/install.py
+++ b/tools/install.py
-@@ -121,26 +121,23 @@ def subdir_files(path, dest, action):
+@@ -119,26 +119,23 @@ def subdir_files(path, dest, action):
+ for subdir, files_in_path in ret.items():
+ action(files_in_path, subdir + '/')
def files(action):
is_windows = sys.platform == 'win32'
@@ -60,16 +70,8 @@ index
655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..fe4723bf15012c8aacacb0393dc8294c
- output_file += '.dll'
- else:
- output_file = 'lib' + output_file + '.' +
variables.get('shlib_suffix')
-- # GYP will output to lib.target except on OS X, this is hardcoded
-- # in its source - see the _InstallableTargetInstallPath function.
-- if sys.platform != 'darwin':
-- output_prefix += 'lib.target/'
+ output_bin = 'node'
+ output_lib = 'libnode.' + variables.get('shlib_suffix')
-+ # GYP will output to lib.target except on OS X, this is hardcoded
-+ # in its source - see the _InstallableTargetInstallPath function.
-+ if sys.platform != 'darwin':
-+ output_libprefix += 'lib.target/'
- if 'false' == variables.get('node_shared'):
- action([output_prefix + output_file], 'bin/' + output_file)
@@ -81,6 +83,8 @@ index
655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..fe4723bf15012c8aacacb0393dc8294c
if 'true' == variables.get('node_use_dtrace'):
action(['out/Release/node.d'], 'lib/dtrace/node.d')
+
+ # behave similarly for systemtap
--
-2.24.1
+2.29.2
diff --git a/nodejs.spec b/nodejs.spec
index 9ba5ae5..dcc511d 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -24,7 +24,7 @@
%global nodejs_epoch 1
%global nodejs_major 14
%global nodejs_minor 15
-%global nodejs_patch 1
+%global nodejs_patch 4
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 83
@@ -96,7 +96,7 @@
%global npm_epoch 1
%global npm_major 6
%global npm_minor 14
-%global npm_patch 8
+%global npm_patch 10
%global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
# uvwasi - from deps/uvwasi/include/uvwasi.h
@@ -677,6 +677,9 @@ end
%changelog
+* Mon Jan 04 2021 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.15.4-1
+- Update to 14.15.4
+
* Wed Dec 02 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.15.1-1
- Update to 14.15.1
diff --git a/sources b/sources
index 7478cbc..3547e12 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.15.1-stripped.tar.gz) =
aa07a49485a0fecc282173b8b6d915b912a19191446ed6f4684d979e4baebadb7708a338410c2c42ee81d8395db6cfaf9b0879baea9e652dd97f7811a077975d
+SHA512 (node-v14.15.4-stripped.tar.gz) =
2c1d9b67e6b9bbdd960eeb82edfb02c237a7c7190407cf60bf14b02eb2b6143159b6f45e7bddb7c97120eab4faa37455534ab8b90bd4161b6d66dab0a72b122e
SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
commit d4fae2de5af42fef0048e8ff5290f76df0e9e4ba
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed Dec 2 20:53:53 2020 -0500
Update to 14.15.1
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index 0aa6bfb..9ba5ae5 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -12,7 +12,7 @@
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 2
+%global baserelease 1
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -23,8 +23,8 @@
# than a Fedora release lifecycle.
%global nodejs_epoch 1
%global nodejs_major 14
-%global nodejs_minor 14
-%global nodejs_patch 0
+%global nodejs_minor 15
+%global nodejs_patch 1
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 83
@@ -677,6 +677,9 @@ end
%changelog
+* Wed Dec 02 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.15.1-1
+- Update to 14.15.1
+
* Tue Oct 20 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.14.0-2
- Don't build with LTO on aarch64
diff --git a/sources b/sources
index 74190a6..7478cbc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.14.0-stripped.tar.gz) =
208bcc585e6e8a25a656d942424afa26aa7442a6252c428c01081e3f052998363d3126e290576493bb8fcc3e2944026013cf7a5757113a8717574cefdaa72c31
+SHA512 (node-v14.15.1-stripped.tar.gz) =
aa07a49485a0fecc282173b8b6d915b912a19191446ed6f4684d979e4baebadb7708a338410c2c42ee81d8395db6cfaf9b0879baea9e652dd97f7811a077975d
SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
commit a042b795522128838140f15a3019f0cc42a63781
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Oct 20 08:52:25 2020 -0400
Don't build with LTO on aarch64
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index 96bfaff..0aa6bfb 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -2,12 +2,17 @@
%bcond_with bootstrap
%bcond_without python3_fixup
+# LTO is currently broken on aarch64 builds
+%ifarch aarch64
+%define _lto_cflags %{nil}
+%endif
+
# == Master Relase ==
# This is used by both the nodejs package and the npm subpackage thar
# has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end.
-%global baserelease 1
+%global baserelease 2
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -672,6 +677,9 @@ end
%changelog
+* Tue Oct 20 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.14.0-2
+- Don't build with LTO on aarch64
+
* Mon Oct 19 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.14.0-1
- Update to 14.14.0
commit ab1676bdb39acbfb7184338364769f22e5277599
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Mon Oct 19 09:37:56 2020 -0400
Update to 14.14.0
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index 600e725..96bfaff 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -18,8 +18,8 @@
# than a Fedora release lifecycle.
%global nodejs_epoch 1
%global nodejs_major 14
-%global nodejs_minor 13
-%global nodejs_patch 1
+%global nodejs_minor 14
+%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 83
@@ -672,6 +672,9 @@ end
%changelog
+* Mon Oct 19 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.14.0-1
+- Update to 14.14.0
+
* Fri Oct 09 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.13.1-1
- Update to 14.13.1
diff --git a/sources b/sources
index 703a43d..74190a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.13.1-stripped.tar.gz) =
eae37da105b0a176353c53d96ce081f6d018f9abe90476fa7396be7d3cf9b6d863d6edac4f67f09d384a717c6491f0c250b25e588dd449750bd70da6180ca35f
+SHA512 (node-v14.14.0-stripped.tar.gz) =
208bcc585e6e8a25a656d942424afa26aa7442a6252c428c01081e3f052998363d3126e290576493bb8fcc3e2944026013cf7a5757113a8717574cefdaa72c31
SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
commit 52d3230036dd6bdc1c3b16ab7df8007696af8eef
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Fri Oct 9 09:44:18 2020 -0400
Update to 14.13.1
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index ebdbac5..600e725 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -19,7 +19,7 @@
%global nodejs_epoch 1
%global nodejs_major 14
%global nodejs_minor 13
-%global nodejs_patch 0
+%global nodejs_patch 1
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
%global nodejs_soversion 83
@@ -51,7 +51,7 @@
# llhttp - from deps/llhttp/include/llhttp.h
%global llhttp_major 2
%global llhttp_minor 1
-%global llhttp_patch 2
+%global llhttp_patch 3
%global llhttp_version %{llhttp_major}.%{llhttp_minor}.%{llhttp_patch}
# libuv - from deps/uv/include/uv/version.h
@@ -672,6 +672,9 @@ end
%changelog
+* Fri Oct 09 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.13.1-1
+- Update to 14.13.1
+
* Thu Oct 01 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.13.0-1
- Update to 14.13.0
diff --git a/sources b/sources
index ae6c258..703a43d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.13.0-stripped.tar.gz) =
be305a7e636a1f04e34b675d905be526f6370a94642bffa19c899e0885d58ddca3eb171765307238a6572cda7efceec2a6aaebf7af2e7a5ad617dee6124500ca
+SHA512 (node-v14.13.1-stripped.tar.gz) =
eae37da105b0a176353c53d96ce081f6d018f9abe90476fa7396be7d3cf9b6d863d6edac4f67f09d384a717c6491f0c250b25e588dd449750bd70da6180ca35f
SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
commit 3781c81a5cccd262ea984b11219c5419b9c6fc4d
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Mon Oct 5 09:40:46 2020 -0400
Add explicit setuptools dep
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index b66b6f2..ebdbac5 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -145,6 +145,7 @@ Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
Patch2: 0002-Install-both-binaries-and-use-libdir.patch
BuildRequires: python3-devel
+BuildRequires: python3-setuptools
BuildRequires: zlib-devel
BuildRequires: brotli-devel
BuildRequires: gcc >= 6.3.0
commit 2cd44ffc6bf6d8b291a848189b31cc8f16771ca7
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Thu Oct 1 13:36:19 2020 -0400
Update to 14.13.0
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index c7ca6db..fdd7ef0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*~
+*.swp
/*.tar.gz
/*.src.rpm
/*.tgz
diff --git a/nodejs.spec b/nodejs.spec
index 2918a64..b66b6f2 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -18,7 +18,7 @@
# than a Fedora release lifecycle.
%global nodejs_epoch 1
%global nodejs_major 14
-%global nodejs_minor 11
+%global nodejs_minor 13
%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
@@ -45,7 +45,7 @@
#
https://github.com/nodejs/node/pull/9332
%global c_ares_major 1
%global c_ares_minor 16
-%global c_ares_patch 0
+%global c_ares_patch 1
%global c_ares_version %{c_ares_major}.%{c_ares_minor}.%{c_ares_patch}
# llhttp - from deps/llhttp/include/llhttp.h
@@ -56,7 +56,7 @@
# libuv - from deps/uv/include/uv/version.h
%global libuv_major 1
-%global libuv_minor 39
+%global libuv_minor 40
%global libuv_patch 0
%global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
@@ -97,7 +97,7 @@
# uvwasi - from deps/uvwasi/include/uvwasi.h
%global uvwasi_major 0
%global uvwasi_minor 0
-%global uvwasi_patch 10
+%global uvwasi_patch 11
%global uvwasi_version %{uvwasi_major}.%{uvwasi_minor}.%{uvwasi_patch}
# histogram_c - assumed from timestamps
@@ -671,6 +671,9 @@ end
%changelog
+* Thu Oct 01 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.13.0-1
+- Update to 14.13.0
+
* Wed Sep 16 2020 Stephen Gallagher <sgallagh(a)redhat.com> - 1:14.11.0-1
- Update to 14.11.0
diff --git a/sources b/sources
index 5aae63e..ae6c258 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (node-v14.11.0-stripped.tar.gz) =
0ac5496eed70d6d00b0d71fed6f07395d96a4fd1d7efdf2598ba66964f04bbabadbf465e26d07e80856ae825794ed740e607d63bdf8f2b2e64f80171d71851f0
+SHA512 (node-v14.13.0-stripped.tar.gz) =
be305a7e636a1f04e34b675d905be526f6370a94642bffa19c899e0885d58ddca3eb171765307238a6572cda7efceec2a6aaebf7af2e7a5ad617dee6124500ca
SHA512 (icu4c-67_1-src.tgz) =
4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
commit 78306ffa5a3b1bf9853313bea9b8973043733d78
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Thu Sep 17 11:55:27 2020 -0400
Drop old pretrans scriptlet
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index e3750ba..2918a64 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -585,24 +585,6 @@ if st and st.type == "directory" then
end
-%pretrans -n v8-devel -p <lua>
--- Replace the v8 libplatform include directory with a symlink
--- Drop this scriptlet when F30 is EOL
-path = "%{_includedir}/libplatform"
-st = posix.stat(path)
-if st and st.type == "directory" then
- status = os.rename(path, path .. ".rpmmoved")
- if not status then
- suffix = 0
- while not status do
- suffix = suffix + 1
- status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." ..
suffix)
- end
- os.rename(path, path .. ".rpmmoved")
- end
-end
-
-
%files
%{_bindir}/node
%dir %{_prefix}/lib/node_modules
@@ -652,7 +634,6 @@ end
%{_libdir}/libv8.so
%{_libdir}/libv8_libbase.so
%{_libdir}/libv8_libplatform.so
-%ghost %{_includedir}/libplatform.rpmmoved
%files -n npm
commit af60d955d99018b81098bf0f8bf08e8a8e99de75
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed Sep 16 08:55:53 2020 -0400
Add package.cfg
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/package.cfg b/package.cfg
new file mode 100644
index 0000000..dfe80fb
--- /dev/null
+++ b/package.cfg
@@ -0,0 +1,2 @@
+[koji]
+targets = master f33