Attachment #139819 for bug #186150

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

Lines 1-8 Link Here

(-)./Makefile (-3 / +3 lines)
1	# Created by: Jin-Sih Lin <linpct@gmail.com>	1	# Created by: Jin-Sih Lin <linpct@gmail.com>
2	# $FreeBSD: head/www/node/Makefile 336427 2013-12-14 09:17:38Z mva $	2	# $FreeBSD: head/www/node/Makefile 339634 2014-01-13 21:00:02Z rene $
3		3
4	PORTNAME= node	4	PORTNAME= node
5	PORTVERSION= 0.10.22	5	PORTVERSION= 0.10.25
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/	7	MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/
8	DISTNAME= ${PORTNAME}-v${PORTVERSION}	8	DISTNAME= ${PORTNAME}-v${PORTVERSION}
Lines 16-22 Link Here
16		16
17	HAS_CONFIGURE= yes	17	HAS_CONFIGURE= yes
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19	USE_PYTHON= 2.7	19	USE_PYTHON= 2
20	USES= gmake	20	USES= gmake
21		21
22	CONFLICTS= node-0.[02-9][0-9]* node-devel-0.[0-9]*	22	CONFLICTS= node-0.[02-9][0-9]* node-devel-0.[0-9]*

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (node-v0.10.22.tar.gz) = 157fc58b3f1d109baefac4eb1d32ae747de5e6d55d87d0e9bec8f8dd10679e7e	1	SHA256 (node-v0.10.25.tar.gz) = 46eef3b9d5475a2081dc2b2f7cf1f4c3a56824d1fc9b04e7ed1d7a88e8f6b36f
2	SIZE (node-v0.10.22.tar.gz) = 13686897	2	SIZE (node-v0.10.25.tar.gz) = 13732322




--- deps/uv/src/unix/kqueue.orig    2013-11-18 23:14:54.000000000 -0200
+++ deps/uv/src/unix/kqueue.c 2013-11-18 23:16:51.000000000 -0200
@@ -263,6 +263,25 @@
   }
 }
 
+ 
+void uv__platform_invalidate_fd(uv_loop_t* loop, int fd) {
+  struct kevent* events;
+  uintptr_t i;
+  uintptr_t nfds;
+
+  assert(loop->watchers != NULL);
+
+ events = (struct kevent*) loop->watchers[loop->nwatchers];
+  nfds = (uintptr_t) loop->watchers[loop->nwatchers + 1];
+  if (events == NULL)
+    return;
+
+  /* Invalidate events with same file descriptor */
+  for (i = 0; i < nfds; i++)
+    if ((int) events[i].ident == fd)
+      events[i].ident = -1;
+}
+
 
 static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags) {
   uv_fs_event_t* handle;




bin/node
include/node/ares.h
include/node/ares_version.h
include/node/common.gypi
include/node/config.gypi
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/openssl/opensslconf.h
include/node/uv-private/ngx-queue.h
include/node/uv-private/stdint-msvc2008.h
include/node/uv-private/tree.h
include/node/uv-private/uv-bsd.h
include/node/uv-private/uv-darwin.h
include/node/uv-private/uv-linux.h
include/node/uv-private/uv-sunos.h
include/node/uv-private/uv-unix.h
include/node/uv-private/uv-win.h
include/node/uv.h
include/node/v8-debug.h
include/node/v8-preparser.h
include/node/v8-profiler.h
include/node/v8-testing.h
include/node/v8.h
include/node/v8stdint.h
include/node/zconf.h
include/node/zlib.h
lib/dtrace/node.d
lib/node_modules/.keepme
@dirrmtry lib/node_modules
@dirrmtry lib/dtrace
@dirrmtry include/node/uv-private
@dirrmtry include/node/openssl
@dirrmtry include/node

Return to bug 186150

Lines 1-28 Link Here

(-)./files/patch-kqueue.c (-28 lines)
1	--- deps/uv/src/unix/kqueue.orig 2013-11-18 23:14:54.000000000 -0200
2	+++ deps/uv/src/unix/kqueue.c 2013-11-18 23:16:51.000000000 -0200
3	@@ -263,6 +263,25 @@
4	}
5	}
6
7	+
8	+void uv__platform_invalidate_fd(uv_loop_t* loop, int fd) {
9	+ struct kevent* events;
10	+ uintptr_t i;
11	+ uintptr_t nfds;
12	+
13	+ assert(loop->watchers != NULL);
14	+
15	+ events = (struct kevent*) loop->watchers[loop->nwatchers];
16	+ nfds = (uintptr_t) loop->watchers[loop->nwatchers + 1];
17	+ if (events == NULL)
18	+ return;
19	+
20	+ /* Invalidate events with same file descriptor */
21	+ for (i = 0; i < nfds; i++)
22	+ if ((int) events[i].ident == fd)
23	+ events[i].ident = -1;
24	+}
25	+
26
27	static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags) {
28	uv_fs_event_t* handle;

Lines 1-5 Link Here

(-)./pkg-plist (-2 / +34 lines)
1	bin/node	1	bin/node
		2	include/node/ares.h
		3	include/node/ares_version.h
		4	include/node/common.gypi
		5	include/node/config.gypi
		6	include/node/nameser.h
		7	include/node/node.h
		8	include/node/node_buffer.h
		9	include/node/node_internals.h
		10	include/node/node_object_wrap.h
		11	include/node/node_version.h
		12	include/node/openssl/opensslconf.h
		13	include/node/uv-private/ngx-queue.h
		14	include/node/uv-private/stdint-msvc2008.h
		15	include/node/uv-private/tree.h
		16	include/node/uv-private/uv-bsd.h
		17	include/node/uv-private/uv-darwin.h
		18	include/node/uv-private/uv-linux.h
		19	include/node/uv-private/uv-sunos.h
		20	include/node/uv-private/uv-unix.h
		21	include/node/uv-private/uv-win.h
		22	include/node/uv.h
		23	include/node/v8-debug.h
		24	include/node/v8-preparser.h
		25	include/node/v8-profiler.h
		26	include/node/v8-testing.h
		27	include/node/v8.h
		28	include/node/v8stdint.h
		29	include/node/zconf.h
		30	include/node/zlib.h
2	lib/dtrace/node.d	31	lib/dtrace/node.d
3	lib/node_modules/.keepme	32	lib/node_modules/.keepme
4	@dirrm lib/node_modules	33	@dirrmtry lib/node_modules
5	@dirrm lib/dtrace	34	@dirrmtry lib/dtrace
		35	@dirrmtry include/node/uv-private
		36	@dirrmtry include/node/openssl
		37	@dirrmtry include/node