Skip to content
Browse files

OS-1009 upgrade node to 0.6.12

  • Loading branch information...
1 parent ec01114 commit 1ade91c7257f3d1e0e89110a8a0b7fe373213a35 @joshwilsdon joshwilsdon committed Mar 4, 2012
Showing with 20 additions and 14 deletions.
  1. +19 −1 .gitignore
  2. +1 −2 node.js/Makefile
  3. BIN node.js/{node-v0.6.9.tar.gz → node-v0.6.12.tar.gz}
  4. +0 −11 node.js/node-v0.6.9.patch
View
20 .gitignore
@@ -2,8 +2,23 @@
/bzip2/bzip2-1.0.6
/bzip2/bzip2-1.0.6-64
/curl/curl-7.21.2
+/dialog/dialog-1.1-20111020/
+/g11n/proto/
+/g11n/src/lib/iconv/common/amd64/
+/g11n/src/lib/iconv/common/*.o
+/g11n/src/lib/iconv/common/*.so
+/g11n/src/lib/iconv/euro/amd64/
+/g11n/src/lib/iconv/euro/*.o
+/g11n/src/lib/iconv/euro/*.so
+/g11n/src/lib/iconv/euro/tbl.h
+/g11n/src/lib/iconv/utf-8/amd64/
+/g11n/src/lib/iconv/utf-8/*.bt
+/g11n/src/lib/iconv/utf-8/*.o
+/g11n/src/lib/iconv/utf-8/*.so
/gcc/gcc-3.4.3
/gcc/gcc-3.4.3-i386-build
+/gcc4/gcc-4.4.4-i386-build
+/gcc4/gcc-4.4.4
/gnupg/gnupg-1.4.11
/gtar/tar-1.23
/gzip/gzip-1.3.5
@@ -22,16 +37,19 @@
/libz/zlib-1.2.3-64
/ncurses/ncurses-5.7
/ncurses/ncurses-5.7-64
-/node.js/node-v0.6.9
+/node.js/node-v0.6.12
/nss-nspr/nss-3.12.8
/nss-nspr/nss-3.12.8-64
/ntp/ntp-dev-4.2.5p200
+/openldap/openldap-2.4.26/
/openssl/openssl-0.9.8o
/openssl/openssl-0.9.8o-64
/perl/perl-5.12.3
/proto
/rsync/rsync-3.0.6
/screen/screen-4.0.3
+/socat/socat-1.7.1.3/
/uuid/uuid-1.6.2
/vim/vim72
/wget/wget-1.12
+/illumos-extra-*.tgz
View
3 node.js/Makefile
@@ -21,7 +21,7 @@
# Copyright 2012 Joyent, Inc.
#
-VER=node-v0.6.9
+VER=node-v0.6.12
BASE=$(PWD)
DESTDIR=$(BASE)/../proto
GCC=$(DESTDIR)/usr/sfw/bin/gcc
@@ -45,5 +45,4 @@ $(VER)/build/default/config.h: $(VER)/configure
$(VER)/configure: $(VER).tar.gz
gtar -zxf $(VER).tar.gz
- (cd $(VER) && gpatch -p1 < ../$(VER).patch)
touch $(VER)/configure
View
BIN node.js/node-v0.6.9.tar.gz → node.js/node-v0.6.12.tar.gz
Binary file not shown.
View
11 node.js/node-v0.6.9.patch
@@ -1,11 +0,0 @@
-diff -urN node-v0.6.9.orig/deps/uv/src/unix/pipe.c node-v0.6.9/deps/uv/src/unix/pipe.c
---- node-v0.6.9.orig/deps/uv/src/unix/pipe.c 2012-01-28 00:32:19.000000000 +0000
-+++ node-v0.6.9/deps/uv/src/unix/pipe.c 2012-01-29 21:39:41.750609048 +0000
-@@ -251,7 +251,6 @@
- pipe = watcher->data;
-
- assert(pipe->type == UV_NAMED_PIPE);
-- assert(pipe->pipe_fname != NULL);
-
- sockfd = uv__accept(pipe->fd, (struct sockaddr *)&saddr, sizeof saddr);
- if (sockfd == -1) {

0 comments on commit 1ade91c

Please sign in to comment.
Something went wrong with that request. Please try again.