Attachment #155640 for bug #199454

View | Details | Raw Unified | Return to bug 199454
Collapse All | Expand All

Lines 3-8 Link Here

(-)b/www/node/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= node	4	PORTNAME= node
5	PORTVERSION= 0.12.0	5	PORTVERSION= 0.12.2
6	PORTREVISION= 1	6	PORTREVISION=
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/	8	MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/

Lines 1-2 Link Here

(-)b/www/node/distinfo (-2 / +2 lines)
1	SHA256 (node-v0.12.0.tar.gz) = 9700e23af4e9b3643af48cef5f2ad20a1331ff531a12154eef2bfb0bb1682e32	1	SHA256 (node-v0.12.2.tar.gz) = ac7e78ade93e633e7ed628532bb8e650caba0c9c33af33581957f3382e2a772d
2	SIZE (node-v0.12.0.tar.gz) = 19096897	2	SIZE (node-v0.12.2.tar.gz) = 19311976




--- 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;
 }

Added Link Here

(-)b/www/node/files/patch-deps_v8_src_base_platform_platform-posix.cc (+11 lines)
1	--- deps/v8/src/base/platform/platform-posix.cc.orig 2015-03-31 22:13:01 UTC
2	+++ deps/v8/src/base/platform/platform-posix.cc
3	@@ -328,7 +328,7 @@ int OS::GetCurrentThreadId() {
4	#elif V8_OS_ANDROID
5	return static_cast<int>(gettid());
6	#else
7	- return static_cast<int>(pthread_self());
8	+ return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
9	#endif
10	}
11




--- ./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,
-                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                           MAP_PRIVATE | MAP_ANON,
                            kMmapFd,
                            kMmapFdOffset);
   if (reservation == MAP_FAILED) return;
@@ -260,7 +260,7 @@
   void* result = mmap(OS::GetRandomMmapAddr(),
                       size,
                       PROT_NONE,
-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
+                      MAP_PRIVATE | MAP_ANON,
                       kMmapFd,
                       kMmapFdOffset);
 
@@ -288,7 +288,7 @@
   return mmap(base,
               size,
               PROT_NONE,
-              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
               kMmapFd,
               kMmapFdOffset) != MAP_FAILED;
 }

Removed Link Here

(-)a/www/node/files/patch-deps_v8_src_platform-posix.cc (-11 lines)
1	--- ./deps/v8/src/base/platform/platform-posix.cc.orig 2015-02-07 04:04:23.000000000 +0800
2	+++ ./deps/v8/src/base/platform/platform-posix.cc 2015-02-08 01:11:42.000000000 +0800
3	@@ -328,7 +328,7 @@
4	#elif V8_OS_ANDROID
5	return static_cast<int>(gettid());
6	#else
7	- return static_cast<int>(pthread_self());
8	+ return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
9	#endif
10	}
11

Lines 1-5 Link Here

(-)b/www/node/files/patch-lib_dns.js (-3 / +3 lines)
1	--- lib/dns.js.orig 2015-02-13 23:42:28.000000000 +0800	1	--- lib/dns.js.orig 2015-03-31 22:13:01 UTC
2	+++ lib/dns.js 2015-02-13 23:46:39.000000000 +0800	2	+++ lib/dns.js
3	@@ -125,6 +125,11 @@	3	@@ -125,6 +125,11 @@ exports.lookup = function lookup(hostnam
4	hints !== (exports.ADDRCONFIG \| exports.V4MAPPED)) {	4	hints !== (exports.ADDRCONFIG \| exports.V4MAPPED)) {
5	throw new TypeError('invalid argument: hints must use valid flags');	5	throw new TypeError('invalid argument: hints must use valid flags');

Added Link Here

(-)b/www/node/files/patch-src_node.cc (-1 / +11 lines)
0	-	1	--- src/node.cc.orig 2015-04-15 04:37:29 UTC
		2	+++ src/node.cc
		3	@@ -2790,7 +2790,7 @@ static void SignalExit(int signo) {
		4	struct sigaction sa;
		5	memset(&sa, 0, sizeof(sa));
		6	sa.sa_handler = SIG_DFL;
		7	- CHECK_EQ(sigaction(signo, &sa, nullptr), 0);
		8	+ CHECK_EQ(sigaction(signo, &sa, NULL), 0);
		9	#endif
		10	raise(signo);
		11	}

Return to bug 199454

Added Link Here

(-)b/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc (+69 lines)
1	--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2015-03-31 22:13:01 UTC
2	+++ deps/v8/src/base/platform/platform-freebsd.cc
3	@@ -131,23 +131,23 @@ std::vector<OS::SharedLibraryAddress> OS
4	addr_buffer[0] = '0';
5	addr_buffer[1] = 'x';
6	addr_buffer[10] = 0;
7	- int result = read(fd, addr_buffer + 2, 8);
8	- if (result < 8) break;
9	+ ssize_t bytes_read = read(fd, addr_buffer + 2, 8);
10	+ if (bytes_read < 8) break;
11	unsigned start = StringToLong(addr_buffer);
12	- result = read(fd, addr_buffer + 2, 1);
13	- if (result < 1) break;
14	+ bytes_read = read(fd, addr_buffer + 2, 1);
15	+ if (bytes_read < 1) break;
16	if (addr_buffer[2] != '-') break;
17	- result = read(fd, addr_buffer + 2, 8);
18	- if (result < 8) break;
19	+ bytes_read = read(fd, addr_buffer + 2, 8);
20	+ if (bytes_read < 8) break;
21	unsigned end = StringToLong(addr_buffer);
22	char buffer[MAP_LENGTH];
23	- int bytes_read = -1;
24	+ bytes_read = -1;
25	do {
26	bytes_read++;
27	if (bytes_read >= MAP_LENGTH - 1)
28	break;
29	- result = read(fd, buffer + bytes_read, 1);
30	- if (result < 1) break;
31	+ bytes_read = read(fd, buffer + bytes_read, 1);
32	+ if (bytes_read < 1) break;
33	} while (buffer[bytes_read] != '\n');
34	buffer[bytes_read] = 0;
35	// Ignore mappings that are not executable.
36	@@ -182,13 +182,13 @@ VirtualMemory::VirtualMemory(size_t size
37
38	VirtualMemory::VirtualMemory(size_t size, size_t alignment)
39	: address_(NULL), size_(0) {
40	- DCHECK(IsAligned(alignment, static_cast<intptr_t>(OS::AllocateAlignment())));
41	+ DCHECK((alignment % OS::AllocateAlignment()) == 0);
42	size_t request_size = RoundUp(size + alignment,
43	static_cast<intptr_t>(OS::AllocateAlignment()));
44	void* reservation = mmap(OS::GetRandomMmapAddr(),
45	request_size,
46	PROT_NONE,
47	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
48	+ MAP_PRIVATE \| MAP_ANON,
49	kMmapFd,
50	kMmapFdOffset);
51	if (reservation == MAP_FAILED) return;
52	@@ -260,7 +260,7 @@ void* VirtualMemory::ReserveRegion(size_
53	void* result = mmap(OS::GetRandomMmapAddr(),
54	size,
55	PROT_NONE,
56	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE,
57	+ MAP_PRIVATE \| MAP_ANON,
58	kMmapFd,
59	kMmapFdOffset);
60
61	@@ -288,7 +288,7 @@ bool VirtualMemory::UncommitRegion(void*
62	return mmap(base,
63	size,
64	PROT_NONE,
65	- MAP_PRIVATE \| MAP_ANON \| MAP_NORESERVE \| MAP_FIXED,
66	+ MAP_PRIVATE \| MAP_ANON \| MAP_FIXED,
67	kMmapFd,
68	kMmapFdOffset) != MAP_FAILED;
69	}