sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Dongxiao Xu 2011-04-19 14:58:37 +08:00 committed by Richard Purdie
parent e8a11302a9
commit 722d95cb70
9 changed files with 51 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta/recipes-sato/rxvt-unicode/files/makefile.patch
View File

@ -1,20 +0,0 @@
--- ../rxvt-unicode-cvs-r0/rxvt-unicode/Makefile.in 2004-08-12 22:32:40 +01:00
+++ rxvt-unicode/Makefile.in 2004-12-24 03:09:00 +00:00
@@ -9,7 +9,7 @@
first_rule: all
dummy:
-subdirs = src doc src/test
+subdirs = src src/test
allsubdirs = W11 $(subdirs)
DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
@@ -24,7 +24,7 @@
#-------------------------------------------------------------------------
-all allbin alldoc tags:
+all allbin tags:
@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done

11
meta/recipes-sato/rxvt-unicode/files/rxvt.desktop
View File

@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Name=Terminal
Comment=When all else fails.
Exec=/usr/bin/rxvt
Icon=utilities-terminal.png
Terminal=false
Type=Application
Categories=Utility
StartupNotify=false

11
meta/recipes-sato/rxvt-unicode/files/signedchar.patch
View File

@ -1,11 +0,0 @@
--- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/command.C 2004-12-21 06:43:00 +00:00
+++ rxvt-unicode/src/command.C 2004-12-24 02:31:36 +00:00
@@ -1862,7 +1862,7 @@
#endif /* NO_SCROLLBAR_REPORT */
{
- char upordown = 0;
+ signed char upordown = 0;
if (scrollBar.style == R_SB_NEXT)
{

28
meta/recipes-sato/rxvt-unicode/files/xwc.patch
View File

@ -1,28 +0,0 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- rxvt-unicode-4.8/src/screen.C~xwc.c
+++ rxvt-unicode-4.8/src/screen.C
@@ -3058,7 +3058,7 @@
else
rxvt_warn ("can't get primary selection, ignoring.\n");
-#if 0
+#ifdef HAVE_XWC
XTextProperty ct;
if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
@@ -3632,9 +3632,11 @@
}
else
#endif
+#ifdef HAVE_XWC
if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
freect = 1;
else
+#endif
{
/* if we failed to convert then send it raw */
ct.value = (unsigned char *)cl;

24
meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
View File

@ -1,24 +0,0 @@
diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
--- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C 2005-02-22 21:39:10 +00:00
+++ rxvt-unicode-5.3/src/screen.C 2005-04-05 22:12:45 +01:00
@@ -3064,7 +3064,7 @@
else
rxvt_warn ("can't get primary selection, ignoring.\n");
-#if 0
+#ifdef HAVE_XWC
XTextProperty ct;
if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
@@ -3648,9 +3648,11 @@
}
else
#endif
+#ifdef HAVE_XWC
if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
freect = 1;
else
+#endif
{
/* if we failed to convert then send it raw */
ct.value = (unsigned char *)cl;

9
meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.desktop Normal file
View File

@ -0,0 +1,9 @@
[Desktop Entry]
Version=1.0
Name=Terminal
Comment=A unicode capable rxvt clone
Exec=rxvt
Icon=terminal
Terminal=false
Type=Application
Categories=Utility;TerminalEmulator;

0
meta/recipes-sato/rxvt-unicode/files/rxvt.png → meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

26
meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/xwc.patch Normal file
View File

@ -0,0 +1,26 @@
Upstream-Status: Pending
diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C
--- rxvt-unicode-9.10-orig//src/screen.C 2011-04-19 13:34:01.327664984 +0800
+++ rxvt-unicode-9.10/src/screen.C 2011-04-19 13:34:47.037665001 +0800
@@ -3152,7 +3152,7 @@
return false;
}
-#if 0
+#if HAVE_XWC
XTextProperty ct;
if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
@@ -3734,9 +3734,11 @@
}
else
#endif
+#ifdef HAVE_XWC
if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
freect = 1;
else
+#endif
{
/* if we failed to convert then send it raw */
ct.value = (unsigned char *)cl;

39
meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb → meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.10.bb
View File

@ -5,13 +5,14 @@ terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
output. It also supports mixing multiple fonts at the \
same time, including Xft fonts."
LICENSE = "GPL"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://src/main.C;beginline=1;endline=31;md5=633e23cdeb89fe980ded9a3af4f335c2"
SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
file://xwc.patch;patch=1 \
file://signedchar.patch;patch=1 \
file://xwc.patch \
file://rxvt.desktop \
file://rxvt.png"
PR = "r5"
PR = "r0"
inherit autotools update-alternatives
@ -35,29 +36,18 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \
--enable-text-blink --enable-rxvt-scroll \
--enable-combining --enable-shared \
--enable-xgetdefault \
--disable-perl \
--with-x=${STAGING_DIR_HOST}${prefix}"
EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
'XLIB=-L${STAGING_LIBDIR} -lX11'"
do_configure () {
mv autoconf/configure.in . || true
rm autoconf/libtool.m4
libtoolize --force
autotools_do_configure
echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
echo '#define HAVE_XLOCALE 1' >> config.h
do_configure_prepend () {
cp aclocal.m4 acinclude.m4
}
do_compile () {
if test -e ${S}/${HOST_SYS}-libtool; then
LIBTOOL=${S}/${HOST_SYS}-libtool
else
LIBTOOL=${S}/libtool
fi
# docs need "yodl" and I have no idea what that is
oe_runmake -C src "LIBTOOL=$LIBTOOL"
do_compile_prepend () {
echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
echo '#define HAVE_XLOCALE 1' >> config.h
}
do_install_append () {
@ -70,3 +60,6 @@ do_install_append () {
}
FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
SRC_URI[md5sum] = "a23aa40b31e843878b6f9c44768de430"
SRC_URI[sha256sum] = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a"