rpms/thunderbird
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixing arc4random_buf build failures

Browse Source
This commit is contained in:
Jan Horak 2022-08-24 16:28:02 +02:00
parent cf253a604a
commit 0a1386a0ff
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
D153716-arc4random.diff Normal file
View File

@ -0,0 +1,45 @@
diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla
--- a/ipc/chromium/src/third_party/libevent/README.mozilla
+++ b/ipc/chromium/src/third_party/libevent/README.mozilla
@@ -20,8 +20,12 @@
Mac doesn't need this since only 64-bit is supported. Use __LP64__ to
distinguish the two cases. If you get something wrong, the CHECK_EVENT_SIZEOF
static assertions in message_pump_libevent.cc will fail. If a new constant is
added, also add a static assertion for it to message_pump_libevent.cc.
+You also need to modify the EVENT__HAVE_ARC4RANDOM and EVENT__HAVE_ARC4RANDOM_BUF
+constants in the generated Linux header to account for the results of the arc4random
+and arc4random_buf configure checks.
+
2. No additional patches are needed at this time, but be careful to avoid
clobbering changes to the various event-config.h files which have been customized
over time to avoid various build bustages.
diff --git a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
--- a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
+++ b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
@@ -27,18 +27,22 @@
#define EVENT__HAVE_ACCEPT4 1
/* Define to 1 if you have the <afunix.h> header file. */
/* #undef EVENT__HAVE_AFUNIX_H 1 */
+#ifdef HAVE_ARC4RANDOM
/* Define to 1 if you have the `arc4random' function. */
-/* #undef EVENT__HAVE_ARC4RANDOM */
+#define EVENT__HAVE_ARC4RANDOM 1
+#endif
/* Define to 1 if you have the `arc4random_addrandom' function. */
/* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */
+#ifdef HAVE_ARC4RANDOM_BUF
/* Define to 1 if you have the `arc4random_buf' function. */
-/* #undef EVENT__HAVE_ARC4RANDOM_BUF */
+#define EVENT__HAVE_ARC4RANDOM_BUF 1
+#endif
/* Define to 1 if you have the <arpa/inet.h> header file. */
#define EVENT__HAVE_ARPA_INET_H 1
/* Define to 1 if you have the `clock_gettime' function. */

4
thunderbird.spec
View File

@ -128,6 +128,7 @@ Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
Patch418: mozilla-1512162.patch
Patch419: cbindgen-already-covers.patch
Patch420: D154024.diff
Patch421: D153716-arc4random.diff
#Patch419: bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch
Patch103: rhbz-1219542-s390-build.patch
# gcc 12 build fix patches
@ -306,7 +307,8 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%patch418 -p1 -b .mozbz-1512162
%patch419 -p1 -b .cbindgen-already-covers
#arc4random failures
%patch420 -p1 -b .D154024.diff
%patch420 -p1 -b .D154024
%patch421 -p1 -b .D153716-arc4random
# most likely fixed
#%patch419 -p1 -b .bindgen