summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/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-5.6/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-5.6/xwc.patch')
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
deleted file mode 100644
index eb87b84b25..0000000000
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
2--- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
3+++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00
4@@ -3064,7 +3064,7 @@
5 else
6 rxvt_warn ("can't get primary selection, ignoring.\n");
7
8-#if 0
9+#ifdef HAVE_XWC
10 XTextProperty ct;
11
12 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
13@@ -3648,9 +3648,11 @@
14 }
15 else
16 #endif
17+#ifdef HAVE_XWC
18 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
19 freect = 1;
20 else
21+#endif
22 {
23 /* if we failed to convert then send it raw */
24 ct.value = (unsigned char *)cl;