diff --git a/SOURCES/0001-Disable-openssl-1.0.2.patch b/SOURCES/0001-Disable-openssl-1.0.2.patch index e759a88..f341142 100644 --- a/SOURCES/0001-Disable-openssl-1.0.2.patch +++ b/SOURCES/0001-Disable-openssl-1.0.2.patch @@ -204,7 +204,7 @@ index b3169ca..958c4e8 100644 + // chain and return 1. If something fails, return 0. + // NOTE: 1.0.1- does not support multiple certs having its own chain in + // a single context. There is just one: extra_chain! -+ r = SSL_CTX_add_extra_chain_cert(ctx, ca); ++ r = SSL_CTX_add_extra_chain_cert(ctx, X509_dup(ca)); +#endif if (!r) { ret = 0; diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index 1936ca3..bc56182 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -13,7 +13,7 @@ Name: %{?scl_prefix}nodejs Epoch: 1 Version: 4.6.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JavaScript runtime License: MIT and ASL 2.0 and ISC and BSD Group: Development/Languages @@ -139,7 +139,7 @@ The API documentation for the Node.js JavaScript runtime. rm -rf deps/npm \ deps/uv \ deps/http_parser \ - deps/zlib + deps/zlib # no need to remove bundled CA certificates anymore %patch2 -p1 @@ -163,14 +163,14 @@ rm -f src/node_root_certs.h export CFLAGS='%{optflags} -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ -fno-delete-null-pointer-checks' export CXXFLAGS='%{optflags} -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ - -fno-delete-null-pointer-checks -I%{_includedir}' + -fno-delete-null-pointer-checks -I%{_includedir}' export LDFLAGS='%{optflags} -L%{_libdir}' ./configure --prefix=%{_prefix} \ --shared-http-parser \ --shared-zlib \ --shared-libuv \ - --shared-openssl \ + --shared-openssl \ --without-npm \ --without-dtrace \ --without-snapshot @@ -227,7 +227,7 @@ cp -p common.gypi %{buildroot}%{_datadir}/node # Install the GDB init tool into the documentation directory mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit -%check +%check %{?scl:scl enable %{scl} "} python tools/test.py --mode=release parallel -J %{?scl:"} @@ -261,19 +261,22 @@ python tools/test.py --mode=release parallel -J %{_pkgdocdir}/html %changelog +* Tue Nov 14 2017 Zuzana Svetlikova - 1:4.6.2-7 +- Resolves: RHBZ#1513065 (certificate chain segfault) + * Wed Oct 18 2017 Zuzana Svetlikova - 1:4.6.2-6 -- Resolves: RHBZ#1476314 +- Resolves: RHBZ#1476315 - disable snaphots - fix c-ares -- bump spec, revert back to 4.6.2 +- bump epoch, revert back to 4.6.2 * Thu Oct 05 2017 Zuzana Svetlikova - 4.8.4-2 -- Resolves: RHBZ#1476314 +- Resolves: RHBZ#1476315 - backport https://github.com/nodejs/node/commit/e3ef382f357d2bd12e7429711936aa79cc1d7699 - fix segfaulting npm * Tue Sep 12 2017 Zuzana Svetlikova - 4.8.4-1 -- Resolves: RHBZ#1476314 +- Resolves: RHBZ#1476315 - update to 4.8.4 - clean up/refactor patches