diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-04-19 14:58:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-28 10:44:26 +0100 |
commit | 722d95cb705a62b607d9798769ec5313138f31cc (patch) | |
tree | 37399da97d330bb929c3da89f71fd117f3393d2b /meta/recipes-sato/rxvt-unicode/files/xwc.patch | |
parent | e8a11302a9816b2d3604460c3307aa8e03f8a30d (diff) | |
download | poky-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/files/xwc.patch')
-rw-r--r-- | meta/recipes-sato/rxvt-unicode/files/xwc.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-sato/rxvt-unicode/files/xwc.patch b/meta/recipes-sato/rxvt-unicode/files/xwc.patch deleted file mode 100644 index 7cf59656ce..0000000000 --- a/meta/recipes-sato/rxvt-unicode/files/xwc.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- rxvt-unicode-4.8/src/screen.C~xwc.c | ||
7 | +++ rxvt-unicode-4.8/src/screen.C | ||
8 | @@ -3058,7 +3058,7 @@ | ||
9 | else | ||
10 | rxvt_warn ("can't get primary selection, ignoring.\n"); | ||
11 | |||
12 | -#if 0 | ||
13 | +#ifdef HAVE_XWC | ||
14 | XTextProperty ct; | ||
15 | |||
16 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) | ||
17 | @@ -3632,9 +3632,11 @@ | ||
18 | } | ||
19 | else | ||
20 | #endif | ||
21 | +#ifdef HAVE_XWC | ||
22 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) | ||
23 | freect = 1; | ||
24 | else | ||
25 | +#endif | ||
26 | { | ||
27 | /* if we failed to convert then send it raw */ | ||
28 | ct.value = (unsigned char *)cl; | ||