Merge branch 'utmapp:main' into main

MxIris-Application-Forks · Dec 16, 2023 · c133151 · c133151
2 parents dacf074 + 62bd84c
commit c133151
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -315,7 +315,9 @@ jobs:
           LAUNCHER_PROFILE_DATA: ${{ vars.LAUNCHER_PROFILE_DATA }}
           LAUNCHER_PROFILE_UUID: ${{ vars.LAUNCHER_PROFILE_UUID }}
       - name: Install appdmg
-        run: npm install -g appdmg
+        run: |
+          python3 -m pip install setuptools
+          npm install -g appdmg
       - name: Download Artifact
         uses: actions/download-artifact@v3
         with:

diff --git a/Build.xcconfig b/Build.xcconfig
@@ -17,8 +17,8 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 4.4.4
-CURRENT_PROJECT_VERSION = 92
+MARKETING_VERSION = 4.4.5
+CURRENT_PROJECT_VERSION = 94
 
 // Codesigning settings defined optionally, see Documentation/iOSDevelopment.md
 #include? "CodeSigning.xcconfig"

diff --git a/Services/UTMJailbreak.m b/Services/UTMJailbreak.m
@@ -397,7 +397,7 @@ bool jb_spawn_ptrace_child(int argc, char **argv) {
         return false;
     }
     childArgv[0] = argv[0];
-    if ((ret = posix_spawnp(&pid, argv[0], NULL, NULL, (void *)childArgv, (void *)environ)) != 0) {
+    if ((ret = posix_spawnp(&pid, argv[0], NULL, NULL, (void *)childArgv, NULL)) != 0) {
         return false;
     }
     return true;

diff --git a/patches/sources b/patches/sources
@@ -46,4 +46,4 @@ VIRGLRENDERER_COMMIT="dc039d9ecd74fc671a85bfbe7c4e4bc552b7b855"
 
 # Decompiled Hypervisor for iOS
 HYPERVISOR_REPO="https://github.com/utmapp/Hypervisor.git"
-HYPERVISOR_COMMIT="b4eb0e00c03692016944fad3e8e3a6613839912e"
+HYPERVISOR_COMMIT="bcec1a8b0cb3b07ecd0f81b33f26fa3048ffd307"