diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-terms/rxvt/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-terms/rxvt/files')
-rw-r--r-- | x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch | 52 | ||||
-rw-r--r-- | x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch | 13 | ||||
-rw-r--r-- | x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff | 126 | ||||
-rw-r--r-- | x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch | 13 | ||||
-rw-r--r-- | x11-terms/rxvt/files/rxvt-2.7.10-rk.patch | 82 |
5 files changed, 286 insertions, 0 deletions
diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch b/x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch new file mode 100644 index 000000000000..e817f8d0e316 --- /dev/null +++ b/x11-terms/rxvt/files/rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch @@ -0,0 +1,52 @@ +# CVE-2008-1142 (rxvt 2.6.4 opens an xterm on :0 if the DISPLAY environment variable is not set, which might allow local users to hijack X11 connections.) +# Based on http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=41;filename=diff;att=1;bug=469296 +# bug 217819 + +diff -Naur rxvt-2.7.10.orig/rclock/rclock.c rxvt-2.7.10/rclock/rclock.c +--- rxvt-2.7.10.orig/rclock/rclock.c 2008-05-03 14:23:07.264082222 +0200 ++++ rxvt-2.7.10/rclock/rclock.c 2008-05-03 14:24:55.433082735 +0200 +@@ -324,9 +324,6 @@ + CheckMaildir(); + #endif + +- if ((display_name = getenv ("DISPLAY")) == NULL) +- display_name = ":0"; +- + /* parse the command line */ + for (i = 1; i < argc; i += 2) + { +@@ -424,7 +421,9 @@ + Xdisplay = XOpenDisplay (display_name); + if (!Xdisplay) + { +- print_error ("can't open display %s", display_name); ++ print_error ("can't open display %s", display_name?display_name: ++ getenv("DISPLAY")?getenv("DISPLAY"): ++ "as no -d given and DISPLAY not set"); + goto Abort; + } + +diff -Naur rxvt-2.7.10.orig/src/init.c rxvt-2.7.10/src/init.c +--- rxvt-2.7.10.orig/src/init.c 2008-05-03 14:23:07.247082766 +0200 ++++ rxvt-2.7.10/src/init.c 2008-05-03 14:43:44.705227631 +0200 +@@ -532,8 +532,7 @@ + /* + * Open display, get options/resources and create the window + */ +- if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL) +- rs[Rs_display_name] = ":0"; ++ rs[Rs_display_name] = getenv("DISPLAY"); + + rxvt_get_options(r, r_argc, r_argv); + free(r_argv); +@@ -550,7 +549,9 @@ + + if (r->Xdisplay == NULL + && (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) { +- rxvt_print_error("can't open display %s", rs[Rs_display_name]); ++ rxvt_print_error("can't open display %s", ++ rs[Rs_display_name]?rs[Rs_display_name]: ++ "as no -display option given and DISPLAY not set"); + exit(EXIT_FAILURE); + } + diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch b/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch new file mode 100644 index 000000000000..e1a48cde8af8 --- /dev/null +++ b/x11-terms/rxvt/files/rxvt-2.7.10-asneeded.patch @@ -0,0 +1,13 @@ +Index: rxvt-2.7.10/src/Makefile.in +=================================================================== +--- rxvt-2.7.10.orig/src/Makefile.in ++++ rxvt-2.7.10/src/Makefile.in +@@ -103,7 +103,7 @@ rxvt: version.h rxvt.o librxvt.la + date >.protos + + librxvt.la: $(LIBOBJS) +- $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@ ++ $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) $(XLIB) -o $@ + #------------------------------------------------------------------------- + tags: $(SRCS) $(HDRS) $(EXTRAHDRS) + ctags $(SRCS) $(HDRS) $(EXTRAHDRS) diff --git a/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff b/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff new file mode 100644 index 000000000000..4baf507685be --- /dev/null +++ b/x11-terms/rxvt/files/rxvt-2.7.10-azz4.diff @@ -0,0 +1,126 @@ +diff -Naurp rxvt-2.7.10.orig/AZZ-ChangeLog rxvt-2.7.10/AZZ-ChangeLog +--- rxvt-2.7.10.orig/AZZ-ChangeLog 1969-12-31 19:00:00.000000000 -0500 ++++ rxvt-2.7.10/AZZ-ChangeLog 2003-03-31 14:11:43.000000000 -0500 +@@ -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 -Naurp rxvt-2.7.10.orig/src/command.c rxvt-2.7.10/src/command.c +--- rxvt-2.7.10.orig/src/command.c 2003-03-26 01:01:23.000000000 -0500 ++++ rxvt-2.7.10/src/command.c 2003-03-31 14:11:43.000000000 -0500 +@@ -3098,7 +3098,7 @@ rxvt_tt_printf(rxvt_t *r, const char *fm + 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 -Naurp rxvt-2.7.10.orig/src/init.c rxvt-2.7.10/src/init.c +--- rxvt-2.7.10.orig/src/init.c 2002-12-04 00:21:39.000000000 -0500 ++++ rxvt-2.7.10/src/init.c 2003-03-31 14:11:43.000000000 -0500 +@@ -34,6 +34,7 @@ + #include "../config.h" /* NECESSARY */ + #include "rxvt.h" /* NECESSARY */ + #include "init.h" ++#include <Xm/MwmUtil.h> + + #include <signal.h> + +@@ -1126,6 +1127,24 @@ rxvt_Create_Windows(rxvt_t *r, int argc, + 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); + +diff -Naurp rxvt-2.7.10.orig/src/rxvt.h rxvt-2.7.10/src/rxvt.h +--- rxvt-2.7.10.orig/src/rxvt.h 2003-03-06 20:17:18.000000000 -0500 ++++ rxvt-2.7.10/src/rxvt.h 2003-03-31 14:11:43.000000000 -0500 +@@ -581,6 +581,9 @@ enum { + Rs_modifier, + Rs_answerbackstring, + Rs_tripleclickwords, ++ Rs_borderless, ++ Rs_overrideRedirect, ++ Rs_bellCommand, + NUM_RESOURCES + } ; + +diff -Naurp rxvt-2.7.10.orig/src/rxvtlib.h.in rxvt-2.7.10/src/rxvtlib.h.in +--- rxvt-2.7.10.orig/src/rxvtlib.h.in 2003-02-27 20:03:16.000000000 -0500 ++++ rxvt-2.7.10/src/rxvtlib.h.in 2003-03-31 14:12:59.000000000 -0500 +@@ -218,6 +218,8 @@ typedef enum { + #define Opt_scrollWithBuffer (1LU<<17) + #define Opt_jumpScroll (1LU<<18) + #define Opt_mouseWheelScrollPage (1LU<<19) ++#define Opt_borderless (1LU<<20) ++#define Opt_overrideredirect (1LU<<21) + /* place holder used for parsing command-line options */ + #define Opt_Reverse (1LU<<30) + #define Opt_Boolean (1LU<<31) +diff -Naurp 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-23 11:56:06.000000000 -0500 ++++ rxvt-2.7.10/src/screen.c 2003-03-31 14:11:43.000000000 -0500 +@@ -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 +@@ -1832,6 +1833,9 @@ rxvt_scr_changeview(rxvt_t *r, u_int16_t + 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 +@@ -1845,6 +1849,7 @@ rxvt_scr_bell(rxvt_t *r) + } else + XBell(r->Xdisplay, 0); + #endif ++ } + } + + /* ------------------------------------------------------------------------- */ +diff -Naurp rxvt-2.7.10.orig/src/xdefaults.c rxvt-2.7.10/src/xdefaults.c +--- rxvt-2.7.10.orig/src/xdefaults.c 2003-02-27 20:03:18.000000000 -0500 ++++ rxvt-2.7.10/src/xdefaults.c 2003-03-31 14:11:43.000000000 -0500 +@@ -108,6 +108,9 @@ static const struct { + "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.10-line-scroll.patch b/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch new file mode 100644 index 000000000000..cabb21cbef29 --- /dev/null +++ b/x11-terms/rxvt/files/rxvt-2.7.10-line-scroll.patch @@ -0,0 +1,13 @@ +--- src/feature.h.orig 2005-06-29 11:58:06.000000000 -0400 ++++ src/feature.h 2005-06-29 11:58:41.000000000 -0400 +@@ -211,8 +211,8 @@ + * SCROLL_ON_* defines above.). + * Also for modifier+Home/End keys to move to top/bottom + */ +-/* #define SCROLL_ON_UPDOWN_KEYS */ +-/* #define SCROLL_ON_HOMEEND_KEYS */ ++#define SCROLL_ON_UPDOWN_KEYS ++#define SCROLL_ON_HOMEEND_KEYS + + /* + * Allow unshifted Next/Prior keys to scroll forward/back 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) |