diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2021-02-03 08:08:55 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2021-02-03 08:09:41 +0000 |
commit | ea2c3fc6deedb313f1c6aaa49d4e9b87e1b3c805 (patch) | |
tree | d528b8d2176f14cb9caf5e3e99817f76c00bde94 /app-misc/mc | |
parent | net-analyzer/zabbix: removed obsolete 5.0.6-r1 & 5.2.2-r1 (diff) | |
download | gentoo-ea2c3fc6deedb313f1c6aaa49d4e9b87e1b3c805.tar.gz gentoo-ea2c3fc6deedb313f1c6aaa49d4e9b87e1b3c805.tar.bz2 gentoo-ea2c3fc6deedb313f1c6aaa49d4e9b87e1b3c805.zip |
app-misc/mc: fix shadow render on ncurses
Reported-by: Thomas Deutschmann
Closes: https://bugs.gentoo.org/768285
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-misc/mc')
-rw-r--r-- | app-misc/mc/files/mc-4.8.26-shadow-crash.patch | 39 | ||||
-rw-r--r-- | app-misc/mc/mc-4.8.26-r1.ebuild | 108 |
2 files changed, 147 insertions, 0 deletions
diff --git a/app-misc/mc/files/mc-4.8.26-shadow-crash.patch b/app-misc/mc/files/mc-4.8.26-shadow-crash.patch new file mode 100644 index 000000000000..4eeee45bc8e6 --- /dev/null +++ b/app-misc/mc/files/mc-4.8.26-shadow-crash.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/768285 +https://midnight-commander.org/ticket/4192 + +From 6394547dbffbad44ea50c64c282de4b610ca07bf Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Wed, 3 Feb 2021 09:47:13 +0300 +Subject: [PATCH] Ticket #4192: fix crash if shadow is out of screen. + +(tty_clip): add extra tests for area boundaries. + +Signed-off-by: Andrew Borodin <aborodin@vmail.ru> +--- + lib/tty/tty-ncurses.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c +index 03235cd5b..5cddf5059 100644 +--- a/lib/tty/tty-ncurses.c ++++ b/lib/tty/tty-ncurses.c +@@ -152,9 +152,16 @@ tty_clip (int *y, int *x, int *rows, int *cols) + + if (*y + *rows > LINES) + *rows = LINES - *y; ++ ++ if (*rows <= 0) ++ return FALSE; ++ + if (*x + *cols > COLS) + *cols = COLS - *x; + ++ if (*cols <= 0) ++ return FALSE; ++ + return TRUE; + } + +-- +2.30.0 + diff --git a/app-misc/mc/mc-4.8.26-r1.ebuild b/app-misc/mc/mc-4.8.26-r1.ebuild new file mode 100644 index 000000000000..222451104a3b --- /dev/null +++ b/app-misc/mc/mc-4.8.26-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +MY_P=${P/_/-} + +DESCRIPTION="GNU Midnight Commander is a text based file manager" +HOMEPAGE="https://www.midnight-commander.org" +SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg" + +REQUIRED_USE="spell? ( edit )" + +RDEPEND=">=dev-libs/glib-2.26.0:2 + gpm? ( sys-libs/gpm ) + kernel_linux? ( sys-fs/e2fsprogs ) + samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) + slang? ( >=sys-libs/slang-2 ) + !slang? ( sys-libs/ncurses:0=[unicode?] ) + spell? ( app-text/aspell ) + X? ( x11-libs/libX11 + x11-libs/libICE + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( dev-libs/check ) + " + +PATCHES=("${FILESDIR}"/${P}-shadow-crash.patch) + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + if use slang && use unicode ; then + ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." + fi +} + +src_configure() { + [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" + + local myeconfargs=( + --enable-charset + --enable-vfs + --with-homedir=$(usex xdg 'XDG' '.mc') + --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") + $(use_enable kernel_linux vfs-undelfs) + # Today mclib does not expose any headers and is linked to + # single 'mc' binary. Thus there is no advantage of having + # a library. Let's avoid shared library altogether + # as it also conflicts with sci-libs/mc: bug #685938 + --disable-mclib + $(use_enable nls) + $(use_enable samba vfs-smb) + $(use_enable sftp vfs-sftp) + $(use_enable spell aspell) + $(use_enable test tests) + $(use_with gpm gpm-mouse) + $(use_with X x) + $(use_with edit internal-edit) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + # CK_FORK=no to avoid using fork() in check library + # as mc mocks fork() itself: bug #644462. + # + # VERBOSE=1 to make test failures contain detailed + # information. + CK_FORK=no emake check VERBOSE=1 +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS README NEWS + + # fix bug #334383 + if use kernel_linux && [[ ${EUID} == 0 ]] ; then + fowners root:tty /usr/libexec/mc/cons.saver + fperms g+s /usr/libexec/mc/cons.saver + fi + + if ! use xdg ; then + sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ + -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die + fi +} + +pkg_postinst() { + elog "To enable exiting to latest working directory," + elog "put this into your ~/.bashrc:" + elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" +} |