103.0.2-1

3 files changed, 47 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53dc1ccfc0e2..8d3af63b023c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 103.0.1
+	pkgver = 103.0.2
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -46,25 +46,27 @@ pkgbase = firefox-appmenu
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=103.0.1
+	provides = firefox=103.0.2
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
 	options = !lto
 	options = !debug
-	source = https://archive.mozilla.org/pub/firefox/releases/103.0.1/source/firefox-103.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/103.0.1/source/firefox-103.0.1.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/103.0.2/source/firefox-103.0.2.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/103.0.2/source/firefox-103.0.2.source.tar.xz.asc
 	source = zstandard-0.18.0.diff
+	source = arc4random.diff
 	source = firefox.desktop
 	source = identity-icons-brand.svg
 	source = fix-wayland-build.patch
 	source = unity-menubar.patch
 	source = fix_csd_window_buttons.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = b2db4df5fae0801e6406686876e8115d9529fb93a01566f22548908ca6c2cf82
+	sha256sums = 766183e8e39c17a84305a85da3237919ffaeb018c6c9d97a7324aea51bd453aa
 	sha256sums = SKIP
 	sha256sums = a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be
+	sha256sums = 714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = 46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25
diff --git a/PKGBUILD b/PKGBUILD
index ad52e76782a1..4d470a3befbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=103.0.1
+pkgver=103.0.2
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -29,14 +29,16 @@ conflicts=("firefox")
 options=(!emptydirs !makeflags !strip !lto !debug)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         zstandard-0.18.0.diff
+        arc4random.diff
         $_pkgname.desktop
         identity-icons-brand.svg
         fix-wayland-build.patch
         unity-menubar.patch
         fix_csd_window_buttons.patch)
-sha256sums=('b2db4df5fae0801e6406686876e8115d9529fb93a01566f22548908ca6c2cf82'
+sha256sums=('766183e8e39c17a84305a85da3237919ffaeb018c6c9d97a7324aea51bd453aa'
             'SKIP'
             'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'
+            '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
             '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25'
@@ -63,6 +65,9 @@ prepare() {
   # 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
+
   #https://aur.archlinux.org/packages/firefox-appmenu nicman32 comment 2021-08-16
   patch -Np1 -i ../fix-wayland-build.patch
 
diff --git a/arc4random.diff b/arc4random.diff
new file mode 100644
index 000000000000..c877d54c1685
--- /dev/null
+++ b/arc4random.diff
@@ -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);
+