Merge lp:~om26er/ubuntu/lucid/libimobiledevice/fix-iOS5-support into lp:ubuntu/lucid-proposed/libimobiledevice

[Omer Akram]

backport fix for bug 795475

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

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

[Sebastien Bacher (seb128)]

Thank you for your work, the current SRU candidate needs to be verified and moved to updates before a new upload though

[Luke Yelavich (themuso)]

As per the other branches, we need a fix for IOS 5 beta 2.

review: Disapprove

Unmerged revisions

5. 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-06-06 12:31:24 +0000
+++ debian/changelog	2011-06-11 11:01:23 +0000
@@ -1,3 +1,10 @@
+libimobiledevice (0.9.7-1ubuntu1.2) lucid-proposed; urgency=low
+
+  * debian/patches/91_fix_iOS5.patch:
+    - Fix support for iOS5. (LP: #795475)
+
+ -- Omer Akram <[e-mail]>  Sat, 11 Jun 2011 15:54:36 +0500
+
 libimobiledevice (0.9.7-1ubuntu1.1) lucid-proposed; urgency=low
 
   * Add compatibility for iOS 4.2 and 4.3. This doesn't add new device
 
=== 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 11:01:23 +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-06-06 12:31:24 +0000
+++ debian/patches/series	2011-06-11 11:01:23 +0000
@@ -3,3 +3,4 @@
 03-fix-python-import.patch
 04-ios-42-compat.patch
 05-ios-43-compat.patch
+91_fix_iOS5.patch