Ubuntu

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

Proposed by Omer Akram on 2011-06-11
Status: Needs review
Proposed branch: lp:~om26er/ubuntu/maverick/libimobiledevice/fix-iOS5-support
Merge into: lp:ubuntu/maverick-proposed/libimobiledevice
Diff against target: 47 lines (+27/-0) 3 files modified
To merge this branch: bzr merge lp:~om26er/ubuntu/maverick/libimobiledevice/fix-iOS5-support
Reviewer Review Type Date Requested Status
Luke Yelavich 2011-06-11 Disapprove on 2011-07-06
Review via email: mp+64288@code.launchpad.net

Description of the Change

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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) wrote :

As per the other branch, I think we should wait for a fix that works with IOS 5 beta 2.

review: Disapprove

Unmerged revisions

7. By Omer Akram on 2011-06-11

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-06 12:31:59 +0000
3+++ debian/changelog 2011-06-11 09:08:32 +0000
4@@ -1,3 +1,10 @@
5+libimobiledevice (1.0.1-1ubuntu0.2) maverick-proposed; urgency=low
6+
7+ * debian/patches/91_fix_iOS5.patch:
8+ - Fix support for iOS5. (LP: #795475)
9+
10+ -- Omer Akram <om26er@ubuntu.com> Sat, 11 Jun 2011 13:50:18 +0500
11+
12 libimobiledevice (1.0.1-1ubuntu0.1) maverick-proposed; urgency=low
13
14 * Add compatibility for iOS 4.2 and 4.3. This doesn't add new device
15
16=== added file 'debian/patches/91_fix_iOS5.patch'
17--- debian/patches/91_fix_iOS5.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/91_fix_iOS5.patch 2011-06-11 09:08:32 +0000
19@@ -0,0 +1,19 @@
20+From: Omer Akram <om26er@ubuntu.com>
21+Author: Nikias Bassen
22+Subject: Lockdown: fix support for iOS 5.
23+Origin: http://cgit.sukimashita.com/libimobiledevice.git/commit/?id=f0487376671ffd6ac3fc121657f1fbd0acea3cb0
24+Bug-Ubuntu: https://launchpad.net/bugs/795475
25+
26+--- a/src/lockdown.c
27++++ b/src/lockdown.c
28+@@ -86,7 +86,9 @@ static int lockdown_check_result(plist_t dict, const char *query_match)
29+
30+ plist_t result_node = plist_dict_get_item(dict, "Result");
31+ if (!result_node) {
32+- return ret;
33++ /* iOS 5: the 'Result' key is not present anymore.
34++ Just assume success here */
35++ return RESULT_SUCCESS;
36+ }
37+
38+ plist_type result_type = plist_get_node_type(result_node);
39
40=== modified file 'debian/patches/series'
41--- debian/patches/series 2011-06-06 12:31:59 +0000
42+++ debian/patches/series 2011-06-11 09:08:32 +0000
43@@ -2,3 +2,4 @@
44 02-add-missing-linking.patch
45 03-ios-42-compat.patch
46 04-ios-43-compat.patch
47+91_fix_iOS5.patch

Subscribers

People subscribed via source and target branches

to all changes: