rpms/nodejs20
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 6.11.0, remove merged system CA patch

Browse Source
This commit is contained in:
Zuzana Svetlikova 2017-06-09 12:59:25 +02:00
parent 982c552804
commit 8cf702090d
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -67,3 +67,4 @@
/node-v6.10.1-stripped.tar.gz /node-v6.10.1-stripped.tar.gz
/node-v6.10.2-stripped.tar.gz /node-v6.10.2-stripped.tar.gz
/node-v6.10.3-stripped.tar.gz /node-v6.10.3-stripped.tar.gz
/node-v6.11.0-stripped.tar.gz

20
nodejs.spec
View File

@ -17,18 +17,18 @@
# than a Fedora release lifecycle. # than a Fedora release lifecycle.
%global nodejs_epoch 1 %global nodejs_epoch 1
%global nodejs_major 6 %global nodejs_major 6
%global nodejs_minor 10 %global nodejs_minor 11
%global nodejs_patch 3 %global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
%global nodejs_release 3 %global nodejs_release 1
# == Bundled Dependency Versions == # == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h # v8 - from deps/v8/include/v8-version.h
%global v8_major 5 %global v8_major 5
%global v8_minor 1 %global v8_minor 1
%global v8_build 281 %global v8_build 281
%global v8_patch 101 %global v8_patch 102
# V8 presently breaks ABI at least every x.y release while never bumping SONAME # V8 presently breaks ABI at least every x.y release while never bumping SONAME
%global v8_abi %{v8_major}.%{v8_minor} %global v8_abi %{v8_major}.%{v8_minor}
%global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
@ -99,10 +99,6 @@ Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch
# EPEL only has OpenSSL 1.0.1, so we need to carry a patch on that platform # EPEL only has OpenSSL 1.0.1, so we need to carry a patch on that platform
Patch2: 0002-Use-openssl-1.0.1.patch Patch2: 0002-Use-openssl-1.0.1.patch
# use system certificates instead of the bundled ones
# Backported from upstream 7.5.0+
Patch3: 0003-crypto-Use-system-CAs-instead-of-using-bundled-ones.patch
# Backported upstream patch to allow building with GCC 7 from # Backported upstream patch to allow building with GCC 7 from
# https://github.com/nodejs/node/commit/2bbee49e6f170a5d6628444a7c9a2235fe0dd929 # https://github.com/nodejs/node/commit/2bbee49e6f170a5d6628444a7c9a2235fe0dd929
Patch4: 0004-Fix-compatibility-with-GCC-7.patch Patch4: 0004-Fix-compatibility-with-GCC-7.patch
@ -252,9 +248,6 @@ rm -rf deps/icu-small \
deps/uv \ deps/uv \
deps/zlib deps/zlib
# Use system CA certificates
%patch3 -p1
# Fix GCC7 build # Fix GCC7 build
%patch4 -p1 %patch4 -p1
@ -447,6 +440,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc
%changelog %changelog
* Fri May 12 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:6.11.0-1
- Update to 6.11.0
- remove system CA patch since it was merged upstream
- https://github.com/nodejs/node/pull/8334
* Fri May 12 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:6.10.3-3 * Fri May 12 2017 Zuzana Svetlikova <zsvetlik@redhat.com> - 1:6.10.3-3
- Rebuild without bootstrap - Rebuild without bootstrap

2
sources
View File

@ -1 +1 @@
SHA512 (node-v6.10.3-stripped.tar.gz) = 0750e6c1597c2379df59fafb5945d3af7d59f371c7996c56394f0cac5361627cebde3f6e46468ef76b0eb6d242e77538ec0c8136f75b98c140f1c6235df596bd SHA512 (node-v6.11.0-stripped.tar.gz) = a23e0d8461dcf87048555d2e4e62c0bacecf6d2a6a8d6d27ed08f6f0911ec31f9a7abc48ab45478eaf3ba6af593714e628a194340168581f2f9c3c8dbf0c7a1d