Attachment 152831 Details for Bug 197508 – node-devel-0.11.16.patch

node-devel-0.11.16.patch

node-devel-0.11.16.patch (text/plain), 5.19 KB, created by linpct on 2015-02-10 06:23:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: linpct

Created: 2015-02-10 06:23:47 UTC

Size: 5.19 KB

patch

obsolete

>diff -ruN www/node-devel.orig/Makefile www/node-devel/Makefile
>--- www/node-devel.orig/Makefile	2015-02-06 21:46:39.000000000 +0800
>+++ www/node-devel/Makefile	2015-02-09 14:44:44.000000000 +0800
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/www/node-devel/Makefile 378506 2015-02-06 05:55:44Z vanilla $
> 
> PORTNAME=	node
>-PORTVERSION=	0.11.14
>+PORTVERSION=	0.11.16
> CATEGORIES=	www
> MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
> PKGNAMESUFFIX=	-devel
>diff -ruN www/node-devel.orig/distinfo www/node-devel/distinfo
>--- www/node-devel.orig/distinfo	2014-10-13 10:17:42.000000000 +0800
>+++ www/node-devel/distinfo	2015-02-09 14:44:58.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (node-v0.11.14.tar.gz) = ce08b0a2769bcc135ca25639c9d411a038e93e0f5f5a83000ecde9b763c4dd83
>-SIZE (node-v0.11.14.tar.gz) = 17255771
>+SHA256 (node-v0.11.16.tar.gz) = f0d141faa1f7da3aff53e9615d76040d29c0650542be3b09ee80aca2f2cc61f6
>+SIZE (node-v0.11.16.tar.gz) = 19059251
>diff -ruN www/node-devel.orig/files/patch-deps_v8_src_platform-freebsd.cc www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc
>--- www/node-devel.orig/files/patch-deps_v8_src_platform-freebsd.cc	2014-10-28 11:05:47.000000000 +0800
>+++ www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc	2015-02-10 10:54:29.000000000 +0800
>@@ -1,6 +1,46 @@
>---- deps/v8/src/platform-freebsd.cc.orig	2014-05-01 20:49:51.000000000 -0400
>-+++ deps/v8/src/platform-freebsd.cc	2014-10-08 13:34:09.000000000 -0400
>-@@ -213,7 +213,7 @@
>+--- ./deps/v8/src/base/platform/platform-freebsd.cc.orig	2015-02-07 04:04:23.000000000 +0800
>++++ ./deps/v8/src/base/platform/platform-freebsd.cc	2015-02-10 10:53:45.000000000 +0800
>+@@ -131,23 +131,23 @@
>+     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, 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,
>@@ -9,7 +49,7 @@
>                             kMmapFd,
>                             kMmapFdOffset);
>    if (reservation == MAP_FAILED) return;
>-@@ -285,7 +285,7 @@
>+@@ -260,7 +260,7 @@
>    void* result = mmap(OS::GetRandomMmapAddr(),
>                        size,
>                        PROT_NONE,
>@@ -18,7 +58,7 @@
>                        kMmapFd,
>                        kMmapFdOffset);
>  
>-@@ -313,7 +313,7 @@
>+@@ -288,7 +288,7 @@
>    return mmap(base,
>                size,
>                PROT_NONE,
>diff -ruN www/node-devel.orig/files/patch-deps_v8_src_platform-posix.cc www/node-devel/files/patch-deps_v8_src_platform-posix.cc
>--- www/node-devel.orig/files/patch-deps_v8_src_platform-posix.cc	1970-01-01 08:00:00.000000000 +0800
>+++ www/node-devel/files/patch-deps_v8_src_platform-posix.cc	2015-02-09 21:58:28.000000000 +0800
>@@ -0,0 +1,11 @@
>+--- ./deps/v8/src/base/platform/platform-posix.cc.orig	2015-02-07 04:04:23.000000000 +0800
>++++ ./deps/v8/src/base/platform/platform-posix.cc	2015-02-08 01:11:42.000000000 +0800
>+@@ -328,7 +328,7 @@
>+ #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 www/node-devel.orig/pkg-plist www/node-devel/pkg-plist
>--- www/node-devel.orig/pkg-plist	2014-10-13 10:38:56.000000000 +0800
>+++ www/node-devel/pkg-plist	2015-02-10 00:33:58.000000000 +0800
>@@ -4,6 +4,7 @@
> 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
>@@ -37,9 +38,3 @@
> lib/node_modules/.keepme
> man/man1/node.1.gz
> share/systemtap/tapset/node.stp
>-%%LOCALBASE%%/libdata/ldconfig/node
>-@dirrmtry include/node/openssl
>-@dirrmtry include/node
>-@dirrmtry lib/node_modules
>-@dirrmtry share/systemtap/tapset
>-@dirrmtry share/systemtap

Actions: View

Attachments on bug 197508: 152831