idevicerestore: handle new timeout error conditions

Author: s0uthwest

.gitignore

@@ -1,6 +1,3 @@
-*.patch
-*.diff
-*.swp
 *.DS_Store
 *.a
 *.o

configure.ac

@@ -28,8 +28,9 @@ AC_CONFIG_MACRO_DIRS([m4])
 AC_CONFIG_SUBDIRS(external/idevicerestore external/img4tool external/tsschecker)
 AC_CONFIG_SRCDIR([futurerestore])
 
+# Check for libraries
 AC_SEARCH_LIBS([pthread_create], [pthread])
-PKG_CHECK_MODULES(libplist, libplist >= 1.12)
+PKG_CHECK_MODULES(libplist, libplist >= 2.0.0)
 PKG_CHECK_MODULES(libzip, libzip >= 0.10)
 PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.2.1)
 PKG_CHECK_MODULES(libfragmentzip, libfragmentzip >= 1.0)

external/idevicerestore

@@ -422,7 +422,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "sed -i '.bak' \"s/.*define VERSION_COUNT_FUTURERESTORE.*/#define VERSION_COUNT_FUTURERESTORE \\\"$(git rev-list --count HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null || sed -i \"s/.*VERSION_COUNT_FUTURERESTORE.*/#define VERSION_COUNT_FUTURERESTORE \\\"$(git rev-list --count HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null\nsed -i '.bak' \"s/.*define VERSION_SHA_FUTURERESTORE.*/#define VERSION_SHA_FUTURERESTORE \\\"$(git rev-parse HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null || sed -i \"s/.*VERSION_SHA_FUTURERESTORE.*/#define VERSION_SHA_FUTURERESTORE \\\"$(git rev-parse HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null\n\n";
+			shellScript = "sed -i '.bak' \"s/.*define VERSION_COUNT_FUTURERESTORE.*/#define VERSION_COUNT_FUTURERESTORE \\\"$(git rev-list --count HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null || sed -i \"s/.*VERSION_COUNT_FUTURERESTORE.*/#define VERSION_COUNT_FUTURERESTORE \\\"$(git rev-list --count HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null\nsed -i '.bak' \"s/.*define VERSION_SHA_FUTURERESTORE.*/#define VERSION_SHA_FUTURERESTORE \\\"$(git rev-parse HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null || sed -i \"s/.*VERSION_SHA_FUTURERESTORE.*/#define VERSION_SHA_FUTURERESTORE \\\"$(git rev-parse HEAD)\\\"/\" ./futurerestore/config.h 2>/dev/null\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

futurerestore.xcodeproj/project.pbxproj

@@ -20,7 +20,7 @@
 
 #undef VERSION_SHA
 #undef VERSION_COUNT
-#define VERSION_COUNT_FUTURERESTORE "undefined version number"
-#define VERSION_SHA_FUTURERESTORE "undefined version commit"
+#define VERSION_COUNT_FUTURERESTORE "undefined number"
+#define VERSION_SHA_FUTURERESTORE "undefined commit"
 
 #endif /* config_h */

futurerestore/config.h

@@ -9,18 +9,17 @@
 #ifndef futurerestore_hpp
 #define futurerestore_hpp
 
-#include "config.h"
 #include <stdio.h>
 #include <functional>
 #include <vector>
-
 #include <plist/plist.h>
+
 #include <jssy.h>
+#include "config.h"
 #include "idevicerestore.h"
 
 #if defined _WIN32 || defined __CYGWIN__
-#ifndef WIN32
-//make sure WIN32 is defined if compiling for windows
+#ifndef WIN32 //make sure WIN32 is defined if compiling for windows
 #define WIN32
 #endif
 #endif

futurerestore/futurerestore.cpp

@@ -75,14 +75,14 @@ void cmd_help(){
     printf("      --exit-recovery\t\tExit recovery mode and quit\n");
 
     printf("\nOptions for SEP:\n");
-    printf("      --latest-sep\t\tUse latest signed sep instead of manually specifying one (may cause bad restore)\n");
+    printf("      --latest-sep\t\tUse latest signed SEP instead of manually specifying one (may cause bad restore)\n");
     printf("  -s, --sep PATH\t\tSEP to be flashed\n");
     printf("  -m, --sep-manifest PATH\tBuildManifest for requesting SEP ticket\n");
 
 #ifdef HAVE_LIBIPATCHER
-    printf("\nOptions for Odysseus method:\n");
-    printf("      --use-pwndfu\t\tuse this for restoring devices with Odysseus method. Device needs to be in kDFU mode already\n");
-    printf("      --just-boot=\"-v\"\t\tuse this to tethered boot the device from kDFU mode. You can optionally set boot-args\n");
+    printf("\nOptions for 32-bit downgrading:\n");
+    printf("      --use-pwndfu\t\tuse this for restoring devices with Odysseus method. Device needs to be in pwned DFU mode already\n");
+    printf("      --just-boot=\"-v\"\t\tuse this to tethered boot the device from pwned DFU mode. You can optionally set boot-args\n");
 #endif
 
     printf("\nOptions for baseband:\n");