Merge lp:~om26er/ubuntu/natty/libimobiledevice/fix-iOS5-support-2 into lp:ubuntu/natty/libimobiledevice

[Omer Akram]

backport the fix for bug 795475

builds on 32-bit:
https://launchpad.net/~om26er/+archive/test/+build/2562063

build on 64-bit:
https://launchpad.net/~om26er/+archive/test/+build/2562062

[lp:~om26er/ubuntu/natty/libimobiledevice/fix-iOS5-support-2]

13. By Omer Akram on 2011-06-11

unapply the new patch

14. By Omer Akram on 2011-06-11

run update-maintainer

15. By Omer Akram on 2011-06-11

oops

[Luke Yelavich (themuso)]

Looks good, however according to the bug report you link to in your changelog entry, IOs 5 beta 2 has broken things again. There is a pointer to a bug upstrea, but there appears to be no patch to solve that yet. My view is that its worthwhile waiting for a new fix before pushing this as an SRU.

Thanks for your work.

review: Disapprove

[Murphy (murphy2712+launchpad)]

It doesn't work with the last iOS5 beta 3.
Any chance to get an update?
Thanks.

Unmerged revisions

15. By Omer Akram on 2011-06-11

oops

14. By Omer Akram on 2011-06-11

run update-maintainer

13. By Omer Akram on 2011-06-11

unapply the new patch

12. By Omer Akram on 2011-06-11

* debian/patches/91_fix_iOS5.patch:
  - Fix support for iOS5. (LP: #795475)

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-10 22:37:36 +0000
+++ debian/changelog	2011-06-11 09:01:32 +0000
@@ -1,3 +1,10 @@
+libimobiledevice (1.1.0-3ubuntu0.1) natty-proposed; urgency=low
+
+  * debian/patches/91_fix_iOS5.patch:
+    - Fix support for iOS5. (LP: #795475)
+
+ -- Omer Akram <[e-mail]>  Sat, 11 Jun 2011 13:21:21 +0500
+
 libimobiledevice (1.1.0-3) experimental; urgency=low
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2011-04-10 22:37:36 +0000
+++ debian/control	2011-06-11 09:01:32 +0000
@@ -1,7 +1,8 @@
 Source: libimobiledevice
 Section: libs
 Priority: optional
-Maintainer: gtkpod Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: gtkpod Maintainers <[e-mail]>
 Uploaders: Julien Lavergne <[e-mail]>
 Standards-Version: 3.9.1.0
 Build-Depends: debhelper (>= 7.0.50~),

=== added file 'debian/patches/91_fix_iOS5.patch'
--- debian/patches/91_fix_iOS5.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/91_fix_iOS5.patch	2011-06-11 09:01:32 +0000
@@ -0,0 +1,19 @@
+From: Omer Akram <[e-mail]>
+Author: Nikias Bassen
+Subject: Lockdown: fix support for iOS 5.
+Origin: http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=f0487376671ffd6ac3fc121657f1fbd0acea3cb0
+Bug-Ubuntu: https://launchpad.net/bugs/795475
+
+--- a/src/lockdown.c
++++ b/src/lockdown.c
+@@ -86,7 +86,9 @@ static int lockdown_check_result(plist_t dict, const char *query_match)
+ 
+ 	plist_t result_node = plist_dict_get_item(dict, "Result");
+ 	if (!result_node) {
+-		return ret;
++		/* iOS 5: the 'Result' key is not present anymore.
++		   Just assume success here */
++		return RESULT_SUCCESS;
+ 	}
+ 
+ 	plist_type result_type = plist_get_node_type(result_node);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-26 21:03:07 +0000
+++ debian/patches/series	2011-06-11 09:01:32 +0000
@@ -1,3 +1,4 @@
 01-libs.private.patch
 02-add-missing-linking.patch
 90_fix_4.3_iOS.patch
+91_fix_iOS5.patch