* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2015-12-23 8:33 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2015-12-23 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 972fa7adcc0d64db8b9c7a274c32fa1723961697
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 08:25:16 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 08:33:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972fa7ad
app-misc/mc: Removed old.
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-misc/mc/Manifest | 3 -
.../mc/files/mc-4.8.11-ncurses_build_fix.patch | 38 -------
app-misc/mc/files/mc-4.8.13-3297-prealloc.patch | 120 ---------------------
app-misc/mc/mc-4.8.11.ebuild | 99 -----------------
app-misc/mc/mc-4.8.12.ebuild | 97 -----------------
app-misc/mc/mc-4.8.13-r1.ebuild | 102 ------------------
app-misc/mc/mc-4.8.13.ebuild | 100 -----------------
7 files changed, 559 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b942724..a60c2bd 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,2 @@
-DIST mc-4.8.11.tar.xz 2211144 SHA256 1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a SHA512 5afb9e0704b8c0e98cd4787f03baf40131a0ab40027103e42f44b2ebd5b6c33b8702d7f534ca8175f3b8efbb25a04f08f0f51a1eb3a1783a99e6117472344fbc WHIRLPOOL bbe6dbad549f45b9d4aab0985ce9a2c35e42017d2f2020972d27d8d43c66473c49fea8754fd6635195b72e6a531625a28327c0f2aa65f5e79cea0db0d54ea7e6
-DIST mc-4.8.12.tar.xz 2237892 SHA256 5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe SHA512 f482177fd2a457b75d96b953922f473ad669ae4d83910c0c3d5445dd459fff38c9abdc0b39e531b58692e00beb6cae2ca4858d79f55204105a62889784b1fbd3 WHIRLPOOL 79fa8fef9f1a076588093360a1f1b5f31ad6e88c2de285408c118492f9d1e9d37ab8d36d3d96b3dae29e3d547a5ecca601cf5ef0a49e7d3e6f5c81a8172536ba
-DIST mc-4.8.13.tar.xz 2231448 SHA256 36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657 SHA512 556047072cc1d22a911cfb3cc82b03d204881f2773e06a8fe2020ecfbd4ffa491e1c710ca2124b9f3b219cd73f2b732a4bfad1671f095c1768864704514b067f WHIRLPOOL 4224dea453e6d46aa0a783bcf1778dab5dc8eac090bae45a617145a8507e7c65b78dd7d7b0f50d2477a4002c62c75ce5304be59a20e84842042fe602318cccf4
DIST mc-4.8.14.tar.xz 2305788 SHA256 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512 656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724 WHIRLPOOL 6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa
DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 WHIRLPOOL 6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
diff --git a/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch b/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch
deleted file mode 100644
index 0d986eb..0000000
--- a/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: lib/tty/key.c
-===================================================================
---- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
-+++ lib/tty/key.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
-@@ -1947,4 +1947,5 @@
- {
- int c;
-+ static int flag = 0; /* Return value from select */
- #ifdef HAVE_LIBGPM
- static struct Gpm_Event ev; /* Mouse event */
-@@ -1979,5 +1980,4 @@
- {
- int nfd;
-- static int flag = 0; /* Return value from select */
- fd_set select_set;
-
-Index: lib/tty/tty-ncurses.c
-===================================================================
---- lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
-+++ lib/tty/tty-ncurses.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
-@@ -50,4 +50,5 @@
- #include "tty.h"
- #include "color-internal.h"
-+#include "key.h"
- #include "mouse.h"
- #include "win.h"
-@@ -531,4 +532,5 @@
- {
- int res;
-+ unsigned char str[UTF8_CHAR_LEN + 1];
-
- res = g_unichar_to_utf8 (c, (char *) str);
-@@ -541,5 +543,4 @@
- else
- {
-- unsigned char str[UTF8_CHAR_LEN + 1];
- const char *s;
-
diff --git a/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch b/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch
deleted file mode 100644
index d84c348..0000000
--- a/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-commit a3486faac37680e3bcf7d0b3905f745765a823fd
-Author: Andrew Borodin <aborodin@vmail.ru>
-Date: Mon Nov 10 10:32:34 2014 +0300
-
- Ticket #3297: don't lose file in case of preallocate space fail.
-
- Don't remove the destination file if it was retrieved incompletely
- but it was already exist and appended during copy/move operation.
-
- Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
-
-diff --git a/src/filemanager/file.c b/src/filemanager/file.c
-index 9fbf081..3009ccf 100644
---- a/src/filemanager/file.c
-+++ b/src/filemanager/file.c
-@@ -1497,7 +1497,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
- int open_flags;
- gboolean is_first_time = TRUE;
- vfs_path_t *src_vpath = NULL, *dst_vpath = NULL;
-- gboolean write_errno_nospace = FALSE;
-
- /* FIXME: We should not be using global variables! */
- ctx->do_reget = 0;
-@@ -1739,28 +1738,39 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
- goto ret;
- }
-
-- while (TRUE)
-+ /* try preallocate space; if fail, try copy anyway */
-+ while (vfs_preallocate (dest_desc, file_size, ctx->do_append != 0 ? sb.st_size : 0) != 0)
- {
-- errno = vfs_preallocate (dest_desc, file_size, (ctx->do_append != 0) ? sb.st_size : 0);
-- if (errno == 0)
-+ if (ctx->skip_all)
-+ {
-+ /* cannot allocate, start the file copying anyway */
-+ return_status = FILE_CONT;
- break;
-+ }
-
-- if (ctx->skip_all)
-- return_status = FILE_SKIPALL;
-- else
-+ return_status =
-+ file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path);
-+
-+ if (return_status == FILE_SKIPALL)
-+ ctx->skip_all = TRUE;
-+
-+ if (ctx->skip_all || return_status == FILE_SKIP)
- {
-- return_status =
-- file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path);
-- if (return_status == FILE_RETRY)
-- continue;
-- if (return_status == FILE_SKIPALL)
-- ctx->skip_all = TRUE;
-+ /* skip the space allocation error, start file copying */
-+ return_status = FILE_CONT;
-+ break;
- }
-- mc_close (dest_desc);
-- dest_desc = -1;
-- mc_unlink (dst_vpath);
-- dst_status = DEST_NONE;
-- goto ret;
-+
-+ if (return_status == FILE_ABORT)
-+ {
-+ mc_close (dest_desc);
-+ dest_desc = -1;
-+ mc_unlink (dst_vpath);
-+ dst_status = DEST_NONE;
-+ goto ret;
-+ }
-+
-+ /* return_status == FILE_RETRY -- try allocate space again */
- }
-
- ctx->eta_secs = 0.0;
-@@ -1822,6 +1832,8 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
- /* dst_write */
- while ((n_written = mc_write (dest_desc, t, n_read)) < n_read)
- {
-+ gboolean write_errno_nospace;
-+
- if (n_written > 0)
- {
- n_read -= n_written;
-@@ -1851,10 +1863,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
- }
- if (return_status != FILE_RETRY)
- goto ret;
--
-- /* User pressed "Retry". Will the next mc_write() call be successful?
-- * Reset error flag to be ready for that. */
-- write_errno_nospace = FALSE;
- }
- }
-
-@@ -1933,16 +1941,9 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
-
- if (dst_status == DEST_SHORT)
- {
-- /* Remove short file */
-- int result = 0;
--
-- /* In case of copy/move to full partition, keep source file
-- * and remove incomplete destination one */
-- if (!write_errno_nospace)
-- result = query_dialog (Q_ ("DialogTitle|Copy"),
-- _("Incomplete file was retrieved. Keep it?"),
-- D_ERROR, 2, _("&Delete"), _("&Keep"));
-- if (result == 0)
-+ /* Query to remove short file */
-+ if (query_dialog (Q_ ("DialogTitle|Copy"), _("Incomplete file was retrieved. Keep it?"),
-+ D_ERROR, 2, _("&Delete"), _("&Keep")) == 0)
- mc_unlink (dst_vpath);
- }
- else if (dst_status == DEST_FULL)
diff --git a/app-misc/mc/mc-4.8.11.ebuild b/app-misc/mc/mc-4.8.11.ebuild
deleted file mode 100644
index 6b7bf3c..0000000
--- a/app-misc/mc/mc-4.8.11.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8: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 )
- 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 )
- "
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ncurses_build_fix.patch
-
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- local myscreen=ncurses
- use slang && myscreen=slang
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local homedir=".mc"
- use xdg && homedir="XDG"
-
- econf \
- --disable-silent-rules \
- --disable-dependency-tracking \
- $(use_enable nls) \
- --enable-vfs \
- $(use_enable kernel_linux vfs-undelfs) \
- --enable-charset \
- $(use_with X x) \
- $(use_enable samba vfs-smb) \
- $(use_enable sftp vfs-sftp) \
- $(use_enable spell aspell) \
- $(use_with gpm gpm-mouse) \
- --with-screen=${myscreen} \
- $(use_with edit internal-edit) \
- $(use_enable mclib) \
- $(use_enable test tests) \
- --with-homedir=${homedir}
-}
-
-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"
-}
diff --git a/app-misc/mc/mc-4.8.12.ebuild b/app-misc/mc/mc-4.8.12.ebuild
deleted file mode 100644
index 7074bfc..0000000
--- a/app-misc/mc/mc-4.8.12.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8: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 )
- 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 )
- "
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- local myscreen=ncurses
- use slang && myscreen=slang
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local homedir=".mc"
- use xdg && homedir="XDG"
-
- econf \
- --disable-silent-rules \
- --disable-dependency-tracking \
- $(use_enable nls) \
- --enable-vfs \
- $(use_enable kernel_linux vfs-undelfs) \
- --enable-charset \
- $(use_with X x) \
- $(use_enable samba vfs-smb) \
- $(use_enable sftp vfs-sftp) \
- $(use_enable spell aspell) \
- $(use_with gpm gpm-mouse) \
- --with-screen=${myscreen} \
- $(use_with edit internal-edit) \
- $(use_enable mclib) \
- $(use_enable test tests) \
- --with-homedir=${homedir}
-}
-
-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"
-}
diff --git a/app-misc/mc/mc-4.8.13-r1.ebuild b/app-misc/mc/mc-4.8.13-r1.ebuild
deleted file mode 100644
index 5e32124..0000000
--- a/app-misc/mc/mc-4.8.13-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8: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 )
- 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 )
- "
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
- epatch "${FILESDIR}"/${P}-tinfo.patch
- epatch "${FILESDIR}"/${P}-3297-prealloc.patch
- epatch_user
- eautoreconf
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- local myscreen=ncurses
- use slang && myscreen=slang
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local homedir=".mc"
- use xdg && homedir="XDG"
-
- econf \
- --disable-silent-rules \
- --disable-dependency-tracking \
- $(use_enable nls) \
- --enable-vfs \
- $(use_enable kernel_linux vfs-undelfs) \
- --enable-charset \
- $(use_with X x) \
- $(use_enable samba vfs-smb) \
- $(use_enable sftp vfs-sftp) \
- $(use_enable spell aspell) \
- $(use_with gpm gpm-mouse) \
- --with-screen=${myscreen} \
- $(use_with edit internal-edit) \
- $(use_enable mclib) \
- $(use_enable test tests) \
- --with-homedir=${homedir}
-}
-
-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"
-}
diff --git a/app-misc/mc/mc-4.8.13.ebuild b/app-misc/mc/mc-4.8.13.ebuild
deleted file mode 100644
index e5c3d02..0000000
--- a/app-misc/mc/mc-4.8.13.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.8: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 )
- 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 )
- "
-
-[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
-
-src_prepare() {
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
- epatch "${FILESDIR}"/${P}-tinfo.patch
- eautoreconf
-}
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- local myscreen=ncurses
- use slang && myscreen=slang
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local homedir=".mc"
- use xdg && homedir="XDG"
-
- econf \
- --disable-silent-rules \
- --disable-dependency-tracking \
- $(use_enable nls) \
- --enable-vfs \
- $(use_enable kernel_linux vfs-undelfs) \
- --enable-charset \
- $(use_with X x) \
- $(use_enable samba vfs-smb) \
- $(use_enable sftp vfs-sftp) \
- $(use_enable spell aspell) \
- $(use_with gpm gpm-mouse) \
- --with-screen=${myscreen} \
- $(use_with edit internal-edit) \
- $(use_enable mclib) \
- $(use_enable test tests) \
- --with-homedir=${homedir}
-}
-
-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"
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2016-04-13 22:47 Sergei Trofimovich
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Trofimovich @ 2016-04-13 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 0cb0c6445bfe23a4d4714e15fc5baa6ecfacad25
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 22:46:46 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 22:47:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb0c644
app-misc/mc: fix build failure against glibc-2.23, bug #579858
Reported-by: Thomas D.
Bug: https://bugs.gentoo.org/579858
Package-Manager: portage-2.2.28
app-misc/mc/files/mc-4.8.16-makedev.patch | 28 ++++++++++++++++++++++++++++
app-misc/mc/mc-4.8.16.ebuild | 5 +++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/app-misc/mc/files/mc-4.8.16-makedev.patch b/app-misc/mc/files/mc-4.8.16-makedev.patch
new file mode 100644
index 0000000..8e7fd0e
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.16-makedev.patch
@@ -0,0 +1,28 @@
+From 4ba3a1a92a59658bc9f5f9d0745db8bb829778cb Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 13 Apr 2016 23:38:47 +0100
+Subject: [PATCH] filemanager/mountlist.c: add makedev() declaration
+
+On glibc-2.23 link fails as
+
+ $ mc-9999/src/filemanager/mountlist.c:750: undefined reference to `makedev'
+
+Reported-by: Thomas D.
+Bug: https://bugs.gentoo.org/579858
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c
+index 166b246..7d6e178 100644
+--- a/src/filemanager/mountlist.c
++++ b/src/filemanager/mountlist.c
+@@ -186,6 +186,7 @@
+
+ #include "lib/global.h"
+ #include "lib/strutil.h" /* str_verscmp() */
++#include "lib/unixcompat.h" /* makedev */
+ #include "mountlist.h"
+
+ /*** global variables ****************************************************************************/
+--
+2.8.1
+
diff --git a/app-misc/mc/mc-4.8.16.ebuild b/app-misc/mc/mc-4.8.16.ebuild
index 4d076d2..32d1189 100644
--- a/app-misc/mc/mc-4.8.16.ebuild
+++ b/app-misc/mc/mc-4.8.16.ebuild
@@ -42,8 +42,9 @@ DEPEND="${RDEPEND}
[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
PATCHES=(
- "${FILESDIR}/${PN}-4.8.13-tinfo.patch"
- "${FILESDIR}/${PN}-4.8.15-ebuild_syntax_EAPI-6.patch"
+ "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+ "${FILESDIR}"/${PN}-4.8.15-ebuild_syntax_EAPI-6.patch
+ "${FILESDIR}"/${PN}-4.8.16-makedev.patch
)
S=${WORKDIR}/${MY_P}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2017-12-02 12:12 Sergei Trofimovich
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Trofimovich @ 2017-12-02 12:12 UTC (permalink / raw
To: gentoo-commits
commit: aeb256e8007ae4b1a0394f2b677214d1a9a78245
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 11:53:25 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 12:12:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb256e8
app-misc/mc: fix selected size handling gin filemanager
Bug: http://midnight-commander.org/ticket/3883
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-misc/mc/files/mc-4.8.19-selected-size.patch | 30 ++++++++++++++++++++++
.../mc/{mc-4.8.20.ebuild => mc-4.8.20-r1.ebuild} | 1 +
2 files changed, 31 insertions(+)
diff --git a/app-misc/mc/files/mc-4.8.19-selected-size.patch b/app-misc/mc/files/mc-4.8.19-selected-size.patch
new file mode 100644
index 00000000000..06d6f46ff32
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.19-selected-size.patch
@@ -0,0 +1,30 @@
+From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Sat, 2 Dec 2017 14:39:50 +0300
+Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales.
+
+The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ lib/util.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/util.c b/lib/util.c
+index 0326f65e8..c23d91fba 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
+ p += strlen (p) - 1;
+ d = x + sizeof (x) - 1;
+ *d-- = '\0';
+- while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' '))
++ /* @size format is "size unit", i.e. "[digits][space][letters]".
++ Copy all charactes after digits. */
++ while (p >= y && !g_ascii_isdigit (*p))
+ *d-- = *p--;
+ for (count = 0; p >= y; count++)
+ {
+--
+2.15.1
+
diff --git a/app-misc/mc/mc-4.8.20.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
similarity index 98%
rename from app-misc/mc/mc-4.8.20.ebuild
rename to app-misc/mc/mc-4.8.20-r1.ebuild
index cb720f326c5..1a2e5e3918a 100644
--- a/app-misc/mc/mc-4.8.20.ebuild
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+ "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
)
S=${WORKDIR}/${MY_P}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2019-03-10 17:43 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2019-03-10 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 66a78b37d34c8038651981c09c225bf88854a04c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 17:41:16 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 17:41:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a78b37
app-misc/mc: Removed old.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-misc/mc/Manifest | 2 -
app-misc/mc/files/mc-4.8.13-tinfo.patch | 39 ---------
app-misc/mc/files/mc-4.8.19-selected-size.patch | 30 -------
app-misc/mc/mc-4.8.20-r1.ebuild | 102 -----------------------
app-misc/mc/mc-4.8.20-r2.ebuild | 105 ------------------------
app-misc/mc/mc-4.8.21.ebuild | 93 ---------------------
6 files changed, 371 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 1424ab6aa80..d59e740a26a 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,3 +1 @@
-DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
-DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
diff --git a/app-misc/mc/files/mc-4.8.13-tinfo.patch b/app-misc/mc/files/mc-4.8.13-tinfo.patch
deleted file mode 100644
index 761c103df65..00000000000
--- a/app-misc/mc/files/mc-4.8.13-tinfo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/527118
---- a/m4.include/mc-with-screen-ncurses.m4
-+++ b/m4.include/mc-with-screen-ncurses.m4
-@@ -101,6 +101,9 @@
- LIBS=
- AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"],
- [AC_MSG_ERROR([Cannot find ncurses library])])
-+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
-+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
-+
-
- screen_type=ncurses
- screen_msg="Ncurses library"
-@@ -111,10 +114,15 @@
- AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
- [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
-
-+ AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
-+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
-+
- if test x"$ncursesw_found" = "x"; then
- LIBS=
- AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
- [AC_MSG_ERROR([Cannot find ncurses library])])
-+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
-+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
- fi
-
- dnl Check the header
-@@ -166,6 +174,9 @@
- LIBS=
- AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
- [AC_MSG_ERROR([Cannot find ncursesw library])])
-+ AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
-+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
-+
-
- dnl Check the header
- ncurses_h_found=
diff --git a/app-misc/mc/files/mc-4.8.19-selected-size.patch b/app-misc/mc/files/mc-4.8.19-selected-size.patch
deleted file mode 100644
index 06d6f46ff32..00000000000
--- a/app-misc/mc/files/mc-4.8.19-selected-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sat, 2 Dec 2017 14:39:50 +0300
-Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales.
-
-The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/util.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/util.c b/lib/util.c
-index 0326f65e8..c23d91fba 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
- p += strlen (p) - 1;
- d = x + sizeof (x) - 1;
- *d-- = '\0';
-- while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' '))
-+ /* @size format is "size unit", i.e. "[digits][space][letters]".
-+ Copy all charactes after digits. */
-+ while (p >= y && !g_ascii_isdigit (*p))
- *d-- = *p--;
- for (count = 0; p >= y; count++)
- {
---
-2.15.1
-
diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
deleted file mode 100644
index 9b71011a40e..00000000000
--- a/app-misc/mc/mc-4.8.20-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test 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= )
- 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}"/${PN}-4.8.13-tinfo.patch
- "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
- default
- eautoreconf
-}
-
-src_configure() {
- local myscreen=ncurses
- use slang && myscreen=slang
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local homedir=".mc"
- use xdg && homedir="XDG"
-
- econf \
- --disable-silent-rules \
- --disable-dependency-tracking \
- $(use_enable nls) \
- --enable-vfs \
- $(use_enable kernel_linux vfs-undelfs) \
- --enable-charset \
- $(use_with X x) \
- $(use_enable samba vfs-smb) \
- $(use_enable sftp vfs-sftp) \
- $(use_enable spell aspell) \
- $(use_with gpm gpm-mouse) \
- --with-screen=${myscreen} \
- $(use_with edit internal-edit) \
- $(use_enable mclib) \
- $(use_enable test tests) \
- --with-homedir=${homedir}
-}
-
-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"
-}
diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild
deleted file mode 100644
index 4a9db190f7b..00000000000
--- a/app-misc/mc/mc-4.8.20-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib 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}"/${PN}-4.8.13-tinfo.patch
- "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
-)
-
-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_prepare() {
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
- default
- eautoreconf
-}
-
-src_configure() {
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local myeconfargs=(
- --disable-dependency-tracking
- --disable-silent-rules
- --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)
- $(use_enable 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_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"
-}
diff --git a/app-misc/mc/mc-4.8.21.ebuild b/app-misc/mc/mc-4.8.21.ebuild
deleted file mode 100644
index e45e8f54e1b..00000000000
--- a/app-misc/mc/mc-4.8.21.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib 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 )
- "
-
-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=(
- --disable-dependency-tracking
- --disable-silent-rules
- --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)
- $(use_enable 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_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"
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2020-03-03 9:42 Sergei Trofimovich
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Trofimovich @ 2020-03-03 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 505d6452fcc516ba6baf978b85ede975cb05bea6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 3 09:41:45 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar 3 09:41:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505d6452
app-misc/mc: fix parallel 'make install'
Reported-by: Rolf Eike Beer
Bug: https://midnight-commander.org/ticket/4070
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../mc/files/mc-4.8.24-mc-lib-twice-4070.patch | 84 ++++++++++++++++++++++
app-misc/mc/mc-4.8.24.ebuild | 2 +
2 files changed, 86 insertions(+)
diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
new file mode 100644
index 00000000000..8db6fdfb2ea
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
@@ -0,0 +1,84 @@
+https://midnight-commander.org/ticket/4070
+
+From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 3 Mar 2020 09:26:12 +0000
+Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
+
+Before the change `mc.lib` was installed twice due to being
+in two `_DATA` variables:
+
+```
+dist_pkgdata_DATA = \
+ mc.lib
+
+pkgdata_DATA = \
+ $(dist_pkgdata_DATA) \
+ $(PKGDATA_OUT)
+```
+
+This causes occasional install failures when two parallel
+`/usr/bin/install` calls race in installing the file:
+
+```
+$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
+...
+ /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
+ -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
+ /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
+ -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
+...
+ /usr/bin/install: cannot create regular file
+ '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
+```
+
+After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ misc/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/misc/Makefile.am
++++ b/misc/Makefile.am
+@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
+ mc.lib
+
+ pkgdata_DATA = \
+- $(dist_pkgdata_DATA) \
++ \
+ $(PKGDATA_OUT)
+
+ SCRIPTS_IN = \
+@@ -54,7 +53,7 @@ EXTRA_DIST = \
+ $(LIBFILES_SCRIPT) \
+ $(SCRIPTS_IN) \
+ $(noinst_DATA) \
+- $(dist_pkgdata_DATA) \
++ \
+ $(PKGDATA_IN)
+
+ install-data-hook:
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \
+ mc.lib
+
+ pkgdata_DATA = \
+- $(dist_pkgdata_DATA) \
++ \
+ $(PKGDATA_OUT)
+
+ SCRIPTS_IN = \
+@@ -508,7 +509,7 @@ EXTRA_DIST = \
+ $(LIBFILES_SCRIPT) \
+ $(SCRIPTS_IN) \
+ $(noinst_DATA) \
+- $(dist_pkgdata_DATA) \
++ \
+ $(PKGDATA_IN)
+
+ all: all-recursive
+--
+2.25.1
+
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
index 2fff74e2efc..035e43c0cb8 100644
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ b/app-misc/mc/mc-4.8.24.ebuild
@@ -42,6 +42,8 @@ RESTRICT="!test? ( test )"
S=${WORKDIR}/${MY_P}
+PATCHES=("${FILESDIR}"/${P}-mc-lib-twice-4070.patch)
+
pkg_pretend() {
if use slang && use unicode ; then
ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2020-11-27 10:54 Sergei Trofimovich
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Trofimovich @ 2020-11-27 10:54 UTC (permalink / raw
To: gentoo-commits
commit: b34d1c9d5a0860fbfbbd78790e77dee2563317c4
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 10:51:34 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 10:54:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34d1c9d
app-misc/mc: map Shift+F<N> keys to alacritty and tmux
Similar to xterm and screen these should just work.
Currently 'mc' hardcodes terminal names to add a workaround.
Ideally it should not. Meanwhile expand the list of affected
terminals.
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch | 26 ++++++
app-misc/mc/mc-4.8.25-r1.ebuild | 110 +++++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch b/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch
new file mode 100644
index 00000000000..239ac5cb7cb
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.25-alacritty-tmux.patch
@@ -0,0 +1,26 @@
+http://midnight-commander.org/ticket/4149
+--- a/misc/mc.lib
++++ b/misc/mc.lib
+@@ -116,6 +116,9 @@ alt-shift-left=\\e[1\;4D
+ alt-shift-up=\\e[1\;4A
+ alt-shift-down=\\e[1\;4B
+
++[terminal:alacritty]
++copy=xterm
++
+ [terminal:gnome]
+ copy=xterm
+
+@@ -137,6 +140,12 @@ copy=xterm
+ [terminal:screen-256color]
+ copy=xterm
+
++[terminal:tmux]
++copy=xterm
++
++[terminal:tmux-256color]
++copy=xterm
++
+ [terminal:ibmpc3]
+ f11=\\e[Y
+ f12=\\e[Z
diff --git a/app-misc/mc/mc-4.8.25-r1.ebuild b/app-misc/mc/mc-4.8.25-r1.ebuild
new file mode 100644
index 00000000000..636e8060c7d
--- /dev/null
+++ b/app-misc/mc/mc-4.8.25-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 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 ~x86-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 )
+ "
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.8.25-alacritty-tmux.patch
+)
+
+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"
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2021-02-03 8:09 Sergei Trofimovich
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Trofimovich @ 2021-02-03 8:09 UTC (permalink / raw
To: gentoo-commits
commit: ea2c3fc6deedb313f1c6aaa49d4e9b87e1b3c805
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 08:08:55 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 08:09:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2c3fc6
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 <AT> gentoo.org>
app-misc/mc/files/mc-4.8.26-shadow-crash.patch | 39 +++++++++
app-misc/mc/mc-4.8.26-r1.ebuild | 108 +++++++++++++++++++++++++
2 files changed, 147 insertions(+)
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 00000000000..4eeee45bc8e
--- /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 00000000000..222451104a3
--- /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"
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2021-03-31 22:17 Sergei Trofimovich
0 siblings, 0 replies; 14+ messages in thread
From: Sergei Trofimovich @ 2021-03-31 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 10a9d09e7c28f9a838a2bf4ad27a6e657aee7e86
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 21:24:54 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 22:17:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a9d09e
app-misc/mc: backport file seccomp failure
Reported-by: Anton Bolshakov
Closes: https://bugs.gentoo.org/776988
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-misc/mc/files/mc-4.8.26-file-seccomp.patch | 142 +++++++++++++++++++++++++
app-misc/mc/mc-4.8.26-r2.ebuild | 118 ++++++++++++++++++++
2 files changed, 260 insertions(+)
diff --git a/app-misc/mc/files/mc-4.8.26-file-seccomp.patch b/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
new file mode 100644
index 00000000000..0a36f47f3a4
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
@@ -0,0 +1,142 @@
+https://bugs.gentoo.org/776988
+https://github.com/MidnightCommander/mc/commit/1ed638d66cf803f69ac12ee80a72d217f2146e43
+
+From 1ed638d66cf803f69ac12ee80a72d217f2146e43 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Tue, 16 Feb 2021 16:29:51 +0300
+Subject: [PATCH] Ticket #4180: fix zip handling.
+
+After 8857423e4ebb770b6f0ea3103abf5d35c85fcbe8 zip archives opened with
+an error:
+
+ file -L -z archive.zip: Bad system call
+
+This caused by using /usr/bin/file with -z option, because seccomp (a
+security sandbox) doesn't allow it..
+
+Solution: use -S option together with -z one.
+
+The file command accepts the -S option since 5.33.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ configure.ac | 66 +++++++++++++++++++++++++++++++++++--------
+ src/filemanager/ext.c | 7 +++--
+ src/setup.c | 2 ++
+ 3 files changed, 60 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5f372dc3f5..f2351c99ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,23 +115,65 @@ fi
+ AC_SUBST(MANDOC)
+ AC_SUBST(MAN_FLAGS)
+
+-dnl Check for -L option to file
++dnl Check for -z, -L, and -S options to file
+ AC_CHECK_PROG(HAVE_FILECMD, file, true, false)
+ if $HAVE_FILECMD; then
+- AC_MSG_CHECKING([for -L option to file command])
+- AC_CACHE_VAL(mc_cv_filel, [
+- file -L . > /dev/null 2>&1
+- if test $? = 0; then
+- mc_cv_filel=yes
++ dnl Don't use the file command if it doesn't accept the -z option
++ AC_MSG_CHECKING([for -z option to file command])
++ AC_CACHE_VAL(mc_cv_file_z, [
++ file -z . > /dev/null 2>&1
++ if test $? = 0; then
++ mc_cv_file_z=yes
++ else
++ mc_cv_file_z=no
++ fi
++ ])
++ AC_MSG_RESULT([$mc_cv_file_z])
++
++ if test x$mc_cv_file_z = xyes; then
++ AC_DEFINE(USE_FILE_CMD, 1, [Define if the file command accepts the -z option])
+ else
+- mc_cv_filel=no
++ AC_MSG_WARN([The file command doesn't accept the -z option and will not be used])
+ fi
+- ])
+- if test x$mc_cv_filel = xyes; then
+- AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
++
++ if test x$mc_cv_file_z = xyes; then
++ dnl file is used; check -L and -S options
++
++ AC_MSG_CHECKING([for -L option to file command])
++ AC_CACHE_VAL(mc_cv_file_L, [
++ file -L . > /dev/null 2>&1
++ if test $? = 0; then
++ mc_cv_file_L=yes
++ else
++ mc_cv_file_L=no
++ fi
++ ])
++ AC_MSG_RESULT([$mc_cv_file_L])
++
++ if test x$mc_cv_file_L = xyes; then
++ AC_DEFINE(FILE_L, "-L ", [Define if the file command accepts the -L option])
++ else
++ AC_DEFINE(FILE_L, "", [Define if the file command accepts the -L option])
++ fi
++
++ dnl The file command accepts the -S option since 5.33
++ AC_MSG_CHECKING([for -S option to file command])
++ AC_CACHE_VAL(mc_cv_file_S, [
++ file -S . > /dev/null 2>&1
++ if test $? = 0; then
++ mc_cv_file_S=yes
++ else
++ mc_cv_file_S=no
++ fi
++ ])
++ AC_MSG_RESULT([$mc_cv_file_S])
++
++ if test x$mc_cv_file_S = xyes; then
++ AC_DEFINE(FILE_S, "-S ", [Define if file command accepts the -S option])
++ else
++ AC_DEFINE(FILE_S, "", [Define if file command accepts the -S option])
++ fi
+ fi
+- filel=$mc_cv_filel
+- AC_MSG_RESULT([$filel])
+ fi
+
+ dnl Only list browsers here that can be run in background (i.e. with `&')
+diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
+index 4e6f10c6c5..d6a09df7bb 100644
+--- a/src/filemanager/ext.c
++++ b/src/filemanager/ext.c
+@@ -71,10 +71,11 @@
+
+ /*** file scope macro definitions ****************************************************************/
+
+-#ifdef FILE_L
+-#define FILE_CMD "file -L -z "
++#ifdef USE_FILE_CMD
++#define FILE_CMD "file -z " FILE_S FILE_L
+ #else
+-#define FILE_CMD "file -z "
++/* actually file is unused, but define some reasonable command */
++#define FILE_CMD "file "
+ #endif
+
+ /*** file scope type declarations ****************************************************************/
+diff --git a/src/setup.c b/src/setup.c
+index 77c07649d5..2ef07f2569 100644
+--- a/src/setup.c
++++ b/src/setup.c
+@@ -317,7 +317,9 @@ static const struct
+ { "old_esc_mode", &old_esc_mode },
+ { "cd_symlinks", &mc_global.vfs.cd_symlinks },
+ { "show_all_if_ambiguous", &mc_global.widget.show_all_if_ambiguous },
++#ifdef USE_FILE_CMD
+ { "use_file_to_guess_type", &use_file_to_check_type },
++#endif
+ { "alternate_plus_minus", &mc_global.tty.alternate_plus_minus },
+ { "only_leading_plus_minus", &only_leading_plus_minus },
+ { "show_output_starts_shell", &output_starts_shell },
diff --git a/app-misc/mc/mc-4.8.26-r2.ebuild b/app-misc/mc/mc-4.8.26-r2.ebuild
new file mode 100644
index 00000000000..9bd2fbe7d5e
--- /dev/null
+++ b/app-misc/mc/mc-4.8.26-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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
+ "${FILESDIR}"/${P}-file-seccomp.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_prepare() {
+ default
+
+ # patch touches configure.ac
+ eautoreconf
+}
+
+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"
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2021-10-01 9:43 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2021-10-01 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 7bf490bf9bec287e3927af2df506fa63a9e245f1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 1 09:42:55 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 1 09:42:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf490bf
app-misc/mc: Security cleanup
Bug: https://bugs.gentoo.org/811159
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-misc/mc/Manifest | 1 -
app-misc/mc/files/mc-4.8.26-file-seccomp.patch | 142 -------------------------
app-misc/mc/files/mc-4.8.26-shadow-crash.patch | 39 -------
app-misc/mc/mc-4.8.26-r4.ebuild | 125 ----------------------
app-misc/mc/mc-4.8.26-r5.ebuild | 131 -----------------------
5 files changed, 438 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 771926154e4..24aa9112735 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1 @@
-DIST mc-4.8.26.tar.xz 2492612 BLAKE2B e13ab99fb7d5a9e2cf1149ad96d763681b0186fbf5c03fc9e349a57a4a6f48b598c9eeed85e4cb94a18c5c5b89d4ee0e21f6d34c8cfd5e21da53551085aa3469 SHA512 f2f06915b775ecc94016fe5d5db9301e953cc89ee0708e79ee96e14a9f53142a467b27061ca57f65b40310fa86d4d13e2f2a29a601f8fefa6216fb10f73007be
DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69
diff --git a/app-misc/mc/files/mc-4.8.26-file-seccomp.patch b/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
deleted file mode 100644
index 0a36f47f3a4..00000000000
--- a/app-misc/mc/files/mc-4.8.26-file-seccomp.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-https://bugs.gentoo.org/776988
-https://github.com/MidnightCommander/mc/commit/1ed638d66cf803f69ac12ee80a72d217f2146e43
-
-From 1ed638d66cf803f69ac12ee80a72d217f2146e43 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Tue, 16 Feb 2021 16:29:51 +0300
-Subject: [PATCH] Ticket #4180: fix zip handling.
-
-After 8857423e4ebb770b6f0ea3103abf5d35c85fcbe8 zip archives opened with
-an error:
-
- file -L -z archive.zip: Bad system call
-
-This caused by using /usr/bin/file with -z option, because seccomp (a
-security sandbox) doesn't allow it..
-
-Solution: use -S option together with -z one.
-
-The file command accepts the -S option since 5.33.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- configure.ac | 66 +++++++++++++++++++++++++++++++++++--------
- src/filemanager/ext.c | 7 +++--
- src/setup.c | 2 ++
- 3 files changed, 60 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5f372dc3f5..f2351c99ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -115,23 +115,65 @@ fi
- AC_SUBST(MANDOC)
- AC_SUBST(MAN_FLAGS)
-
--dnl Check for -L option to file
-+dnl Check for -z, -L, and -S options to file
- AC_CHECK_PROG(HAVE_FILECMD, file, true, false)
- if $HAVE_FILECMD; then
-- AC_MSG_CHECKING([for -L option to file command])
-- AC_CACHE_VAL(mc_cv_filel, [
-- file -L . > /dev/null 2>&1
-- if test $? = 0; then
-- mc_cv_filel=yes
-+ dnl Don't use the file command if it doesn't accept the -z option
-+ AC_MSG_CHECKING([for -z option to file command])
-+ AC_CACHE_VAL(mc_cv_file_z, [
-+ file -z . > /dev/null 2>&1
-+ if test $? = 0; then
-+ mc_cv_file_z=yes
-+ else
-+ mc_cv_file_z=no
-+ fi
-+ ])
-+ AC_MSG_RESULT([$mc_cv_file_z])
-+
-+ if test x$mc_cv_file_z = xyes; then
-+ AC_DEFINE(USE_FILE_CMD, 1, [Define if the file command accepts the -z option])
- else
-- mc_cv_filel=no
-+ AC_MSG_WARN([The file command doesn't accept the -z option and will not be used])
- fi
-- ])
-- if test x$mc_cv_filel = xyes; then
-- AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
-+
-+ if test x$mc_cv_file_z = xyes; then
-+ dnl file is used; check -L and -S options
-+
-+ AC_MSG_CHECKING([for -L option to file command])
-+ AC_CACHE_VAL(mc_cv_file_L, [
-+ file -L . > /dev/null 2>&1
-+ if test $? = 0; then
-+ mc_cv_file_L=yes
-+ else
-+ mc_cv_file_L=no
-+ fi
-+ ])
-+ AC_MSG_RESULT([$mc_cv_file_L])
-+
-+ if test x$mc_cv_file_L = xyes; then
-+ AC_DEFINE(FILE_L, "-L ", [Define if the file command accepts the -L option])
-+ else
-+ AC_DEFINE(FILE_L, "", [Define if the file command accepts the -L option])
-+ fi
-+
-+ dnl The file command accepts the -S option since 5.33
-+ AC_MSG_CHECKING([for -S option to file command])
-+ AC_CACHE_VAL(mc_cv_file_S, [
-+ file -S . > /dev/null 2>&1
-+ if test $? = 0; then
-+ mc_cv_file_S=yes
-+ else
-+ mc_cv_file_S=no
-+ fi
-+ ])
-+ AC_MSG_RESULT([$mc_cv_file_S])
-+
-+ if test x$mc_cv_file_S = xyes; then
-+ AC_DEFINE(FILE_S, "-S ", [Define if file command accepts the -S option])
-+ else
-+ AC_DEFINE(FILE_S, "", [Define if file command accepts the -S option])
-+ fi
- fi
-- filel=$mc_cv_filel
-- AC_MSG_RESULT([$filel])
- fi
-
- dnl Only list browsers here that can be run in background (i.e. with `&')
-diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
-index 4e6f10c6c5..d6a09df7bb 100644
---- a/src/filemanager/ext.c
-+++ b/src/filemanager/ext.c
-@@ -71,10 +71,11 @@
-
- /*** file scope macro definitions ****************************************************************/
-
--#ifdef FILE_L
--#define FILE_CMD "file -L -z "
-+#ifdef USE_FILE_CMD
-+#define FILE_CMD "file -z " FILE_S FILE_L
- #else
--#define FILE_CMD "file -z "
-+/* actually file is unused, but define some reasonable command */
-+#define FILE_CMD "file "
- #endif
-
- /*** file scope type declarations ****************************************************************/
-diff --git a/src/setup.c b/src/setup.c
-index 77c07649d5..2ef07f2569 100644
---- a/src/setup.c
-+++ b/src/setup.c
-@@ -317,7 +317,9 @@ static const struct
- { "old_esc_mode", &old_esc_mode },
- { "cd_symlinks", &mc_global.vfs.cd_symlinks },
- { "show_all_if_ambiguous", &mc_global.widget.show_all_if_ambiguous },
-+#ifdef USE_FILE_CMD
- { "use_file_to_guess_type", &use_file_to_check_type },
-+#endif
- { "alternate_plus_minus", &mc_global.tty.alternate_plus_minus },
- { "only_leading_plus_minus", &only_leading_plus_minus },
- { "show_output_starts_shell", &output_starts_shell },
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
deleted file mode 100644
index 4eeee45bc8e..00000000000
--- a/app-misc/mc/files/mc-4.8.26-shadow-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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-r4.ebuild b/app-misc/mc/mc-4.8.26-r4.ebuild
deleted file mode 100644
index 26d020ad5a2..00000000000
--- a/app-misc/mc/mc-4.8.26-r4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://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 ~riscv ~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:=[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
- "${FILESDIR}"/${P}-file-seccomp.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_prepare() {
- default
-
- # patch touches configure.ac
- eautoreconf
-}
-
-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() {
- if use spell && ! has_version app-dicts/aspell-en ; then
- elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
- elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
- elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
- elog
- fi
-
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.26-r5.ebuild b/app-misc/mc/mc-4.8.26-r5.ebuild
deleted file mode 100644
index 7bd110cd799..00000000000
--- a/app-misc/mc/mc-4.8.26-r5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://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 ~riscv ~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:=[unicode(+)?] )
- spell? ( app-text/aspell )
- X? ( x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM )"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.8.26-file-seccomp.patch
- "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
- "${FILESDIR}"/${PN}-4.8.26-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_prepare() {
- default
-
- # patch touches configure.ac
- eautoreconf
-}
-
-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() {
- # Bug #759466
- if [[ ${EUID} == 0 ]]; then
- ewarn "You are emerging ${PN} as root with 'userpriv' disabled." \
- "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
- fi
-
- # 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() {
- if use spell && ! has_version app-dicts/aspell-en ; then
- elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
- elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
- elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
- elog
- fi
-
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2022-04-05 15:25 Lars Wendler
0 siblings, 0 replies; 14+ messages in thread
From: Lars Wendler @ 2022-04-05 15:25 UTC (permalink / raw
To: gentoo-commits
commit: 8a4b991f7876da3e73a53e78c097d2cd91ba2fae
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 5 15:22:50 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 15:25:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4b991f
app-misc/mc: Fixed tests
Closes: https://bugs.gentoo.org/836812
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-misc/mc/files/mc-4.8.28-tests.patch | 35 +++++++++++++++++++++++++++++++++
app-misc/mc/mc-4.8.28.ebuild | 1 +
2 files changed, 36 insertions(+)
diff --git a/app-misc/mc/files/mc-4.8.28-tests.patch b/app-misc/mc/files/mc-4.8.28-tests.patch
new file mode 100644
index 000000000000..ccd9dc1addc9
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.28-tests.patch
@@ -0,0 +1,35 @@
+START_TEST uses the variable name _i, so GCC complains about redefining it with
+a different type here.
+
+--- mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-20 10:02:47.000000000 +0000
++++ mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-27 15:31:19.812120141 +0100
+@@ -353,20 +353,20 @@
+ START_TEST (filevercmp_test5)
+ /* *INDENT-ON* */
+ {
+- size_t _i;
++ size_t ii;
+
+- for (_i = 0; _i < filevercmp_test_ds5_len; _i++)
+- for (; filevercmp_test_ds5[_i] != NULL; _i++)
++ for (ii = 0; ii < filevercmp_test_ds5_len; ii++)
++ for (; filevercmp_test_ds5[ii] != NULL; ii++)
+ {
+- const char *i = filevercmp_test_ds5[_i];
+- size_t _j;
++ const char *i = filevercmp_test_ds5[ii];
++ size_t jj;
+
+- for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++)
++ for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++)
+ {
+- const char *j = filevercmp_test_ds5[_j];
++ const char *j = filevercmp_test_ds5[jj];
+
+- ck_assert_int_eq (test_filevercmp (i, j), 0);
+- ck_assert_int_eq (test_filevercmp (j, i), 0);
++ ck_assert_int_eq (test_filevercmp (i, j), 0);
++ ck_assert_int_eq (test_filevercmp (j, i), 0);
+ }
+ }
+ }
diff --git a/app-misc/mc/mc-4.8.28.ebuild b/app-misc/mc/mc-4.8.28.ebuild
index 3b62f454f445..c9ccfbc6bf8b 100644
--- a/app-misc/mc/mc-4.8.28.ebuild
+++ b/app-misc/mc/mc-4.8.28.ebuild
@@ -48,6 +48,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+ "${FILESDIR}"/${P}-tests.patch #836812
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2023-01-24 11:01 Marek Szuba
0 siblings, 0 replies; 14+ messages in thread
From: Marek Szuba @ 2023-01-24 11:01 UTC (permalink / raw
To: gentoo-commits
commit: 2b77588e1eca99bfa6f72fa241cbe6107a85984c
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 10:08:53 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 11:00:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b77588e
app-misc/mc: add 4.8.29
Closes: https://bugs.gentoo.org/880755
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-misc/mc/Manifest | 1 +
app-misc/mc/files/mc-4.8.29-gentoo-tools.patch | 11 +++
app-misc/mc/mc-4.8.29.ebuild | 126 +++++++++++++++++++++++++
3 files changed, 138 insertions(+)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 80fee7d07564..5ec351d4282b 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1 +1,2 @@
DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
+DIST mc-4.8.29.tar.xz 2368164 BLAKE2B 0ecddf33b4b7b32918484bc7efe15ef1c9dda094814c85ceabf1b4bd9343507a33932b8cd050fdae2e683f9815ab6dd802ff8eb8e2215c6264be073bc5ac7e4d SHA512 c7e219eda34197d0294748cf5fd1a5dcfedfc17c20cfcf94c4dad5170f87095845f4fc0065e2868342125039c13cc3ba617804df74186816828e93ed71c1e9a3
diff --git a/app-misc/mc/files/mc-4.8.29-gentoo-tools.patch b/app-misc/mc/files/mc-4.8.29-gentoo-tools.patch
new file mode 100644
index 000000000000..4c7ccfed942b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.29-gentoo-tools.patch
@@ -0,0 +1,11 @@
+--- a/misc/ext.d/video.sh
++++ b/misc/ext.d/video.sh
+@@ -19,7 +19,7 @@
+ elif which mpv_identify.sh >/dev/null 2>&1; then
+ mpv_identify.sh "${MC_EXT_FILENAME}"
+ else
+- echo "Please install either mplayer or mpv to get information for this file"
++ echo "Please install either mplayer or mpv[tools] to get information for this file"
+ fi
+ ;;
+ esac
diff --git a/app-misc/mc/mc-4.8.29.ebuild b/app-misc/mc/mc-4.8.29.ebuild
new file mode 100644
index 000000000000..dd866468de2a
--- /dev/null
+++ b/app-misc/mc/mc-4.8.29.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${P/_/-}"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://midnight-commander.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+edit gpm nls sftp slang spell test unicode X"
+
+REQUIRED_USE="spell? ( edit )"
+
+DEPEND="
+ >=dev-libs/glib-2.30.0:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs[tools(+)] )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses:=[unicode(+)?] )
+ spell? ( app-text/aspell )
+ X? (
+ x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM
+ )
+"
+RDEPEND="${DEPEND}
+ spell? ( app-dicts/aspell-en )"
+BDEPEND="
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
+ "${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
+)
+
+pkg_pretend() {
+ if use slang && use unicode ; then
+ ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+ fi
+}
+
+src_prepare() {
+ default
+ # patch touches configure.ac
+ eautoreconf
+}
+
+src_configure() {
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local myeconfargs=(
+ --enable-charset
+ --enable-vfs
+ --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 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() {
+ # Bug #759466
+ if [[ ${EUID} == 0 ]] ; then
+ ewarn "You are emerging ${PN} as root with 'userpriv' disabled."
+ ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
+ fi
+
+ # 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 NEWS README
+
+ # 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
+}
+
+pkg_postinst() {
+ if use spell && ! has_version app-dicts/aspell-en ; then
+ elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
+ elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
+ elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
+ elog
+ fi
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2023-03-22 23:43 Marek Szuba
0 siblings, 0 replies; 14+ messages in thread
From: Marek Szuba @ 2023-03-22 23:43 UTC (permalink / raw
To: gentoo-commits
commit: ba78d4f642d6ab7e287b45cbc6ecae872d45dcfd
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 22:56:54 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 23:43:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba78d4f6
app-misc/mc: fix implicit function declaration in configure
Closes: https://bugs.gentoo.org/900475
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-misc/mc/files/mc-4.8.29-autoconf-c99.patch | 24 ++++++++++++++++++++++++
app-misc/mc/mc-4.8.29.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/app-misc/mc/files/mc-4.8.29-autoconf-c99.patch b/app-misc/mc/files/mc-4.8.29-autoconf-c99.patch
new file mode 100644
index 000000000000..f1577dd7abbc
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.29-autoconf-c99.patch
@@ -0,0 +1,24 @@
+From a2dbad461b8a63630f9ad7cfa36b6613e85a91cb Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Sun, 5 Feb 2023 18:38:37 +0100
+Subject: [PATCH] autoconf: Fix C99 compatibility issue in mc_GET_FS_INFO check
+Content-type: text/plain
+
+Include <fcntl.h> for the declaration of posix_fallocate. This
+avoids an implicit function declaration and build issues with future
+compilers.
+
+Signed-off-by: Florian Weimer <fweimer@redhat.com>
+--- a/m4.include/mc-get-fs-info.m4
++++ b/m4.include/mc-get-fs-info.m4
+@@ -8,6 +8,7 @@ AC_DEFUN([gl_POSIX_FALLOCATE], [
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #define _XOPEN_SOURCE 600
+ #include <stdlib.h>
++ #include <fcntl.h>
+ #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7)
+ possibly broken posix_fallocate
+ #endif
+--
+2.39.1
+
diff --git a/app-misc/mc/mc-4.8.29.ebuild b/app-misc/mc/mc-4.8.29.ebuild
index e24016e2177e..7604d402b276 100644
--- a/app-misc/mc/mc-4.8.29.ebuild
+++ b/app-misc/mc/mc-4.8.29.ebuild
@@ -50,6 +50,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
+ "${FILESDIR}"/${PN}-4.8.29-autoconf-c99.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2023-08-19 11:15 Marek Szuba
0 siblings, 0 replies; 14+ messages in thread
From: Marek Szuba @ 2023-08-19 11:15 UTC (permalink / raw
To: gentoo-commits
commit: b271cd099c12be67e1069188f51eed06747e4b5f
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 22:20:16 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 11:15:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b271cd09
app-misc/mc: drop 4.8.28-r2
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-misc/mc/Manifest | 1 -
app-misc/mc/files/mc-4.8.28-tests.patch | 35 ----------
app-misc/mc/mc-4.8.28-r2.ebuild | 120 --------------------------------
3 files changed, 156 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 5ec351d4282b..116061769e09 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1 @@
-DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
DIST mc-4.8.29.tar.xz 2368164 BLAKE2B 0ecddf33b4b7b32918484bc7efe15ef1c9dda094814c85ceabf1b4bd9343507a33932b8cd050fdae2e683f9815ab6dd802ff8eb8e2215c6264be073bc5ac7e4d SHA512 c7e219eda34197d0294748cf5fd1a5dcfedfc17c20cfcf94c4dad5170f87095845f4fc0065e2868342125039c13cc3ba617804df74186816828e93ed71c1e9a3
diff --git a/app-misc/mc/files/mc-4.8.28-tests.patch b/app-misc/mc/files/mc-4.8.28-tests.patch
deleted file mode 100644
index ccd9dc1addc9..000000000000
--- a/app-misc/mc/files/mc-4.8.28-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-START_TEST uses the variable name _i, so GCC complains about redefining it with
-a different type here.
-
---- mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-20 10:02:47.000000000 +0000
-+++ mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-27 15:31:19.812120141 +0100
-@@ -353,20 +353,20 @@
- START_TEST (filevercmp_test5)
- /* *INDENT-ON* */
- {
-- size_t _i;
-+ size_t ii;
-
-- for (_i = 0; _i < filevercmp_test_ds5_len; _i++)
-- for (; filevercmp_test_ds5[_i] != NULL; _i++)
-+ for (ii = 0; ii < filevercmp_test_ds5_len; ii++)
-+ for (; filevercmp_test_ds5[ii] != NULL; ii++)
- {
-- const char *i = filevercmp_test_ds5[_i];
-- size_t _j;
-+ const char *i = filevercmp_test_ds5[ii];
-+ size_t jj;
-
-- for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++)
-+ for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++)
- {
-- const char *j = filevercmp_test_ds5[_j];
-+ const char *j = filevercmp_test_ds5[jj];
-
-- ck_assert_int_eq (test_filevercmp (i, j), 0);
-- ck_assert_int_eq (test_filevercmp (j, i), 0);
-+ ck_assert_int_eq (test_filevercmp (i, j), 0);
-+ ck_assert_int_eq (test_filevercmp (j, i), 0);
- }
- }
- }
diff --git a/app-misc/mc/mc-4.8.28-r2.ebuild b/app-misc/mc/mc-4.8.28-r2.ebuild
deleted file mode 100644
index 9358a40edd7e..000000000000
--- a/app-misc/mc/mc-4.8.28-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="${P/_/-}"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://midnight-commander.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+edit gpm nls sftp +slang spell test unicode X"
-
-REQUIRED_USE="spell? ( edit )"
-
-DEPEND="
- >=dev-libs/glib-2.30.0:2
- gpm? ( sys-libs/gpm )
- kernel_linux? ( sys-fs/e2fsprogs[tools(+)] )
- sftp? ( net-libs/libssh2 )
- slang? ( >=sys-libs/slang-2 )
- !slang? ( sys-libs/ncurses:=[unicode(+)?] )
- spell? ( app-text/aspell )
- X? (
- x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM
- )
-"
-RDEPEND="${DEPEND}
- spell? ( app-dicts/aspell-en )"
-BDEPEND="
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-libs/check )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
- "${FILESDIR}"/${P}-tests.patch #836812
-)
-
-src_prepare() {
- default
- # patch touches configure.ac
- eautoreconf
-}
-
-src_configure() {
- [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
- local myeconfargs=(
- --enable-charset
- --enable-vfs
- --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 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() {
- # Bug #759466
- if [[ ${EUID} == 0 ]] ; then
- ewarn "You are emerging ${PN} as root with 'userpriv' disabled."
- ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!"
- fi
-
- # 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 NEWS README
-
- # 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
-}
-
-pkg_postinst() {
- if use spell && ! has_version app-dicts/aspell-en ; then
- elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed."
- elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini"
- elog "It has to be set to one of your installed aspell dictionaries or 'NONE'"
- elog
- fi
- elog "To enable exiting to latest working directory,"
- elog "put this into your ~/.bashrc:"
- elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
@ 2023-10-22 10:04 Marek Szuba
0 siblings, 0 replies; 14+ messages in thread
From: Marek Szuba @ 2023-10-22 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 76f1a2cd1a585f4f89867925b448b9e055573dec
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 10:01:21 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 10:04:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f1a2cd
app-misc/mc: skip problematic iconv-related test on musl
Obviously not a proper solution but I really need upstream feedback
on this, and they have yet to even acknowledge the relevant bug
on their tracker.
Url: https://midnight-commander.org/ticket/4495
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-misc/mc/files/mc-4.8.30-musl-tests.patch | 15 +++++++++++++++
app-misc/mc/mc-4.8.30-r1.ebuild | 5 ++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/app-misc/mc/files/mc-4.8.30-musl-tests.patch b/app-misc/mc/files/mc-4.8.30-musl-tests.patch
new file mode 100644
index 000000000000..0e8ea32e2990
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.30-musl-tests.patch
@@ -0,0 +1,15 @@
+--- a/tests/lib/vfs/path_len.c
++++ b/tests/lib/vfs/path_len.c
+@@ -89,12 +89,6 @@
+ "/тестовый/путь",
+ 26
+ },
+-#ifdef HAVE_CHARSET
+- { /* 3. */
+- "/#enc:KOI8-R/тестовый/путь",
+- 38
+- },
+-#endif /* HAVE_CHARSET */
+ };
+ /* *INDENT-ON* */
+
diff --git a/app-misc/mc/mc-4.8.30-r1.ebuild b/app-misc/mc/mc-4.8.30-r1.ebuild
index 8bd59fa87beb..170bcb1bb4dd 100644
--- a/app-misc/mc/mc-4.8.30-r1.ebuild
+++ b/app-misc/mc/mc-4.8.30-r1.ebuild
@@ -55,7 +55,10 @@ PATCHES=(
src_prepare() {
default
- # patch touches configure.ac
+
+ # Bug #906194
+ use elibc_musl && eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2023-10-22 10:04 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-10 17:43 [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2023-10-22 10:04 Marek Szuba
2023-08-19 11:15 Marek Szuba
2023-03-22 23:43 Marek Szuba
2023-01-24 11:01 Marek Szuba
2022-04-05 15:25 Lars Wendler
2021-10-01 9:43 Lars Wendler
2021-03-31 22:17 Sergei Trofimovich
2021-02-03 8:09 Sergei Trofimovich
2020-11-27 10:54 Sergei Trofimovich
2020-03-03 9:42 Sergei Trofimovich
2017-12-02 12:12 Sergei Trofimovich
2016-04-13 22:47 Sergei Trofimovich
2015-12-23 8:33 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox