Merge lp:~paulliu/ubuntu/quantal/freerdp/forubuntu into lp:ubuntu/quantal/freerdp

Proposed by Ying-Chun Liu
Status: Merged
Merge reported by: Mathieu Trudel-Lapierre
Merged at revision: not available
Proposed branch: lp:~paulliu/ubuntu/quantal/freerdp/forubuntu
Merge into: lp:ubuntu/quantal/freerdp
Diff against target: 109 lines (+56/-3)
6 files modified
.pc/applied-patches (+1/-0)
debian/changelog (+7/-0)
debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch (+44/-0)
debian/patches/series (+1/-0)
libfreerdp-core/freerdp.c (+3/-2)
libfreerdp-core/rdp.c (+0/-1)
To merge this branch: bzr merge lp:~paulliu/ubuntu/quantal/freerdp/forubuntu
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+111348@code.launchpad.net
To post a comment you must log in.
Ying-Chun Liu (paulliu) wrote :

Hi.
The current version of freerdp in Ubuntu Quantal cannot load any extensions due to there is a bug.
This commit fix the extension loading bug.

Thanks,
Paul

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2012-06-13 19:08:57 +0000
3+++ .pc/applied-patches 2012-06-21 07:02:20 +0000
4@@ -1,2 +1,3 @@
5 remote_control.diff
6 cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879
7+cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2012-06-13 19:08:57 +0000
11+++ debian/changelog 2012-06-21 07:02:20 +0000
12@@ -1,3 +1,10 @@
13+freerdp (1.0.1-1ubuntu5) quantal; urgency=low
14+
15+ * Add debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch:
16+ Fix freerdp extension handling problem. (LP: 1015897)
17+
18+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org> Thu, 21 Jun 2012 13:34:16 +0800
19+
20 freerdp (1.0.1-1ubuntu4) quantal; urgency=low
21
22 * Cherry pick upstream bugfix for crash when $HOME is unset.
23
24=== added file 'debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch'
25--- debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch 1970-01-01 00:00:00 +0000
26+++ debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch 2012-06-21 07:02:20 +0000
27@@ -0,0 +1,44 @@
28+From 48ad5feb0a6ad831d863f89ed74b443021e54303 Mon Sep 17 00:00:00 2001
29+From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
30+Date: Tue, 19 Jun 2012 14:49:53 +0800
31+Subject: [PATCH] Init extensions in pre_connect stage.
32+
33+Due to the client is parsing the args in pre_connect,
34+we should start loading the extensions after client parsing the args.
35+
36+Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
37+---
38+ libfreerdp-core/freerdp.c | 5 +++--
39+ libfreerdp-core/rdp.c | 1 -
40+ 2 files changed, 3 insertions(+), 3 deletions(-)
41+
42+Index: freerdp/libfreerdp-core/freerdp.c
43+===================================================================
44+--- freerdp.orig/libfreerdp-core/freerdp.c 2012-06-20 17:35:11.000000000 +0800
45++++ freerdp/libfreerdp-core/freerdp.c 2012-06-20 17:38:41.258489372 +0800
46+@@ -35,10 +35,11 @@
47+
48+ rdp = instance->context->rdp;
49+
50+- extension_pre_connect(rdp->extension);
51+-
52+ IFCALLRET(instance->PreConnect, status, instance);
53+
54++ rdp->extension = extension_new(instance);
55++ extension_pre_connect(rdp->extension);
56++
57+ if (status != true)
58+ {
59+ printf("freerdp_pre_connect failed\n");
60+Index: freerdp/libfreerdp-core/rdp.c
61+===================================================================
62+--- freerdp.orig/libfreerdp-core/rdp.c 2012-06-20 17:35:11.000000000 +0800
63++++ freerdp/libfreerdp-core/rdp.c 2012-06-20 17:38:51.365185967 +0800
64+@@ -878,7 +878,6 @@
65+ rdp->settings = settings_new((void*) instance);
66+ if (instance != NULL)
67+ instance->settings = rdp->settings;
68+- rdp->extension = extension_new(instance);
69+ rdp->transport = transport_new(rdp->settings);
70+ rdp->license = license_new(rdp);
71+ rdp->input = input_new(rdp);
72
73=== modified file 'debian/patches/series'
74--- debian/patches/series 2012-06-13 19:08:57 +0000
75+++ debian/patches/series 2012-06-21 07:02:20 +0000
76@@ -1,2 +1,3 @@
77 remote_control.diff
78 cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879
79+cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch
80
81=== modified file 'libfreerdp-core/freerdp.c'
82--- libfreerdp-core/freerdp.c 2012-02-11 10:34:05 +0000
83+++ libfreerdp-core/freerdp.c 2012-06-21 07:02:20 +0000
84@@ -35,10 +35,11 @@
85
86 rdp = instance->context->rdp;
87
88+ IFCALLRET(instance->PreConnect, status, instance);
89+
90+ rdp->extension = extension_new(instance);
91 extension_pre_connect(rdp->extension);
92
93- IFCALLRET(instance->PreConnect, status, instance);
94-
95 if (status != true)
96 {
97 printf("freerdp_pre_connect failed\n");
98
99=== modified file 'libfreerdp-core/rdp.c'
100--- libfreerdp-core/rdp.c 2012-02-11 10:34:05 +0000
101+++ libfreerdp-core/rdp.c 2012-06-21 07:02:20 +0000
102@@ -878,7 +878,6 @@
103 rdp->settings = settings_new((void*) instance);
104 if (instance != NULL)
105 instance->settings = rdp->settings;
106- rdp->extension = extension_new(instance);
107 rdp->transport = transport_new(rdp->settings);
108 rdp->license = license_new(rdp);
109 rdp->input = input_new(rdp);

Subscribers

People subscribed via source and target branches

to all changes: