[arch-commits] Commit in firefox-developer-edition/trunk (PKGBUILD arc4random.diff)

[Andrew Crerar]

    Date: Monday, August 8, 2022 @ 14:51:44
  Author: andrewsc
Revision: 1260958

upgpkg: firefox-developer-edition 104.0b7-1

- Added arc4random.diff to unbreak the build

Added:
  firefox-developer-edition/trunk/arc4random.diff
Modified:
  firefox-developer-edition/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 +++++++++----
 arc4random.diff |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-08 14:51:41 UTC (rev 1260957)
+++ PKGBUILD	2022-08-08 14:51:44 UTC (rev 1260958)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=firefox-developer-edition
-pkgver=104.0b4
+pkgver=104.0b7
 pkgrel=1
 pkgdesc="Developer Edition of the popular Firefox web browser"
 arch=('x86_64')
@@ -25,13 +25,15 @@
         firefox-install-dir.patch
         "$pkgname".desktop
         identity-icons-brand.svg
-        zstandard-0.18.0.diff)
-sha512sums=('b54bb9dc35ce7c3666b5245f638c45cd7efd2f2439d1c52f721f73854806f956b855dbdd44d179d3d0ddf7e33a87d22c8bc24c9d9fff69202db0412a33189b7c'
+        zstandard-0.18.0.diff
+        arc4random.diff)
+sha512sums=('dd0f98a2692d8589cf76cfd6a1f59fc840c3667318d4a83f1b4d4b8bc843c7b147cb26b832ffdeb840a2184b5ea6ce787ed7065302b31669b8ab6e931bfc5c29'
             'SKIP'
             'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
             '2ff0cb8e2eb94cee306b488adf6d7f4debbaff6155be3ed3eeee814cdb356e2e60fe38cc29d6c8d10079937fd2c930cfddf283977cf645395d31eaf76c7f0ac2'
             'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17'
-            'c949cf492bc93b6f3f1f827744e0f39e555c518434c8e73e27143a769b0d123fe4ba2cae07b7b7e7b594f8da43383d4fb4cd28b6b52e0d3e7a985afbadfb3d04')
+            'c949cf492bc93b6f3f1f827744e0f39e555c518434c8e73e27143a769b0d123fe4ba2cae07b7b7e7b594f8da43383d4fb4cd28b6b52e0d3e7a985afbadfb3d04'
+            '9cbc214c3ae7b93ef6c0573194dc7600dd0b4bb6f2653693d75b08475b7c3d65f6a181055060848143b488207c39af3fdb7382bb45de5264b2daedcb62bf97f2')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -54,6 +56,9 @@
   # Unbreak build with python-zstandard 0.18.0
   patch -Np1 -i ../zstandard-0.18.0.diff
 
+  # Unbreak build with glibc 2.36
+  patch -Np1 -i ../arc4random.diff
+
   echo -n "$_google_api_key" > google-api-key
   echo -n "$_mozilla_api_key" > mozilla-api-key
 

Added: arc4random.diff
===================================================================
--- arc4random.diff	                        (rev 0)
+++ arc4random.diff	2022-08-08 14:51:44 UTC (rev 1260958)
@@ -0,0 +1,33 @@
+diff --git i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
+index 101d39d455107..3764806240f9f 100644
+--- i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
++++ w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h
+@@ -30,13 +30,13 @@
+ /* #undef EVENT__HAVE_AFUNIX_H 1 */
+ 
+ /* Define to 1 if you have the `arc4random' function. */
+-/* #undef EVENT__HAVE_ARC4RANDOM */
++#define EVENT__HAVE_ARC4RANDOM 1
+ 
+ /* Define to 1 if you have the `arc4random_addrandom' function. */
+ /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */
+ 
+ /* Define to 1 if you have the `arc4random_buf' function. */
+-/* #undef EVENT__HAVE_ARC4RANDOM_BUF */
++#define EVENT__HAVE_ARC4RANDOM_BUF 1
+ 
+ /* Define to 1 if you have the <arpa/inet.h> header file. */
+ #define EVENT__HAVE_ARPA_INET_H 1
+diff --git i/toolkit/crashreporter/client/ping.cpp w/toolkit/crashreporter/client/ping.cpp
+index 57cf85de80b79..93a2f6e80ad0b 100644
+--- i/toolkit/crashreporter/client/ping.cpp
++++ w/toolkit/crashreporter/client/ping.cpp
+@@ -53,7 +53,7 @@ static string GenerateUUID() {
+ 
+   CFRelease(uuid);
+ #elif defined(HAVE_ARC4RANDOM_BUF)  // Android, BSD, ...
+-  arc4random_buf(id, sizeof(UUID));
++  arc4random_buf(&id, sizeof(UUID));
+ #else                               // Linux
+   int fd = open("/dev/urandom", O_RDONLY);
+