Added -DLINUX_KEYS to CFLAGS and -Wl,-z,now to LDFLAGS. This closes bug #22325.

9 files changed, 115 insertions, 195 deletions

diff --git a/x11-terms/rxvt/ChangeLog b/x11-terms/rxvt/ChangeLog
index 8b35279e4493..7300b169fedf 100644
--- a/x11-terms/rxvt/ChangeLog
+++ b/x11-terms/rxvt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/rxvt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.28 2004/08/14 15:42:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.29 2004/11/06 09:14:05 usata Exp $
+
+*rxvt-2.7.10-r1 (06 Nov 2004)
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/rxvt-2.7.10-rk.patch, -files/rxvt-2.7.8-azz4.diff,
+  -files/rxvt-2.7.8-security.patch, +rxvt-2.7.10-r1.ebuild,
+  rxvt-2.7.10.ebuild, -rxvt-2.7.8-r6.ebuild:
+  Added -DLINUX_KEYS to CFLAGS and -Wl,-z,now to LDFLAGS.
+  This closes bug #22325.
 
   15 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> rxvt-2.7.10.ebuild:
   Stable on ppc.
diff --git a/x11-terms/rxvt/Manifest b/x11-terms/rxvt/Manifest
index 82876cf81d4f..b64ccc819bf6 100644
--- a/x11-terms/rxvt/Manifest
+++ b/x11-terms/rxvt/Manifest
@@ -1,9 +1,11 @@
-MD5 dab3a5d7b5a1d6d957738adf84860296 rxvt-2.7.10.ebuild 1793
-MD5 33025e3da57ce53a531c28c0bfb31801 rxvt-2.7.8-r6.ebuild 1782
 MD5 34aa8462ee146c5ba0bc4a8195604f2e ChangeLog 5152
 MD5 cd46a87805d1d53c2c0e5f9d9169b9ae metadata.xml 491
-MD5 80a958edd8a6f68140bca93f4bdeadbd files/rxvt-2.7.8-security.patch 1038
-MD5 fd0595d265134b4991dcc6a04b4027d0 files/digest-rxvt-2.7.8-r6 124
+MD5 dab3a5d7b5a1d6d957738adf84860296 rxvt-2.7.10.ebuild 1793
+MD5 33025e3da57ce53a531c28c0bfb31801 rxvt-2.7.8-r6.ebuild 1782
+MD5 4da80080c807fdbcca3a1dccfc57026f rxvt-2.7.10-r1.ebuild 1811
 MD5 6f965732f7321df2b451de2ccb1bfc57 files/digest-rxvt-2.7.10 126
 MD5 a38b2f365a55cad915e1e503466ab029 files/rxvt-2.7.10-azz4.diff 5072
 MD5 c86a25e3f580bd3065077fd5782029f4 files/rxvt-2.7.8-azz4.diff 5032
+MD5 80a958edd8a6f68140bca93f4bdeadbd files/rxvt-2.7.8-security.patch 1038
+MD5 fd0595d265134b4991dcc6a04b4027d0 files/digest-rxvt-2.7.8-r6 124
+MD5 6f965732f7321df2b451de2ccb1bfc57 files/digest-rxvt-2.7.10-r1 126
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.10-r1 b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r1
new file mode 100644
index 000000000000..5e2c3db27851
--- /dev/null
+++ b/x11-terms/rxvt/files/digest-rxvt-2.7.10-r1
@@ -0,0 +1,2 @@
+MD5 302c5c455e64047b02d1ef19ff749141 rxvt-2.7.10.tar.gz 595073
+MD5 16be90450ba268312bb146b3d4e7b6e9 rxvt-2.7.10-rk.patch 2772
diff --git a/x11-terms/rxvt/files/digest-rxvt-2.7.8-r6 b/x11-terms/rxvt/files/digest-rxvt-2.7.8-r6
deleted file mode 100644
index e7de7438a12d..000000000000
--- a/x11-terms/rxvt/files/digest-rxvt-2.7.8-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e91b733b4f480f218db4b3b331ea42f6 rxvt-2.7.8.tar.gz 488213
-MD5 872b3e5967243c339499f2298100ef3a rxvt-2.7.8-rk.patch 2681
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-rk.patch b/x11-terms/rxvt/files/rxvt-2.7.10-rk.patch
new file mode 100644
index 000000000000..471c7a26b739
--- /dev/null
+++ b/x11-terms/rxvt/files/rxvt-2.7.10-rk.patch
@@ -0,0 +1,82 @@
+diff -urN rxvt-2.7.10.ORIG/src/screen.c rxvt-2.7.10/src/screen.c
+--- rxvt-2.7.10.ORIG/src/screen.c	2003-03-24 01:56:06.000000000 +0900
++++ rxvt-2.7.10/src/screen.c	2003-06-30 02:11:27.000000000 +0900
+@@ -828,10 +828,18 @@
+ 	    if (h->chstat == WBYTE) {
+ 		h->rstyle |= RS_multi2;	/* multibyte 2nd byte */
+ 		h->chstat = SBYTE;
+-		if ((r->encoding_method == EUCJ) || (r->encoding_method == GB))
++		if ((r->encoding_method == EUCJ) && ((char)stp[r->screen.cur.col - 1] == (char)0x8e))
++		    h->rstyle &= ~RS_multiMask, r->screen.cur.col--;
++		else if ((r->encoding_method == EUCJ) || (r->encoding_method == GB))
+ 		    c |= 0x80;	/* maybe overkill, but makes it selectable */
+ 	    } else if (h->chstat == SBYTE) {
+-		if (h->multi_byte || (c & 0x80)) {	/* multibyte 1st byte */
++		if (r->encoding_method == SJIS) {
++		    if ((h->multi_byte || ((c >= (char)0x81 && c <= (char)0x9f) || 
++(c >= (char)0xe0 && c <= (char)0xfc)))) {
++			h->rstyle |= RS_multi1;
++			h->chstat = WBYTE;
++		    }
++		} else if (h->multi_byte || (c & 0x80)) {	/* multibyte 1st byte */
+ 		    h->rstyle |= RS_multi1;
+ 		    h->chstat = WBYTE;
+ 		    if ((r->encoding_method == EUCJ)
+@@ -2932,6 +2940,9 @@
+     unsigned char  *new_selection_text;
+     char           *str;
+     text_t         *t;
++#ifdef MULTICHAR_SET
++    rend_t         *tr;
++#endif
+ 
+     D_SELECT((stderr, "rxvt_selection_make(): r->selection.op=%d, r->selection.clicks=%d", r->selection.op, r->selection.clicks));
+     switch (r->selection.op) {
+@@ -2966,10 +2977,22 @@
+  */
+     for (; row < end_row; row++, col = 0) {
+ 	t = &(r->screen.text[row][col]);
++#ifdef MULTICHAR_SET
++	tr = &(r->screen.rend[row][col]);
++#endif
+ 	if ((end_col = r->screen.tlen[row]) == -1)
+ 	    end_col = r->TermWin.ncol;
++#ifdef MULTICHAR_SET
++	for (; col < end_col; col++, str++, t++, tr++) {
++	    if ( (r->encoding_method == EUCJ)
++		&& (*t & 0x80) && !(*tr & RS_multiMask) )
++		*str++ = 0x8E; 
++	    *str = *t;
++	}
++#else
+ 	for (; col < end_col; col++)
+ 	    *str++ = *t++;
++#endif
+ 	if (r->screen.tlen[row] != -1)
+ 	    *str++ = '\n';
+     }
+@@ -2977,12 +3000,24 @@
+  * B: end row
+  */
+     t = &(r->screen.text[row][col]);
++#ifdef MULTICHAR_SET
++    tr = &(r->screen.rend[row][col]);
++#endif
+     end_col = r->screen.tlen[row];
+     if (end_col == -1 || r->selection.end.col <= end_col)
+ 	end_col = r->selection.end.col;
+     MIN_IT(end_col, r->TermWin.ncol);	/* CHANGE */
++#ifdef MULTICHAR_SET
++    for (; col < end_col; col++, str++, t++, tr++) {
++	if ( (r->encoding_method == EUCJ)
++	    && (*t & 0x80) && !(*tr & RS_multiMask) )
++	    *str++ = 0x8E; 
++	*str = *t;
++    }
++#else
+     for (; col < end_col; col++)
+ 	*str++ = *t++;
++#endif
+ #ifndef NO_OLD_SELECTION
+     if (r->selection_style == OLD_SELECT)
+ 	if (end_col == r->TermWin.ncol)
diff --git a/x11-terms/rxvt/files/rxvt-2.7.8-azz4.diff b/x11-terms/rxvt/files/rxvt-2.7.8-azz4.diff
deleted file mode 100644
index 09bc45805107..000000000000
--- a/x11-terms/rxvt/files/rxvt-2.7.8-azz4.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Naur rxvt-2.7.8/AZZ-ChangeLog rxvt-2.7.8-azz4/AZZ-ChangeLog
---- rxvt-2.7.8/AZZ-ChangeLog	Thu Jan  1 01:00:00 1970
-+++ rxvt-2.7.8-azz4/AZZ-ChangeLog	Mon May 20 23:10:36 2002
-@@ -0,0 +1,7 @@
-+- Modified to support borderlessness with -nb and override-redirect with
-+  -or (or resources borderless and overrideRedirect).
-+- Modified to allow an arbitrary command to be run instead of the bell
-+  with -bc.
-+- Fixed buffer overflow in command.c (not that you should install this suid
-+  root anyway)
-+
-diff -Naur rxvt-2.7.8/src/command.c rxvt-2.7.8-azz4/src/command.c
---- rxvt-2.7.8/src/command.c	Thu Nov 29 06:53:58 2001
-+++ rxvt-2.7.8-azz4/src/command.c	Mon May 20 23:11:21 2002
-@@ -2930,7 +2930,7 @@
-     unsigned char   buf[256];
- 
-     va_start(arg_ptr, fmt);
--    vsprintf((char *)buf, fmt, arg_ptr);
-+    vsnprintf((char *)buf, sizeof buf, fmt, arg_ptr);
-     va_end(arg_ptr);
-     rxvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
- }
-diff -Naur rxvt-2.7.8/src/init.c rxvt-2.7.8-azz4/src/init.c
---- rxvt-2.7.8/src/init.c	Thu Nov 29 06:38:07 2001
-+++ rxvt-2.7.8-azz4/src/init.c	Mon May 20 23:22:45 2002
-@@ -34,6 +34,7 @@
- #include "../config.h"		/* NECESSARY */
- #include "rxvt.h"		/* NECESSARY */
- #include "init.h"
-+#include <Xm/MwmUtil.h>
- 
- #include <signal.h>
- 
-@@ -917,6 +918,24 @@
- 					       r->PixColors[Color_border],
- 					       r->PixColors[Color_fg]);
- #endif
-+     if (r->Options & Opt_borderless) {
-+       Atom mwmatom;
-+       MotifWmHints hints;
-+ 
-+       mwmatom = XInternAtom(r->Xdisplay, _XA_MOTIF_WM_HINTS, FALSE);
-+       hints.flags = MWM_HINTS_DECORATIONS;
-+       hints.decorations = 0;
-+       XChangeProperty(r->Xdisplay, r->TermWin.parent[0], mwmatom, mwmatom,
-+         32, PropModeReplace, (unsigned char *)&hints, 
-+         sizeof(MotifWmHints)/sizeof(long));
-+     }
-+     if (r->Options & Opt_overrideredirect) {
-+       XSetWindowAttributes attrib;
-+ 
-+       attrib.override_redirect = True;
-+       XChangeWindowAttributes(r->Xdisplay, r->TermWin.parent[0],
-+                               CWOverrideRedirect, &attrib);
-+     }
-     rxvt_xterm_seq(r, XTerm_title, r->h->rs[Rs_title], CHAR_ST);
-     rxvt_xterm_seq(r, XTerm_iconName, r->h->rs[Rs_iconName], CHAR_ST);
- 
-@@ -1079,7 +1098,7 @@
-  * We don't want them, we don't need them.
-  */
-     for (i = 0; i < r->num_fds; i++) {
--	if (i == STDERR_FILENO || i == cfd || i == r->tty_fd
-+	if (i == STDERR_FILENO || i == STDOUT_FILENO || i == cfd || i == r->tty_fd
- #ifdef __sgi			/* Alex Coventry says we need 4 & 7 too */
- 	    || i == 4 || i == 7
- #endif
-diff -Naur rxvt-2.7.8/src/rxvt.h rxvt-2.7.8-azz4/src/rxvt.h
---- rxvt-2.7.8/src/rxvt.h	Thu Nov 29 06:38:07 2001
-+++ rxvt-2.7.8-azz4/src/rxvt.h	Mon May 20 23:30:20 2002
-@@ -556,6 +556,9 @@
-     Rs_modifier,
-     Rs_answerbackstring,
-     Rs_tripleclickwords,
-+    Rs_borderless,
-+    Rs_overrideRedirect,
-+    Rs_bellCommand,
-     NUM_RESOURCES
- } ;
- 
-diff -Naur rxvt-2.7.8/src/rxvtlib.h.in rxvt-2.7.8-azz4/src/rxvtlib.h.in
---- rxvt-2.7.8/src/rxvtlib.h.in	Tue Nov 27 12:51:15 2001
-+++ rxvt-2.7.8-azz4/src/rxvtlib.h.in	Mon May 20 23:15:31 2002
-@@ -189,6 +189,8 @@
- #define Opt_tripleclickwords	(1LU<<16)
- #define Opt_scrollWithBuffer	(1LU<<17)
- #define Opt_jumpScroll		(1LU<<18)
-+#define Opt_borderless          (1LU<<19)
-+#define Opt_overrideredirect    (1LU<<20)
- /* place holder used for parsing command-line options */
- #define Opt_Reverse		(1LU<<30)
- #define Opt_Boolean		(1LU<<31)
-diff -Naur rxvt-2.7.8/src/screen.c rxvt-2.7.8-azz4/src/screen.c
---- rxvt-2.7.8/src/screen.c	Wed Nov 28 11:58:12 2001
-+++ rxvt-2.7.8-azz4/src/screen.c	Mon May 20 23:28:19 2002
-@@ -29,6 +29,7 @@
- #include "screen.intpro"	/* PROTOS for internal routines */
- 
- #include <X11/Xmd.h>		/* get the typedef for CARD32 */
-+#include <stdlib.h>
- 
- /* ------------------------------------------------------------------------- */
- #ifdef MULTICHAR_SET
-@@ -1829,6 +1830,9 @@
- void
- rxvt_scr_bell(rxvt_t *r)
- {
-+	if (r->h->rs[Rs_bellCommand]) {
-+		system(r->h->rs[Rs_bellCommand]);
-+	} else {
- #ifndef NO_BELL
- # ifndef NO_MAPALERT
- #  ifdef MAPALERT_OPTION
-@@ -1842,6 +1846,7 @@
-     } else
- 	XBell(r->Xdisplay, 0);
- #endif
-+	}
- }
- 
- /* ------------------------------------------------------------------------- */
-diff -Naur rxvt-2.7.8/src/xdefaults.c rxvt-2.7.8-azz4/src/xdefaults.c
---- rxvt-2.7.8/src/xdefaults.c	Thu Nov 29 07:22:51 2001
-+++ rxvt-2.7.8-azz4/src/xdefaults.c	Mon May 20 23:29:42 2002
-@@ -108,6 +108,9 @@
- 	 "scroll-on-tty-output inhibit"),
-     BOOL(Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
- 	 "scroll-on-keypress"),
-+    BOOL(Rs_borderless, "borderless", "nb", Opt_borderless, "use MWM hints to remove the window border"),
-+    BOOL(Rs_overrideRedirect, "overrideRedirect", "or", Opt_overrideredirect, "set the override_redirect flag"),
-+    STRG(Rs_bellCommand, "bellCommand", "bc", "string", "command to execute instead of beeping"),
-     BOOL(Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer,
- 	 "scroll-with-buffer"),
- #ifdef TRANSPARENT
diff --git a/x11-terms/rxvt/files/rxvt-2.7.8-security.patch b/x11-terms/rxvt/files/rxvt-2.7.8-security.patch
deleted file mode 100644
index 109f32434e7d..000000000000
--- a/x11-terms/rxvt/files/rxvt-2.7.8-security.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur rxvt-2.7.6/src/command.c rxvt-2.7.6-new/src/command.c
---- rxvt-2.7.6/src/command.c	Tue Feb 25 13:29:15 2003
-+++ rxvt-2.7.6-new/src/command.c	Tue Feb 25 13:27:23 2003
-@@ -2260,8 +2260,11 @@
-      * rxvt_menubar_dispatch() violates the constness of the string,
-      * so do it here
-      */
--	    if (arg == XTerm_Menu)
-+	    if (arg == XTerm_Menu) {
-+#if 0 /* SECURITY */		    
- 		rxvt_menubar_dispatch(r, (char *)s);
-+#endif
-+	    }
- 	    else
- 		rxvt_xterm_seq(r, arg, (char *)s, eh);
- 	    free(s);
-@@ -2300,6 +2303,7 @@
- 
-     assert(str != NULL);
-     switch (op) {
-+	    
-     case XTerm_name:
- 	rxvt_set_title(r, str);
-     /* FALLTHROUGH */
-@@ -2375,12 +2379,15 @@
-     case XTerm_font:
- 	rxvt_change_font(r, 0, str);
- 	break;
-+#if 0 /* SECURITY! */
-     case XTerm_dumpscreen:	/* no error notices */
- 	if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) {
- 	    rxvt_scr_dump(r, fd);
- 	    close(fd);
- 	}
- 	break;
-+#endif
-+	
-     }
- }
- /*----------------------------------------------------------------------*/
-
diff --git a/x11-terms/rxvt/rxvt-2.7.8-r6.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r1.ebuild
index 973ae9b49762..d2634ab17d29 100644
--- a/x11-terms/rxvt/rxvt-2.7.8-r6.ebuild
+++ b/x11-terms/rxvt/rxvt-2.7.10-r1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.8-r6.ebuild,v 1.10 2004/06/28 22:09:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r1.ebuild,v 1.1 2004/11/06 09:14:05 usata Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="rxvt -- nice small x11 terminal"
 HOMEPAGE="http://www.rxvt.org/"
-SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz
-	cjk? ( http://hp.vector.co.jp/authors/VA021953/rxvt/src/${P}-rk.patch )"
+SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc alpha sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips amd64 ~ppc64"
 IUSE="motif cjk xgetdefault"
 
 DEPEND="virtual/libc
@@ -22,9 +21,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-security.patch
 	use motif && epatch ${FILESDIR}/${P}-azz4.diff
-	use cjk && epatch ${DISTDIR}/${P}-rk.patch
+	use cjk && epatch ${FILESDIR}/${P}-rk.patch
 }
 
 src_compile() {
@@ -36,7 +34,12 @@ src_compile() {
 		term="rxvt"
 	fi
 
+	# bug #22325
+	append-flags -DLINUX_KEYS
+	append-ldflags -Wl,-z,now
+
 	econf \
+		--enable-everything \
 		--enable-rxvt-scroll \
 		--enable-next-scroll \
 		--enable-xterm-scroll \
@@ -47,13 +50,14 @@ src_compile() {
 		--enable-mousewheel \
 		--enable-slipwheeling \
 		--enable-smart-resize \
+		--enable-256-color \
 		--enable-menubar \
 		--enable-languages \
 		--enable-xim \
 		--enable-shared \
 		--enable-keepscrolling \
 		--with-term=${term} \
-		`use_enable xgetdefault` || die
+		$(use_enable xgetdefault) || die
 
 	emake || die
 }
diff --git a/x11-terms/rxvt/rxvt-2.7.10.ebuild b/x11-terms/rxvt/rxvt-2.7.10.ebuild
index 004e66766304..81979f3f090e 100644
--- a/x11-terms/rxvt/rxvt-2.7.10.ebuild
+++ b/x11-terms/rxvt/rxvt-2.7.10.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10.ebuild,v 1.14 2004/08/14 15:42:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10.ebuild,v 1.15 2004/11/06 09:14:05 usata Exp $
 
 inherit eutils
 
 DESCRIPTION="rxvt -- nice small x11 terminal"
 HOMEPAGE="http://www.rxvt.org/"
-SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz
-	cjk? ( http://dev.gentoo.org/~usata/distfiles/${P}-rk.patch )"
+SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +22,7 @@ src_unpack() {
 	cd ${S}
 
 	use motif && epatch ${FILESDIR}/${P}-azz4.diff
-	use cjk && epatch ${DISTDIR}/${P}-rk.patch
+	use cjk && epatch ${FILESDIR}/${P}-rk.patch
 }
 
 src_compile() {