Holy hell make those clouds smaller

Undecimus.xcodeproj/project.pbxproj

@@ -428,7 +428,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Get path for dpkg\nset -e\nif [ -f ~/.profile ]; then\n    . ~/.profile\nfi\nRESOURCES_VERSION=\"$(dpkg --info Undecimus/resources/resources.deb | grep Version: | awk '{print $2}')\"\nif [ -z \"${RESOURCES_VERSION}\" ]; then\n    echo \"dpkg not found or resources.deb missing\"\n    exit 1\nfi\ndefaults write \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\" BundledResources \"${RESOURCES_VERSION}\"\n";
+			shellScript = "\"${SOURCE_ROOT}/post.sh\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

Undecimus/Assets.xcassets/Clouds.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Clouds.png",
+      "filename" : "Clouds.jpg",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "Clouds@2x.png",
+      "filename" : "Clouds@2x.jpg",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "Clouds@3x.png",
+      "filename" : "Clouds@3x.jpg",
       "scale" : "3x"
     }
   ],
@@ -20,4 +20,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

Undecimus/Main.storyboard

@@ -883,7 +883,7 @@
                                     </tableViewCell>
                                 </cells>
                             </tableViewSection>
-                            <tableViewSection headerTitle="Utilities" footerTitle="unc0ver v2.1.1" id="33o-xO-9yG">
+                            <tableViewSection headerTitle="Utilities" footerTitle="PLACEHOLDER" id="33o-xO-9yG">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="2Iu-w9-x4b">
                                         <rect key="frame" x="0.0" y="955" width="320" height="44"/>

Undecimus/source/SettingsTableViewController.m

@@ -410,6 +410,7 @@
 }
 
 - (void)tableView:(UITableView *)tableView willDisplayFooterView:(UITableViewHeaderFooterView *)footerView forSection:(NSInteger)section {
+    footerView.textLabel.text = [@"unc0ver " stringByAppendingString:[[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleShortVersionString"]];
     footerView.textLabel.textAlignment = NSTextAlignmentCenter;
 }
 

Undecimus/source/ViewController.m

@@ -672,9 +672,12 @@ void extractResources() {
     if (!debIsInstalled("com.bingner.spawn")) {
         _assert(installDeb("spawn.deb", false), message, true);
     }
-    if (!debIsConfigured("science.xnu.injector")) {
+    if (!debIsConfigured("science.xnu.injector") && !debIsConfigured("trustinjector")) {
         _assert(installDeb("injector.deb", false), message, true);
     }
+    if (debIsInstalled("jailbreak-resources")) {
+        _assert(removeDeb("jailbreak-resources", true), message, true);
+    }
     _assert(installDeb("resources.deb", false), message, true);
 }
 

Undecimus/source/patchfinder64.c

@@ -269,7 +269,10 @@ xref64(const uint8_t *buf, addr_t start, addr_t end, addr_t what)
     for (i = start & ~3; i < end; i += 4) {
         uint32_t op = *(uint32_t *)(buf + i);
         unsigned reg = op & 0x1F;
+        int op_is_adrp = 0;
+        
         if ((op & 0x9F000000) == 0x90000000) {
+            op_is_adrp = 1;
             signed adr = ((op & 0x60000000) >> 18) | ((op & 0xFFFFE0) << 8);
             //printf("%llx: ADRP X%d, 0x%llx\n", i, reg, ((long long)adr << 1) + (i & ~0xFFF));
             value[reg] = ((long long)adr << 1) + (i & ~0xFFF);
@@ -311,7 +314,7 @@ xref64(const uint8_t *buf, addr_t start, addr_t end, addr_t what)
             //printf("%llx: LDR X%d, =0x%llx\n", i, reg, adr + i);
             value[reg] = adr + i;		// XXX address, not actual value
         }
-        if (value[reg] == what) {
+        if (!op_is_adrp && value[reg] == what) {
             return i;
         }
     }

Undecimus/source/utils.h

@@ -64,6 +64,7 @@ bool debIsConfigured(char *packageID);
 bool compareInstalledVersion(const char *packageID, const char *op, const char *version);
 bool installDeb(char *debName, bool forceDeps);
 bool installDebs(NSArray <NSString*> *debs, bool forceDeps);
+bool removeDeb(char *packageID, bool forceDeps);
 bool pidFileIsValid(NSString *pidfile);
 bool pspawnHookLoaded(void);
 bool is_symlink(const char *filename);

Undecimus/source/utils.m

@@ -172,6 +172,11 @@ bool installDebs(NSArray <NSString*> *debs, bool forceDeps) {
     return !WEXITSTATUS(rv);
 }
 
+bool removeDeb(char *packageID, bool forceDeps) {
+    int rv = systemf("/usr/bin/dpkg %s -r \"%s\"", (forceDeps?"--force-depends":""), packageID);
+    return !WEXITSTATUS(rv);
+}
+
 bool pidFileIsValid(NSString *pidfile) {
     NSString *jbdpid = [NSString stringWithContentsOfFile:pidfile encoding:NSUTF8StringEncoding error:NULL];
     if (jbdpid != nil && pidOfProcess("/usr/libexec/jailbreakd") == jbdpid.integerValue) {

Update.txt

@@ -1 +1 @@
-2.1.1
+2.1.3

post.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+# Get path for dpkg
+set -e
+if [ -f ~/.profile ]; then
+    . ~/.profile
+fi
+
+RESOURCES_VERSION="$(dpkg --info ${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/resources.deb | grep Version: | awk '{print $2}')"
+if [ -z "${RESOURCES_VERSION}" ]; then
+    echo "dpkg not found or resources.deb missing"
+    exit 1
+else
+    echo "Bundled resources: ${RESOURCES_VERSION}"
+fi
+
+PACKAGE_VERSION="$(git describe --tags --match="v*" | sed -e 's@-\([^-]*\)-\([^-]*\)$@+\1.\2@;s@^v@@;s@%@~@g')"
+if [ -z "${PACKAGE_VERSION}" ]; then
+    echo "Could not generate package version"
+    exit 1
+else
+    echo "Package Version: ${PACKAGE_VERSION}"
+fi
+
+defaults write "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}" BundledResources "${RESOURCES_VERSION}"
+defaults write "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}" CFBundleShortVersionString "${PACKAGE_VERSION}"