← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xfce4-terminal/maverick

« back to all changes in this revision

Viewing changes to debian/patches/01_CVE-2007-3770.patch

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2007-08-12 20:28:03 UTC
  • Revision ID: james.westby@ubuntu.com-20070812202803-28op2hv0kyqjuxqr
Tags: 0.2.6-3ubuntu1
* Merge with Debian Unstable, Ubuntu changes:
  - Adhere to DebianMaintainerField
  - Keep using xfce.mk
  - debian/patches/02_desktop_category.patch: show under the Accessories not
    the System menu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_CVE-2007-3770.patch
 
1
--- xfce4-terminal-0.2.6.orig/helpers/opera-browser.desktop.in
 
2
+++ xfce4-terminal-0.2.6/helpers/opera-browser.desktop.in
 
3
@@ -5,4 +5,4 @@
 
4
 Type=Application
 
5
 X-Terminal-Binaries=opera;
 
6
 X-Terminal-Category=WebBrowser
 
7
-X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
 
8
+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u
 
9
--- xfce4-terminal-0.2.6.orig/helpers/evolution.desktop.in
 
10
+++ xfce4-terminal-0.2.6/helpers/evolution.desktop.in
 
11
@@ -5,4 +5,4 @@
 
12
 Type=Application
 
13
 X-Terminal-Binaries=evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
 
14
 X-Terminal-Category=MailReader
 
15
-X-Terminal-Command=%B "mailto:%u"
 
16
+X-Terminal-Command=%B mailto:%u
 
17
--- xfce4-terminal-0.2.6.orig/helpers/mozilla-mailer.desktop.in
 
18
+++ xfce4-terminal-0.2.6/helpers/mozilla-mailer.desktop.in
 
19
@@ -5,4 +5,4 @@
 
20
 Type=Application
 
21
 X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
 
22
 X-Terminal-Category=MailReader
 
23
-X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
 
24
+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u
 
25
--- xfce4-terminal-0.2.6.orig/helpers/exo-open-mailer.desktop.in
 
26
+++ xfce4-terminal-0.2.6/helpers/exo-open-mailer.desktop.in
 
27
@@ -5,4 +5,4 @@
 
28
 Type=Application
 
29
 X-Terminal-Binaries=exo-open
 
30
 X-Terminal-Category=MailReader
 
31
-X-Terminal-Command=%B --launch MailReader "%u"
 
32
+X-Terminal-Command=%B --launch MailReader %u
 
33
--- xfce4-terminal-0.2.6.orig/helpers/kmail.desktop.in
 
34
+++ xfce4-terminal-0.2.6/helpers/kmail.desktop.in
 
35
@@ -5,4 +5,4 @@
 
36
 Type=Application
 
37
 X-Terminal-Binaries=kmail;
 
38
 X-Terminal-Category=MailReader
 
39
-X-Terminal-Command=%B "%u"
 
40
+X-Terminal-Command=%B %u
 
41
--- xfce4-terminal-0.2.6.orig/helpers/exo-open-browser.desktop.in
 
42
+++ xfce4-terminal-0.2.6/helpers/exo-open-browser.desktop.in
 
43
@@ -5,4 +5,4 @@
 
44
 Type=Application
 
45
 X-Terminal-Binaries=exo-open
 
46
 X-Terminal-Category=WebBrowser
 
47
-X-Terminal-Command=%B --launch WebBrowser "%u"
 
48
+X-Terminal-Command=%B --launch WebBrowser %u
 
49
--- xfce4-terminal-0.2.6.orig/helpers/epiphany.desktop.in
 
50
+++ xfce4-terminal-0.2.6/helpers/epiphany.desktop.in
 
51
@@ -5,4 +5,4 @@
 
52
 Type=Application
 
53
 X-Terminal-Binaries=epiphany;
 
54
 X-Terminal-Category=WebBrowser
 
55
-X-Terminal-Command=%B "%u"
 
56
+X-Terminal-Command=%B %u
 
57
--- xfce4-terminal-0.2.6.orig/helpers/galeon.desktop.in
 
58
+++ xfce4-terminal-0.2.6/helpers/galeon.desktop.in
 
59
@@ -5,4 +5,4 @@
 
60
 Type=Application
 
61
 X-Terminal-Binaries=galeon;
 
62
 X-Terminal-Category=WebBrowser
 
63
-X-Terminal-Command=%B "%u"
 
64
+X-Terminal-Command=%B %u
 
65
--- xfce4-terminal-0.2.6.orig/helpers/konqueror.desktop.in
 
66
+++ xfce4-terminal-0.2.6/helpers/konqueror.desktop.in
 
67
@@ -5,6 +5,6 @@
 
68
 Type=Application
 
69
 X-Terminal-Binaries=konqueror;
 
70
 X-Terminal-Category=WebBrowser
 
71
-X-Terminal-Command=%B "%u"
 
72
+X-Terminal-Command=%B %u
 
73
 
 
74
 
 
75
--- xfce4-terminal-0.2.6.orig/helpers/balsa.desktop.in
 
76
+++ xfce4-terminal-0.2.6/helpers/balsa.desktop.in
 
77
@@ -5,4 +5,4 @@
 
78
 Type=Application
 
79
 X-Terminal-Binaries=balsa
 
80
 X-Terminal-Category=MailReader
 
81
-X-Terminal-Command=%B -m "mailto:%u"
 
82
+X-Terminal-Command=%B -m mailto:%u
 
83
--- xfce4-terminal-0.2.6.orig/helpers/sylpheed-claws.desktop.in
 
84
+++ xfce4-terminal-0.2.6/helpers/sylpheed-claws.desktop.in
 
85
@@ -7,4 +7,4 @@
 
86
 StartupNotify=true
 
87
 X-Terminal-Binaries=sylpheed-claws;
 
88
 X-Terminal-Category=MailReader
 
89
-X-Terminal-Command=%B --compose "%u"
 
90
+X-Terminal-Command=%B --compose %u
 
91
--- xfce4-terminal-0.2.6.orig/helpers/sensible-browser.desktop.in
 
92
+++ xfce4-terminal-0.2.6/helpers/sensible-browser.desktop.in
 
93
@@ -5,4 +5,4 @@
 
94
 Type=Application
 
95
 X-Terminal-Binaries=sensible-browser
 
96
 X-Terminal-Category=WebBrowser
 
97
-X-Terminal-Command=%B "%u"
 
98
+X-Terminal-Command=%B %u
 
99
--- xfce4-terminal-0.2.6.orig/helpers/firefox.desktop.in
 
100
+++ xfce4-terminal-0.2.6/helpers/firefox.desktop.in
 
101
@@ -5,4 +5,4 @@
 
102
 Type=Application
 
103
 X-Terminal-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
 
104
 X-Terminal-Category=WebBrowser
 
105
-X-Terminal-Command=%B -remote "openURL(%u)" || %B "%u"
 
106
+X-Terminal-Command=%B -remote openURL\(%u\) || %B %u
 
107
--- xfce4-terminal-0.2.6.orig/helpers/mozilla-browser.desktop.in
 
108
+++ xfce4-terminal-0.2.6/helpers/mozilla-browser.desktop.in
 
109
@@ -5,4 +5,4 @@
 
110
 Type=Application
 
111
 X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
 
112
 X-Terminal-Category=WebBrowser
 
113
-X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
 
114
+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u
 
115
--- xfce4-terminal-0.2.6.orig/helpers/opera-mailer.desktop.in
 
116
+++ xfce4-terminal-0.2.6/helpers/opera-mailer.desktop.in
 
117
@@ -5,4 +5,4 @@
 
118
 Type=Application
 
119
 X-Terminal-Binaries=opera;
 
120
 X-Terminal-Category=MailReader
 
121
-X-Terminal-Command=%B -remote "openURL(mailto:%u)" || %B "mailto:%u"
 
122
+X-Terminal-Command=%B -remote openURL\(mailto:%u\) || %B mailto:%u
 
123
--- xfce4-terminal-0.2.6.orig/helpers/mutt.desktop.in
 
124
+++ xfce4-terminal-0.2.6/helpers/mutt.desktop.in
 
125
@@ -5,4 +5,4 @@
 
126
 Type=Application
 
127
 X-Terminal-Binaries=mutt;
 
128
 X-Terminal-Category=MailReader
 
129
-X-Terminal-Command=Terminal -x %B "%u"
 
130
+X-Terminal-Command=Terminal -x %B %u
 
131
--- xfce4-terminal-0.2.6.orig/helpers/thunderbird.desktop.in
 
132
+++ xfce4-terminal-0.2.6/helpers/thunderbird.desktop.in
 
133
@@ -5,4 +5,4 @@
 
134
 Type=Application
 
135
 X-Terminal-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
 
136
 X-Terminal-Category=MailReader
 
137
-X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
 
138
+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u
 
139
--- xfce4-terminal-0.2.6.orig/helpers/lynx.desktop.in
 
140
+++ xfce4-terminal-0.2.6/helpers/lynx.desktop.in
 
141
@@ -5,4 +5,4 @@
 
142
 Type=Application
 
143
 X-Terminal-Binaries=lynx;
 
144
 X-Terminal-Category=WebBrowser
 
145
-X-Terminal-Command=Terminal -x %B "%u"
 
146
+X-Terminal-Command=Terminal -x %B %u
 
147
--- xfce4-terminal-0.2.6.orig/terminal/terminal-helper.c
 
148
+++ xfce4-terminal-0.2.6/terminal/terminal-helper.c
 
149
@@ -349,6 +349,7 @@
 
150
   gchar       *argv[4];
 
151
   gchar       *command;
 
152
   gchar       *t;
 
153
+  gchar       *escaped;
 
154
   guint        n;
 
155
 
 
156
   g_return_if_fail (TERMINAL_IS_HELPER (helper));
 
157
@@ -359,6 +360,8 @@
 
158
     if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
 
159
       ++n;
 
160
 
 
161
+  escaped = g_shell_quote (uri);
 
162
+
 
163
   if (n > 0)
 
164
     {
 
165
       command = g_new (gchar, strlen (helper->command) + n * strlen (uri) + 1);
 
166
@@ -366,7 +369,7 @@
 
167
         {
 
168
           if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
 
169
             {
 
170
-              for (u = uri; *u != '\0'; )
 
171
+              for (u = escaped; *u != '\0'; )
 
172
                 *t++ = *u++;
 
173
               s += 2;
 
174
             }
 
175
@@ -379,9 +382,11 @@
 
176
     }
 
177
   else
 
178
     {
 
179
-      command = g_strconcat (helper->command, " ", uri, NULL);
 
180
+      command = g_strconcat (helper->command, " ", escaped, NULL);
 
181
     }
 
182
 
 
183
+  g_free (escaped);
 
184
+
 
185
   argv[0] = "/bin/sh";
 
186
   argv[1] = "-c";
 
187
   argv[2] = command;