diff --git a/manifest b/manifest index 97a1c01e..188992e7 100644 --- a/manifest +++ b/manifest @@ -313,22 +313,22 @@ f usr/gnu/share/terminfo/x/xterms 0644 root bin f usr/gnu/share/terminfo/x/xterms-sun 0644 root bin # node.js d usr/node 0755 root bin -d usr/node/0.8 0755 root bin -d usr/node/0.8/bin 0755 root bin -d usr/node/0.8/lib 0755 root bin -d usr/node/0.8/lib/dtrace 0755 root bin -d usr/node/0.8/man 0755 root bin -d usr/node/0.8/man/man1 0755 root bin -d usr/node/0.8/node_modules 0755 root bin +d usr/node/0.10 0755 root bin +d usr/node/0.10/bin 0755 root bin +d usr/node/0.10/lib 0755 root bin +d usr/node/0.10/lib/dtrace 0755 root bin +d usr/node/0.10/man 0755 root bin +d usr/node/0.10/man/man1 0755 root bin +d usr/node/0.10/node_modules 0755 root bin d usr/node/bin 0755 root bin -s usr/node/bin/node=../0.8/bin/node -s usr/node/node_modules=./0.8/node_modules -f usr/node/0.8/bin/node 0555 root bin -f usr/node/0.8/man/man1/node.1 0444 root bin -f usr/node/0.8/lib/dtrace/node.d 0444 root bin -f usr/node/0.8/node_modules/platform_node_version.js 0444 root bin -s usr/share/man/man1/node.1=../../../node/0.8/man/man1/node.1 -h usr/lib/dtrace/node.d=usr/node/0.8/lib/dtrace/node.d +s usr/node/bin/node=../0.10/bin/node +s usr/node/node_modules=./0.10/node_modules +f usr/node/0.10/bin/node 0555 root bin +f usr/node/0.10/man/man1/node.1 0444 root bin +f usr/node/0.10/lib/dtrace/node.d 0444 root bin +f usr/node/0.10/node_modules/platform_node_version.js 0444 root bin +s usr/share/man/man1/node.1=../../../node/0.10/man/man1/node.1 +h usr/lib/dtrace/node.d=usr/node/0.10/lib/dtrace/node.d # nss-nspr d usr/lib/mps 0755 root bin s usr/lib/mps/64=amd64 diff --git a/node.js/Makefile b/node.js/Makefile index 24a2e99d..9511c361 100644 --- a/node.js/Makefile +++ b/node.js/Makefile @@ -21,8 +21,8 @@ # Copyright (c) 2013, Joyent, Inc. All rights reserved. # -MAJOR_VER = 0.8 -VER = node-v0.8.26 +MAJOR_VER = 0.10 +VER = node-v0.10.26 include ../Makefile.defs diff --git a/node.js/Patches/abort_on_uncaught_exception.patch b/node.js/Patches/abort_on_uncaught_exception.patch deleted file mode 100644 index c059b0d7..00000000 --- a/node.js/Patches/abort_on_uncaught_exception.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/deps/v8/src/flag-definitions.h b/deps/v8/src/flag-definitions.h -index 6bb1507..dfa293d 100644 ---- a/deps/v8/src/flag-definitions.h -+++ b/deps/v8/src/flag-definitions.h -@@ -414,6 +414,8 @@ DEFINE_int(sim_stack_alignment, 8, - "Stack alingment in bytes in simulator (4 or 8, 8 is default)") - - // isolate.cc -+DEFINE_bool(abort_on_uncaught_exception, false, -+ "abort program (dump core) when an uncaught exception is thrown") - DEFINE_bool(trace_exception, false, - "print stack trace when throwing exceptions") - DEFINE_bool(preallocate_message_memory, false, -diff --git a/deps/v8/src/isolate.cc b/deps/v8/src/isolate.cc -index 8fcb370..189c76a 100644 ---- a/deps/v8/src/isolate.cc -+++ b/deps/v8/src/isolate.cc -@@ -1053,6 +1053,7 @@ bool Isolate::IsErrorObject(Handle obj) { - return false; - } - -+static int fatal_exception_depth = 0; - - void Isolate::DoThrow(Object* exception, MessageLocation* location) { - ASSERT(!has_pending_exception()); -@@ -1123,6 +1124,35 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { - thread_local_top()->pending_message_start_pos_ = location->start_pos(); - thread_local_top()->pending_message_end_pos_ = location->end_pos(); - } -+ -+ // If the abort-on-uncaught-exception flag is specified, abort on any -+ // exception not caught by JavaScript, even when an external handler is -+ // present. This flag is intended for use by JavaScript developers, so -+ // print a user-friendly stack trace (not an internal one). -+ if (fatal_exception_depth == 0 && -+ FLAG_abort_on_uncaught_exception && -+ (report_exception || can_be_caught_externally)) { -+ fatal_exception_depth++; -+ fprintf(stderr, "UNCAUGHT EXCEPTION: "); -+ exception->ShortPrint(stderr); -+ -+ if (IsErrorObject(exception_handle)) { -+ Handle key = factory()->LookupAsciiSymbol("message"); -+ MaybeObject *maybeMessage = -+ JSObject::cast(*exception_handle)->GetProperty(*key); -+ Object *messageObject; -+ if (maybeMessage->ToObject(&messageObject)) { -+ String *message = String::cast(messageObject); -+ fprintf(stderr, "\nEXCEPTION MESSAGE: "); -+ message->PrintOn(stderr); -+ } -+ } -+ -+ fprintf(stderr, "\nFROM:\n"); -+ PrintCurrentStackTrace(stderr); -+ OS::Abort(); -+ } -+ - } else if (location != NULL && !location->script().is_null()) { - // We are bootstrapping and caught an error where the location is set - // and we have a script for the location. diff --git a/node.js/Patches/fs-event.diff b/node.js/Patches/fs-event.diff new file mode 100644 index 00000000..ea345c2a --- /dev/null +++ b/node.js/Patches/fs-event.diff @@ -0,0 +1,16 @@ +diff --git a/deps/uv/src/unix/sunos.c b/deps/uv/src/unix/sunos.c +index 9030bfa..5249de0 100644 +--- a/deps/uv/src/unix/sunos.c ++++ b/deps/uv/src/unix/sunos.c +@@ -364,11 +364,11 @@ static void uv__fs_event_read(uv_loop_t* loop, + handle->fd = PORT_FIRED; + handle->cb(handle, NULL, events, 0); + +- if (handle->fd != PORT_DELETED) ++ if (handle->fd != PORT_DELETED && !(events & UV_RENAME)) + if (uv__fs_event_rearm(handle) != 0) + handle->cb(handle, NULL, 0, -1); + } +- while (handle->fd != PORT_DELETED); ++ while (handle->fd != PORT_DELETED && !(events & UV_RENAME)); + } diff --git a/node.js/Patches/node-5feedc5-socket-getFD.patch b/node.js/Patches/node-5feedc5-socket-getFD.patch index 0c0aaae5..048b4582 100644 --- a/node.js/Patches/node-5feedc5-socket-getFD.patch +++ b/node.js/Patches/node-5feedc5-socket-getFD.patch @@ -37,7 +37,7 @@ index e79d212..c7c0489 100644 + + UNWRAP(StreamWrap) + -+ int fd = (int)wrap->stream_->fd; ++ int fd = (int)wrap->stream_->io_watcher.fd; + + return scope.Close(Integer::New(fd)); +} diff --git a/node.js/Patches/separate-host.diff b/node.js/Patches/separate-host.diff index 4ff20aa8..b56a09c3 100644 --- a/node.js/Patches/separate-host.diff +++ b/node.js/Patches/separate-host.diff @@ -1,7 +1,6 @@ -diff -ur node-v0.8.14/configure node-v0.8.14-32/configure ---- node-v0.8.14/configure 2012-10-25 20:49:32.000000000 +0000 -+++ node-v0.8.14-32/configure 2013-01-11 20:31:32.754470909 +0000 -@@ -359,6 +359,7 @@ +--- a/configure.orig Wed Dec 18 23:49:45 2013 ++++ b/configure Mon Dec 23 21:03:16 2013 +@@ -470,6 +470,7 @@ target_arch = options.dest_cpu or host_arch o['variables']['host_arch'] = host_arch o['variables']['target_arch'] = target_arch @@ -9,7 +8,7 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure if target_arch == 'arm': configure_arm(o) -@@ -400,13 +401,13 @@ +@@ -533,13 +534,13 @@ # assume shared_zlib if one of these is set? if options.shared_zlib_libpath: @@ -24,8 +23,8 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure + o['include_dirs_target'] += [options.shared_zlib_includes] - def configure_v8(o): -@@ -415,13 +416,13 @@ + def configure_http_parser(o): +@@ -590,13 +591,13 @@ # assume shared_v8 if one of these is set? if options.shared_v8_libpath: @@ -41,7 +40,7 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure def configure_openssl(o): -@@ -438,7 +439,7 @@ +@@ -613,7 +614,7 @@ (libs, cflags) = pkg_config('openssl') or ('-lssl -lcrypto', '') if options.shared_openssl_libpath: @@ -50,7 +49,7 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure if options.shared_openssl_libname: libnames = options.shared_openssl_libname.split(',') -@@ -447,17 +448,18 @@ +@@ -622,7 +623,7 @@ o['libraries'] += libs.split() if options.shared_openssl_includes: @@ -59,15 +58,16 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure else: o['cflags'] += cflags.split() +@@ -650,10 +651,11 @@ output = { - 'variables': {}, + 'variables': { 'python': sys.executable }, - 'include_dirs': [], + 'include_dirs_target': [], 'libraries': [], 'defines': [], 'cflags': [], -+ 'ldflags_target': [], ++ 'ldflags_target': [] } configure_node(output) diff --git a/node.js/node-v0.8.26.tar.gz b/node.js/node-v0.10.26.tar.gz similarity index 60% rename from node.js/node-v0.8.26.tar.gz rename to node.js/node-v0.10.26.tar.gz index e9cedad3..3e3c6666 100644 Binary files a/node.js/node-v0.8.26.tar.gz and b/node.js/node-v0.10.26.tar.gz differ