Hello community,
here is the log from the commit of package nodejs6 for openSUSE:Factory checked
in at 2018-01-06 18:52:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs6 (Old)
and /work/SRC/openSUSE:Factory/.nodejs6.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs6"
Sat Jan 6 18:52:07 2018 rev:19 rq:561899 version:6.12.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs6/nodejs6.changes 2017-12-09
20:32:49.598292138 +0100
+++ /work/SRC/openSUSE:Factory/.nodejs6.new/nodejs6.changes 2018-01-06
18:52:12.990744711 +0100
@@ -1,0 +2,15 @@
+Fri Dec 22 14:28:07 UTC 2017 - adam.ma...@suse.de
+
+- Enable CI tests in %check target
+ + fix_ci_tests.patch:
+ - DNS queries in buildroots are failing with EAI_AGAIN
+ - disable test-module-loading-globalpaths.js - we have
+ hardcoded global paths
+ + versioned.patch: call versioned node binary for tests
+
+-------------------------------------------------------------------
+Thu Dec 14 09:45:50 UTC 2017 - adam.ma...@suse.de
+
+- Dropped 8334.diff - no longer needed
+
+-------------------------------------------------------------------
@@ -6 +21 @@
- and lower)
+ and lower) (bsc#1072322)
Old:
----
8334.diff
New:
----
fix_ci_tests.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs6.spec ++++++
--- /var/tmp/diff_new_pack.sovyeI/_old 2018-01-06 18:52:13.922701166 +0100
+++ /var/tmp/diff_new_pack.sovyeI/_new 2018-01-06 18:52:13.922701166 +0100
@@ -92,7 +92,7 @@
Source3: nodejs.keyring
## UPSTREAM PATCHES HERE, if any
-Patch1: 8334.diff
+Patch3: fix_ci_tests.patch
## Our patches
# PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built
@@ -161,12 +161,19 @@
BuildRequires: zlib-devel
%if ! %{with intree_openssl}
+
+%if %node_version_number >= 8
+BuildRequires: openssl-devel >= 1.0.2
+%else # older node doesn't support OpenSSL 1.1
+
%if 0%{?suse_version} >= 1330
BuildRequires: libopenssl-1_0_0-devel
%else
BuildRequires: openssl-devel >= 1.0.2
%endif
-%endif
+
+%endif # older node doesn't support OpenSSL 1.1
+%endif # ! {with intree_openssl}
%if ! %{with intree_cares}
BuildRequires: pkgconfig(libcares) >= 1.10.0
@@ -248,8 +255,8 @@
%prep
echo "`grep node-v%{version}.tar.xz %{S:1} | head -n1 | cut -c1-64` %{S:0}" |
sha256sum -c
%setup -q -n node-v%{version}
-%if %node_version_number < 6
-%patch1 -p1
+%patch3 -p1
+%if ! %{with intree_openssl}
%endif
%patch101 -p1
%patch102 -p1
@@ -381,9 +388,19 @@
ln -s %{_sysconfdir}/alternatives/npx.1%{ext_man}
%{buildroot}%{_mandir}/man1/npx.1%{ext_man}
%endif
-# Check that Node.js isn't completely broken.
%check
-%{buildroot}%{_bindir}/node%{node_version_number} -e
'require("assert").strictEqual(process.versions.node, "%{version}");'
+ln addon-rpm.gypi deps/npm/node_modules/node-gyp/addon-rpm.gypi
+# Tarball doesn't have eslint package distributed, so disable some tests
+find test -name \*-eslint-\* -print -delete
+# No documentation is generated, don't bother checking it
+rm -f test/doctool/test-make-doc.js
+# DNS lookup doesn't work in build root
+rm -f test/parallel/test-dns-cancel-reverse-lookup.js \
+ test/parallel/test-dns-resolveany.js
+# multicast test fail since no socket?
+rm -f test/parallel/test-dgram-membership.js
+# Run CI tests - 'advisory for now'
+make test-ci || echo "****** UNIT TESTS NOT ALL HAPPY *****"
%files
%defattr(-, root, root)
++++++ fix_ci_tests.patch ++++++
Author: Adam Majer <ama...@suse.de>
Date: Dec 20 09:18:49 UTC 2017
Summary: Fix CI unit tests framework for OBS building
Index: node-v6.12.2/test/parallel/test-module-loading-globalpaths.js
===================================================================
--- node-v6.12.2.orig/test/parallel/test-module-loading-globalpaths.js
+++ node-v6.12.2/test/parallel/test-module-loading-globalpaths.js
@@ -7,6 +7,9 @@ const fs = require('fs');
const child_process = require('child_process');
const pkgName = 'foo';
+common.skip('hardcoded global paths');
+return;
+
if (process.argv[2] === 'child') {
console.log(require(pkgName).string);
} else {
++++++ versioned.patch ++++++
--- /var/tmp/diff_new_pack.sovyeI/_old 2018-01-06 18:52:13.986698176 +0100
+++ /var/tmp/diff_new_pack.sovyeI/_new 2018-01-06 18:52:13.990697989 +0100
@@ -8,10 +8,10 @@
This is also important for generation of binary
modules for multiple versions of NodeJS
-Index: node-v6.11.3/node.gyp
+Index: node-v6.12.2/node.gyp
===================================================================
---- node-v6.11.3.orig/node.gyp
-+++ node-v6.11.3/node.gyp
+--- node-v6.12.2.orig/node.gyp
++++ node-v6.12.2/node.gyp
@@ -19,7 +19,7 @@
'node_shared_openssl%': 'false',
'node_v8_options%': '',
@@ -21,7 +21,7 @@
'library_files': [
'lib/internal/bootstrap_node.js',
'lib/_debug_agent.js',
-@@ -432,10 +432,10 @@
+@@ -437,10 +437,10 @@
{
'action_name': 'node_dtrace_provider_o',
'inputs': [
@@ -34,7 +34,7 @@
],
'action': [ 'dtrace', '-G', '-xnolibs', '-s',
'src/node_provider.d',
'<@(_inputs)', '-o', '<@(_outputs)' ]
-@@ -485,7 +485,7 @@
+@@ -490,7 +490,7 @@
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
],
'outputs': [
@@ -43,7 +43,7 @@
],
'conditions': [
[ 'target_arch=="ia32" or target_arch=="arm"', {
-@@ -546,8 +546,8 @@
+@@ -551,8 +551,8 @@
],
'variables': {
@@ -54,7 +54,7 @@
'OBJ_SUFFIX': 'o',
'conditions': [
['OS=="win"', {
-@@ -655,7 +655,7 @@
+@@ -660,7 +660,7 @@
['OS=="aix"', {
'targets': [
{
@@ -63,10 +63,10 @@
'conditions': [
['node_shared=="true"', {
'type': 'shared_library',
-Index: node-v6.11.3/Makefile
+Index: node-v6.12.2/Makefile
===================================================================
---- node-v6.11.3.orig/Makefile
-+++ node-v6.11.3/Makefile
+--- node-v6.12.2.orig/Makefile
++++ node-v6.12.2/Makefile
@@ -37,10 +37,10 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT
EXEEXT := $(shell $(PYTHON) -c \
"import sys; print('.exe' if sys.platform == 'win32' else '')")
@@ -80,11 +80,11 @@
# Flags for packaging.
BUILD_DOWNLOAD_FLAGS ?= --download=all
-Index: node-v6.11.3/tools/install.py
+Index: node-v6.12.2/tools/install.py
===================================================================
---- node-v6.11.3.orig/tools/install.py
-+++ node-v6.11.3/tools/install.py
-@@ -77,7 +77,7 @@ def install(paths, dst): map(lambda path
+--- node-v6.12.2.orig/tools/install.py
++++ node-v6.12.2/tools/install.py
+@@ -78,7 +78,7 @@ def install(paths, dst): map(lambda path
def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths)
def npm_files(action):
@@ -93,7 +93,7 @@
# don't install npm if the target path is a symlink, it probably means
# that a dev version of npm is installed there
-@@ -91,11 +91,11 @@ def npm_files(action):
+@@ -92,11 +92,11 @@ def npm_files(action):
action(paths, target_path + dirname[9:] + '/')
# create/remove symlink
@@ -108,7 +108,7 @@
else:
assert(0) # unhandled action type
-@@ -109,7 +109,7 @@ def subdir_files(path, dest, action):
+@@ -110,7 +110,7 @@ def subdir_files(path, dest, action):
def files(action):
is_windows = sys.platform == 'win32'
@@ -117,7 +117,7 @@
output_prefix = 'out/Release/'
if 'false' == variables.get('node_shared'):
-@@ -131,7 +131,7 @@ def files(action):
+@@ -135,7 +135,7 @@ def files(action):
action(['out/Release/node.d'], sysconfig.get_config_var("LIB") +
'/dtrace/node.d')
# behave similarly for systemtap
@@ -126,7 +126,7 @@
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
action(['deps/v8/tools/lldbinit'], 'share/doc/node/')
-@@ -140,7 +140,7 @@ def files(action):
+@@ -144,7 +144,7 @@ def files(action):
if 'freebsd' in sys.platform or 'openbsd' in sys.platform:
action(['doc/node.1'], 'man/man1/')
else:
@@ -135,7 +135,7 @@
if 'true' == variables.get('node_install_npm'): npm_files(action)
-@@ -154,31 +154,31 @@ def headers(action):
+@@ -158,31 +158,31 @@ def headers(action):
'src/node_buffer.h',
'src/node_object_wrap.h',
'src/node_version.h',
@@ -176,10 +176,10 @@
def run(args):
global node_prefix, install_path, target_defaults, variables
-Index: node-v6.11.3/doc/node.1
+Index: node-v6.12.2/doc/node.1
===================================================================
---- node-v6.11.3.orig/doc/node.1
-+++ node-v6.11.3/doc/node.1
+--- node-v6.12.2.orig/doc/node.1
++++ node-v6.12.2/doc/node.1
@@ -26,12 +26,12 @@
.SH NAME
@@ -212,10 +212,10 @@
.RB [ \-\-v8-options ]
Execute without arguments to start the REPL.
-Index: node-v6.11.3/src/node.stp
+Index: node-v6.12.2/src/node.stp
===================================================================
---- node-v6.11.3.orig/src/node.stp
-+++ node-v6.11.3/src/node.stp
+--- node-v6.12.2.orig/src/node.stp
++++ node-v6.12.2/src/node.stp
@@ -1,4 +1,4 @@
-probe node_net_server_connection =
process("node").mark("net__server__connection")
+probe node_net_server_connection =
process("node6").mark("net__server__connection")
@@ -285,10 +285,10 @@
{
scavenge = 1 << 0;
compact = 1 << 1;
-Index: node-v6.11.3/deps/npm/man/man1/npm.1
+Index: node-v6.12.2/deps/npm/man/man1/npm.1
===================================================================
---- node-v6.11.3.orig/deps/npm/man/man1/npm.1
-+++ node-v6.11.3/deps/npm/man/man1/npm.1
+--- node-v6.12.2.orig/deps/npm/man/man1/npm.1
++++ node-v6.12.2/deps/npm/man/man1/npm.1
@@ -1,11 +1,11 @@
.TH "NPM" "1" "November 2016" "" ""
.SH "NAME"
@@ -418,20 +418,20 @@
.RE
-Index: node-v6.11.3/deps/npm/bin/npm-cli.js
+Index: node-v6.12.2/deps/npm/bin/npm-cli.js
===================================================================
---- node-v6.11.3.orig/deps/npm/bin/npm-cli.js
-+++ node-v6.11.3/deps/npm/bin/npm-cli.js
+--- node-v6.12.2.orig/deps/npm/bin/npm-cli.js
++++ node-v6.12.2/deps/npm/bin/npm-cli.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node6
;(function () { // wrapper in case we're in module_context mode
// windows: running "npm blah" in this folder will invoke WSH, not node.
/*global WScript*/
-Index: node-v6.11.3/src/node_main.cc
+Index: node-v6.12.2/src/node_main.cc
===================================================================
---- node-v6.11.3.orig/src/node_main.cc
-+++ node-v6.11.3/src/node_main.cc
+--- node-v6.12.2.orig/src/node_main.cc
++++ node-v6.12.2/src/node_main.cc
@@ -52,6 +52,7 @@ int wmain(int argc, wchar_t *wargv[]) {
int main(int argc, char *argv[]) {
// Disable stdio buffering, it interacts poorly with printf()
@@ -440,3 +440,16 @@
setvbuf(stdout, nullptr, _IONBF, 0);
setvbuf(stderr, nullptr, _IONBF, 0);
return node::Start(argc, argv);
+Index: node-v6.12.2/tools/test.py
+===================================================================
+--- node-v6.12.2.orig/tools/test.py
++++ node-v6.12.2/tools/test.py
+@@ -858,7 +858,7 @@ class Context(object):
+
+ def GetVm(self, arch, mode):
+ if arch == 'none':
+- name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node'
++ name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node6'
+ else:
+ name = 'out/%s.%s/node' % (arch, mode)
+
