diff --git a/payloads/Kexts/Acidanthera/Lilu-v1.6.6-DEBUG.zip b/payloads/Kexts/Acidanthera/Lilu-v1.6.6-DEBUG.zip index d813731fa..94b56c3ef 100644 Binary files a/payloads/Kexts/Acidanthera/Lilu-v1.6.6-DEBUG.zip and b/payloads/Kexts/Acidanthera/Lilu-v1.6.6-DEBUG.zip differ diff --git a/payloads/Kexts/Acidanthera/Lilu-v1.6.6-RELEASE.zip b/payloads/Kexts/Acidanthera/Lilu-v1.6.6-RELEASE.zip index 8c729eade..583e294d7 100644 Binary files a/payloads/Kexts/Acidanthera/Lilu-v1.6.6-RELEASE.zip and b/payloads/Kexts/Acidanthera/Lilu-v1.6.6-RELEASE.zip differ diff --git a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.1-DEBUG.zip b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.1-DEBUG.zip deleted file mode 100644 index 3d326e96b..000000000 Binary files a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.1-DEBUG.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.1-RELEASE.zip b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.1-RELEASE.zip deleted file mode 100644 index 321df9cf2..000000000 Binary files a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.1-RELEASE.zip and /dev/null differ diff --git a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.2-DEBUG.zip b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.2-DEBUG.zip new file mode 100644 index 000000000..f49898e5b Binary files /dev/null and b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.2-DEBUG.zip differ diff --git a/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.2-RELEASE.zip b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.2-RELEASE.zip new file mode 100644 index 000000000..a17032de4 Binary files /dev/null and b/payloads/Kexts/Acidanthera/RestrictEvents-v1.1.2-RELEASE.zip differ diff --git a/resources/build/misc.py b/resources/build/misc.py index 917bc4409..dd36673a1 100644 --- a/resources/build/misc.py +++ b/resources/build/misc.py @@ -119,10 +119,8 @@ class BuildMiscellaneous: re_patch_args = [] - # Resolve content caching when kern.hv_vmm_present is set - if support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (1)")["Enabled"] is True and self.constants.set_content_caching is True: - logging.info("- Fixing Content Caching support") - re_patch_args.append("asset") + if self.constants.allow_oc_everywhere is False and self.constants.serial_settings == "None": + re_patch_args.append("sbvmm") # Resolve CoreGraphics.framework crashing on Ivy Bridge in macOS 13.3+ # Ref: https://github.com/acidanthera/RestrictEvents/pull/12 diff --git a/resources/build/security.py b/resources/build/security.py index f0818c62b..5a9073aa5 100644 --- a/resources/build/security.py +++ b/resources/build/security.py @@ -76,9 +76,4 @@ class BuildSecurity: if self.constants.secure_status is False: logging.info("- Disabling SecureBootModel") - self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled" - if self.constants.force_vmm is True: - logging.info("- Forcing VMM patchset to support OTA updates") - support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (1)")["Enabled"] = True - support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2) Legacy")["Enabled"] = True - support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2) Ventura")["Enabled"] = True + self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled" \ No newline at end of file diff --git a/resources/build/smbios.py b/resources/build/smbios.py index 8a1bf46de..296083487 100644 --- a/resources/build/smbios.py +++ b/resources/build/smbios.py @@ -41,10 +41,6 @@ class BuildSMBIOS: logging.info("- Enabling Board ID exemption patch") support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Booter"]["Patch"], "Comment", "Skip Board ID check")["Enabled"] = True - logging.info("- Enabling VMM exemption patch") - support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (1)")["Enabled"] = True - support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2) Legacy")["Enabled"] = True - support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2) Ventura")["Enabled"] = True else: logging.info("- Enabling SMC exemption patch") support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Identifier", "com.apple.driver.AppleSMC")["Enabled"] = True diff --git a/resources/constants.py b/resources/constants.py index 7e79e95a5..e629b7209 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -38,7 +38,7 @@ class Constants: self.airportbcrmfixup_version: str = "2.1.7" # AirPortBrcmFixup self.nvmefix_version: str = "1.1.0" # NVMeFix self.applealc_version: str = "1.6.3" # AppleALC - self.restrictevents_version: str = "1.1.1" # RestrictEvents + self.restrictevents_version: str = "1.1.2" # RestrictEvents self.featureunlock_version: str = "1.1.4" # FeatureUnlock self.debugenhancer_version: str = "1.0.7" # DebugEnhancer self.cpufriend_version: str = "1.2.6" # CPUFriend diff --git a/resources/macos_installer_handler.py b/resources/macos_installer_handler.py index 617051303..039cf8bd2 100644 --- a/resources/macos_installer_handler.py +++ b/resources/macos_installer_handler.py @@ -234,7 +234,7 @@ class RemoteInstallerCatalog: Parses Apple's Software Update catalog and finds all macOS installers. """ - def __init__(self, seed_override: SeedType = SeedType.PublicRelease, os_override: int = os_data.os_data.ventura) -> None: + def __init__(self, seed_override: SeedType = SeedType.PublicRelease, os_override: int = os_data.os_data.sonoma) -> None: self.catalog_url: str = self._construct_catalog_url(seed_override, os_override) @@ -421,8 +421,7 @@ class RemoteInstallerCatalog: return {} newest_apps: dict = self.available_apps.copy() - supported_versions = ["10.13", "10.14", "10.15", "11", "12", "13"] - + supported_versions = ["10.13", "10.14", "10.15", "11", "12", "13", "14"] for version in supported_versions: remote_version_minor = 0 @@ -489,11 +488,6 @@ class RemoteInstallerCatalog: newest_apps.pop(ia) break - # Remove unsupported versions (namely 14) - for ia in list(newest_apps): - if newest_apps[ia]["Version"].split(".")[0] not in supported_versions: - newest_apps.pop(ia) - return newest_apps