diff --git a/CHANGELOG.md b/CHANGELOG.md index 087ac9492..484966f59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ - Adjust SIP setting to better reflect current SIP usage - Resolve Monterey Bluetooth issues on user-upgraded BCM94331 BT4.0 modules - Fix iGPU-only iMac14,x display output when using Minimal/Moderate spoof +- Increment Binaries: + - OpenCore 0.7.5 - release + - BrcmPatchRAM 2.6.1 - release + - WhateverGreen 1.5.5 - release ## 0.3.1 - Increment Binaries: diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist index e4ef87826..ce1ccfb25 100644 --- a/payloads/Config/config.plist +++ b/payloads/Config/config.plist @@ -300,6 +300,8 @@ 0 RebuildAppleMemoryMap + ResizeAppleGpuBars + -1 SetupVirtualMap SignalAppleOS @@ -2018,6 +2020,8 @@ RequestBootVarRouting + ResizeGpuBars + -1 TscSyncTimeout 0 UnblockFsConnect diff --git a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1-DEBUG.zip b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1-DEBUG.zip new file mode 100644 index 000000000..269fc8696 Binary files /dev/null and b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1-DEBUG.zip differ diff --git a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1-RELEASE.zip b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1-RELEASE.zip new file mode 100644 index 000000000..1c9bd0f9c Binary files /dev/null and b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip deleted file mode 100644 index cff22a80b..000000000 Binary files a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/BlueToolFixup.patch b/payloads/Kexts/Acidanthera/BlueToolFixup.patch deleted file mode 100644 index ee3f85313..000000000 --- a/payloads/Kexts/Acidanthera/BlueToolFixup.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp -index 0fa891a..18e4b74 100644 ---- a/BrcmPatchRAM/BlueToolFixup.cpp -+++ b/BrcmPatchRAM/BlueToolFixup.cpp -@@ -37,8 +37,10 @@ bool BlueToolFixup::start(IOService *provider) { - } - setProperty("VersionInfo", kextVersion); - setName("bluetooth"); -+ /* - uint8_t bytes[] {0x00, 0x00, 0x00, 0x00}; - setProperty("transport-encoding", bytes, sizeof(bytes)); -+ */ - registerService(); - - return true; -@@ -50,7 +52,22 @@ bool BlueToolFixup::start(IOService *provider) { - static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate"; - static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi"; - -+static const uint8_t kVendorCheckOriginal[] = -+ { -+ 0x74, 0x08, // jz short 08 -+ 0x81, 0xFA, // cmp edx -+ 0x12, 0x0A, 0x00, 0x00 // Vendor CSR -+ }; -+ -+ static const uint8_t kVendorCheckPatched[] = -+ { -+ 0xEB, 0x08, // jmp short 08 -+ 0x81, 0xFA, // cmp edx -+ 0x12, 0x0A, 0x00, 0x00 // Vendor CSR -+ }; -+ - static const char *blueToolPath = "/usr/sbin/BlueTool"; -+static const char *bluetoothdPath = "/usr/sbin/bluetoothd"; - - static mach_vm_address_t orig_cs_validate {}; - -@@ -71,9 +88,14 @@ static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_o - char path[PATH_MAX]; - int pathlen = PATH_MAX; - FunctionCast(patched_cs_validate_page, orig_cs_validate)(vp, pager, page_offset, data, validated_p, tainted_p, nx_p); -- if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, blueToolPath) == 0)) { -- searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched); -- } -+ if (vn_getpath(vp, path, &pathlen) == 0) { -+ if (UNLIKELY(strcmp(path, blueToolPath) == 0)) { -+ searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched); -+ } -+ if (UNLIKELY(strcmp(path, bluetoothdPath) == 0)) { -+ searchAndPatch(data, PAGE_SIZE, path, kVendorCheckOriginal, kVendorCheckPatched); -+ } -+ } - } - - diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-DEBUG.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-DEBUG.zip deleted file mode 100644 index 6074aeaca..000000000 Binary files a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-DEBUG.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-RELEASE.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-RELEASE.zip deleted file mode 100644 index 9ca63d82f..000000000 Binary files a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.4-RELEASE.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.5-DEBUG.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.5-DEBUG.zip new file mode 100644 index 000000000..a548b5b75 Binary files /dev/null and b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.5-DEBUG.zip differ diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.5-RELEASE.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.5-RELEASE.zip new file mode 100644 index 000000000..79a4c6a41 Binary files /dev/null and b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.5-RELEASE.zip differ diff --git a/payloads/OpenCore/OpenCore-DEBUG.zip b/payloads/OpenCore/OpenCore-DEBUG.zip index 6cb2a7041..108fc585b 100644 Binary files a/payloads/OpenCore/OpenCore-DEBUG.zip and b/payloads/OpenCore/OpenCore-DEBUG.zip differ diff --git a/payloads/OpenCore/OpenCore-RELEASE.zip b/payloads/OpenCore/OpenCore-RELEASE.zip index 3a784e944..4e1ccd764 100644 Binary files a/payloads/OpenCore/OpenCore-RELEASE.zip and b/payloads/OpenCore/OpenCore-RELEASE.zip differ diff --git a/payloads/Tools/ocvalidate b/payloads/Tools/ocvalidate deleted file mode 100755 index 0d105f8a7..000000000 Binary files a/payloads/Tools/ocvalidate and /dev/null differ diff --git a/payloads/Tools/ocvalidate-0.7.5 b/payloads/Tools/ocvalidate-0.7.5 new file mode 100755 index 000000000..08fed8fd5 Binary files /dev/null and b/payloads/Tools/ocvalidate-0.7.5 differ diff --git a/resources/constants.py b/resources/constants.py index 031af5e02..5dbe2ad86 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -22,13 +22,13 @@ class Constants: # OpenCore Versioning # https://github.com/acidanthera/OpenCorePkg self.opencore_commit = "bd3f7a1 - 10-04-2021" - self.opencore_version = "0.7.4" + self.opencore_version = "0.7.5" # Kext Versioning ## Acidanthera ## https://github.com/acidanthera self.lilu_version = "1.5.6" # Lilu - self.whatevergreen_version = "1.5.4" # WhateverGreen + self.whatevergreen_version = "1.5.5" # WhateverGreen self.airportbcrmfixup_version = "2.1.3" # AirPortBrcmFixup self.nvmefix_version = "1.0.9" # NVMeFix self.applealc_version = "1.6.3" # AppleALC @@ -37,7 +37,7 @@ class Constants: self.featureunlock_version = "1.0.3" # FeatureUnlock self.debugenhancer_version = "1.0.4" # DebugEnhancer self.cpufriend_version = "1.2.4" # CPUFriend - self.bluetool_version = "2.6.1" # BlueToolFixup + self.bluetool_version = "2.6.1" # BlueToolFixup (BrcmPatchRAM) self.cslvfixup_version = "2.6.1" # CSLVFixup ## Apple @@ -317,7 +317,7 @@ class Constants: @property def bluetool_path(self): - return self.payload_kexts_path / Path(f"Acidanthera/BlueToolFixup-v{self.bluetool_version}.zip") + return self.payload_kexts_path / Path(f"Acidanthera/BlueToolFixup-v{self.bluetool_version}-{self.kext_variant}.zip") @property def cslvfixup_path(self): @@ -455,7 +455,7 @@ class Constants: @property def ocvalidate_path(self): - return self.payload_path / Path("Tools/ocvalidate") + return self.payload_path / Path(f"Tools/ocvalidate-{self.opencore_version}") # Icons @property