summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-04-19 06:58:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 09:44:26 (GMT)
commit722d95cb705a62b607d9798769ec5313138f31cc (patch)
tree37399da97d330bb929c3da89f71fd117f3393d2b /meta/recipes-sato
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')
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/makefile.patch20
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/rxvt.desktop11
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/signedchar.patch11
-rw-r--r--meta/recipes-sato/rxvt-unicode/files/xwc.patch28
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch24
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.desktop9
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.png (renamed from meta/recipes-sato/rxvt-unicode/files/rxvt.png)bin2847 -> 2847 bytes
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch26
-rw-r--r--meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.10.bb (renamed from meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb)39
9 files changed, 51 insertions, 117 deletions
diff --git a/meta/recipes-sato/rxvt-unicode/files/makefile.patch b/meta/recipes-sato/rxvt-unicode/files/makefile.patch
deleted file mode 100644
index 86f82ee..0000000
--- a/meta/recipes-sato/rxvt-unicode/files/makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1--- ../rxvt-unicode-cvs-r0/rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00
2+++ rxvt-unicode/Makefile.in 2004-12-24 03:09:00 +00:00
3@@ -9,7 +9,7 @@
4 first_rule: all
5 dummy:
6
7-subdirs = src doc src/test
8+subdirs = src src/test
9 allsubdirs = W11 $(subdirs)
10
11 DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
12@@ -24,7 +24,7 @@
13
14 #-------------------------------------------------------------------------
15
16-all allbin alldoc tags:
17+all allbin tags:
18 @if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
19 @for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
20
diff --git a/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop
deleted file mode 100644
index a419c98..0000000
--- a/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
1[Desktop Entry]
2Encoding=UTF-8
3Name=Terminal
4Comment=When all else fails.
5Exec=/usr/bin/rxvt
6Icon=utilities-terminal.png
7Terminal=false
8Type=Application
9Categories=Utility
10StartupNotify=false
11
diff --git a/meta/recipes-sato/rxvt-unicode/files/signedchar.patch b/meta/recipes-sato/rxvt-unicode/files/signedchar.patch
deleted file mode 100644
index 6faa175..0000000
--- a/meta/recipes-sato/rxvt-unicode/files/signedchar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00
2+++ rxvt-unicode/src/command.C 2004-12-24 02:31:36 +00:00
3@@ -1862,7 +1862,7 @@
4 #endif /* NO_SCROLLBAR_REPORT */
5
6 {
7- char upordown = 0;
8+ signed char upordown = 0;
9
10 if (scrollBar.style == R_SB_NEXT)
11 {
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 7cf5965..0000000
--- 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;
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 eb87b84..0000000
--- 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;
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.desktop
new file mode 100644
index 0000000..882ea41
--- /dev/null
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.desktop
@@ -0,0 +1,9 @@
1[Desktop Entry]
2Version=1.0
3Name=Terminal
4Comment=A unicode capable rxvt clone
5Exec=rxvt
6Icon=terminal
7Terminal=false
8Type=Application
9Categories=Utility;TerminalEmulator;
diff --git a/meta/recipes-sato/rxvt-unicode/files/rxvt.png b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.png
index e56fa2e..e56fa2e 100644
--- a/meta/recipes-sato/rxvt-unicode/files/rxvt.png
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.png
Binary files differ
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 0000000..16efeef
--- /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;
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.10.bb
index d130895..9657e21 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.10.bb
@@ -5,13 +5,14 @@ terminal emulator rxvt, modified to store text in Unicode \
5(either UCS-2 or UCS-4) and to use locale-correct input and \ 5(either UCS-2 or UCS-4) and to use locale-correct input and \
6output. It also supports mixing multiple fonts at the \ 6output. It also supports mixing multiple fonts at the \
7same time, including Xft fonts." 7same time, including Xft fonts."
8LICENSE = "GPL" 8LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
10 file://src/main.C;beginline=1;endline=31;md5=633e23cdeb89fe980ded9a3af4f335c2"
9SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ 11SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
10 file://xwc.patch;patch=1 \ 12 file://xwc.patch \
11 file://signedchar.patch;patch=1 \
12 file://rxvt.desktop \ 13 file://rxvt.desktop \
13 file://rxvt.png" 14 file://rxvt.png"
14PR = "r5" 15PR = "r0"
15 16
16inherit autotools update-alternatives 17inherit autotools update-alternatives
17 18
@@ -35,29 +36,18 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \
35 --enable-text-blink --enable-rxvt-scroll \ 36 --enable-text-blink --enable-rxvt-scroll \
36 --enable-combining --enable-shared \ 37 --enable-combining --enable-shared \
37 --enable-xgetdefault \ 38 --enable-xgetdefault \
39 --disable-perl \
38 --with-x=${STAGING_DIR_HOST}${prefix}" 40 --with-x=${STAGING_DIR_HOST}${prefix}"
39EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
40 'XLIB=-L${STAGING_LIBDIR} -lX11'"
41 41
42do_configure () { 42do_configure_prepend () {
43 mv autoconf/configure.in . || true 43 cp aclocal.m4 acinclude.m4
44 rm autoconf/libtool.m4
45 libtoolize --force
46 autotools_do_configure
47 echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
48 echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
49 echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
50 echo '#define HAVE_XLOCALE 1' >> config.h
51} 44}
52 45
53do_compile () { 46do_compile_prepend () {
54 if test -e ${S}/${HOST_SYS}-libtool; then 47 echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
55 LIBTOOL=${S}/${HOST_SYS}-libtool 48 echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
56 else 49 echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
57 LIBTOOL=${S}/libtool 50 echo '#define HAVE_XLOCALE 1' >> config.h
58 fi
59 # docs need "yodl" and I have no idea what that is
60 oe_runmake -C src "LIBTOOL=$LIBTOOL"
61} 51}
62 52
63do_install_append () { 53do_install_append () {
@@ -70,3 +60,6 @@ do_install_append () {
70} 60}
71 61
72FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" 62FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
63
64SRC_URI[md5sum] = "a23aa40b31e843878b6f9c44768de430"
65SRC_URI[sha256sum] = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a"