Ubuntu
freerdp package

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

  1. Quantal (12.10)
  2. forubuntu
  3. Merge into quantal
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.
Revision history for this message
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
=== modified file '.pc/applied-patches'
--- .pc/applied-patches 2012-06-13 19:08:57 +0000
+++ .pc/applied-patches 2012-06-21 07:02:20 +0000
@@ -1,2 +1,3 @@
1remote_control.diff1remote_control.diff
2cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e2918792cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879
3cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch
34
=== modified file 'debian/changelog'
--- debian/changelog 2012-06-13 19:08:57 +0000
+++ debian/changelog 2012-06-21 07:02:20 +0000
@@ -1,3 +1,10 @@
1freerdp (1.0.1-1ubuntu5) quantal; urgency=low
2
3 * Add debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch:
4 Fix freerdp extension handling problem. (LP: 1015897)
5
6 -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org> Thu, 21 Jun 2012 13:34:16 +0800
7
1freerdp (1.0.1-1ubuntu4) quantal; urgency=low8freerdp (1.0.1-1ubuntu4) quantal; urgency=low
29
3 * Cherry pick upstream bugfix for crash when $HOME is unset.10 * Cherry pick upstream bugfix for crash when $HOME is unset.
411
=== added file 'debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch'
--- debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch 2012-06-21 07:02:20 +0000
@@ -0,0 +1,44 @@
1From 48ad5feb0a6ad831d863f89ed74b443021e54303 Mon Sep 17 00:00:00 2001
2From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
3Date: Tue, 19 Jun 2012 14:49:53 +0800
4Subject: [PATCH] Init extensions in pre_connect stage.
5
6Due to the client is parsing the args in pre_connect,
7we should start loading the extensions after client parsing the args.
8
9Signed-off-by: Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
10---
11 libfreerdp-core/freerdp.c | 5 +++--
12 libfreerdp-core/rdp.c | 1 -
13 2 files changed, 3 insertions(+), 3 deletions(-)
14
15Index: freerdp/libfreerdp-core/freerdp.c
16===================================================================
17--- freerdp.orig/libfreerdp-core/freerdp.c 2012-06-20 17:35:11.000000000 +0800
18+++ freerdp/libfreerdp-core/freerdp.c 2012-06-20 17:38:41.258489372 +0800
19@@ -35,10 +35,11 @@
20
21 rdp = instance->context->rdp;
22
23- extension_pre_connect(rdp->extension);
24-
25 IFCALLRET(instance->PreConnect, status, instance);
26
27+ rdp->extension = extension_new(instance);
28+ extension_pre_connect(rdp->extension);
29+
30 if (status != true)
31 {
32 printf("freerdp_pre_connect failed\n");
33Index: freerdp/libfreerdp-core/rdp.c
34===================================================================
35--- freerdp.orig/libfreerdp-core/rdp.c 2012-06-20 17:35:11.000000000 +0800
36+++ freerdp/libfreerdp-core/rdp.c 2012-06-20 17:38:51.365185967 +0800
37@@ -878,7 +878,6 @@
38 rdp->settings = settings_new((void*) instance);
39 if (instance != NULL)
40 instance->settings = rdp->settings;
41- rdp->extension = extension_new(instance);
42 rdp->transport = transport_new(rdp->settings);
43 rdp->license = license_new(rdp);
44 rdp->input = input_new(rdp);
045
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-06-13 19:08:57 +0000
+++ debian/patches/series 2012-06-21 07:02:20 +0000
@@ -1,2 +1,3 @@
1remote_control.diff1remote_control.diff
2cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e2918792cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879
3cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch
34
=== modified file 'libfreerdp-core/freerdp.c'
--- libfreerdp-core/freerdp.c 2012-02-11 10:34:05 +0000
+++ libfreerdp-core/freerdp.c 2012-06-21 07:02:20 +0000
@@ -35,10 +35,11 @@
3535
36 rdp = instance->context->rdp;36 rdp = instance->context->rdp;
3737
38 IFCALLRET(instance->PreConnect, status, instance);
39
40 rdp->extension = extension_new(instance);
38 extension_pre_connect(rdp->extension);41 extension_pre_connect(rdp->extension);
3942
40 IFCALLRET(instance->PreConnect, status, instance);
41
42 if (status != true)43 if (status != true)
43 {44 {
44 printf("freerdp_pre_connect failed\n");45 printf("freerdp_pre_connect failed\n");
4546
=== modified file 'libfreerdp-core/rdp.c'
--- libfreerdp-core/rdp.c 2012-02-11 10:34:05 +0000
+++ libfreerdp-core/rdp.c 2012-06-21 07:02:20 +0000
@@ -878,7 +878,6 @@
878 rdp->settings = settings_new((void*) instance);878 rdp->settings = settings_new((void*) instance);
879 if (instance != NULL)879 if (instance != NULL)
880 instance->settings = rdp->settings;880 instance->settings = rdp->settings;
881 rdp->extension = extension_new(instance);
882 rdp->transport = transport_new(rdp->settings);881 rdp->transport = transport_new(rdp->settings);
883 rdp->license = license_new(rdp);882 rdp->license = license_new(rdp);
884 rdp->input = input_new(rdp);883 rdp->input = input_new(rdp);

Subscribers

People subscribed via source and target branches

to all changes: