Remove idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch

3 files changed, 6 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76b2bbd6f0c2..e51695436005 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = futurerestore-s0uthwest-git
 	pkgdesc = iOS upgrade and downgrade tool utilizing SHSH blobs - s0uthwest's fork - git version
-	pkgver = r230.b6f1b1b
-	pkgrel = 3
+	pkgver = r230.8e00751
+	pkgrel = 4
 	url = https://github.com/s0uthwest/futurerestore
 	arch = x86_64
 	license = LGPL3
@@ -25,14 +25,12 @@ pkgbase = futurerestore-s0uthwest-git
 	source = git+https://github.com/s0uthwest/idevicerestore.git
 	source = git+https://github.com/tihmstar/jssy.git
 	source = idevicerestore-0001-configure.ac-check-for-pthreads.patch
-	source = idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = eb412d9b814a8d94e6f716e82559f5d5e31b5ca5267b8e28c47d72d09312ea138f448785a3f39e8798d2cd15b9f65168fda39a21ea465274d32b3b24a979ed91
-	sha512sums = 5c77470c161488c88d42401da6048007b2186081e12628e83a943e15bccdff43a4e92bb55e0e3b85ee35ed157544eea7c9d99f25203e62ceaf3171e92c9ff54a
 
 pkgname = futurerestore-s0uthwest-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 16e631f0c92c..79eda0e872b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: 0x9fff00 <0x9fff00+git@protonmail.ch>
 pkgname=futurerestore-s0uthwest-git
 _pkgname=futurerestore
-pkgver=r230.b6f1b1b
-pkgrel=3
+pkgver=r230.8e00751
+pkgrel=4
 pkgdesc="iOS upgrade and downgrade tool utilizing SHSH blobs - s0uthwest's fork - git version"
 arch=('x86_64')
 url="https://github.com/s0uthwest/futurerestore"
@@ -16,15 +16,13 @@ source=('git+https://github.com/s0uthwest/futurerestore.git'
         'git+https://github.com/s0uthwest/tsschecker.git'
         'git+https://github.com/s0uthwest/idevicerestore.git'
         'git+https://github.com/tihmstar/jssy.git'
-        'idevicerestore-0001-configure.ac-check-for-pthreads.patch'
-        'idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch')
+        'idevicerestore-0001-configure.ac-check-for-pthreads.patch')
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'eb412d9b814a8d94e6f716e82559f5d5e31b5ca5267b8e28c47d72d09312ea138f448785a3f39e8798d2cd15b9f65168fda39a21ea465274d32b3b24a979ed91'
-            '5c77470c161488c88d42401da6048007b2186081e12628e83a943e15bccdff43a4e92bb55e0e3b85ee35ed157544eea7c9d99f25203e62ceaf3171e92c9ff54a')
+            'eb412d9b814a8d94e6f716e82559f5d5e31b5ca5267b8e28c47d72d09312ea138f448785a3f39e8798d2cd15b9f65168fda39a21ea465274d32b3b24a979ed91')
 
 pkgver() {
   cd "$_pkgname"
diff --git a/idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch b/idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch
deleted file mode 100644
index 03a8cafd7e96..000000000000
--- a/idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 25bd64dbf3171a662182502da6f6f3a27e80b10f Mon Sep 17 00:00:00 2001
-From: 0x9fff00 <0x9fff00+git@protonmail.ch>
-Date: Mon, 18 Feb 2019 19:16:59 +0100
-Subject: [PATCH 2/2] Revert "img4: fix compiling for linux"
-
-This reverts commit 264c4361474782274c7e28cd0d0134c3c4ff7065.
-
-This caused the restore to get stuck at "Waiting for device...".
----
- src/img4.c | 3 +--
- src/img4.h | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/img4.c b/src/img4.c
-index c3195d7..db33f15 100644
---- a/src/img4.c
-+++ b/src/img4.c
-@@ -123,8 +123,7 @@ static const unsigned char *asn1_find_element(unsigned int index, unsigned char
- 	}
- 
- 	// find the element we are searching
--    int i = 0;
--    while (i <= index, i++) {
-+	for (int i = 0; i <= index; i++) {
- 		off += asn1_get_element(&data[off], &el_type, &el_size);
- 		if (i == index)
- 			break;
-diff --git a/src/img4.h b/src/img4.h
-index 005ead3..b83f1ca 100644
---- a/src/img4.h
-+++ b/src/img4.h
-@@ -32,4 +32,4 @@ int img4_stitch_component(const char* component_name, const unsigned char* compo
- }
- #endif
- 
--#endif /* idevicerestore_img4_h */
-+#endif
--- 
-2.20.1
-