The MAP_NORESERVE flag to mmap() has never been implemented in FreeBSD and

is being removed.  No portrev bump needed since the kernel will continue to
accept this flag for old binaries even after support for it in new binaries
is removed.

PR:		193961
Approved by:	portmgr (antoine)

5 files changed, 107 insertions, 0 deletions

diff --git a/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc b/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
index d9cfe09fd719..2256ed45e94e 100644
--- a/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
+++ b/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
@@ -32,3 +32,30 @@
      } while (buffer[bytes_read] != '\n');
      buffer[bytes_read] = 0;
      // Ignore mappings that are not executable.
+@@ -187,7 +187,7 @@
+   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;
+@@ -259,7 +259,7 @@
+   void* result = mmap(OS::GetRandomMmapAddr(),
+                       size,
+                       PROT_NONE,
+-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
++                      MAP_PRIVATE | MAP_ANON,
+                       kMmapFd,
+                       kMmapFdOffset);
+ 
+@@ -287,7 +287,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;
+ }
diff --git a/www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc b/www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc
new file mode 100644
index 000000000000..7e69091d44ea
--- /dev/null
+++ b/www/node-devel/files/patch-deps_v8_src_platform-freebsd.cc
@@ -0,0 +1,29 @@
+--- 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 @@
+   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;
+@@ -285,7 +285,7 @@
+   void* result = mmap(OS::GetRandomMmapAddr(),
+                       size,
+                       PROT_NONE,
+-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
++                      MAP_PRIVATE | MAP_ANON,
+                       kMmapFd,
+                       kMmapFdOffset);
+ 
+@@ -313,7 +313,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;
+ }
diff --git a/www/node/files/patch-deps_v8_src_platform-freebsd.cc b/www/node/files/patch-deps_v8_src_platform-freebsd.cc
new file mode 100644
index 000000000000..2802769ea38f
--- /dev/null
+++ b/www/node/files/patch-deps_v8_src_platform-freebsd.cc
@@ -0,0 +1,29 @@
+--- deps/v8/src/platform-freebsd.cc.orig	2014-09-16 18:47:52.000000000 -0400
++++ deps/v8/src/platform-freebsd.cc	2014-10-08 13:23:25.000000000 -0400
+@@ -343,7 +343,7 @@
+   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;
+@@ -415,7 +415,7 @@
+   void* result = mmap(OS::GetRandomMmapAddr(),
+                       size,
+                       PROT_NONE,
+-                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
++                      MAP_PRIVATE | MAP_ANON,
+                       kMmapFd,
+                       kMmapFdOffset);
+ 
+@@ -445,7 +445,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;
+ }
diff --git a/www/trafficserver/files/patch-lib__ts__Compatability.h b/www/trafficserver/files/patch-lib__ts__Compatability.h
new file mode 100644
index 000000000000..82e72c34a725
--- /dev/null
+++ b/www/trafficserver/files/patch-lib__ts__Compatability.h
@@ -0,0 +1,11 @@
+--- lib/ts/Compatability.h.orig	2014-10-08 13:41:39.000000000 -0400
++++ lib/ts/Compatability.h	2014-10-08 13:42:29.000000000 -0400
+@@ -55,7 +55,7 @@
+ #if defined(linux)
+ #define NEED_ALTZONE_DEFINED
+ #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
+-#elif defined(darwin)
++#elif defined(darwin) || defined(__FreeBSD__)
+ #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED)
+ #elif defined(solaris)
+ #define NEED_ALTZONE_DEFINED
diff --git a/www/trafficserver/files/patch-tools__jtest__jtest.cc b/www/trafficserver/files/patch-tools__jtest__jtest.cc
new file mode 100644
index 000000000000..3ba14b752708
--- /dev/null
+++ b/www/trafficserver/files/patch-tools__jtest__jtest.cc
@@ -0,0 +1,11 @@
+--- tools/jtest/jtest.cc.orig	2014-10-08 13:50:58.000000000 -0400
++++ tools/jtest/jtest.cc	2014-10-08 13:51:12.000000000 -0400
+@@ -2689,7 +2689,7 @@
+     ink_assert( !ftruncate(fd,numbytes) );
+     bytes = (unsigned char *)
+       mmap(NULL,numbytes,PROT_READ|PROT_WRITE,
+-           MAP_SHARED|MAP_NORESERVE,
++           MAP_SHARED,
+            fd, 0);
+     if (bytes == (unsigned char*)MAP_FAILED || !bytes)
+       panic("unable to map URL Hash file\n");