Fix compability with libimobiledevice >= 1.1.5 wrt #496796 by "ikk_pl"

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 130 insertions, 12 deletions

diff --git a/app-pda/ifuse/ChangeLog b/app-pda/ifuse/ChangeLog
index f99c8833291b..997f4282eb18 100644
--- a/app-pda/ifuse/ChangeLog
+++ b/app-pda/ifuse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/ifuse
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/ifuse/ChangeLog,v 1.12 2013/05/11 22:05:54 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/ifuse/ChangeLog,v 1.13 2014/02/04 07:13:44 ssuominen Exp $
+
+*ifuse-1.1.2-r1 (04 Feb 2014)
+
+  04 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/ifuse-1.1.2-libimobiledevice115.patch, +ifuse-1.1.2-r1.ebuild:
+  Fix compability with libimobiledevice >= 1.1.5 wrt #496796 by "ikk_pl"
 
   11 May 2013; Samuli Suominen <ssuominen@gentoo.org> ifuse-1.1.2.ebuild:
   Use subslot operator for the libplist and libimobiledevice dependencies.
@@ -51,4 +57,3 @@
 
   08 Jun 2009; <chainsaw@gentoo.org> +ifuse-0.9.1.ebuild, +metadata.xml:
   Initial commit, ebuild by me. Closes bug #241174.
-
diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest
index 9d02f6d2fb96..8ad388198f3a 100644
--- a/app-pda/ifuse/Manifest
+++ b/app-pda/ifuse/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ifuse-1.1.2-libimobiledevice115.patch 2717 SHA256 45125a5019d388a9b0dd335a58f13beac099b21f11aa1db736578a4b3b53b8a4 SHA512 a869bd8e71d17a2058089ef3cd2650f75d3d4dd7eab18e99b588a2f13164e979c924215aa9b2906a0e49640c30bb6a172b92c32c48fe0babf7e6866ccfaf9c65 WHIRLPOOL 5d127da31c751d59d8a1e827cc41c2186eee18c341826b80d6604d91f7207bc92c3be6f4059d859eac10847b041ed5592bdf48770a39016f286d1ce9c6c5dba2
 DIST ifuse-1.1.2.tar.bz2 84645 SHA256 47835c8afb72588b3202fe0b206d7ea37a68663d9aa4eaf73f0a4bcb6215fc05 SHA512 eb2d2340265d9d51ba44b0f24665a648fe4c07dc379563f517b1e1994ff513cabc72a61d77cf13bcf24771ace3716aef55fa40db3c0045539a5b8bc3e6b487ae WHIRLPOOL eda8b8fff0e28688b4adb4b5457f1b1c590b0e16b6fd94470e507609193170441c60c3abf3518ae178023c3ba5393b3c185170f773bbf9b0dc2e6f937c3fe1c5
+EBUILD ifuse-1.1.2-r1.ebuild 1036 SHA256 d7ee0807e4810888543cadeea8ed18422c2cd9bd445456cd58ce27fe4113eaea SHA512 d4e79da7c47700d89af999f9fbb4f47d14861c66a2e82ce121e35879ea77f603f8e7d19a92ac8b2fcc5fe4fd64b6a593fdfbe813eaaa58e34e3147f5ead24437 WHIRLPOOL b3a728a04e31e502b59dbed03bb5f814df7e90c1272067d3e81768fbf9fc958bde53765bc7f823f9578c0393e28675b60d766b6411cc905063a72f2872be95a9
 EBUILD ifuse-1.1.2.ebuild 987 SHA256 87c84b4307fa1f2f5c81b0910a339f2c5819a8890f847c09fcc51bcfbf22e644 SHA512 f468fc58c28ab03074b3c74be35fcde5f49ee52835b97e7d99d2258956e91a07ee1047a9ef0612c77ce17b185843e0d6acf3ef1d00c2fd7485304a6c636efdc9 WHIRLPOOL ea417365a1363ded11f2b4a796697f4957feb9ac073e56ac9a7f662873939d13daba7649c528e714d7178a7f4bf0d87e16c2ef8a1bbf9110ebafd01f1323e962
-MISC ChangeLog 1768 SHA256 f32eeed52cb4dedf9d3853bd0ef2fac2d1c3efcfabaae44a7fe196784ff56464 SHA512 f829e716e50bdd35331339c6b9388686ba6d38444c7a0ddd2bb036938bd387998eed84005aaaeb0bc8eb20e5219f8ecbbc96dab9e38b1885e07fb643acd018cf WHIRLPOOL c6a05dae5fab1a325fc926260a27c3ff7bb49d913851ee3da0458826cc576503474eceb0becc18cd15bb541d99e9739f7b95d3cb225336cb77f5c31fe8f4a779
+MISC ChangeLog 1998 SHA256 6f4064193e0e9526499664ad773472764fdfb2b5240d913df55fd6ae4afc462f SHA512 633e994218c595df5d76f6dc02941626b71eb8ec13554d46d61e8cea2db3daf30e40d2b21b881d87f6d8697ca96c21e0d31ceeb4d3533d231042712329558a69 WHIRLPOOL bf06fda5fea5de191bd4d7a3681d34dad755337c5bf2c18b9be4d7e01003c72c62af9329258e686b6205d2e83c56deb91bbb38dc75d15440e0c93161ca71a426
 MISC metadata.xml 158 SHA256 21247a564394680460e294ac138a92903d91b5cafee5cafc38a50656caf965e2 SHA512 1095f62f09baf2c54d8b48f022e8364f73feaa99df7443e770f70e8dd22705ccaaa3f71a946c223c6f1903d0387dfc84693b4f4e3976f65423474221b0b4ac90 WHIRLPOOL 04e0de42ec7067178deb39fc7963229c529b500130ad2757288bc6a2b9e8275fa3e417e7ca290b4cd883d052dffd829aeb4509053e31c38e30bcf8e28270ce3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRjsCUAAoJEEdUh39IaPFNS7QH/1Py09ik/Gq9XRIugWyUhFcD
-4xXFiH1Nzzw6PukDWCc4i6PXoyFIWN3KaX3+OlrC3BKe/Lr0aiMAhxJlbN66lkbX
-olF930CRe3XoGXJIWo203/zVDfsAv8AN1Uwj/C7WjU13pt011+PDQlk4W5ilf0UL
-B/PsRsHhWfa4s09BIeZnt5evVNzgYnyUtDd6nbrRAmuas6kuxYlegW5rIJw4zpn+
-QEzFEzPIK6VPqYW4vydvq6M1VFDRSnGS2vhcxdArbYpx6ZQXXwBnTUg92DB7lXBM
-AzqT9gmTC21VFVoV/o3S4diqcCpNs3nzlNBvJ97MLJL46PK0e7cpm4mKwrplyLk=
-=78VZ
+iQEcBAEBCAAGBQJS8JMBAAoJEEdUh39IaPFNlOsH/i8pputaG3UneSig0xOt+s69
+Q/yct2sAcBAazDfHXlvDmZSji7mU6YJlA4rRDwUJeApDEZtTVlKYpXv3b8QMDi87
+QVNCaNMGLmWOQsX+gBQs5yYm3hRBfXEHc6MIIrexurqIffNXKOcOOA2gIUH2MKGt
+LX5fsGjiqZrsIISV8tKiKidEt9cyE6qWUHLErivp9qacjjQ8d3xH+U7ayuOgucNP
+w5jmjVT6U58lOG4UF2xFcyhJLSXkneABxltivArdeqvNW0p+1w1PJ7HFeYf3+YB3
+YlgJgg11BIXNtlswWNL3EaPIqXBpcHCpxATgwrzwfkJfk4nS9OHhiFnYCUgW8CA=
+=l17a
 -----END PGP SIGNATURE-----
diff --git a/app-pda/ifuse/files/ifuse-1.1.2-libimobiledevice115.patch b/app-pda/ifuse/files/ifuse-1.1.2-libimobiledevice115.patch
new file mode 100644
index 000000000000..8d74cf88f869
--- /dev/null
+++ b/app-pda/ifuse/files/ifuse-1.1.2-libimobiledevice115.patch
@@ -0,0 +1,78 @@
+From 9ac32aa3cb2ed5242c0fe3c58ef5f571bf2b95d7 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen
+Date: Sun, 24 Mar 2013 01:45:23 +0000
+Subject: Updated for libimobiledevice >= 1.1.5
+
+---
+diff --git a/configure.ac b/configure.ac
+index 85d131a..ca518ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,6 +17,10 @@ PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.0, libimobiled
+ if test x"$libimobiledevice_1_1" = xyes; then
+   AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1], 1, [Define if libimobiledevice is using 1.1.0 API])
+ fi
++PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.5, libimobiledevice_1_1_5=yes, libimobiledevice_1_1_5=no)
++if test x"$libimobiledevice_1_1_5" = xyes; then
++  AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1_5], 1, [Define if libimobiledevice is using 1.1.5 API])
++fi
+ libimobiledevice_VERSION=`$PKG_CONFIG --modversion "libimobiledevice-1.0" 2>&1`
+ PKG_CHECK_MODULES(libfuse, fuse >= 2.7.0)
+ PKG_CHECK_MODULES(libplist, libplist)
+diff --git a/src/ifuse.c b/src/ifuse.c
+index b5735ee..9fafb47 100644
+--- a/src/ifuse.c
++++ b/src/ifuse.c
+@@ -71,7 +71,11 @@ static struct {
+ 	char *appid;
+ #endif
+ 	char *service_name;
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++	lockdownd_service_descriptor_t service;
++#else
+ 	uint16_t port;
++#endif
+ } opts;
+ 
+ enum {
+@@ -402,7 +406,11 @@ void *ifuse_init(struct fuse_conn_info *conn)
+ 		afc_client_new_from_house_arrest_client(house_arrest, &afc);
+ 	} else { 
+ #endif
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++		afc_client_new(phone, opts.service, &afc);
++#else
+ 		afc_client_new(phone, opts.port, &afc);
++#endif
+ #ifdef HAVE_LIBIMOBILEDEVICE_1_1
+ 	}
+ #endif
+@@ -744,7 +752,13 @@ int main(int argc, char *argv[])
+ 		return EXIT_FAILURE;
+ 	}
+ 
+-	if ((lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port) {
++	if (
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++	(lockdownd_start_service(control, opts.service_name, &opts.service) != LOCKDOWN_E_SUCCESS) || !opts.service
++#else
++	(lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port
++#endif
++ 	) {
+ 		lockdownd_client_free(control);
+ 		idevice_free(phone);
+ 		fprintf(stderr, "Failed to start AFC service '%s' on the device.\n", opts.service_name);
+@@ -757,7 +771,11 @@ int main(int argc, char *argv[])
+ 
+ #ifdef HAVE_LIBIMOBILEDEVICE_1_1
+ 	if (!strcmp(opts.service_name, HOUSE_ARREST_SERVICE_NAME)) {
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++		house_arrest_client_new(phone, opts.service, &house_arrest);
++#else
+ 		house_arrest_client_new(phone, opts.port, &house_arrest);
++#endif
+ 		if (!house_arrest) {
+ 			fprintf(stderr, "Could not start document sharing service!\n");
+ 			return EXIT_FAILURE;
+--
+cgit v0.9.1-1-gc6f5
diff --git a/app-pda/ifuse/ifuse-1.1.2-r1.ebuild b/app-pda/ifuse/ifuse-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..c5cf1f7eb57f
--- /dev/null
+++ b/app-pda/ifuse/ifuse-1.1.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/ifuse/ifuse-1.1.2-r1.ebuild,v 1.1 2014/02/04 07:13:44 ssuominen Exp $
+
+EAPI=5
+inherit autotools readme.gentoo
+
+DESCRIPTION="Mount Apple iPhone/iPod Touch file systems for backup purposes"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-pda/libimobiledevice-1.1.4:=
+	>=app-pda/libplist-1.8:=
+	>=sys-fs/fuse-2.7.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README"
+
+DOC_CONTENTS="Only use this filesystem driver to create backups of your data.
+The music database is hashed, and attempting to add files will cause the
+iPod/iPhone to consider your database unauthorised.
+It will respond by wiping all media files, requiring a restore through iTunes."
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libimobiledevice115.patch
+	eautoreconf
+}