diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index 35bfad8c1..8f466a51f 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" TERMUX_PKG_VERSION=10.15.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=797ab34c74b83b21b7d6ea261b5ca235d34c61a7da5aebb32459a963097ede3e TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz # Note that we do not use a shared libuv to avoid an issue with the Android @@ -37,7 +38,6 @@ termux_step_configure () { --dest-os=android \ --shared-cares \ --shared-openssl \ - --without-inspector \ --with-intl=system-icu \ --without-snapshot \ --cross-compiling diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index 523867481..8faf86742 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" -TERMUX_PKG_VERSION=11.6.0 -TERMUX_PKG_SHA256=94f2be389c80ab939114f67c824db7ebd12df602358b7481c55431336bbff9b3 +TERMUX_PKG_VERSION=11.7.0 +TERMUX_PKG_SHA256=07febdd8722f6e24ad0cb9360e183baa75a07cad390c14896e3d97027e0fada2 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz # Note that we do not use a shared libuv to avoid an issue with the Android # linker, which does not use symbols of linked shared libraries when resolving @@ -38,7 +38,6 @@ termux_step_configure () { --dest-os=android \ --shared-cares \ --shared-openssl \ - --without-inspector \ --with-intl=system-icu \ --without-snapshot \ --cross-compiling diff --git a/packages/nodejs/src-node.cc.patch b/packages/nodejs/src-node.cc.patch deleted file mode 100644 index df51d5cfe..000000000 --- a/packages/nodejs/src-node.cc.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -u -r ../node-v10.9.0/src/node.cc ./src/node.cc ---- ../node-v10.9.0/src/node.cc 2018-08-15 13:53:34.000000000 +0000 -+++ ./src/node.cc 2018-08-23 20:49:59.353995878 +0000 -@@ -106,7 +106,7 @@ - #include // setuid, getuid - #endif - --#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) -+#if defined(__POSIX__) && !defined(__CloudABI__) - #include // getpwnam() - #include // getgrnam() - #endif -@@ -690,7 +690,7 @@ - - // Look up environment variable unless running as setuid root. - bool SafeGetenv(const char* key, std::string* text) { --#if !defined(__CloudABI__) && !defined(_WIN32) -+#if !defined(__CloudABI__) && !defined(_WIN32) && !defined(__ANDROID__) - if (linux_at_secure || getuid() != geteuid() || getgid() != getegid()) - goto fail; - #endif -@@ -2402,13 +2402,13 @@ - env->SetMethod(process, "reallyExit", Exit); - env->SetMethodNoSideEffect(process, "uptime", Uptime); - --#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) -+#if defined(__POSIX__) && !defined(__CloudABI__) - env->SetMethodNoSideEffect(process, "getuid", GetUid); - env->SetMethodNoSideEffect(process, "geteuid", GetEUid); - env->SetMethodNoSideEffect(process, "getgid", GetGid); - env->SetMethodNoSideEffect(process, "getegid", GetEGid); - env->SetMethodNoSideEffect(process, "getgroups", GetGroups); --#endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__) -+#endif // __POSIX__ && !defined(__CloudABI__) - } - - diff --git a/packages/nodejs/src-node_internals.h.patch b/packages/nodejs/src-node_internals.h.patch index e51b68682..1fa427cb8 100644 --- a/packages/nodejs/src-node_internals.h.patch +++ b/packages/nodejs/src-node_internals.h.patch @@ -1,21 +1,12 @@ -diff -u -r ../node-v10.9.0/src/node_internals.h ./src/node_internals.h ---- ../node-v10.9.0/src/node_internals.h 2018-08-15 13:53:35.000000000 +0000 -+++ ./src/node_internals.h 2018-08-24 00:07:40.104037627 +0000 -@@ -951,7 +951,7 @@ - void Umask(const v8::FunctionCallbackInfo& args); - void Uptime(const v8::FunctionCallbackInfo& args); +diff -u -r ../node-v11.7.0/src/node_internals.h ./src/node_internals.h +--- ../node-v11.7.0/src/node_internals.h 2019-01-17 21:27:16.000000000 +0000 ++++ ./src/node_internals.h 2019-01-18 22:44:06.207542176 +0000 +@@ -358,7 +358,7 @@ + + // Functions defined in node.cc that are exposed via the bootstrapper object -#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) +#if defined(__POSIX__) && !defined(__CloudABI__) - void SetGid(const v8::FunctionCallbackInfo& args); - void SetEGid(const v8::FunctionCallbackInfo& args); - void SetUid(const v8::FunctionCallbackInfo& args); -@@ -963,7 +963,7 @@ - void GetEUid(const v8::FunctionCallbackInfo& args); - void GetEGid(const v8::FunctionCallbackInfo& args); - void GetGroups(const v8::FunctionCallbackInfo& args); --#endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__) -+#endif // __POSIX__ && !defined(__CloudABI__) - - } // namespace node + #define NODE_IMPLEMENTS_POSIX_CREDENTIALS 1 + #endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__) diff --git a/packages/nodejs/src-node_process.cc.patch b/packages/nodejs/src-node_process.cc.patch deleted file mode 100644 index 8dd18c4b4..000000000 --- a/packages/nodejs/src-node_process.cc.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -u -r ../node-v10.9.0/src/node_process.cc ./src/node_process.cc ---- ../node-v10.9.0/src/node_process.cc 2018-08-15 13:53:35.000000000 +0000 -+++ ./src/node_process.cc 2018-08-23 23:40:53.046488108 +0000 -@@ -20,7 +20,7 @@ - #include // setuid, getuid - #endif - --#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) -+#if defined(__POSIX__) && !defined(__CloudABI__) - #include // getpwnam() - #include // getgrnam() - #endif -@@ -247,7 +247,7 @@ - } - - --#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__) -+#if defined(__POSIX__) && !defined(__CloudABI__) - - static const uid_t uid_not_found = static_cast(-1); - static const gid_t gid_not_found = static_cast(-1); -@@ -546,6 +546,6 @@ - return env->ThrowErrnoException(errno, "initgroups"); - } - --#endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__) -+#endif // __POSIX__ && !defined(__CloudABI__) - - } // namespace node