summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-04-19 14:58:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 10:44:26 +0100
commit722d95cb705a62b607d9798769ec5313138f31cc (patch)
tree37399da97d330bb929c3da89f71fd117f3393d2b /meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch
parente8a11302a9816b2d3604460c3307aa8e03f8a30d (diff)
downloadpoky-722d95cb705a62b607d9798769ec5313138f31cc.tar.gz
rxvt-unicode: upgrade to version 9.10
Remove some patches since some logic doesn't exist in upstream. This upgrades fixes CVE: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2006-0126 Also it fixes [Yocto #980] (From OE-Core rev: 6108c5962a717e1ece4aa7acb0f543f7d8e86a35) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch')
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch
new file mode 100644
index 0000000000..16efeef49f
--- /dev/null
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch
@@ -0,0 +1,26 @@
1Upstream-Status: Pending
2
3diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C
4--- rxvt-unicode-9.10-orig//src/screen.C 2011-04-19 13:34:01.327664984 +0800
5+++ rxvt-unicode-9.10/src/screen.C 2011-04-19 13:34:47.037665001 +0800
6@@ -3152,7 +3152,7 @@
7 return false;
8 }
9
10-#if 0
11+#if HAVE_XWC
12 XTextProperty ct;
13
14 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
15@@ -3734,9 +3734,11 @@
16 }
17 else
18 #endif
19+#ifdef HAVE_XWC
20 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
21 freect = 1;
22 else
23+#endif
24 {
25 /* if we failed to convert then send it raw */
26 ct.value = (unsigned char *)cl;