diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-04-19 14:58:37 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-05-06 17:44:24 -0700 |
commit | d8f4a335006c8fc0201f9f28c4492d58fe4afe9a (patch) | |
tree | 500febe4886a1ade19cd56411468f9b559b26c75 /meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch | |
parent | a982aa5786b38552b562118d510897af0bdac977 (diff) | |
download | poky-d8f4a335006c8fc0201f9f28c4492d58fe4afe9a.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.patch | 26 |
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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | diff -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; | ||