libimobiledevice: 1.3.0 > 1.4.0

5 files changed, 24 insertions, 52 deletions

diff --git a/REPO b/REPO
index 5e81979..ac09c04 100644
--- a/REPO
+++ b/REPO
@@ -203,10 +203,9 @@ f:a0b57ae963ffe075c161bc6bacabd457:gvfs/post-install
 f:824252fc0cd5548cd8a5f068baac4fb1:gvfs/.signature
 f:da9f4a756eda647be7f99857ebafe293:gvfs/Pkgfile
 f:04107144ad05fccb6b632021772d6e9f:gvfs/.footprint
-f:8d94ec6a93a1d2f12bfad4c75313b32b:libimobiledevice/libimobiledevice-libplist-2.3.0.patch
-f:73a2d594d1e162456b6fb57a68eeb6f9:libimobiledevice/.signature
-f:760b5ae8e3e1ac3a40353c7644314c71:libimobiledevice/Pkgfile
-f:8129c2683f64b7a01a44f1d46a76cc87:libimobiledevice/.footprint
+f:f620a8d83ff8a0f96e771a8cc475ced5:libimobiledevice/.signature
+f:44179db1ee1e34a97af99e85528798c9:libimobiledevice/Pkgfile
+f:99c173d34fc44bb7a2dde561b232e010:libimobiledevice/.footprint
 f:95f3a1ebcc5a4ee8a9edafe7df0fcbc5:xfce4-calculator-plugin/post-install
 f:57d3fb9f4a455b2644941da9200abcb6:xfce4-calculator-plugin/.signature
 f:82fba7db1143f4d402c7273d15974d12:xfce4-calculator-plugin/Pkgfile
diff --git a/libimobiledevice/.footprint b/libimobiledevice/.footprint
index 293eaf1..f681731 100644
--- a/libimobiledevice/.footprint
+++ b/libimobiledevice/.footprint
@@ -1,12 +1,15 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/afcclient
 -rwxr-xr-x	root/root	usr/bin/idevice_id
 -rwxr-xr-x	root/root	usr/bin/idevicebackup
 -rwxr-xr-x	root/root	usr/bin/idevicebackup2
+-rwxr-xr-x	root/root	usr/bin/idevicebtlogger
 -rwxr-xr-x	root/root	usr/bin/idevicecrashreport
 -rwxr-xr-x	root/root	usr/bin/idevicedate
 -rwxr-xr-x	root/root	usr/bin/idevicedebug
 -rwxr-xr-x	root/root	usr/bin/idevicedebugserverproxy
+-rwxr-xr-x	root/root	usr/bin/idevicedevmodectl
 -rwxr-xr-x	root/root	usr/bin/idevicediagnostics
 -rwxr-xr-x	root/root	usr/bin/ideviceenterrecovery
 -rwxr-xr-x	root/root	usr/bin/ideviceimagemounter
@@ -21,6 +24,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/libimobiledevice/
 -rw-r--r--	root/root	usr/include/libimobiledevice/afc.h
+-rw-r--r--	root/root	usr/include/libimobiledevice/bt_packet_logger.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/companion_proxy.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/debugserver.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/diagnostics_relay.h
@@ -37,9 +41,11 @@ drwxr-xr-x	root/root	usr/include/libimobiledevice/
 -rw-r--r--	root/root	usr/include/libimobiledevice/mobilebackup2.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/mobilesync.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/notification_proxy.h
+-rw-r--r--	root/root	usr/include/libimobiledevice/ostrace.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/preboard.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/property_list_service.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/restore.h
+-rw-r--r--	root/root	usr/include/libimobiledevice/reverse_proxy.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/sbservices.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/screenshotr.h
 -rw-r--r--	root/root	usr/include/libimobiledevice/service.h
@@ -47,21 +53,24 @@ drwxr-xr-x	root/root	usr/include/libimobiledevice/
 -rw-r--r--	root/root	usr/include/libimobiledevice/webinspector.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libimobiledevice-1.0.a
-lrwxrwxrwx	root/root	usr/lib/libimobiledevice-1.0.so -> libimobiledevice-1.0.so.6.0.0
-lrwxrwxrwx	root/root	usr/lib/libimobiledevice-1.0.so.6 -> libimobiledevice-1.0.so.6.0.0
--rwxr-xr-x	root/root	usr/lib/libimobiledevice-1.0.so.6.0.0
+lrwxrwxrwx	root/root	usr/lib/libimobiledevice-1.0.so -> libimobiledevice-1.0.so.6.1.0
+lrwxrwxrwx	root/root	usr/lib/libimobiledevice-1.0.so.6 -> libimobiledevice-1.0.so.6.1.0
+-rwxr-xr-x	root/root	usr/lib/libimobiledevice-1.0.so.6.1.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libimobiledevice-1.0.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/afcclient.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevice_id.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevicebackup.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevicebackup2.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/idevicebtlogger.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevicecrashreport.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevicedate.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevicedebug.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevicedebugserverproxy.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/idevicedevmodectl.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/idevicediagnostics.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ideviceenterrecovery.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ideviceimagemounter.1.gz
diff --git a/libimobiledevice/.signature b/libimobiledevice/.signature
index dea908d..4f4898a 100644
--- a/libimobiledevice/.signature
+++ b/libimobiledevice/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/xfce4.pub
-RWRSAbUnL7azFIMbylDg50SebWlpA0f/v7edPk5g9ue44kD286PMVwNAssVY0ZebTm6oMXdaOCNI6DhxiUg0n+x4k43o5u/FrAE=
-SHA256 (Pkgfile) = 1c6c2ceb9e11f2aade3f104b86d524a844d4efd1d98d11c905bca64d3bf44765
-SHA256 (.footprint) = d311fc584048e1afd16939e3f622e78b7403737c932400321fb947b9451a5900
-SHA256 (libimobiledevice-1.3.0.tar.bz2) = 53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6
-SHA256 (libimobiledevice-libplist-2.3.0.patch) = 57fb4616c68c240aad47df52168fa30e4bf43845bfbe53df23cc412003ae64fd
+RWRSAbUnL7azFE5lYsLDIopxHjLOSWuWtiExBhuG+g4Ry+0U7XjK5TDSQt7UUJ2mmnxgK6ralQceGgfMxP6zKDfpu+fKq9i/IAk=
+SHA256 (Pkgfile) = 584c6f773a0b5c5ebd789a4d4327f1714f12da9347fc008bdaf226c45ca0b4b9
+SHA256 (.footprint) = 24344bdac9123d8cbab481e6b0d543e1da4c26481a5e1bd9057cdc4495ac77c6
+SHA256 (libimobiledevice-1.4.0.tar.bz2) = 23cc0077e221c7d991bd0eb02150a0d49199bcca1ddf059edccee9ffd914939d
diff --git a/libimobiledevice/Pkgfile b/libimobiledevice/Pkgfile
index 2b517d1..5c49b3f 100644
--- a/libimobiledevice/Pkgfile
+++ b/libimobiledevice/Pkgfile
@@ -1,21 +1,18 @@
 # Description: A cross-platform protocol library to communicate with iOS devices
 # URL: https://github.com/libimobiledevice/libimobiledevice
-# Maintainer: mac-a-r0ni, j at lngn dot net
-# Depends on: libusbmuxd
+# Maintainer: Jay Lanagan, j at lngn dot net
+# Depends on: libtatsu libusbmuxd
 
 name=libimobiledevice
-version=1.3.0
-release=2
-source=(https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2 libimobiledevice-libplist-2.3.0.patch)
+version=1.4.0
+release=1
+source=(https://github.com/$name/$name/releases/download/$version/$name-$version.tar.bz2)
 
 build()
 {
 
 cd $name-${version}*
 
-  # Fix build with libplist 2.3.0
-  patch -Np1 -i ../libimobiledevice-libplist-2.3.0.patch
-
   autoreconf -fvi
 
   ./configure --prefix=/usr --without-cython
diff --git a/libimobiledevice/libimobiledevice-libplist-2.3.0.patch b/libimobiledevice/libimobiledevice-libplist-2.3.0.patch
deleted file mode 100644
index 25f8d3d..0000000
--- a/libimobiledevice/libimobiledevice-libplist-2.3.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git i/common/utils.c w/common/utils.c
-index 7f66ec2..7ebe997 100644
---- i/common/utils.c
-+++ w/common/utils.c
-@@ -314,7 +314,7 @@ int plist_read_from_filename(plist_t *plist, const char *filename)
- 	return 1;
- }
- 
--int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format)
-+int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format)
- {
- 	char *buffer = NULL;
- 	uint32_t length;
-diff --git i/common/utils.h w/common/utils.h
-index 2c3acec..4faa5bd 100644
---- i/common/utils.h
-+++ w/common/utils.h
-@@ -51,13 +51,8 @@ char *generate_uuid(void);
- void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
- void buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length);
- 
--enum plist_format_t {
--	PLIST_FORMAT_XML,
--	PLIST_FORMAT_BINARY
--};
--
- int plist_read_from_filename(plist_t *plist, const char *filename);
--int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
-+int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format);
- 
- void plist_print_to_stream(plist_t plist, FILE* stream);
-