summaryrefslogtreecommitdiff
path: root/x11/rxvt
diff options
context:
space:
mode:
authornros <nros@pkgsrc.org>2017-08-05 07:00:20 +0000
committernros <nros@pkgsrc.org>2017-08-05 07:00:20 +0000
commit5bb778f75bbb88b609c5066cfab651e4c9cc7244 (patch)
tree92aa4807c5f102ea6f0a744ac0bac65b23139a8b /x11/rxvt
parentb16fe2fa1d2524836a5a1c56fb40c57b44f7004b (diff)
downloadpkgsrc-5bb778f75bbb88b609c5066cfab651e4c9cc7244.tar.gz
Add patch to fix CVE-2017-7483.
Bump PKGREVISION.
Diffstat (limited to 'x11/rxvt')
-rw-r--r--x11/rxvt/Makefile4
-rw-r--r--x11/rxvt/distinfo3
-rw-r--r--x11/rxvt/patches/patch-src_command.c13
3 files changed, 17 insertions, 3 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index e261dc9b82f..ab035f5bdb4 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2017/01/19 18:52:30 agc Exp $
+# $NetBSD: Makefile,v 1.60 2017/08/05 07:00:20 nros Exp $
DISTNAME= rxvt-2.7.10
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rxvt/}
MASTER_SITES+= ftp://mason.primenet.com.au/pub/rxvt/
diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index 1df68a59836..48520c73ccb 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2015/11/04 03:28:53 agc Exp $
+$NetBSD: distinfo,v 1.24 2017/08/05 07:00:20 nros Exp $
SHA1 (rxvt-2.7.10.tar.bz2) = 16eae23c3227e28e5e7a53a58eaa3226affe65f9
RMD160 (rxvt-2.7.10.tar.bz2) = 83fab8df589e2413ba820d04bafb069e6af8c445
@@ -16,4 +16,5 @@ SHA1 (patch-aj) = 43ca25f034e6160f3a3dabbf1488df31cdecf95b
SHA1 (patch-ak) = 83f7ffcf91d671bd8e75e5c063fd1336c0e08ed6
SHA1 (patch-al) = 7107ec12205d0a5011a5828f8d30fbd577de41b7
SHA1 (patch-am) = db69ba3b6754454613aa4aec61c1b033d7e013ae
+SHA1 (patch-src_command.c) = ca6af737445f2687e3823bd0d4390e3150f664b1
SHA1 (patch-src_rxvt.h) = 86db6ffc24f1133771b6e94275a9edab07b97437
diff --git a/x11/rxvt/patches/patch-src_command.c b/x11/rxvt/patches/patch-src_command.c
new file mode 100644
index 00000000000..97823c470ee
--- /dev/null
+++ b/x11/rxvt/patches/patch-src_command.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_command.c,v 1.1 2017/08/05 07:00:20 nros Exp $
+* fix CVE-2017-7483
+--- src/command.c.orig 2017-08-05 06:35:48.000000000 +0000
++++ src/command.c
+@@ -2096,7 +2096,7 @@ rxvt_process_csi_seq(rxvt_t *r)
+ i = ch - CSI_ICH;
+ ndef = get_byte_array_bit(csi_defaults, i);
+ for (p = 0; p < nargs; p++)
+- if (arg[p] == -1)
++ if (arg[p] < 0 || arg[p] > 30000)
+ arg[p] = ndef;
+
+ #ifdef DEBUG_CMD