Bug#942838: stretch-pu: package nodejs-mozilla 8.11.1~dfsg-2~deb9u1
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
This is a backport of nodejs 8.11.1 from stretch-backports into stretch proper,
to be used by the upcoming Firefox ESR 68, package under its own name to avoid
problems in other packages.
I attach the debdiff from the stretch-backports package.
Thanks,
Emilio
diff -Nru nodejs-8.11.1~dfsg/debian/changelog nodejs-mozilla-8.11.1~dfsg/debian/changelog
--- nodejs-8.11.1~dfsg/debian/changelog 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/changelog 2019-09-02 11:21:56.000000000 +0200
@@ -1,3 +1,16 @@
+nodejs-mozilla (8.11.1~dfsg-2~deb9u1) stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport to stretch as nodejs-mozilla, to be used for Firefox ESR 68.
+ * Use internal libuv, http-parser and c-ares as the ones in stretch are
+ too old.
+ * disable-expired-cert-test.patch: disable a test case that fails due to an
+ expired test certificate.
+ * fix-openssl-error-string.patch: update a test expected output for
+ openssl 1.1.0j.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 02 Sep 2019 11:21:56 +0200
+
nodejs (8.11.1~dfsg-2~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
diff -Nru nodejs-8.11.1~dfsg/debian/control nodejs-mozilla-8.11.1~dfsg/debian/control
--- nodejs-8.11.1~dfsg/debian/control 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/control 2019-09-02 11:21:56.000000000 +0200
@@ -1,4 +1,4 @@
-Source: nodejs
+Source: nodejs-mozilla
Section: javascript
Priority: optional
Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org>
@@ -14,46 +14,25 @@
procps,
zlib1g-dev,
libicu-dev,
- libc-ares-dev (>= 1.14~),
- libhttp-parser-dev (>= 2.8~),
+# libc-ares-dev (>= 1.14~),
+# libhttp-parser-dev (>= 2.8~),
libkvm-dev [kfreebsd-any],
gyp (>= 0.1~svn1773),
ca-certificates,
python,
libssl1.0-dev (>= 1.0.2),
- libuv1-dev (>= 1.15.0)
-Build-Depends-Indep: node-js-yaml,
- node-marked
+# libuv1-dev (>= 1.15.0)
Standards-Version: 4.1.2
Homepage: http://nodejs.org/
Vcs-Browser: https://salsa.debian.org/js-team/nodejs/tree/master-8.x
Vcs-Git: https://salsa.debian.org/js-team/nodejs.git -b master-8.x
-Package: nodejs-dev
-Section: devel
-Architecture: amd64 arm64 armhf i386 kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel ppc64 ppc64el s390x
-Depends: ${cdbs:Depends},
- ${misc:Depends},
- nodejs (= ${binary:Version})
-Suggests: ${cdbs:Suggests}
-Description: evented I/O for V8 javascript (development files)
- Node.js is a platform built on Chrome's JavaScript runtime for easily
- building fast, scalable network applications. Node.js uses an
- event-driven, non-blocking I/O model that makes it lightweight and
- efficient, perfect for data-intensive real-time applications that run
- across distributed devices.
- .
- This package is needed to build plugins.
-
-Package: nodejs
+Package: nodejs-mozilla
Architecture: amd64 arm64 armhf i386 kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel ppc64 ppc64el s390x
Depends: ${shlibs:Depends},
${misc:Depends}
Provides: ${cdbs:Provides}
Recommends: ${cdbs:Recommends},
- nodejs-doc
-Replaces: nodejs-legacy
-Conflicts: nodejs-legacy
Description: evented I/O for V8 javascript
Node.js is a platform built on Chrome's JavaScript runtime for easily
building fast, scalable network applications. Node.js uses an
@@ -66,27 +45,3 @@
.
System, Events, Standard I/O, Modules, Timers, Child Processes, POSIX,
HTTP, Multipart Parsing, TCP, DNS, Assert, Path, URL, Query Strings.
-
-Package: nodejs-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Provides: ${cdbs:Provides}
-Recommends: ${cdbs:Recommends}, nodejs
-Replaces: nodejs (<< 6.11.2~dfsg-3)
-Conflicts: nodejs (<< 6.11.2~dfsg-3)
-Description: API documentation for Node.js, the javascript platform
- Node.js is a platform built on Chrome's JavaScript runtime for easily
- building fast, scalable network applications. Node.js uses an
- event-driven, non-blocking I/O model that makes it lightweight and
- efficient, perfect for data-intensive real-time applications that run
- across distributed devices.
- .
- Node.js is bundled with several useful libraries to handle server
- tasks:
- .
- System, Events, Standard I/O, Modules, Timers, Child Processes, POSIX,
- HTTP, Multipart Parsing, TCP, DNS, Assert, Path, URL, Query Strings.
- .
- This package contains API documentation for nodejs.
-
diff -Nru nodejs-8.11.1~dfsg/debian/dh_nodejs nodejs-mozilla-8.11.1~dfsg/debian/dh_nodejs
--- nodejs-8.11.1~dfsg/debian/dh_nodejs 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/dh_nodejs 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_nodejs - set nodejs dependencies
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_nodejs> [S<I<debhelper options>>]
-
-=head1 DESCRIPTION
-
-B<dh_nodejs> is a debhelper program that is responsible for generating
-appropriate dependencies on nodejs.
-
-The dependency on nodejs will be generated in B<${misc:Depends}>.
-
-=cut
-
-init();
-
-# TODO: add support for generating nodejs:Recommends instead
-#my $relation='Depends';
-#if (defined $dh{RELATION}) {
-# $relation=ucfirst(lc($dh{RELATION}));
-#}
-
-# parse list file
-open (RAWFILE, '/usr/share/nodejs/pluginsdep')
- or error("cannot read /usr/share/nodejs/pluginsdep: $!\n");
-my $deps = <RAWFILE>;
-close RAWFILE;
-chomp $deps;
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
- addsubstvar($package, "misc:Depends", $deps);
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of nodejs-dev.
-
-=head1 AUTHOR
-
-Jonas Smedegaard <dr@jones.dk>
-
-=cut
-
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs-dev.dirs nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.dirs
--- nodejs-8.11.1~dfsg/debian/nodejs-dev.dirs 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/include/nodejs
-usr/include/nodejs/deps/uv
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs-dev.install nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.install
--- nodejs-8.11.1~dfsg/debian/nodejs-dev.install 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-src/*.h usr/include/nodejs/src
-deps/v8/include/*.h usr/include/nodejs/deps/v8/include
-deps/v8/include/libplatform usr/include/nodejs/deps/v8/include
-common.gypi usr/include/nodejs
-usr/bin/dh_nodejs
-debian/nodejs.pm usr/share/perl5/Debian/Debhelper/Sequence/
-usr/share/nodejs/pluginsdep
-
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs-dev.links nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.links
--- nodejs-8.11.1~dfsg/debian/nodejs-dev.links 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-usr/include/uv.h usr/include/nodejs/deps/uv/include/uv.h
-usr/include/uv-unix.h usr/include/nodejs/deps/uv/include/uv-unix.h
-usr/include/uv-version.h usr/include/nodejs/deps/uv/include/uv-version.h
-usr/include/uv-threadpool.h usr/include/nodejs/deps/uv/include/uv-threadpool.h
-usr/include/uv-errno.h usr/include/nodejs/deps/uv/include/uv-errno.h
-usr/include/uv-linux.h usr/include/nodejs/deps/uv/include/uv-linux.h
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs-dev.manpages nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.manpages
--- nodejs-8.11.1~dfsg/debian/nodejs-dev.manpages 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs-dev.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/dh_nodejs.1
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.dirs nodejs-mozilla-8.11.1~dfsg/debian/nodejs.dirs
--- nodejs-8.11.1~dfsg/debian/nodejs.dirs 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/nodejs
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs-doc.doc-base nodejs-mozilla-8.11.1~dfsg/debian/nodejs-doc.doc-base
--- nodejs-8.11.1~dfsg/debian/nodejs-doc.doc-base 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs-doc.doc-base 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-Document: nodejs-api
-Title: Node API Manual
-Author: Ryan Dahl
-Abstract: This manual describes the API and command-line usage of Node.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/nodejs-doc/api/index.html
-Files: /usr/share/doc/nodejs-doc/api/*.html
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs-doc.docs nodejs-mozilla-8.11.1~dfsg/debian/nodejs-doc.docs
--- nodejs-8.11.1~dfsg/debian/nodejs-doc.docs 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs-doc.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-out/doc/api
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.install nodejs-mozilla-8.11.1~dfsg/debian/nodejs.install
--- nodejs-8.11.1~dfsg/debian/nodejs.install 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/bin/node
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.links nodejs-mozilla-8.11.1~dfsg/debian/nodejs.links
--- nodejs-8.11.1~dfsg/debian/nodejs.links 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin/node usr/bin/nodejs
-usr/share/man/man1/node.1 usr/share/man/man1/nodejs.1
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.manpages nodejs-mozilla-8.11.1~dfsg/debian/nodejs.manpages
--- nodejs-8.11.1~dfsg/debian/nodejs.manpages 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/node.1
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.pm nodejs-mozilla-8.11.1~dfsg/debian/nodejs.pm
--- nodejs-8.11.1~dfsg/debian/nodejs.pm 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.pm 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#! /usr/bin/perl
-# debhelper sequence file for dh_nodejs
-
-use warnings;
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-insert_before("dh_installinit", "dh_nodejs");
-
-1
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.postinst nodejs-mozilla-8.11.1~dfsg/debian/nodejs.postinst
--- nodejs-8.11.1~dfsg/debian/nodejs.postinst 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.postinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- if dpkg --compare-versions "$2" le 0.6.19~dfsg1-2; then
- update-alternatives --remove js /usr/bin/node
- fi
-
- update-alternatives --install /usr/bin/js js /usr/bin/nodejs 200 \
- --slave /usr/share/man/man1/js.1.gz js.1.gz /usr/share/man/man1/nodejs.1.gz
-fi
-
-#DEBHELPER#
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.prerm nodejs-mozilla-8.11.1~dfsg/debian/nodejs.prerm
--- nodejs-8.11.1~dfsg/debian/nodejs.prerm 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
- update-alternatives --remove js /usr/bin/nodejs
-fi
-
-#DEBHELPER#
diff -Nru nodejs-8.11.1~dfsg/debian/nodejs.README.Debian nodejs-mozilla-8.11.1~dfsg/debian/nodejs.README.Debian
--- nodejs-8.11.1~dfsg/debian/nodejs.README.Debian 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/nodejs.README.Debian 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-nodejs for Debian
-=================
-
-packaged modules
-----------------
-
-The global search path for modules is
-/usr/lib/nodejs
-
-Future packages of node modules will use that directory,
-so it should be used wisely.
-
-
-user modules
-------------
-
-Node looks for modules in ./node_modules directory first;
-please read node#modules documentation carefully for more information.
-
-Node does not look for modules in /usr/local/lib/node_modules,
-where npm put them.
-Please read npm-link(1) of npm package, to understand how to properly
-use npm-installed modules in a project.
-
-Note that require.paths is not supported in future node versions.
-See also node(1) for more information about NODE_PATH.
-
diff -Nru nodejs-8.11.1~dfsg/debian/patches/disable-expired-cert-test.patch nodejs-mozilla-8.11.1~dfsg/debian/patches/disable-expired-cert-test.patch
--- nodejs-8.11.1~dfsg/debian/patches/disable-expired-cert-test.patch 1970-01-01 01:00:00.000000000 +0100
+++ nodejs-mozilla-8.11.1~dfsg/debian/patches/disable-expired-cert-test.patch 2019-09-02 11:21:56.000000000 +0200
@@ -0,0 +1,22 @@
+--- a/test/parallel/test-tls-server-verify.js
++++ b/test/parallel/test-tls-server-verify.js
+@@ -107,9 +107,10 @@
+ { name: 'agent3', shouldReject: false, shouldAuth: true },
+ { name: 'nocert', shouldReject: true }
+ ]
+- },
++ }
+
+
++ /*
+ { title: 'Allow only certs signed by CA2 but not in the CRL',
+ requestCert: true,
+ rejectUnauthorized: true,
+@@ -125,6 +126,7 @@
+ { name: 'nocert', shouldReject: true }
+ ]
+ }
++ */
+ ];
+
+ function filenamePEM(n) {
diff -Nru nodejs-8.11.1~dfsg/debian/patches/fix-openssl-error-string.patch nodejs-mozilla-8.11.1~dfsg/debian/patches/fix-openssl-error-string.patch
--- nodejs-8.11.1~dfsg/debian/patches/fix-openssl-error-string.patch 1970-01-01 01:00:00.000000000 +0100
+++ nodejs-mozilla-8.11.1~dfsg/debian/patches/fix-openssl-error-string.patch 2019-09-02 11:21:56.000000000 +0200
@@ -0,0 +1,31 @@
+From 19246de748ccc529751a78c87ae44066feffd9c0 Mon Sep 17 00:00:00 2001
+From: Shigeki Ohtsu <ohtsu@ohtsu.org>
+Date: Wed, 15 Aug 2018 00:03:03 +0900
+Subject: [PATCH] test: fix error messages for OpenSSL-1.1.0i
+
+After upgradeing OpenSSL-1.1.0i, two tests are failed due to changes
+of error messages.
+
+Ref: https://github.com/openssl/openssl/commit/45ae18b38401a027f231f1408e71b13ff3111021
+Ref: https://github.com/openssl/openssl/commit/36d2517a97f6020049116492b4d5491d177e629c
+PR-URL: https://github.com/nodejs/node/pull/22318
+Reviewed-By: James M Snell <jasnell@gmail.com>
+Reviewed-By: Rod Vagg <rod@vagg.org>
+---
+ test/parallel/test-crypto-scrypt.js | 4 ++--
+ test/parallel/test-tls-passphrase.js | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/parallel/test-tls-passphrase.js b/test/parallel/test-tls-passphrase.js
+index b183309af714..6ed19c74d22f 100644
+--- a/test/parallel/test-tls-passphrase.js
++++ b/test/parallel/test-tls-passphrase.js
+@@ -221,7 +221,7 @@ server.listen(0, common.mustCall(function() {
+ }, common.mustCall());
+ })).unref();
+
+-const errMessagePassword = /bad password read/;
++const errMessagePassword = /bad decrypt/;
+
+ // Missing passphrase
+ assert.throws(function() {
diff -Nru nodejs-8.11.1~dfsg/debian/patches/series nodejs-mozilla-8.11.1~dfsg/debian/patches/series
--- nodejs-8.11.1~dfsg/debian/patches/series 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/patches/series 2019-09-02 11:21:56.000000000 +0200
@@ -10,3 +10,5 @@
benchmark_without_alice.patch
test-http2-connect-upstream-fix.patch
772393c79b039ab7eb73b54aa4e1b93147653340.patch
+disable-expired-cert-test.patch
+fix-openssl-error-string.patch
diff -Nru nodejs-8.11.1~dfsg/debian/rules nodejs-mozilla-8.11.1~dfsg/debian/rules
--- nodejs-8.11.1~dfsg/debian/rules 2018-05-02 08:09:28.000000000 +0200
+++ nodejs-mozilla-8.11.1~dfsg/debian/rules 2019-09-02 11:21:56.000000000 +0200
@@ -44,16 +44,14 @@
DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(deps/v8/benchmarks/v8-logo\.png|test/fixtures/person\.jpg.*|test/fixtures/sample\.png|test/fixtures/google_ssl_hello\.bin|test/fixtures/test_cert\.pfx|src/res/node\.ico|debian/(changelog|copyright(|_hints|_newhints)))$
DEB_CONFIGURE_NORMAL_ARGS =
-DEB_CONFIGURE_EXTRA_FLAGS = --without-npm \
+DEB_CONFIGURE_EXTRA_FLAGS = \
+--without-npm \
--without-snapshot \
--shared-openssl \
--shared-zlib \
---shared-cares \
---shared-http-parser \
--with-intl=system-icu \
---prefix=/usr \
---openssl-use-def-ca-store \
---shared-libuv
+--prefix=/usr/lib/nodejs-mozilla \
+--openssl-use-def-ca-store
# map HOST ARCH AND OS, and if unknown let upstream guess
@@ -135,7 +133,7 @@
endif
endif
-DEB_DESTDIR = $(CURDIR)/debian/tmp
+#DEB_DESTDIR = $(CURDIR)/debian/tmp
DEB_MAKE_CLEAN_TARGET = clean
ifeq ($(DEB_PARALLEL_JOBS),)
JOBS := 1
@@ -186,25 +184,10 @@
find . -name "*.pyc" -delete
rm -rf out
-# remove *.json files from documentation
-binary-install/nodejs-doc::
- find debian/nodejs-doc/usr/share/doc/nodejs-doc -name *.json -delete
-
pre-build::
ln -sTf /usr/lib/nodejs node_modules
mkdir -p $(NODE_TEST_DIR)
-build/nodejs-doc::
- make doc-only
-
-# Provide dependency hints for reverse dependencies to consume
-CDBS_SUGGESTS_nodejs-dev = debhelper
-install/nodejs-dev::
- pod2man --release "" --center "" debian/dh_nodejs > $(cdbs_curdestdir)/usr/share/man/man1/dh_nodejs.1
- install -D debian/dh_nodejs $(cdbs_curdestdir)/usr/bin/dh_nodejs
- mkdir -p $(cdbs_curdestdir)/usr/share/nodejs
- echo '$(abi-deps)' > $(cdbs_curdestdir)/usr/share/nodejs/pluginsdep
-
check:
-ln -s /usr/bin/node node
mkdir -p $(NODE_TEST_DIR)
Reply to: