components/desktop/thunderbird/patches/firefox-50-arc4random.patch
author Stacy Yeh <stacy.yeh@oracle.com>
Tue, 19 Jul 2016 14:15:23 -0700
changeset 6431 e4667e7df088
child 7015 47aaa6f8ec6e
permissions -rw-r--r--
23601539 Update Thunderbird to version 45.1.0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6431
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     1
ARC4RANDOM_EXPORT is defined as extern. Fixes issues in arc4random and libevent. 
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     2
Solaris specific changes, will not send upstream.
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     3
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     4
--- a/ipc/chromium/src/third_party/libevent/arc4random.c    2016-03-01 09:29:36.602447178 -0800
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     5
+++ b/ipc/chromium/src/third_party/libevent/arc4random.c    2016-03-01 10:17:51.627857034 -0800
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     6
@@ -445,8 +445,8 @@ arc4random_stir(void)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     7
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     8
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
     9
 #ifndef ARC4RANDOM_NOADDRANDOM
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    10
-ARC4RANDOM_EXPORT void
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    11
-arc4random_addrandom(const unsigned char *dat, int datlen)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    12
+extern void
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    13
+arc4random_addrandom(uchar_t *dat, size_t datlen)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    14
 {
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    15
        int j;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    16
        _ARC4_LOCK();
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    17
@@ -477,7 +477,7 @@ arc4random(void)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    18
 }
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    19
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    20
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    21
-ARC4RANDOM_EXPORT void
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    22
+extern void
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    23
 arc4random_buf(void *_buf, size_t n)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    24
 {
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    25
        unsigned char *buf = _buf;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    26
--- a/config/system-headers	2015-11-03 11:34:17.000000000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    27
+++ b/config/system-headers	2015-11-09 03:34:24.577525000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    28
@@ -1064,7 +1064,6 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    29
 sys/stat.h
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    30
 sys/statvfs.h
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    31
 sys/syscall.h
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    32
-sys/sysctl.h
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    33
 sys/sysinfo.h
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    34
 sys/sysmp.h
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    35
 sys/syssgi.h
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    36
--- a/ipc/chromium/src/third_party/libevent/arc4random.c	2016-03-23 11:47:53.743867536 -0700
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    37
+++ b/ipc/chromium/src/third_party/libevent/arc4random.c	2016-03-23 11:48:38.956865864 -0700
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    38
@@ -41,6 +41,10 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    39
  * RC4 is a registered trademark of RSA Laboratories.
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    40
  */
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    41
 
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    42
+#if defined (OS_SOLARIS)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    43
+#undef _EVENT_HAVE_SYS_SYSCTL_H
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    44
+#endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    45
+
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    46
 #ifndef ARC4RANDOM_EXPORT
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    47
 #define ARC4RANDOM_EXPORT
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    48
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    49
@@ -59,7 +61,7 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    50
 #include <sys/param.h>
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    51
 #include <sys/time.h>
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    52
 #ifdef _EVENT_HAVE_SYS_SYSCTL_H
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    53
-#include <sys/sysctl.h>
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    54
+;//#include <sys/sysctl.h>
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    55
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    56
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    57
 #include <limits.h>
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    58
diff a/ipc/app/moz.build b/ipc/app/moz.build
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    59
--- a/ipc/app/moz.build 2015-11-03 11:34:14.000000000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    60
+++ b/ipc/app/moz.build 2015-11-10 08:31:42.024431000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    61
@@ -130,5 +130,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    62
         'utils',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    63
     ]
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    64
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    65
+OS_LIBS += [
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    66
+    '$(DEPTH)/security/nss/lib/util/libnssutil3.so',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    67
+    '$(DEPTH)/security/nss/lib/ssl/libssl3.so',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    68
+    '$(DEPTH)/security/nss/lib/smime/libsmime3.so',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    69
+    '$(DEPTH)/security/nss/lib/nss/libnss3.so',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    70
+    '$(DEPTH)/config/external/lgpllibs/liblgpllibs.so',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    71
+    '-lsendfile',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    72
+]
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    73
 if CONFIG['GNU_CXX']:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    74
     CXXFLAGS += ['-Wshadow']
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    75
--- a/ipc/chromium/moz.build	2016-03-28 13:41:06.878922929 -0700
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    76
+++ b/ipc/chromium/moz.build	2016-03-28 13:42:04.555448660 -0700
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    77
@@ -161,6 +161,23 @@ if os_bsd or os_linux:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    78
             'src/base/message_pump_qt.cc',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    79
         ]
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    80
 
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    81
+if os_solaris:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    82
+    SOURCES += [
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    83
+	'src/base/atomicops_internals_x86_gcc.cc',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    84
+	'src/base/idle_timer_none.cc',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    85
+	'src/base/process_util_linux.cc',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    86
+	'src/base/time_posix.cc',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    87
+    ]
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    88
+    if CONFIG['MOZ_WIDGET_GTK']:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    89
+	SOURCES += [
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    90
+            'src/base/message_pump_glib.cc',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    91
+	]
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    92
+    if not CONFIG['MOZ_NATIVE_LIBEVENT']:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    93
+	SOURCES += [
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    94
+            'src/third_party/libevent/devpoll.c',
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    95
+	]
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    96
+    LOCAL_INCLUDES += ['src/third_party/libevent/solaris']
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    97
+
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    98
 ost = CONFIG['OS_TEST']
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
    99
 if '86' not in ost and 'arm' not in ost and 'mips' not in ost:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   100
     SOURCES += [
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   101
diff a/ipc/chromium/src/third_party/libeventcommon.mozbuild b/ipc/chromium/src/third_party/libeventcommon.mozbuild
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   102
--- a/ipc/chromium/src/third_party/libeventcommon.mozbuild	2015-11-03 11:34:14.000000000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   103
+++ b/ipc/chromium/src/third_party/libeventcommon.mozbuild	2015-11-09 03:34:24.579311000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   104
@@ -9,6 +9,7 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   105
 os_openbsd = 0
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   106
 os_bsd = 0
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   107
 os_linux = 0
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   108
+os_solaris = 0
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   109
 
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   110
 if CONFIG['OS_ARCH'] == 'WINNT':
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   111
     os_win = 1
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   112
@@ -21,6 +22,9 @@ else:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   113
                                'NetBSD', 'OpenBSD']:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   114
         os_bsd = 1
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   115
         libevent_include_suffix = 'bsd'
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   116
+    elif CONFIG['OS_ARCH'] == 'SunOS':
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   117
+        os_solaris = 1
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   118
+        libevent_include_suffix = 'solaris'
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   119
     else:
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   120
         os_linux = 1
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   121
         if CONFIG['OS_TARGET'] == 'Android':
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   122
diff a/ipc/chromium/src/third_party/libevent/event.c b/ipc/chromium/src/third_party/libevent/event.c
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   123
--- a/ipc/chromium/src/third_party/libevent/event.c	2015-11-03 11:34:14.000000000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   124
+++ b/ipc/chromium/src/third_party/libevent/event.c	2015-11-09 03:34:24.485030000 +0100
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   125
@@ -70,7 +70,7 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   126
 #include "util-internal.h"
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   127
 
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   128
 #ifdef _EVENT_HAVE_EVENT_PORTS
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   129
-extern const struct eventop evportops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   130
+//extern const struct eventop evportops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   131
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   132
 #ifdef _EVENT_HAVE_SELECT
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   133
 extern const struct eventop selectops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   134
@@ -79,7 +79,7 @@ extern const struct eventop selectops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   135
 extern const struct eventop pollops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   136
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   137
 #ifdef _EVENT_HAVE_EPOLL
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   138
-extern const struct eventop epollops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   139
+//extern const struct eventop epollops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   140
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   141
 #ifdef _EVENT_HAVE_WORKING_KQUEUE
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   142
 extern const struct eventop kqops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   143
@@ -94,13 +94,13 @@ extern const struct eventop win32ops;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   144
 /* Array of backends in order of preference. */
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   145
 static const struct eventop *eventops[] = {
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   146
 #ifdef _EVENT_HAVE_EVENT_PORTS
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   147
-	&evportops,
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   148
+	//&evportops,
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   149
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   150
 #ifdef _EVENT_HAVE_WORKING_KQUEUE
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   151
 	&kqops,
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   152
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   153
 #ifdef _EVENT_HAVE_EPOLL
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   154
-	&epollops,
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   155
+	//&epollops,
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   156
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   157
 #ifdef _EVENT_HAVE_DEVPOLL
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   158
 	&devpollops,
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   159
@@ -2883,8 +2883,8 @@
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   160
 #endif
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   161
 	if (evsig_global_setup_locks_(enable_locks) < 0)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   162
 		return -1;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   163
-	if (evutil_secure_rng_global_setup_locks_(enable_locks) < 0)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   164
-		return -1;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   165
+//	if (evutil_secure_rng_global_setup_locks_(enable_locks) < 0)
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   166
+//		return -1;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   167
 	return 0;
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   168
 }
e4667e7df088 23601539 Update Thunderbird to version 45.1.0
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff changeset
   169
 #endif