From 32a0289af3d9c8e117c1e5dfdf9a4d5f7503c156 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Wed, 22 Sep 2021 19:25:29 -0600 Subject: [PATCH] Fix Music.app support Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/497 --- Resources/Build.py | 3 +++ Resources/Constants.py | 5 +++++ payloads/Config/config.plist | 18 ++++++++++++++++++ .../Kexts/Acidanthera/CSLVFixup-v2.6.1.zip | Bin 0 -> 10150 bytes 4 files changed, 26 insertions(+) create mode 100644 payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1.zip diff --git a/Resources/Build.py b/Resources/Build.py index ecad0b42e..b4e64b0a5 100644 --- a/Resources/Build.py +++ b/Resources/Build.py @@ -683,6 +683,9 @@ class BuildOpenCore: print("- Disabling Library Validation") self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Disable Library Validation Enforcement")["Enabled"] = True self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Settings"] += " -allow_amfi" + # CSLVFixup simply patches out __RESTRICT and __restrict out of the Music.app Binary + # Ref: https://pewpewthespells.com/blog/blocking_code_injection_on_ios_and_os_x.html + self.enable_kext("CSLVFixup.kext", self.constants.cslvfixup_version, self.constants.cslvfixup_path) if self.constants.secure_status is False: print("- Disabling SecureBootModel") self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled" diff --git a/Resources/Constants.py b/Resources/Constants.py index e3f4dfae7..526f9517b 100644 --- a/Resources/Constants.py +++ b/Resources/Constants.py @@ -35,6 +35,7 @@ class Constants: self.debugenhancer_version = "1.0.4" # DebugEnhancer self.cpufriend_version = "1.2.4" # CPUFriend self.bluetool_version = "2.6.1" # BlueToolFixup + self.cslvfixup_version = "2.6.1" # CSLVFixup ## Apple ## https://www.apple.com @@ -336,6 +337,10 @@ class Constants: @property def bluetool_path(self): return self.payload_kexts_path / Path(f"Acidanthera/BlueToolFixup-v{self.bluetool_version}.zip") + + @property + def cslvfixup_path(self): + return self.payload_kexts_path / Path(f"Acidanthera/CSLVFixup-v{self.cslvfixup_version}.zip") @property def innie_path(self): diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist index d27afa770..2dc5db14c 100644 --- a/payloads/Config/config.plist +++ b/payloads/Config/config.plist @@ -952,6 +952,24 @@ PlistPath Contents/Info.plist + + Arch + x86_64 + BundlePath + CSLVFixup.kext + Comment + Fix Music.app + Enabled + + ExecutablePath + Contents/MacOS/CSLVFixup + MaxKernel + 20.99.99 + MinKernel + 20.0.0 + PlistPath + Contents/Info.plist + Block diff --git a/payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1.zip b/payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..d91bb523506886d5e761b461edccd2ef3a9be7b9 GIT binary patch literal 10150 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 JAn%{6{{sz)fUp1n literal 0 HcmV?d00001