commit: be94e6b541775bb349967bd705ca26bdc6c331ed Author: John Helmert III <ajak <AT> gentoo <DOT> org> AuthorDate: Sun Sep 18 21:15:21 2022 +0000 Commit: John Helmert III <ajak <AT> gentoo <DOT> org> CommitDate: Sun Sep 18 21:15:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be94e6b5
x11-terms/mrxvt: treeclean Bug: https://bugs.gentoo.org/791004 Signed-off-by: John Helmert III <ajak <AT> gentoo.org> profiles/package.mask | 5 - x11-terms/mrxvt/Manifest | 1 - ...rxvt-0.5.4-001-fix-segfault-when-wd-empty.patch | 13 --- x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch | 20 ---- x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch | 33 ------ x11-terms/mrxvt/metadata.xml | 16 --- x11-terms/mrxvt/mrxvt-0.5.4.ebuild | 121 --------------------- 7 files changed, 209 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index f9e634cbe188..47166fa94dcb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -325,11 +325,6 @@ dev-haskell/doctest-parallel # bug #772209 app-crypt/keybase -# John Helmert III <[email protected]> (2022-08-14) -# Remote code execution vulnerability, dead upstream. Removal in 30 -# days, bug #791004. -x11-terms/mrxvt - # John Helmert III <[email protected]> (2022-08-14) # Dead upstream, vulnerable, no revdeps except a usedep. Removal in 30 # days, bug #618000 diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest deleted file mode 100644 index 428f9cc38dc6..000000000000 --- a/x11-terms/mrxvt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992 diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch deleted file mode 100644 index bf5362b3ee37..000000000000 --- a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/tabbar.c -=================================================================== ---- ./src/tabbar.c (revision 337) -+++ ./src/tabbar.c (working copy) -@@ -1327,7 +1327,7 @@ - if( p.we_wordc > 1) - rxvt_msg( DBG_ERROR, DBG_TABBAR, - "Too many words when expanding %s\n", cwdOption ); -- else -+ else if( NOT_NULL( *p.we_wordv ) ) - { - filename = *p.we_wordv; - diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch deleted file mode 100644 index 2bb39a423aed..000000000000 --- a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/rxvtlib.h -+++ b/src/rxvtlib.h -@@ -790,7 +790,7 @@ typedef struct { - } action_t; - - /* Values for macro_t.type. Must sync this with macroNames from macros.c */ --enum { -+enum macroFnNames { - MacroFnDummy=0, - MacroFnEsc, - MacroFnStr, -@@ -820,7 +820,7 @@ enum { - MacroFnSaveConfig, - MacroFnToggleMacros, - NMACRO_FUNCS --} macroFnNames; -+}; - - typedef unsigned char macro_priority_t; - typedef struct { diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch deleted file mode 100644 index 1c2215937099..000000000000 --- a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch +++ /dev/null @@ -1,33 +0,0 @@ -http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch - ---- ./configure.ac -+++ ./configure.ac -@@ -952,7 +952,7 @@ - if test "x$support_png" = "xyes"; then - AC_CHECK_LIB( - png, -- png_check_sig, -+ png_sig_cmp, - [], - [support_png=no], - [-lz -lm] ---- ./src/mpng.c -+++ ./src/mpng.c -@@ -83,7 +83,7 @@ - display_depth = XDefaultDepth(display,XDefaultScreen(display)); - - fread(sig, 1, 8, ifile); -- if (!png_check_sig(sig, 8)){ -+ if (png_sig_cmp(sig, 0, 8)){ - fclose(ifile); - return -1; - } -@@ -113,7 +113,7 @@ - - if (png_depth < 8){ - if (png_color_type == PNG_COLOR_TYPE_GRAY ){ -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - png_row_bytes = png_width; - }else{ - png_set_expand(png_ptr); diff --git a/x11-terms/mrxvt/metadata.xml b/x11-terms/mrxvt/metadata.xml deleted file mode 100644 index c562e92a8fcf..000000000000 --- a/x11-terms/mrxvt/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Anthony G. Basile</name> - </maintainer> - <use> - <flag name="menubar">Enable mrxvt menubar</flag> - <flag name="utempter">REcords user logins. Useful on multi-user - systems</flag> - </use> - <upstream> - <remote-id type="sourceforge">materm</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild deleted file mode 100644 index f9311471c350..000000000000 --- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support" -HOMEPAGE="http://materm.sourceforge.net/"; -SRC_URI="mirror://sourceforge/materm/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" - -L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW" -IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - jpeg? ( virtual/jpeg ) - png? ( media-libs/libpng:= ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - virtual/libiconv - ) - utempter? ( sys-libs/libutempter ) - xpm? ( x11-libs/libXpm )" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch - "${FILESDIR}"/${P}-libpng14.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf - - # if you want to pass any other flags, use EXTRA_ECONF. - if use l10n_el ; then - myconf="${myconf} --enable-greek" - fi - if use l10n_ja ; then - # --with-encoding=sjis - myconf="${myconf} --enable-kanji --with-encoding=eucj" - fi - if use l10n_ko ; then - myconf="${myconf} --enable-kr --with-encoding=kr" - fi - if use l10n_th ; then - myconf="${myconf} --enable-thai" - fi - if use l10n_zh-CN ; then - # --with-encoding=gbk - myconf="${myconf} --enable-gb --with-encoding=gb" - fi - if use l10n_zh-TW ; then - myconf="${myconf} --enable-big5 --with-encoding=big5" - fi - - # 2006-03-13 gi1242: mrxvt works best with TERM=rxvt AND correctly set - # termcap / terminfo entries. If the rxvt termcap / terminfo entries are - # messed up then then it's better to set TERM=xterm. - # - # Provide support for this by setting the or RXVT_TERM environment variables - # before emerging, as done in the rxvt ebuild. - - if [[ -n ${RXVT_TERM} ]]; then - myconf="${myconf} --with-term=${RXVT_TERM}" - fi - - econf \ - --enable-everything \ - --with-atab-extra=25 \ - $(use_enable debug) \ - $(use_enable jpeg) \ - $(use_enable png) \ - $(use_enable xpm) \ - $(use_enable session sessionmgr) \ - $(use_enable truetype xft) \ - $(use_enable utempter) \ - $(use_enable menubar) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} install - # Give mrxvt perms to update utmp - fowners root:utmp /usr/bin/mrxvt - fperms g+s /usr/bin/mrxvt - dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO -} - -pkg_postinst() { - if [[ -z ${RXVT_TERM} ]]; then - einfo - einfo "If you experience problems with curses programs, then this is" - einfo "most likely because of incorrectly set termcap / terminfo" - einfo "entries. To fix this you can dry and run (as user)" - einfo " tic /usr/share/doc/${P}/etc/mrxvt.terminfo" - einfo "Alternately, run the offending programs with TERM=xterm." - einfo - einfo "To emerge mrxvt with TERM=xterm by default, set the RXVT_TERM" - einfo "environment variable to 'xterm', or your desired default" - einfo "terminal name. Alternately you can put 'Mrxvt.termName: xterm'" - einfo "in your ~/.mrxvtrc, or /etc/mrxvt/mrxvtrc." - einfo - fi -}
