diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/rxvt-unicode-escape-sequences.patch | |
parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/patches/rxvt-unicode-escape-sequences.patch')
-rw-r--r-- | gnu/packages/patches/rxvt-unicode-escape-sequences.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/rxvt-unicode-escape-sequences.patch b/gnu/packages/patches/rxvt-unicode-escape-sequences.patch deleted file mode 100644 index 064dd51e2d..0000000000 --- a/gnu/packages/patches/rxvt-unicode-escape-sequences.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch prevents a code execution vector involving terminal escape -sequences when rxvt-unicode is in "secure mode". - -This change was spurred by the following conversation on the -oss-security mailing list: - -Problem description and proof of concept: -http://seclists.org/oss-sec/2017/q2/190 - -Upstream response: -http://seclists.org/oss-sec/2017/q2/291 - -Patch copied from upstream source repository: -http://cvs.schmorp.de/rxvt-unicode/src/command.C?r1=1.582&r2=1.583 - ---- rxvt-unicode/src/command.C 2016/07/14 05:33:26 1.582 -+++ rxvt-unicode/src/command.C 2017/05/18 02:43:18 1.583 -@@ -2695,7 +2695,7 @@ - /* kidnapped escape sequence: Should be 8.3.48 */ - case C1_ESA: /* ESC G */ - // used by original rxvt for rob nations own graphics mode -- if (cmd_getc () == 'Q') -+ if (cmd_getc () == 'Q' && option (Opt_insecure)) - tt_printf ("\033G0\012"); /* query graphics - no graphics */ - break; - -@@ -2914,7 +2914,7 @@ - break; - - case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ -- case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ -+ case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ - #ifdef ISO6429 - arg[0] = -arg[0]; - #else /* emulate common DEC VTs */ |