Update libirecovery, libplist and libusbmuxd names for 1.0.0/2.2.0/2.0.2

7 files changed, 126 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad9405040e0d..e76d091f5e27 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 = r248.08d0e00
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/s0uthwest/futurerestore
 	arch = x86_64
 	license = LGPL3
@@ -23,17 +23,23 @@ pkgbase = futurerestore-s0uthwest-git
 	source = git+https://github.com/tihmstar/tsschecker.git
 	source = git+https://github.com/s0uthwest/idevicerestore.git
 	source = git+https://github.com/tihmstar/jssy.git
+	source = futurerestore-0001-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch
 	source = img4tool-0001-Include-arpa-inet.h-header.patch
 	source = tsschecker-0001-Fix-incorrect-language-standard.patch
+	source = tsschecker-0002-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch
 	source = idevicerestore-0001-configure.ac-check-for-pthreads.patch
+	source = idevicerestore-0002-Update-libirecovery-libplist-and-libusbmuxd-names-fo.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 8fb94f7c55ffda3e0cae69ff66dbc833e95adcf2dd7fa046012801539539bcde
 	sha256sums = bd9c4dc74f56a26d9aef10938fe0fb58cdec268a80a04b217dd4a32c5b60db2d
-	sha256sums = 3fcde7558ae9f5ebfa930a2b02074251a6817e2a984c8d0e18113baa0ea708a5
-	sha256sums = 621e0e9bd2a31d8be8da59c051d2190a98be0f5c4cd5158225ffd4ff91d3ab1e
+	sha256sums = cc9efff8b41be914b36955d15adca72447ea0ec68ec6fb4bec43bc0d67ca400c
+	sha256sums = f85de30d45d2390e99d08932c4483632854947f18b8681013e9cd7729033a775
+	sha256sums = 366065b2c1d80b6a22a0a3560e51bf30372311d390771ff105b1cf5b53fb7da0
+	sha256sums = 95a44eef2daa9b996b027006e3f7b06eb0e47a51c40ff9fbb0271324c132a97d
 
 pkgname = futurerestore-s0uthwest-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 13bc6650d70f..f91d978e907a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _name=futurerestore
 _forkname=$_name-s0uthwest
 pkgname=$_forkname-git
 pkgver=r248.08d0e00
-pkgrel=6
+pkgrel=7
 pkgdesc="iOS upgrade and downgrade tool utilizing SHSH blobs - s0uthwest's fork - git version"
 arch=('x86_64')
 url="https://github.com/s0uthwest/$_name"
@@ -18,17 +18,23 @@ source=("git+$url.git"
         'git+https://github.com/tihmstar/tsschecker.git'
         'git+https://github.com/s0uthwest/idevicerestore.git'
         'git+https://github.com/tihmstar/jssy.git'
+        "$_name-0001-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch"
         'img4tool-0001-Include-arpa-inet.h-header.patch'
         'tsschecker-0001-Fix-incorrect-language-standard.patch'
-        'idevicerestore-0001-configure.ac-check-for-pthreads.patch')
+        'tsschecker-0002-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch'
+        'idevicerestore-0001-configure.ac-check-for-pthreads.patch'
+        'idevicerestore-0002-Update-libirecovery-libplist-and-libusbmuxd-names-fo.patch')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
+            '8fb94f7c55ffda3e0cae69ff66dbc833e95adcf2dd7fa046012801539539bcde'
             'bd9c4dc74f56a26d9aef10938fe0fb58cdec268a80a04b217dd4a32c5b60db2d'
-            '3fcde7558ae9f5ebfa930a2b02074251a6817e2a984c8d0e18113baa0ea708a5'
-            '621e0e9bd2a31d8be8da59c051d2190a98be0f5c4cd5158225ffd4ff91d3ab1e')
+            'cc9efff8b41be914b36955d15adca72447ea0ec68ec6fb4bec43bc0d67ca400c'
+            'f85de30d45d2390e99d08932c4483632854947f18b8681013e9cd7729033a775'
+            '366065b2c1d80b6a22a0a3560e51bf30372311d390771ff105b1cf5b53fb7da0'
+            '95a44eef2daa9b996b027006e3f7b06eb0e47a51c40ff9fbb0271324c132a97d')
 
 pkgver() {
   cd "$_name"
@@ -45,6 +51,10 @@ prepare() {
   git config submodule.external/idevicerestore.url "$srcdir/idevicerestore"
   git submodule update
 
+  for p in "$srcdir"/$_name-*.patch; do
+    patch -Np1 -i "$p"
+  done
+
   cd external/img4tool
   for p in "$srcdir"/img4tool-*.patch; do
     patch -Np1 -i "$p"
diff --git a/futurerestore-0001-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch b/futurerestore-0001-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch
new file mode 100644
index 000000000000..415beb7076b7
--- /dev/null
+++ b/futurerestore-0001-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch
@@ -0,0 +1,30 @@
+From cbd71ea81dff449b696d1764adae824ad45399a2 Mon Sep 17 00:00:00 2001
+From: 0x9fff00 <0x9fff00+git@protonmail.ch>
+Date: Sat, 20 Jun 2020 23:36:53 +0200
+Subject: [PATCH] Update libplist and libirecovery names for 2.2.0/1.0.0
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 68e5e62..2178d09 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,11 +30,11 @@ AC_CONFIG_SRCDIR([futurerestore])
+ 
+ # Check for libraries
+ AC_SEARCH_LIBS([pthread_create], [pthread])
+-PKG_CHECK_MODULES(libplist, libplist >= 2.0.0)
++PKG_CHECK_MODULES(libplist, libplist-2.0 >= 2.2.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)
+-PKG_CHECK_MODULES(libirecovery, libirecovery >= 0.2.0)
++PKG_CHECK_MODULES(libirecovery, libirecovery-1.0 >= 1.0.0)
+ 
+ AC_PROG_CC
+ AC_PROG_CXX
+-- 
+2.27.0
+
diff --git a/idevicerestore-0001-configure.ac-check-for-pthreads.patch b/idevicerestore-0001-configure.ac-check-for-pthreads.patch
index 8ef48423cffa..40450de4d741 100644
--- a/idevicerestore-0001-configure.ac-check-for-pthreads.patch
+++ b/idevicerestore-0001-configure.ac-check-for-pthreads.patch
@@ -1,7 +1,7 @@
-From 9481d9fcf04203477dca4d503524c042fe63ab0e Mon Sep 17 00:00:00 2001
+From 74a52b212dc9cd83c3f42e133cb19f1595c0f53b Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx100@gmail.com>
 Date: Fri, 25 Sep 2015 23:37:27 +0300
-Subject: [PATCH] configure.ac: check for pthreads
+Subject: [PATCH 1/2] configure.ac: check for pthreads
 
 Fixes building at least on Arch.
 ---
@@ -9,7 +9,7 @@ Fixes building at least on Arch.
  1 file changed, 1 insertion(+)
 
 diff --git a/configure.ac b/configure.ac
-index 8f20317..df7ac04 100644
+index 349ee8f..d69e56d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,6 +19,7 @@ AM_PROG_CC_C_O
@@ -21,5 +21,5 @@ index 8f20317..df7ac04 100644
  PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.2.1)
  PKG_CHECK_MODULES(libplist, libplist >= 1.0)
 -- 
-2.25.0
+2.27.0
 
diff --git a/idevicerestore-0002-Update-libirecovery-libplist-and-libusbmuxd-names-fo.patch b/idevicerestore-0002-Update-libirecovery-libplist-and-libusbmuxd-names-fo.patch
new file mode 100644
index 000000000000..65f95d806261
--- /dev/null
+++ b/idevicerestore-0002-Update-libirecovery-libplist-and-libusbmuxd-names-fo.patch
@@ -0,0 +1,32 @@
+From c9d64f9ab3dadfb6bd080df721fa6e7277a629a2 Mon Sep 17 00:00:00 2001
+From: 0x9fff00 <0x9fff00+git@protonmail.ch>
+Date: Sat, 20 Jun 2020 23:48:52 +0200
+Subject: [PATCH 2/2] Update libirecovery, libplist and libusbmuxd names for
+ 1.0.0/2.2.0/2.0.2
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d69e56d..cd8cc32 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,11 +20,11 @@ AC_PROG_LIBTOOL
+ 
+ # Checks for libraries.
+ AC_SEARCH_LIBS([pthread_create], [pthread])
+-PKG_CHECK_MODULES(libirecovery, libirecovery >= 0.2.0)
++PKG_CHECK_MODULES(libirecovery, libirecovery-1.0 >= 1.0.0)
+ PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.2.1)
+-PKG_CHECK_MODULES(libplist, libplist >= 1.0)
++PKG_CHECK_MODULES(libplist, libplist-2.0 >= 2.2.0)
+ PKG_CHECK_MODULES(libzip, libzip >= 1.4)
+-PKG_CHECK_MODULES(libusbmuxd, libusbmuxd >= 1.0)
++PKG_CHECK_MODULES(libusbmuxd, libusbmuxd-2.0 >= 2.0.2)
+ PKG_CHECK_MODULES(libcurl, libcurl >= 7.0)
+ PKG_CHECK_MODULES(openssl, openssl >= 0.9.8)
+ PKG_CHECK_MODULES(zlib, zlib >= 1.2)
+-- 
+2.27.0
+
diff --git a/tsschecker-0001-Fix-incorrect-language-standard.patch b/tsschecker-0001-Fix-incorrect-language-standard.patch
index 1ba2be4ebf88..1b3b0b531f19 100644
--- a/tsschecker-0001-Fix-incorrect-language-standard.patch
+++ b/tsschecker-0001-Fix-incorrect-language-standard.patch
@@ -1,17 +1,17 @@
-From fea67caa58f492b86fbab298e3329dbf5ff835fb Mon Sep 17 00:00:00 2001
+From eccc13e8ca858e4fa7e108cf425f30bd25125e63 Mon Sep 17 00:00:00 2001
 From: 0x9fff00 <0x9fff00+git@protonmail.ch>
 Date: Sat, 8 Feb 2020 18:22:55 +0100
-Subject: [PATCH] Fix incorrect language standard
+Subject: [PATCH 1/2] Fix incorrect language standard
 
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 4d8ca11..e9e2384 100644
+index 9b9acf0..dc7a58b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -15,7 +15,7 @@ esac
+@@ -23,7 +23,7 @@ AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
  
  # Checks for programs.
  AC_PROG_CC
@@ -21,5 +21,5 @@ index 4d8ca11..e9e2384 100644
  AC_PROG_LIBTOOL
  AC_CONFIG_MACRO_DIRS([m4])
 -- 
-2.25.0
+2.27.0
 
diff --git a/tsschecker-0002-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch b/tsschecker-0002-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch
new file mode 100644
index 000000000000..2efba7d5863a
--- /dev/null
+++ b/tsschecker-0002-Update-libplist-and-libirecovery-names-for-2.2.0-1.0.patch
@@ -0,0 +1,32 @@
+From c4c74eef28d3c99787060db2d23895f2b6ea2780 Mon Sep 17 00:00:00 2001
+From: 0x9fff00 <0x9fff00+git@protonmail.ch>
+Date: Sat, 20 Jun 2020 22:30:08 +0200
+Subject: [PATCH 2/2] Update libplist and libirecovery names for 2.2.0/1.0.0
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dc7a58b..f5b3336 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,13 +51,13 @@ AC_ARG_WITH(
+     ]
+ )
+ 
+-PKG_CHECK_MODULES(libplist, libplist >= 1.0)
++PKG_CHECK_MODULES(libplist, libplist-2.0 >= 2.2.0)
+ PKG_CHECK_MODULES(libcurl, libcurl >= 1.0)
+ PKG_CHECK_MODULES(libfragmentzip, libfragmentzip >= 1.0)
+ AS_IF([test "x$with_libcrypto" != xno],
+     [PKG_CHECK_MODULES(libcrypto, libcrypto >= 1.0)]
+ )
+-PKG_CHECK_MODULES(libirecovery, libirecovery >= 0.2.0)
++PKG_CHECK_MODULES(libirecovery, libirecovery-1.0 >= 1.0.0)
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([getopt.h stddef.h stdlib.h string.h stdio.h unistd.h])
+-- 
+2.27.0
+