diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2020-01-07 00:55:30 +0200 |
|---|---|---|
| committer | TBK <tbk@jjtc.eu> | 2020-03-20 07:59:50 +0000 |
| commit | 86317da5622f4bbbcda0c78043d513b90bb64a69 (patch) | |
| tree | a3707b2bdc55655c73883fedaec857c54b5b60c7 /community/nodejs-current | |
| parent | 7f4e39a628def0e74485283e00ef46162e4b51c3 (diff) | |
| download | aports-86317da5622f4bbbcda0c78043d513b90bb64a69.tar.bz2 aports-86317da5622f4bbbcda0c78043d513b90bb64a69.tar.xz | |
community/nodejs-current: upgrade to 13.11.0
Diffstat (limited to 'community/nodejs-current')
| -rw-r--r-- | community/nodejs-current/APKBUILD | 34 | ||||
| -rw-r--r-- | community/nodejs-current/elf.patch | 11 |
2 files changed, 23 insertions, 22 deletions
diff --git a/community/nodejs-current/APKBUILD b/community/nodejs-current/APKBUILD index 80802f6135..835927d580 100644 --- a/community/nodejs-current/APKBUILD +++ b/community/nodejs-current/APKBUILD @@ -2,6 +2,10 @@ # Maintainer: Jose-Luis Rivas <ghostbar@riseup.net> # # secfixes: +# 13.11.0-r0: +# - CVE-2019-15604 +# - CVE-2019-15605 +# - CVE-2019-15606 # 11.10.1-r0: # - CVE-2019-5737 # 11.3.0-r0: @@ -20,7 +24,7 @@ # pkgname=nodejs-current # The current stable version, i.e. non-LTS. -pkgver=13.1.0 +pkgver=13.11.0 pkgrel=0 pkgdesc="JavaScript runtime built on V8 engine - current stable version" url="https://nodejs.org/" @@ -28,7 +32,7 @@ arch="all !mips64 !mips64el" license="MIT" depends="ca-certificates" depends_dev="libuv" -makedepends="linux-headers python2 paxmark +makedepends="linux-headers python2 zlib-dev libuv-dev openssl-dev c-ares-dev nghttp2-dev" subpackages="$pkgname-dev $pkgname-doc" provides="nodejs" @@ -36,6 +40,7 @@ replaces="nodejs nodejs-lts" # nodejs-lts for backward compatibility source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz dont-run-gyp-files-for-bundled-deps.patch link-with-libatomic-on-mips32.patch + elf.patch " builddir="$srcdir/node-v$pkgver" @@ -43,12 +48,10 @@ prepare() { default_prepare # Remove bundled dependencies that we're not using. - rm -rf deps/cares deps/openssl deps/uv deps/zlib + rm -rf deps/cares deps/openssl deps/zlib } build() { - cd "$builddir" - case "$CARCH" in mips*) _carchflags="--with-mips-arch-variant=r1 --with-mips-float-abi=soft";; esac @@ -60,15 +63,10 @@ build() { --shared-openssl \ --shared-cares \ --shared-nghttp2 \ + --without-npm \ --openssl-use-def-ca-store - # we need run mksnapshot at build time so paxmark it early. - make -C out mksnapshot BUILDTYPE=Release - paxmark -m out/Release/mksnapshot make - - # paxmark so JIT works - paxmark -m out/Release/node } # TODO Run provided test suite. @@ -80,18 +78,10 @@ check() { } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - - # It's strange, but it really needs to be paxmarked again... - paxmark -m "$pkgdir"/usr/bin/node - - # Remove npm, it's provided by main/nodejs package. - rm -r "$pkgdir"/usr/lib/node_modules - rm "$pkgdir"/usr/bin/npm "$pkgdir"/usr/bin/npx } -sha512sums="4d012d4638682ef1c7eac55913b0f997e163c47b0ee57f6364bac9f03772792279c4915545f5a78e75a42e8cd1006133c0eb318bbfe375f71bd4ca19a314dd77 node-v13.1.0.tar.gz +sha512sums="93d6c75e76e91012c3414222d795139c73bdb80a8a01d6be58d46c231fb7c2a2e34cd26f39263e6bbdfbd06f3b35b35085fb28378b99504e3c2372e3de33a654 node-v13.11.0.tar.gz 940cc90aaa77a531cde13e31918a9978f9478936c3851038bcdf2869e64de03ce84dec5a46519469a90a8ba2853226825452d23d9347752abdbe04e944c083eb dont-run-gyp-files-for-bundled-deps.patch -9f60928b53447f9590c7065bcdbdd4065d10a06e8451531615791a3bd7d14f9114807e5446e0ec00e2cb7a11a277050345e34636b199db2979d7f022b31ffde4 link-with-libatomic-on-mips32.patch" +9f60928b53447f9590c7065bcdbdd4065d10a06e8451531615791a3bd7d14f9114807e5446e0ec00e2cb7a11a277050345e34636b199db2979d7f022b31ffde4 link-with-libatomic-on-mips32.patch +ace818285ff0b868f17be64db7c7b77b314ba370fda6bac640d56bf18322a54fa015206a3e1adefa1d78ef66b597eebf10c28d6549005cd7e58f60a37c38b741 elf.patch" diff --git a/community/nodejs-current/elf.patch b/community/nodejs-current/elf.patch new file mode 100644 index 0000000000..7a697c7cb5 --- /dev/null +++ b/community/nodejs-current/elf.patch @@ -0,0 +1,11 @@ +--- a/deps/v8/src/base/cpu.cc ++++ b/deps/v8/src/base/cpu.cc +@@ -17,7 +17,7 @@ + #if V8_OS_QNX + #include <sys/syspage.h> // cpuinfo + #endif +-#if (V8_OS_LINUX && V8_HOST_ARCH_PPC) || V8_OS_ANDROID ++#if (V8_OS_LINUX && V8_HOST_ARCH_PPC) || (V8_OS_LINUX && V8_HOST_ARCH_ARM) || V8_OS_ANDROID + #include <elf.h> + #endif + #if V8_OS_AIX |