[arch-commits] Commit in firefox/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, April 28, 2020 @ 12:51:48
  Author: heftig
Revision: 381784

75.0-2

Added:
  firefox/trunk/0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch
Modified:
  firefox/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch |   35 ++++++++++
 PKGBUILD                                                        |    7 +-
 2 files changed, 41 insertions(+), 1 deletion(-)

Added: 0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch
===================================================================
--- 0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch	                        (rev 0)
+++ 0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch	2020-04-28 12:51:48 UTC (rev 381784)
@@ -0,0 +1,35 @@
+From 0447215abf836bbb8eef53aeccf029dd40bd1a52 Mon Sep 17 00:00:00 2001
+From: Jeff Gilbert <jgilbert at mozilla.com>
+Date: Sun, 12 Apr 2020 21:21:32 +0000
+Subject: [PATCH] Bug 1623885 - Add "subsystem" to Mesa sandbox policy to fix
+ libdrm-2.4.101+. r=gcp, a=RyanVM
+
+Differential Revision: https://phabricator.services.mozilla.com/D70579
+---
+ .../linux/broker/SandboxBrokerPolicyFactory.cpp        | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
+index 3aa7cf27e353..0b3948ebd92e 100644
+--- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
++++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
+@@ -86,10 +86,12 @@ static void AddMesaSysfsPaths(SandboxBroker::Policy* aPolicy) {
+             // broker.  To match this, allow the canonical paths.
+             UniqueFreePtr<char[]> realSysPath(realpath(sysPath.get(), nullptr));
+             if (realSysPath) {
+-              static const Array<const char*, 7> kMesaAttrSuffixes = {
+-                  "revision",         "vendor", "device", "subsystem_vendor",
+-                  "subsystem_device", "uevent", "config"};
+-              for (const auto attrSuffix : kMesaAttrSuffixes) {
++              constexpr const char* kMesaAttrSuffixes[] = {
++                  "config",    "device",           "revision",
++                  "subsystem", "subsystem_device", "subsystem_vendor",
++                  "uevent",    "vendor",
++              };
++              for (const auto& attrSuffix : kMesaAttrSuffixes) {
+                 nsPrintfCString attrPath("%s/%s", realSysPath.get(),
+                                          attrSuffix);
+                 aPolicy->AddPath(rdonly, attrPath.get());
+-- 
+2.26.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-28 09:51:20 UTC (rev 381783)
+++ PKGBUILD	2020-04-28 12:51:48 UTC (rev 381784)
@@ -4,7 +4,7 @@
 
 pkgname=firefox
 pkgver=75.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -21,10 +21,12 @@
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
+        0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch
         0001-Use-remoting-name-for-GDK-application-names.patch
         $pkgname.desktop)
 sha256sums=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f'
             'SKIP'
+            'ebb169804750ddc10a4801ed6ddb37356331bbf76615f58eb29de2e6e15ee930'
             '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
             'a9e5264257041c0b968425b5c97436ba48e8d294e1a0f02c59c35461ea245c33')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
@@ -45,6 +47,9 @@
   mkdir mozbuild
   cd firefox-$pkgver
 
+  # https://bugs.archlinux.org/task/66185
+  patch -Np1 -i ../0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch