--- a/components/desktop/firefox/patches/firefox-50-arc4random.patch Fri Nov 18 19:13:03 2016 -0800
+++ b/components/desktop/firefox/patches/firefox-50-arc4random.patch Mon Nov 14 04:25:50 2016 -0800
@@ -3,26 +3,26 @@
--- a/ipc/chromium/src/third_party/libevent/arc4random.c 2016-03-01 09:29:36.602447178 -0800
+++ b/ipc/chromium/src/third_party/libevent/arc4random.c 2016-03-01 10:17:51.627857034 -0800
-@@ -445,8 +445,8 @@ arc4random_stir(void)
+@@ -445,8 +449,8 @@
#endif
-
+
#ifndef ARC4RANDOM_NOADDRANDOM
-ARC4RANDOM_EXPORT void
-arc4random_addrandom(const unsigned char *dat, int datlen)
+extern void
+arc4random_addrandom(uchar_t *dat, size_t datlen)
{
- int j;
- _ARC4_LOCK();
-@@ -477,7 +477,7 @@ arc4random(void)
+ int j;
+ _ARC4_LOCK();
+@@ -477,7 +481,7 @@
}
#endif
-
+
-ARC4RANDOM_EXPORT void
+extern void
arc4random_buf(void *_buf, size_t n)
{
- unsigned char *buf = _buf;
+ unsigned char *buf = _buf;
--- a/config/system-headers 2015-11-03 11:34:17.000000000 +0100
+++ b/config/system-headers 2015-11-09 03:34:24.577525000 +0100
@@ -1064,7 +1064,6 @@
@@ -46,7 +46,7 @@
#ifndef ARC4RANDOM_EXPORT
#define ARC4RANDOM_EXPORT
#endif
-@@ -59,7 +61,7 @@
+@@ -59,7 +63,7 @@
#include <sys/param.h>
#include <sys/time.h>
#ifdef _EVENT_HAVE_SYS_SYSCTL_H
@@ -57,7 +57,7 @@
#include <limits.h>
--- a/ipc/chromium/moz.build 2016-03-28 13:41:06.878922929 -0700
+++ b/ipc/chromium/moz.build 2016-03-28 13:42:04.555448660 -0700
-@@ -161,6 +161,23 @@ if os_bsd or os_linux:
+@@ -161,6 +161,23 @@
'src/base/message_pump_qt.cc',
]
@@ -79,20 +79,20 @@
+ LOCAL_INCLUDES += ['src/third_party/libevent/solaris']
+
ost = CONFIG['OS_TEST']
- if '86' not in ost and 'arm' not in ost and 'mips' not in ost:
+ if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost:
SOURCES += [
diff a/ipc/chromium/src/third_party/libeventcommon.mozbuild b/ipc/chromium/src/third_party/libeventcommon.mozbuild
--- a/ipc/chromium/src/third_party/libeventcommon.mozbuild 2015-11-03 11:34:14.000000000 +0100
+++ b/ipc/chromium/src/third_party/libeventcommon.mozbuild 2015-11-09 03:34:24.579311000 +0100
@@ -9,6 +9,7 @@
- os_openbsd = 0
+ os_macosx = 0
os_bsd = 0
os_linux = 0
+os_solaris = 0
if CONFIG['OS_ARCH'] == 'WINNT':
os_win = 1
-@@ -21,6 +22,9 @@ else:
+@@ -21,6 +22,9 @@
'NetBSD', 'OpenBSD']:
os_bsd = 1
libevent_include_suffix = 'bsd'