Fix patches

5 files changed, 52 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fec5a3592603..76b2bbd6f0c2 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 = r231.546c759
-	pkgrel = 2
+	pkgver = r230.b6f1b1b
+	pkgrel = 3
 	url = https://github.com/s0uthwest/futurerestore
 	arch = x86_64
 	license = LGPL3
@@ -25,14 +25,14 @@ 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-ubuntu-compiling.patch
+	source = idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 99635fba451f1bfa0864cb4b2ccee76c49413c66ec08a975cdb4432d564cbc4824be96999fe5adbec9cf90b41f5ba00e71fd45088e173e66af75d5722ad7e587
-	sha512sums = f840c0897da1b11e5f43b09d784b57757f8de68edf021f5a9230ccbf392acabe1b1e574a4156d7cef86976c3f38ca04b9ad2d52f72c08c94e4105720780edd0d
+	sha512sums = eb412d9b814a8d94e6f716e82559f5d5e31b5ca5267b8e28c47d72d09312ea138f448785a3f39e8798d2cd15b9f65168fda39a21ea465274d32b3b24a979ed91
+	sha512sums = 5c77470c161488c88d42401da6048007b2186081e12628e83a943e15bccdff43a4e92bb55e0e3b85ee35ed157544eea7c9d99f25203e62ceaf3171e92c9ff54a
 
 pkgname = futurerestore-s0uthwest-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e8e3defdbe01..16e631f0c92c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: 0x9fff00 <0x9fff00+git@protonmail.ch>
 pkgname=futurerestore-s0uthwest-git
 _pkgname=futurerestore
-pkgver=r231.546c759
-pkgrel=2
+pkgver=r230.b6f1b1b
+pkgrel=3
 pkgdesc="iOS upgrade and downgrade tool utilizing SHSH blobs - s0uthwest's fork - git version"
 arch=('x86_64')
 url="https://github.com/s0uthwest/futurerestore"
@@ -17,14 +17,14 @@ source=('git+https://github.com/s0uthwest/futurerestore.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-ubuntu-compiling.patch')
+        'idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch')
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '99635fba451f1bfa0864cb4b2ccee76c49413c66ec08a975cdb4432d564cbc4824be96999fe5adbec9cf90b41f5ba00e71fd45088e173e66af75d5722ad7e587'
-            'f840c0897da1b11e5f43b09d784b57757f8de68edf021f5a9230ccbf392acabe1b1e574a4156d7cef86976c3f38ca04b9ad2d52f72c08c94e4105720780edd0d')
+            'eb412d9b814a8d94e6f716e82559f5d5e31b5ca5267b8e28c47d72d09312ea138f448785a3f39e8798d2cd15b9f65168fda39a21ea465274d32b3b24a979ed91'
+            '5c77470c161488c88d42401da6048007b2186081e12628e83a943e15bccdff43a4e92bb55e0e3b85ee35ed157544eea7c9d99f25203e62ceaf3171e92c9ff54a')
 
 pkgver() {
   cd "$_pkgname"
diff --git a/idevicerestore-0001-configure.ac-check-for-pthreads.patch b/idevicerestore-0001-configure.ac-check-for-pthreads.patch
index 58c92c185663..0e55384d8792 100644
--- a/idevicerestore-0001-configure.ac-check-for-pthreads.patch
+++ b/idevicerestore-0001-configure.ac-check-for-pthreads.patch
@@ -1,4 +1,4 @@
-From f79c08e7b63b96cc8328729b7f87e94133de65ab Mon Sep 17 00:00:00 2001
+From 9481d9fcf04203477dca4d503524c042fe63ab0e Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx100@gmail.com>
 Date: Fri, 25 Sep 2015 23:37:27 +0300
 Subject: [PATCH 1/2] configure.ac: check for pthreads
@@ -9,7 +9,7 @@ Fixes building at least on Arch.
  1 file changed, 1 insertion(+)
 
 diff --git a/configure.ac b/configure.ac
-index d189087..55aea17 100644
+index 8f20317..df7ac04 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,6 +19,7 @@ AM_PROG_CC_C_O
diff --git a/idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch b/idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch
new file mode 100644
index 000000000000..03a8cafd7e96
--- /dev/null
+++ b/idevicerestore-0002-Revert-img4-fix-compiling-for-linux.patch
@@ -0,0 +1,40 @@
+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
+
diff --git a/idevicerestore-0002-Revert-img4-fix-ubuntu-compiling.patch b/idevicerestore-0002-Revert-img4-fix-ubuntu-compiling.patch
deleted file mode 100644
index 6610d6de1c9c..000000000000
--- a/idevicerestore-0002-Revert-img4-fix-ubuntu-compiling.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d1c43cc5d9a9722addbd20db6599a4c568963f24 Mon Sep 17 00:00:00 2001
-From: 0x9fff00 <0x9fff00+git@protonmail.ch>
-Date: Sun, 17 Feb 2019 14:58:52 +0100
-Subject: [PATCH 2/2] Revert "img4: fix ubuntu compiling"
-
-This reverts commit 07a40245037b4d255e2142bb49d29c91336a317f.
-
-This caused the restore to get stuck at "Waiting for device...".
----
- src/img4.c | 4 +---
- src/img4.h | 2 +-
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/img4.c b/src/img4.c
-index 8ca5baa..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;
-@@ -174,7 +173,6 @@ int img4_stitch_component(const char* component_name, const unsigned char* compo
- 
- 	// create element header for the "IMG4" magic
- 	asn1_create_element_header(ASN1_IA5_STRING, IMG4_MAGIC_SIZE, &magic_header, &magic_header_size);
--    
- 	// create element header for the blob (ApImg4Ticket)
- 	asn1_create_element_header(ASN1_CONTEXT_SPECIFIC|ASN1_CONSTRUCTED, blob_size, &blob_header, &blob_header_size);
- 
-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
-