um?

wumbomumbo · Aug 17, 2024 · fc57f90 · fc57f90
1 parent cd3cc2a
commit fc57f90
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -89,7 +89,7 @@ jobs:
           gmake -j$(sysctl -n hw.physicalcpu) NIGHTLY=1
 
       - name: Upload Artifact
-        id: Cheapamine-latest-upload
+        id: cheapamine-latest-upload
         uses: actions/upload-artifact@v3
         with:
           name: Cheapamine

diff --git a/.gitmodules b/.gitmodules
@@ -4,7 +4,7 @@
 [submodule "BaseBin/XPF"]
 	path = BaseBin/XPF
 	url = https://github.com/opa334/XPF
-[submodule "Application/Cheapamine/Cheapamine/Exploits/kfd/kfd"]
+[submodule "Exploits/kfd/src/kfd"]
 	path = Application/Cheapamine/Cheapamine/Exploits/kfd/kfd
 	url = https://github.com/opa334/kfd
 [submodule "BaseBin/opainject"]

diff --git a/Application/Cheapamine.xcodeproj/project.pbxproj b/Application/Cheapamine.xcodeproj/project.pbxproj
@@ -174,7 +174,7 @@
 		8C5FA96F2BDD789C008C246F /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C5FA9412BDD503D008C246F /* IOSurface.framework */; };
 		8C5FA9712BDD81EF008C246F /* LICENSE_weightBufs.md in Resources */ = {isa = PBXBuildFile; fileRef = 8C5FA9702BDD81EF008C246F /* LICENSE_weightBufs.md */; };
 		8C609C9E2C19B4270023DD12 /* NSString+Version.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C609C9C2C19AECF0023DD12 /* NSString+Version.m */; };
-		8C609C9F2C19B6FA0023DD12 /* libkrw-Cheapamine.deb in Resources */ = {isa = PBXBuildFile; fileRef = 8C609C992C19AC250023DD12 /* libkrw-Cheapamine.deb */; };
+		8C609C9F2C19B6FA0023DD12 /* libkrw-cheapamine.deb in Resources */ = {isa = PBXBuildFile; fileRef = 8C609C992C19AC250023DD12 /* libkrw-cheapamine.deb */; };
 		8C6599DB2C555A60000FF57F /* DOPSJetsamListItemsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C6599DA2C555A60000FF57F /* DOPSJetsamListItemsController.m */; };
 		8C6599DD2C555A71000FF57F /* DOPSJetsamListItemsController.h in Sources */ = {isa = PBXBuildFile; fileRef = 8C6599DC2C555A71000FF57F /* DOPSJetsamListItemsController.h */; };
 		8C71981A2ABF0E82003C6658 /* DOAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C7198192ABF0E82003C6658 /* DOAppDelegate.m */; };
@@ -505,12 +505,12 @@
 		8C5FA9582BDD6C0C008C246F /* kernel_rw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kernel_rw.h; sourceTree = "<group>"; };
 		8C5FA9592BDD6C0C008C246F /* exploit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = exploit.h; sourceTree = "<group>"; };
 		8C5FA9702BDD81EF008C246F /* LICENSE_weightBufs.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENSE_weightBufs.md; sourceTree = "<group>"; };
-		8C609C992C19AC250023DD12 /* libkrw-Cheapamine.deb */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libkrw-Cheapamine.deb"; path = "../../../Packages/libkrw-provider/libkrw-Cheapamine.deb"; sourceTree = "<group>"; };
+		8C609C992C19AC250023DD12 /* libkrw-cheapamine.deb */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libkrw-cheapamine.deb"; path = "../../../Packages/libkrw-provider/libkrw-cheapamine.deb"; sourceTree = "<group>"; };
 		8C609C9C2C19AECF0023DD12 /* NSString+Version.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Version.m"; sourceTree = "<group>"; };
 		8C609C9D2C19AEE70023DD12 /* NSString+Version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Version.h"; sourceTree = "<group>"; };
 		8C6599DA2C555A60000FF57F /* DOPSJetsamListItemsController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DOPSJetsamListItemsController.m; sourceTree = "<group>"; };
 		8C6599DC2C555A71000FF57F /* DOPSJetsamListItemsController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOPSJetsamListItemsController.h; sourceTree = "<group>"; };
-		8C7198152ABF0E82003C6658 /* Cheapamine.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cheapamine.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		8C7198152ABF0E82003C6658 /* cheapamine.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cheapamine.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8C7198182ABF0E82003C6658 /* DOAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOAppDelegate.h; sourceTree = "<group>"; };
 		8C7198192ABF0E82003C6658 /* DOAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DOAppDelegate.m; sourceTree = "<group>"; };
 		8C71981B2ABF0E82003C6658 /* DOSceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DOSceneDelegate.h; sourceTree = "<group>"; };
@@ -1103,7 +1103,7 @@
 				8CB94F022B59E17A0098BAFD /* basebin.tc */,
 				8C512B8B2B5C9DE800C6F14A /* sileo.deb */,
 				8C512B8C2B5C9DE800C6F14A /* zebra.deb */,
-				8C609C992C19AC250023DD12 /* libkrw-Cheapamine.deb */,
+				8C609C992C19AC250023DD12 /* libkrw-cheapamine.deb */,
 				8CCD8A832B6F165A004B72B0 /* libroot.deb */,
 				8CCD2FC32B77AA9200F9C5DA /* basebin-link.deb */,
 				04DD0B362B7BA6180055DE4F /* LICENSE.md */,
@@ -1481,7 +1481,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8C609C9F2C19B6FA0023DD12 /* libkrw-Cheapamine.deb in Resources */,
+				8C609C9F2C19B6FA0023DD12 /* libkrw-cheapamine.deb in Resources */,
 				04DD0B372B7BA6180055DE4F /* LICENSE.md in Resources */,
 				04DD0B3A2B7BF3E80055DE4F /* LICENSE_libc.md in Resources */,
 				8C56D4CD2B7C118B001C03D3 /* LICENSE_kfd.md in Resources */,

diff --git a/Application/Cheapamine/Jailbreak/DOBootstrapper.m b/Application/Cheapamine/Jailbreak/DOBootstrapper.m
@@ -17,14 +17,14 @@
 #import <sys/stat.h>
 #import "NSString+Version.h"
 
-#define LIBKRW_Cheapamine_BUNDLED_VERSION @"2.0.3"
-#define LIBROOT_Cheapamine_BUNDLED_VERSION @"1.0.1"
+#define LIBKRW_CHEAPAMINE_BUNDLED_VERSION @"2.0.3"
+#define LIBROOT_CHEAPAMINE_BUNDLED_VERSION @"1.0.1"
 #define BASEBIN_LINK_BUNDLED_VERSION @"1.0.0"
 
 static NSDictionary *gBundledPackages = @{
-    @"libkrw0-Cheapamine" : LIBKRW_Cheapamine_BUNDLED_VERSION,
-    @"libroot-Cheapamine" : LIBROOT_Cheapamine_BUNDLED_VERSION,
-    @"Cheapamine-basebin-link" : BASEBIN_LINK_BUNDLED_VERSION,
+    @"libkrw0-cheapamine" : LIBKRW_CHEAPAMINE_BUNDLED_VERSION,
+    @"libroot-cheapamine" : LIBROOT_CHEAPAMINE_BUNDLED_VERSION,
+    @"cheapamine-basebin-link" : BASEBIN_LINK_BUNDLED_VERSION,
 };
 
 struct hfs_mount_args {
@@ -294,8 +294,8 @@ - (void)fixupPathPermissions
     // /private
     // /private/preboot
     // /private/preboot/UUID
-    // /private/preboot/UUID/Cheapamine-<UUID>
-    // /private/preboot/UUID/Cheapamine-<UUID>/procursus
+    // /private/preboot/UUID/cheapamine-<UUID>
+    // /private/preboot/UUID/cheapamine-<UUID>/procursus
 
     NSString *tmpPath = JBROOT_PATH(@"/");
     while (![tmpPath isEqualToString:@"/"]) {
@@ -655,9 +655,9 @@ - (NSError *)finalizeBootstrap
         if (error) return error;
     }
 
-    BOOL shouldInstallLibroot = [self shouldInstallPackage:@"libroot-Cheapamine"];
-    BOOL shouldInstallLibkrw = [self shouldInstallPackage:@"libkrw0-Cheapamine"];
-    BOOL shouldInstallBasebinLink = [self shouldInstallPackage:@"Cheapamine-basebin-link"];
+    BOOL shouldInstallLibroot = [self shouldInstallPackage:@"libroot-cheapamine"];
+    BOOL shouldInstallLibkrw = [self shouldInstallPackage:@"libkrw0-cheapamine"];
+    BOOL shouldInstallBasebinLink = [self shouldInstallPackage:@"cheapamine-basebin-link"];
 
     if (shouldInstallLibroot || shouldInstallLibkrw || shouldInstallBasebinLink) {
         [[DOUIManager sharedInstance] sendLog:@"Updating Bundled Packages" debug:NO];
@@ -668,7 +668,7 @@ - (NSError *)finalizeBootstrap
         }
 
         if (shouldInstallLibkrw) {
-            NSString *libkrwPath = [[NSBundle mainBundle].bundlePath stringByAppendingPathComponent:@"libkrw-Cheapamine.deb"];
+            NSString *libkrwPath = [[NSBundle mainBundle].bundlePath stringByAppendingPathComponent:@"libkrw-cheapamine.deb"];
             int r = [self installPackage:libkrwPath];
             if (r != 0) return [NSError errorWithDomain:bootstrapErrorDomain code:BootstrapErrorCodeFailedFinalising userInfo:@{NSLocalizedDescriptionKey : [NSString stringWithFormat:@"Failed to install the libkrw plugin: %d\n", r]}];
         }

diff --git a/Application/Cheapamine/Jailbreak/DOEnvironmentManager.m b/Application/Cheapamine/Jailbreak/DOEnvironmentManager.m
@@ -103,7 +103,7 @@ - (void)locateJailbreakRoot
 
         // First attempt at finding jailbreak root, look for Cheapamine 2.x path
         for (NSString *subItem in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:activePrebootPath error:nil]) {
-            if (subItem.length == 15 && [subItem hasPrefix:@"Cheapamine-"]) {
+            if (subItem.length == 15 && [subItem hasPrefix:@"cheapamine-"]) {
                 randomizedJailbreakPath = [activePrebootPath stringByAppendingPathComponent:subItem];
                 break;
             }
@@ -168,7 +168,7 @@ - (NSError *)ensureJailbreakRootExists
             [randomString appendFormat:@"%C", randomCharacter];
         }
 
-        NSString *randomJailbreakFolderName = [NSString stringWithFormat:@"Cheapamine-%@", randomString];
+        NSString *randomJailbreakFolderName = [NSString stringWithFormat:@"cheapamine-%@", randomString];
         NSString *randomizedJailbreakPath = [activePrebootPath stringByAppendingPathComponent:randomJailbreakFolderName];
         NSString *jailbreakRootPath = [randomizedJailbreakPath stringByAppendingPathComponent:@"procursus"];
 

diff --git a/Packages/.gitignore b/Packages/.gitignore
@@ -1,3 +1,3 @@
-libkrw-provider/libkrw-Cheapamine.*
+libkrw-provider/libkrw-cheapamine.*
 libroot/libroot.*
 basebin-link/basebin-link.*
diff --git a/Packages/basebin-link/control b/Packages/basebin-link/control
@@ -1,5 +1,5 @@
-Package: Cheapamine-basebin-link
-Name: Cheapamine BaseBin Link
+Package: cheapamine-basebin-link
+Name: cheapamine BaseBin Link
 Author: opa334 <[email protected]>
 Maintainer: opa334 <[email protected]>
 Architecture: iphoneos-arm64

diff --git a/Packages/libkrw-provider/Makefile b/Packages/libkrw-provider/Makefile
@@ -1,4 +1,4 @@
-TARGET = libkrw-Cheapamine.dylib
+TARGET = libkrw-cheapamine.dylib
 CC = clang
 
 CFLAGS = -I../../BaseBin/.include -Isrc -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -arch arm64 -arch arm64e -miphoneos-version-min=15.0 -fobjc-arc -O2
@@ -15,12 +15,12 @@ $(TARGET): $(wildcard src/*.c)
 
 clean:
 	@rm -f $(TARGET)
-	@rm -f libkrw-Cheapamine.deb
+	@rm -f libkrw-cheapamine.deb
 
 package: all
 	@mkdir -p .package/DEBIAN
 	@mkdir -p .package/var/jb/usr/lib/libkrw
 	@cp control .package/DEBIAN/control
-	@cp libkrw-Cheapamine.dylib .package/var/jb/usr/lib/libkrw/libkrw-Cheapamine.dylib
-	@dpkg-deb --root-owner-group -Zzstd -b .package ./libkrw-Cheapamine.deb
+	@cp libkrw-cheapamine.dylib .package/var/jb/usr/lib/libkrw/libkrw-cheapamine.dylib
+	@dpkg-deb --root-owner-group -Zzstd -b .package ./libkrw-cheapamine.deb
 	@rm -rf .package
diff --git a/Packages/libkrw-provider/control b/Packages/libkrw-provider/control
@@ -1,4 +1,4 @@
-Package: libkrw0-Cheapamine
+Package: libkrw0-cheapamine
 Name: libkrw Plug-in (Cheapamine)
 Author: opa334 <[email protected]>
 Maintainer: opa334 <[email protected]>

diff --git a/Packages/libroot/control b/Packages/libroot/control
@@ -1,4 +1,4 @@
-Package: libroot-Cheapamine
+Package: libroot-cheapamine
 Name: libroot (Cheapamine)
 Author: opa334
 Maintainer: opa334