aboutsummaryrefslogtreecommitdiffstats
path: root/main/nodejs/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'main/nodejs/APKBUILD')
-rw-r--r--main/nodejs/APKBUILD50
1 files changed, 17 insertions, 33 deletions
diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD
index 19eb78ffad..0c88c792da 100644
--- a/main/nodejs/APKBUILD
+++ b/main/nodejs/APKBUILD
@@ -6,6 +6,8 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
#
# secfixes:
+# 14.16.1-r0:
+# - CVE-2020-7774
# 14.16.0-r0:
# - CVE-2021-22883
# - CVE-2021-22884
@@ -65,11 +67,11 @@
pkgname=nodejs
# Note: Update only to even-numbered versions (e.g. 6.y.z, 8.y.z)!
# Odd-numbered versions are supported only for 9 months by upstream.
-pkgver=14.16.0
+pkgver=14.17.1
pkgrel=0
pkgdesc="JavaScript runtime built on V8 engine - LTS version"
url="https://nodejs.org/"
-arch="all !mips64 !mips64el"
+arch="all !mips64 !mips64el !riscv64"
license="MIT"
depends="ca-certificates nghttp2-libs>=1.41"
makedepends="
@@ -82,7 +84,9 @@ makedepends="
python3
zlib-dev
"
-subpackages="$pkgname-dev $pkgname-doc npm::noarch"
+install="$pkgname.post-upgrade"
+subpackages="$pkgname-dev $pkgname-doc"
+provider_priority=100 # highest priority (other provider is nodejs-current)
provides="nodejs-lts=$pkgver" # for backward compatibility
replaces="nodejs-current nodejs-lts" # nodejs-lts for backward compatibility
source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz
@@ -119,6 +123,10 @@ build() {
# couldn't upgrade nodejs package in stable branches to fix CVEs due to
# libuv incompatibility.
#
+ # NOTE: We don't package the bundled npm - it's a separate project with
+ # its own release cycle and version numbering, so it's better to keep
+ # it in a standalone aport.
+ #
# TODO: After icu package is modified to split data into multiple
# variants, change --with-intl to "system-icu".
python3 configure.py --prefix=/usr \
@@ -130,7 +138,8 @@ build() {
--shared-nghttp2 \
--openssl-use-def-ca-store \
--with-icu-default-data-dir=$(icu-config --icudatadir) \
- --with-intl=small-icu
+ --with-intl=small-icu \
+ --without-npm
make BUILDTYPE=Release
}
@@ -145,19 +154,6 @@ check() {
package() {
make DESTDIR="$pkgdir" install
-
- cp -pr "$pkgdir"/usr/lib/node_modules/npm/man "$pkgdir"/usr/share
- local d; for d in docs man; do
- rm -r "$pkgdir"/usr/lib/node_modules/npm/$d
- done
-
- # XXX: Workaround for https://github.com/npm/cli/issues/780.
- (cd "$pkgdir"/usr/share/man/man5 && find * \
- -type f ! \( -name 'package-json.*' -or -name 'npmrc.*' -or -name 'npm-*' \) \
- -exec mv {} npm-{} \;)
- (cd "$pkgdir"/usr/share/man/man7 && find * \
- -type f ! \( -name 'semver.*' -or -name 'npm-*' \) \
- -exec mv {} npm-{} \;)
}
dev() {
@@ -165,20 +161,8 @@ dev() {
default_dev
}
-npm() {
- pkgdesc="A package manager for JavaScript"
- depends="$pkgname"
- # for backward compatibility
- provides="nodejs-npm=$pkgver-r$pkgrel nodejs-current-npm=$pkgver-r$pkgrel"
- replaces="nodejs-npm nodejs-current-npm $pkgname"
-
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/np[mx] "$subpkgdir"/usr/bin/
-
- mkdir -p "$subpkgdir"/usr/lib/node_modules
- mv "$pkgdir"/usr/lib/node_modules/npm "$subpkgdir"/usr/lib/node_modules/
-}
-
-sha512sums="13d7df2c7365dcf11f0aa582f92bbc676ea0445ea8e0ffdeeabc6fac1e66986b872757e44e2e52ac4191302ef071e4119799a36dead7a78c9e698455d41fbc49 node-v14.16.0.tar.gz
+sha512sums="
+b77be226a87ef5b15a109ac7e7b63258727974b2b468da1ae26a8e10aaebe71339c0a3cfb849a3b1d469e0d0e64e864310ec9d5d9c9ab105619e82f03910ac60 node-v14.17.1.tar.gz
dbe8167b61518f8f59176759d69834d57bf3e6a5a5fd3dfc2359cafe0325da08b27f8220d278ed77f50c9f63a03313eabbbb0eaca3e592e5bb4e0d5be0ced373 disable-running-gyp-on-shared-deps.patch
-44e81fbf254bd79e38b813f7f5a1336df854588939cba50aaec600660495f9b7745a7049a99eb59d15a51100b3a44f66892a902d7fc32e1399b51883ad4c02cf link-with-libatomic-on-mips32.patch"
+44e81fbf254bd79e38b813f7f5a1336df854588939cba50aaec600660495f9b7745a7049a99eb59d15a51100b3a44f66892a902d7fc32e1399b51883ad4c02cf link-with-libatomic-on-mips32.patch
+"