summaryrefslogtreecommitdiff
path: root/x11/eterm
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2021-09-19 08:49:01 +0000
committernia <nia@pkgsrc.org>2021-09-19 08:49:01 +0000
commit2efd12f14076f46e44b6d64f0125345482c9ac58 (patch)
treeb5dc38aa360cd6cf197e6ee11ebcf9f1480852d4 /x11/eterm
parentbeb38478eb2ff673ebfa6b4bc5224187aac0c3e2 (diff)
downloadpkgsrc-2efd12f14076f46e44b6d64f0125345482c9ac58.tar.gz
eterm: apply patch for CVE-2021-33477
Diffstat (limited to 'x11/eterm')
-rw-r--r--x11/eterm/Makefile4
-rw-r--r--x11/eterm/distinfo3
-rw-r--r--x11/eterm/patches/patch-src_term.c23
3 files changed, 27 insertions, 3 deletions
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 439b65c694d..dc92ef5042f 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2021/05/24 19:55:59 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2021/09/19 08:49:01 nia Exp $
DISTNAME= Eterm-0.9.6
PKGNAME= ${DISTNAME:S/^E/e/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/}
DISTFILES= ${DEFAULT_DISTFILES} ${PIXMAP_FILES}
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index d5130bee477..3b847f5cfdb 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2020/04/20 00:47:34 joerg Exp $
+$NetBSD: distinfo,v 1.24 2021/09/19 08:49:01 nia Exp $
SHA1 (Eterm-0.9.6.tar.gz) = b4cb00f898ffd2de9bf7ae0ecde1cc3a5fee9f02
RMD160 (Eterm-0.9.6.tar.gz) = 96e2ebf7ee7464ffab8bbecec2976a1e5935712e
@@ -14,3 +14,4 @@ SHA1 (patch-ai) = 1f1a050c27b042c5cccff91aae4ced7b887b68b1
SHA1 (patch-src_Makefile.in) = 3000a407bed7d7c23bfc127fd09b0723d9c0b395
SHA1 (patch-src_command.c) = 0b5b3dbde8eba16b1690155a28764ec7ea0f6bff
SHA1 (patch-src_screen.c) = f820501e3a67cfc59dedd1dd5e3eb6f06ae2be23
+SHA1 (patch-src_term.c) = 45b1fecdb9b0f726f4ce5c001c27cc20340cd687
diff --git a/x11/eterm/patches/patch-src_term.c b/x11/eterm/patches/patch-src_term.c
new file mode 100644
index 00000000000..a1a53d1a731
--- /dev/null
+++ b/x11/eterm/patches/patch-src_term.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_term.c,v 1.1 2021/09/19 08:49:01 nia Exp $
+
+Add patch from rxvt-unicode to fix CVE-2021-33477.
+https://sources.debian.org/patches/eterm/0.9.6-6.1/CVE-2021-33477.patch/
+
+--- src/term.c.orig 2011-03-16 05:16:59.000000000 +0000
++++ src/term.c
+@@ -1176,6 +1176,7 @@ process_escape_seq(void)
+ case 'E':
+ scr_add_lines((unsigned char *) "\n\r", 1, 2);
+ break;
++#if 0 /* disabled because embedded newlines can make exploits easier */
+ case 'G':
+ if ((ch = cmd_getc()) == 'Q') { /* query graphics */
+ tt_printf((unsigned char *) "\033G0\n"); /* no graphics */
+@@ -1185,6 +1186,7 @@ process_escape_seq(void)
+ } while (ch != ':');
+ }
+ break;
++#endif
+ case 'H':
+ scr_set_tab(1);
+ break;