Attachment 161181 Details for Bug 203203 – Patch to update port to node 4.1.0.

Patch to update port to node 4.1.0.

node-4.1.0.patch.txt (text/plain), 7.70 KB, created by Douglas Carmichael on 2015-09-19 08:33:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Carmichael

Created: 2015-09-19 08:33:11 UTC

Size: 7.70 KB

patch

obsolete

>diff -ruN node.orig/Makefile node/Makefile
>--- node.orig/Makefile	2015-09-19 02:47:23.392862000 -0500
>+++ node/Makefile	2015-09-19 02:47:38.024412000 -0500
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/node/Makefile 392101 2015-07-14 21:28:59Z pgollucci $
> 
> PORTNAME=	node
>-PORTVERSION=	0.12.7
>+PORTVERSION=	4.1.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
>diff -ruN node.orig/distinfo node/distinfo
>--- node.orig/distinfo	2015-09-19 02:47:23.394489000 -0500
>+++ node/distinfo	2015-09-19 02:51:42.827935000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (node-v0.12.7.tar.gz) = b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d
>-SIZE (node-v0.12.7.tar.gz) = 20063992
>+SHA256 (node-v4.1.0.tar.gz) = 453005f64ee529f7dcf1237eb27ee2fa2415c49f5c9e7463e8b71fba61c5b408
>+SIZE (node-v4.1.0.tar.gz) = 22518671
>diff -ruN node.orig/files/patch-deps_v8_src_base_platform_platform-freebsd.cc node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
>--- node.orig/files/patch-deps_v8_src_base_platform_platform-freebsd.cc	2015-09-19 02:47:23.396319000 -0500
>+++ node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc	1969-12-31 18:00:00.000000000 -0600
>@@ -1,69 +0,0 @@
>---- deps/v8/src/base/platform/platform-freebsd.cc.orig	2015-03-31 22:13:01 UTC
>-+++ deps/v8/src/base/platform/platform-freebsd.cc
>-@@ -131,23 +131,23 @@ std::vector<OS::SharedLibraryAddress> OS
>-     addr_buffer[0] = '0';
>-     addr_buffer[1] = 'x';
>-     addr_buffer[10] = 0;
>--    int result = read(fd, addr_buffer + 2, 8);
>--    if (result < 8) break;
>-+    ssize_t bytes_read = read(fd, addr_buffer + 2, 8);
>-+    if (bytes_read < 8) break;
>-     unsigned start = StringToLong(addr_buffer);
>--    result = read(fd, addr_buffer + 2, 1);
>--    if (result < 1) break;
>-+    bytes_read = read(fd, addr_buffer + 2, 1);
>-+    if (bytes_read < 1) break;
>-     if (addr_buffer[2] != '-') break;
>--    result = read(fd, addr_buffer + 2, 8);
>--    if (result < 8) break;
>-+    bytes_read = read(fd, addr_buffer + 2, 8);
>-+    if (bytes_read < 8) break;
>-     unsigned end = StringToLong(addr_buffer);
>-     char buffer[MAP_LENGTH];
>--    int bytes_read = -1;
>-+    bytes_read = -1;
>-     do {
>-       bytes_read++;
>-       if (bytes_read >= MAP_LENGTH - 1)
>-         break;
>--      result = read(fd, buffer + bytes_read, 1);
>--      if (result < 1) break;
>-+      bytes_read = read(fd, buffer + bytes_read, 1);
>-+      if (bytes_read < 1) break;
>-     } while (buffer[bytes_read] != '\n');
>-     buffer[bytes_read] = 0;
>-     // Ignore mappings that are not executable.
>-@@ -182,13 +182,13 @@ VirtualMemory::VirtualMemory(size_t size
>- 
>- VirtualMemory::VirtualMemory(size_t size, size_t alignment)
>-     : address_(NULL), size_(0) {
>--  DCHECK(IsAligned(alignment, static_cast<intptr_t>(OS::AllocateAlignment())));
>-+  DCHECK((alignment % OS::AllocateAlignment()) == 0);
>-   size_t request_size = RoundUp(size + alignment,
>-                                 static_cast<intptr_t>(OS::AllocateAlignment()));
>-   void* reservation = mmap(OS::GetRandomMmapAddr(),
>-                            request_size,
>-                            PROT_NONE,
>--                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
>-+                           MAP_PRIVATE | MAP_ANON,
>-                            kMmapFd,
>-                            kMmapFdOffset);
>-   if (reservation == MAP_FAILED) return;
>-@@ -260,7 +260,7 @@ void* VirtualMemory::ReserveRegion(size_
>-   void* result = mmap(OS::GetRandomMmapAddr(),
>-                       size,
>-                       PROT_NONE,
>--                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
>-+                      MAP_PRIVATE | MAP_ANON,
>-                       kMmapFd,
>-                       kMmapFdOffset);
>- 
>-@@ -288,7 +288,7 @@ bool VirtualMemory::UncommitRegion(void*
>-   return mmap(base,
>-               size,
>-               PROT_NONE,
>--              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
>-+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
>-               kMmapFd,
>-               kMmapFdOffset) != MAP_FAILED;
>- }
>diff -ruN node.orig/files/patch-deps_v8_src_base_platform_platform-posix.cc node/files/patch-deps_v8_src_base_platform_platform-posix.cc
>--- node.orig/files/patch-deps_v8_src_base_platform_platform-posix.cc	2015-09-19 02:47:23.397384000 -0500
>+++ node/files/patch-deps_v8_src_base_platform_platform-posix.cc	1969-12-31 18:00:00.000000000 -0600
>@@ -1,11 +0,0 @@
>---- deps/v8/src/base/platform/platform-posix.cc.orig	2015-03-31 22:13:01 UTC
>-+++ deps/v8/src/base/platform/platform-posix.cc
>-@@ -328,7 +328,7 @@ int OS::GetCurrentThreadId() {
>- #elif V8_OS_ANDROID
>-   return static_cast<int>(gettid());
>- #else
>--  return static_cast<int>(pthread_self());
>-+  return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
>- #endif
>- }
>- 
>diff -ruN node.orig/pkg-plist node/pkg-plist
>--- node.orig/pkg-plist	2015-09-19 02:47:23.399200000 -0500
>+++ node/pkg-plist	2015-09-19 03:09:16.602886000 -0500
>@@ -1,16 +1,38 @@
> bin/node
>-include/node/android-ifaddrs.h
>-include/node/ares.h
>-include/node/ares_version.h
> include/node/common.gypi
> include/node/config.gypi
>-include/node/libplatform/libplatform.h
>-include/node/nameser.h
> include/node/node.h
> include/node/node_buffer.h
> include/node/node_internals.h
> include/node/node_object_wrap.h
> include/node/node_version.h
>+include/node/ares.h
>+include/node/ares_version.h
>+include/node/nameser.h
>+include/node/v8-debug.h
>+include/node/v8-platform.h
>+include/node/v8-profiler.h
>+include/node/v8-testing.h
>+include/node/v8-util.h
>+include/node/v8-version.h
>+include/node/v8.h
>+include/node/v8config.h
>+include/node/libplatform/libplatform.h
>+include/node/android-ifaddrs.h
>+include/node/pthread-fixes.h
>+include/node/tree.h
>+include/node/stdint-msvc2008.h
>+include/node/uv-aix.h
>+include/node/uv-bsd.h
>+include/node/uv-darwin.h
>+include/node/uv-errno.h
>+include/node/uv-linux.h
>+include/node/uv-sunos.h
>+include/node/uv-threadpool.h
>+include/node/uv-unix.h
>+include/node/uv-version.h
>+include/node/uv-win.h
>+include/node/uv.h
> include/node/openssl/aes.h
> include/node/openssl/asn1.h
> include/node/openssl/asn1_mac.h
>@@ -86,28 +108,23 @@
> include/node/openssl/x509.h
> include/node/openssl/x509_vfy.h
> include/node/openssl/x509v3.h
>-include/node/pthread-fixes.h
>-include/node/smalloc.h
>-include/node/stdint-msvc2008.h
>-include/node/tree.h
>-include/node/uv-aix.h
>-include/node/uv-bsd.h
>-include/node/uv-darwin.h
>-include/node/uv-errno.h
>-include/node/uv-linux.h
>-include/node/uv-sunos.h
>-include/node/uv-threadpool.h
>-include/node/uv-unix.h
>-include/node/uv-version.h
>-include/node/uv-win.h
>-include/node/uv.h
>-include/node/v8-debug.h
>-include/node/v8-platform.h
>-include/node/v8-profiler.h
>-include/node/v8-testing.h
>-include/node/v8-util.h
>-include/node/v8.h
>-include/node/v8config.h
>-include/node/v8stdint.h
>-@(,,444) man/man1/node.1.gz
>+include/node/openssl/archs/VC-WIN64A/opensslconf.h
>+include/node/openssl/archs/linux-x86_64/opensslconf.h
>+include/node/openssl/archs/BSD-x86/opensslconf.h
>+include/node/openssl/archs/solaris-x86-gcc/opensslconf.h
>+include/node/openssl/archs/linux-ppc/opensslconf.h
>+include/node/openssl/archs/linux-armv4/opensslconf.h
>+include/node/openssl/archs/aix64-gcc/opensslconf.h
>+include/node/openssl/archs/darwin64-x86_64-cc/opensslconf.h
>+include/node/openssl/archs/linux-elf/opensslconf.h
>+include/node/openssl/archs/linux-x32/opensslconf.h
>+include/node/openssl/archs/linux-aarch64/opensslconf.h
>+include/node/openssl/archs/linux-ppc64/opensslconf.h
>+include/node/openssl/archs/darwin-i386-cc/opensslconf.h
>+include/node/openssl/archs/solaris64-x86_64-gcc/opensslconf.h
>+include/node/openssl/archs/BSD-x86_64/opensslconf.h
>+include/node/openssl/archs/VC-WIN32/opensslconf.h
>+include/node/openssl/archs/aix-gcc/opensslconf.h
> share/systemtap/tapset/node.stp
>+@(,,444) man/man1/node.1.gz
>+share/doc/node/gdbinit

Actions: View

Attachments on bug 203203: 161181 | 161217