From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:34:50 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../mac/hardenedruntime/v1/developer/browser.xml   | 44 ----------------------
 .../mac/hardenedruntime/v1/production/browser.xml  | 36 ------------------
 .../mac/hardenedruntime/v2/developer/browser.xml   |  5 +--
 .../v2/developer/plugin-container.xml              |  5 +--
 .../v2/production/firefox.browser.xml              |  3 --
 .../production/firefoxdeveloperedition.browser.xml |  3 --
 .../v2/production/nightly.browser.xml              |  3 --
 .../v2/production/plugin-container.xml             |  5 +--
 8 files changed, 3 insertions(+), 101 deletions(-)
 delete mode 100644 security/mac/hardenedruntime/v1/developer/browser.xml
 delete mode 100644 security/mac/hardenedruntime/v1/production/browser.xml

(limited to 'security/mac')

diff --git a/security/mac/hardenedruntime/v1/developer/browser.xml b/security/mac/hardenedruntime/v1/developer/browser.xml
deleted file mode 100644
index 04ac41acaa..0000000000
--- a/security/mac/hardenedruntime/v1/developer/browser.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!--
-     Entitlements to apply during codesigning of developer builds. These
-     differ from the production entitlements in that they allow debugging of
-     executables and allow dyld environment variables to be used. This set of
-     entitlements is intended to be used for signing of builds used in
-     automated testing or local developer builds where debugging of a signed
-     build might be necessary. The com.apple.security.get-task-allow
-     entitlement must be set to true to allow debuggers to attach to
-     application processes but prohibits notarization with the notary service.
-     dyld environment variables are used for some tests and may be useful for
-     developers.
--->
-<plist version="1.0">
-  <dict>
-    <!-- Firefox needs to create executable pages without MAP_JIT on x64 -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
-    <key>com.apple.security.cs.allow-jit</key><true/>
-
-    <!-- Allow loading third party CDM libraries -->
-    <key>com.apple.security.cs.disable-library-validation</key><true/>
-
-    <!-- Allow dyld environment variables for gtests and debugging -->
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>
-
-    <!-- Allow debuggers to attach to running executables -->
-    <key>com.apple.security.get-task-allow</key><true/>
-
-    <!-- Firefox needs to access the microphone on sites the user allows -->
-    <key>com.apple.security.device.audio-input</key><true/>
-
-    <!-- Firefox needs to access the camera on sites the user allows -->
-    <key>com.apple.security.device.camera</key><true/>
-
-    <!-- Firefox needs to access the location on sites the user allows -->
-    <key>com.apple.security.personal-information.location</key><true/>
-
-    <!-- For SmartCardServices(7) -->
-    <key>com.apple.security.smartcard</key><true/>
-  </dict>
-</plist>
diff --git a/security/mac/hardenedruntime/v1/production/browser.xml b/security/mac/hardenedruntime/v1/production/browser.xml
deleted file mode 100644
index 860db86814..0000000000
--- a/security/mac/hardenedruntime/v1/production/browser.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!--
-     Entitlements to apply during codesigning of production builds.
--->
-<plist version="1.0">
-  <dict>
-    <!-- Firefox needs to create executable pages without MAP_JIT on x64 -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
-    <key>com.apple.security.cs.allow-jit</key><true/>
-
-    <!-- Allow loading third party CDM libraries -->
-    <key>com.apple.security.cs.disable-library-validation</key><true/>
-
-    <!-- Firefox needs to access the microphone on sites the user allows -->
-    <key>com.apple.security.device.audio-input</key><true/>
-
-    <!-- Firefox needs to access the camera on sites the user allows -->
-    <key>com.apple.security.device.camera</key><true/>
-
-    <!-- Firefox needs to access the location on sites the user allows -->
-    <key>com.apple.security.personal-information.location</key><true/>
-
-    <!-- For SmartCardServices(7) -->
-    <key>com.apple.security.smartcard</key><true/>
-
-    <!-- Required for com.apple.developer.web-browser.public-key-credential -->
-    <key>com.apple.application-identifier</key>
-    <string>43AQ936H96.org.mozilla.*</string>
-
-    <!-- For platform passkey (webauthn) support -->
-    <key>com.apple.developer.web-browser.public-key-credential</key><true/>
-  </dict>
-</plist>
diff --git a/security/mac/hardenedruntime/v2/developer/browser.xml b/security/mac/hardenedruntime/v2/developer/browser.xml
index 33f520143e..ae4946f1c3 100644
--- a/security/mac/hardenedruntime/v2/developer/browser.xml
+++ b/security/mac/hardenedruntime/v2/developer/browser.xml
@@ -6,10 +6,7 @@
 -->
 <plist version="1.0">
   <dict>
-    <!-- Firefox needs to create executable pages without MAP_JIT on x64 -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
+    <!-- Firefox needs to create executable pages with MAP_JIT -->
     <key>com.apple.security.cs.allow-jit</key><true/>
 
     <!-- For dev builds only, allow loading third party libraries as a
diff --git a/security/mac/hardenedruntime/v2/developer/plugin-container.xml b/security/mac/hardenedruntime/v2/developer/plugin-container.xml
index 7bed5fc2b8..d53a6841ea 100644
--- a/security/mac/hardenedruntime/v2/developer/plugin-container.xml
+++ b/security/mac/hardenedruntime/v2/developer/plugin-container.xml
@@ -6,10 +6,7 @@
 -->
 <plist version="1.0">
   <dict>
-    <!-- Firefox needs to create executable pages without MAP_JIT on x64 -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
+    <!-- Firefox needs to create executable pages with MAP_JIT -->
     <key>com.apple.security.cs.allow-jit</key><true/>
 
     <!-- Allow dyld environment variables for debugging -->
diff --git a/security/mac/hardenedruntime/v2/production/firefox.browser.xml b/security/mac/hardenedruntime/v2/production/firefox.browser.xml
index 3a14e8ad37..abbf33e9d2 100644
--- a/security/mac/hardenedruntime/v2/production/firefox.browser.xml
+++ b/security/mac/hardenedruntime/v2/production/firefox.browser.xml
@@ -6,9 +6,6 @@
 -->
 <plist version="1.0">
   <dict>
-    <!-- Firefox needs to create executable pages (without MAP_JIT) -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
     <!-- Allow loading third party libraries to support pkcs11 modules -->
     <key>com.apple.security.cs.disable-library-validation</key><true/>
 
diff --git a/security/mac/hardenedruntime/v2/production/firefoxdeveloperedition.browser.xml b/security/mac/hardenedruntime/v2/production/firefoxdeveloperedition.browser.xml
index ef8480b081..1e3484e64d 100644
--- a/security/mac/hardenedruntime/v2/production/firefoxdeveloperedition.browser.xml
+++ b/security/mac/hardenedruntime/v2/production/firefoxdeveloperedition.browser.xml
@@ -6,9 +6,6 @@
 -->
 <plist version="1.0">
   <dict>
-    <!-- Firefox needs to create executable pages (without MAP_JIT) -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
     <!-- Allow loading third party libraries to support pkcs11 modules -->
     <key>com.apple.security.cs.disable-library-validation</key><true/>
 
diff --git a/security/mac/hardenedruntime/v2/production/nightly.browser.xml b/security/mac/hardenedruntime/v2/production/nightly.browser.xml
index 03ff689334..2dae2aea3c 100644
--- a/security/mac/hardenedruntime/v2/production/nightly.browser.xml
+++ b/security/mac/hardenedruntime/v2/production/nightly.browser.xml
@@ -6,9 +6,6 @@
 -->
 <plist version="1.0">
   <dict>
-    <!-- Firefox needs to create executable pages (without MAP_JIT) -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
     <!-- Allow loading third party libraries to support pkcs11 modules -->
     <key>com.apple.security.cs.disable-library-validation</key><true/>
 
diff --git a/security/mac/hardenedruntime/v2/production/plugin-container.xml b/security/mac/hardenedruntime/v2/production/plugin-container.xml
index cfc79f1d21..9f689ebc42 100644
--- a/security/mac/hardenedruntime/v2/production/plugin-container.xml
+++ b/security/mac/hardenedruntime/v2/production/plugin-container.xml
@@ -6,10 +6,7 @@
 -->
 <plist version="1.0">
   <dict>
-    <!-- Firefox needs to create executable pages without MAP_JIT on x64 -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
-
-    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
+    <!-- Firefox needs to create executable pages with MAP_JIT -->
     <key>com.apple.security.cs.allow-jit</key><true/>
   </dict>
 </plist>
-- 
cgit v1.2.3