mrxvt: re-add after adding a patch for CVE-2017-7483 from x11/rxvt

bump PKGREVISION relative to removed version

8 files changed, 168 insertions, 0 deletions

diff --git a/x11/mrxvt/DESCR b/x11/mrxvt/DESCR
new file mode 100644
index 00000000000..18a9cd490f7
--- /dev/null
+++ b/x11/mrxvt/DESCR
@@ -0,0 +1,6 @@
+Mrxvt (previously named as materm) is a lightweight and powerful
+multi-tabbed X terminal emulator based on the popular rxvt and aterm.
+It implements many useful features seen in some modern X terminal
+emulators, like gnome-terminal and konsole, but keeps to be
+lightweight and independent from the GNOME and KDE desktop
+environment.
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
new file mode 100644
index 00000000000..c6e6d0b0786
--- /dev/null
+++ b/x11/mrxvt/Makefile
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile,v 1.36 2017/11/27 08:05:24 maya Exp $
+#
+
+DISTNAME=	mrxvt-0.5.4
+PKGREVISION=	11
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=materm/}
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://code.google.com/p/mrxvt/
+COMMENT=	Multi-tabbed terminal emulator with Xft support
+
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		gmake
+USE_FEATURES+=		snprintf
+
+CONFIGURE_ARGS+=	--enable-xft
+CONFIGURE_ARGS+=	--enable-text-shadow
+CONFIGURE_ARGS+=	--enable-24bits
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+
+CONFIGURE_ARGS.HPUX+=	--disable-lastlog --disable-utmp --disable-wtmp
+
+EGDIR=			${PREFIX}/share/examples
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/mrxvt
+CONF_FILES=		${EGDIR}/mrxvt/mrxvtrc ${PKG_SYSCONFDIR}/mrxvt/mrxvtrc
+CONF_FILES+=		${EGDIR}/mrxvt/default.menu ${PKG_SYSCONFDIR}/mrxvt/default.menu
+CONF_FILES+=		${EGDIR}/mrxvt/submenus.menu ${PKG_SYSCONFDIR}/mrxvt/submenus.menu
+
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
+# Make mrxvt setuid root so that tty ownership setting and utmp logging
+# function correctly.
+#
+CONFIGURE_ARGS+=	--enable-ttygid
+SPECIAL_PERMS=		${PREFIX}/bin/mrxvt ${SETUID_ROOT_PERMS}
+.endif
+
+BUILDLINK_DEPMETHOD.libXt+=	build
+
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/mrxvt/PLIST b/x11/mrxvt/PLIST
new file mode 100644
index 00000000000..9ce398b6112
--- /dev/null
+++ b/x11/mrxvt/PLIST
@@ -0,0 +1,28 @@
+@comment $NetBSD: PLIST,v 1.7 2017/11/27 08:05:24 maya Exp $
+bin/mrxvt
+man/man1/mrxvt.1
+share/doc/mrxvt/README.greek.bz2
+share/doc/mrxvt/README.menu.bz2
+share/doc/mrxvt/README.xvt.bz2
+share/doc/mrxvt/behind_mrxvt.txt.bz2
+share/doc/mrxvt/etc/XTerm.ad
+share/doc/mrxvt/etc/mrxvt.terminfo
+share/doc/mrxvt/etc/rxvt.termcap
+share/doc/mrxvt/etc/rxvt.terminfo
+share/doc/mrxvt/hack-mrxvt.txt.bz2
+share/doc/mrxvt/mrxvt_seq.txt.bz2
+share/doc/mrxvt/rxvtRef.txt.bz2
+share/doc/mrxvt/scripts/mrxvt.vbs
+share/doc/mrxvt/scripts/mrxvtset.pl
+share/doc/mrxvt/scripts/settitle.c
+share/doc/mrxvt/xterm-ctlseqs.txt.bz2
+share/examples/mrxvt/default.menu
+share/examples/mrxvt/mrxvtrc
+share/examples/mrxvt/mrxvtrc.sample
+share/examples/mrxvt/submenus.menu
+share/pixmaps/mrxvt-csh.png
+share/pixmaps/mrxvt-csh.xpm
+share/pixmaps/mrxvt-root.png
+share/pixmaps/mrxvt-root.xpm
+share/pixmaps/mrxvt.png
+share/pixmaps/mrxvt.xpm
diff --git a/x11/mrxvt/distinfo b/x11/mrxvt/distinfo
new file mode 100644
index 00000000000..11e3ab0a753
--- /dev/null
+++ b/x11/mrxvt/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.12 2017/11/27 08:05:24 maya Exp $
+
+SHA1 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 62b1d128f71e463dd38239efa4d5bc0daa77e9cf
+RMD160 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 039929a83065055abfe29e239d7760390bb54a6b
+SHA512 (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 703d32e803d73e21ba5c746bcea94331c43e53e6f1b84a86271e94ae4cc59e6c4e8d4e86cbc3e29d594aec04881db57f587b1e94c42249b2beef08e718b69a36
+Size (mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch) = 380 bytes
+SHA1 (mrxvt-0.5.4.tar.gz) = f50e9ad2f652d4212b0ac5241b919372d9e43744
+RMD160 (mrxvt-0.5.4.tar.gz) = 175ce5c554c267ada4efde18e22704ff1b688dac
+SHA512 (mrxvt-0.5.4.tar.gz) = 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992
+Size (mrxvt-0.5.4.tar.gz) = 603978 bytes
+SHA1 (patch-aa) = 809be5640f60ccc8238c2b851056fd520426f6b1
+SHA1 (patch-src_command.c) = 1705e80d071bbab1bebe51bda13b22ffae1b727f
+SHA1 (patch-src_init.c) = 358b46b1c03ef3cdf62b964ca435db7987c9c33d
+SHA1 (patch-src_transparent.c) = 09229a237dfc2fef6c6d76f75270ead5c75521e1
diff --git a/x11/mrxvt/patches/patch-aa b/x11/mrxvt/patches/patch-aa
new file mode 100644
index 00000000000..23468d5780e
--- /dev/null
+++ b/x11/mrxvt/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2017/11/27 08:05:24 maya Exp $
+
+--- src/logging.c.orig	2008-02-17 22:04:50.000000000 +0000
++++ src/logging.c
+@@ -105,7 +105,7 @@ rxvt_makeutent(rxvt_t *r, int page, cons
+     else if (sscanf(pty, "pts/%d", &i) == 1)
+ 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
+ #endif
+-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
++    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) && STRNCMP(pty, "pts", 3)) {
+ 	rxvt_msg (DBG_ERROR, DBG_LOGGING, "can't parse tty name \"%s\"", pty);
+ 	return;
+     }
diff --git a/x11/mrxvt/patches/patch-src_command.c b/x11/mrxvt/patches/patch-src_command.c
new file mode 100644
index 00000000000..045c46116f5
--- /dev/null
+++ b/x11/mrxvt/patches/patch-src_command.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_command.c,v 1.1 2017/11/27 08:05:24 maya Exp $
+
+Avoid integer overflow (CVE-2017-7483)
+
+--- src/command.c.orig	2008-07-09 21:33:36.000000000 +0000
++++ src/command.c
+@@ -5207,7 +5207,7 @@ rxvt_process_csi_seq(rxvt_t* r, int page
+     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
diff --git a/x11/mrxvt/patches/patch-src_init.c b/x11/mrxvt/patches/patch-src_init.c
new file mode 100644
index 00000000000..8df36b906ac
--- /dev/null
+++ b/x11/mrxvt/patches/patch-src_init.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_init.c,v 1.3 2017/11/27 08:05:24 maya Exp $
+
+Fix strict alignment SIGBUS
+
+--- src/init.c.orig	2008-06-13 19:08:13.000000000 +0000
++++ src/init.c
+@@ -3239,7 +3239,7 @@ rxvt_create_show_windows( rxvt_t *r, int
+     XGCValues		    gcvalue;
+     unsigned long	    gcmask;
+ #ifndef NO_FRILLS
+-    CARD32		    pid = (CARD32) getpid ();
++    CARD64		    pid = (CARD64) getpid ();
+ #endif
+ #ifdef TRANSPARENT
+     register int	    i;
diff --git a/x11/mrxvt/patches/patch-src_transparent.c b/x11/mrxvt/patches/patch-src_transparent.c
new file mode 100644
index 00000000000..9b9eb15d8d4
--- /dev/null
+++ b/x11/mrxvt/patches/patch-src_transparent.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_transparent.c,v 1.3 2017/11/27 08:05:24 maya Exp $
+
+Fix strict aligment SIGBUS
+
+--- src/transparent.c.orig	2008-02-17 22:04:50.000000000 +0000
++++ src/transparent.c
+@@ -56,7 +56,7 @@ rxvt_set_opacity (rxvt_t* r)
+     Window	    wintree[PARENT_NUMBER];
+     Window	    root;
+     Window*	    list;
+-    CARD32	    opacity;
++    CARD64	    opacity;
+ 
+ 
+     /* do not set opacity */
+@@ -71,7 +71,7 @@ rxvt_set_opacity (rxvt_t* r)
+     XSetWindowBackground(r->Xdisplay, r->TermWin.parent, VTBG(r,0) );
+ #endif
+ 
+-    opacity = (CARD32) (r->TermWin.opacity * (0xffffffff / 100));
++    opacity = (CARD64) (r->TermWin.opacity * (0xffffffff / 100));
+ 
+     /*
+     ** look for parent tree of top level window because the window