Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

community/nodejs-current: upgrade to 11.1.0 #4116

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 7 additions & 14 deletions community/nodejs-current/APKBUILD
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
#
# secfixes:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jirutka said that secfixes should remain for history purposes

# 9.10.0-r0:
# - CVE-2018-7158
# - CVE-2018-7159
# - CVE-2018-7160
# 9.2.1-r0:
# - CVE-2017-15896
# - CVE-2017-15897
#
pkgname=nodejs-current
# The current stable version, i.e. non-LTS.
pkgver=9.11.1
pkgrel=4

pkgver=10.10.0
pkgrel=1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Node.js v11.1.0 is already out, can you update this PR? AFAIK pgrel should be set to 0


pkgdesc="JavaScript runtime built on V8 engine - current stable version"
url="https://nodejs.org/"
arch="all"
license="MIT"
depends="ca-certificates"
depends_dev="libuv"
# gold is needed for mksnapshot
makedepends="$depends_dev python2 openssl1.0-dev zlib-dev libuv-dev linux-headers
makedepends="$depends_dev python2 openssl1.1-dev zlib-dev libuv-dev linux-headers
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

openssl1.1-dev is in testing repo and could not be used in community

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as in #5558 the correct package is openssl-dev

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

openssl1.1-dev has been renamed to openssl-dev and moved to main.

paxmark binutils-gold http-parser-dev ca-certificates c-ares-dev"
subpackages="$pkgname-dev $pkgname-doc"
provides="nodejs"
Expand Down Expand Up @@ -78,5 +71,5 @@ package() {
rm "$pkgdir"/usr/bin/npm "$pkgdir"/usr/bin/npx
}

sha512sums="6bdd0afa3bdcc633075bbaf1c3a9b8c1a914a881da2dc942ff1477a2b000930a8777c0498db5edcb1eeaa7f13cff942ab88bf0764e296d49e0d1a9a677a52bb0 node-v9.11.1.tar.gz
ba95f21b1e80717ef63941854e7ed412f64a91da068c0dbf0d6d9697333ee266c9f4cd7bf1a01111eeb28aa66adefd8a58cfb3e82debb84b43e35e9dc914dd36 dont-run-gyp-files-for-bundled-deps.patch"
sha512sums="6f8e37dad2ae0acbd6bfd3ea57f0fdd263cba9f2e0cbbcc311e6d0167c6c0ea12f57189d1982f8cf11acb024536de506e2f3376895b67422d280e3eec21e6ad3 node-v10.10.0.tar.gz
e9740479eecab31865d3b3a67a30404f5c53be0e9314c29894befc3f031560dc599f3c469c51c7b0a7bc5265aefbc40ee759b59ce9355ceb87a8722a839ed704 dont-run-gyp-files-for-bundled-deps.patch"
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ Subject: Disable running gyp files for bundled deps

Author: Stephen Gallagher <sgallagh@redhat.com>

Modified 2016-11-26 by Jakub Jirutka <jakub@jirutka.cz> to update for
Node.js 7.2.0
Modified 2016-11-26 by Jakub Jirutka <jakub@jirutka.cz> to update for Node.js 7.2.0
Modified 2018-04-27 to Node.js 10.0.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be changed to 11.1.0


--- a/Makefile
+++ b/Makefile
@@ -72,8 +72,7 @@
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
ln -fs out/Debug/$(NODE_EXE) $@
@@ -91,8 +91,7 @@
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi

-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
+out/Makefile: common.gypi deps/v8/gypfiles/toolchain.gypi \
deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \
deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
config.gypi
$(PYTHON) tools/gyp_node.py -f make
$(PYTHON) tools/gyp_node.py -f make