gentoo resync : 15.12.2019

3 files changed, 155 insertions, 0 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 137971df238c..e294b5bac38d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,9 +2,11 @@ AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961
 AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99
 AUX mc-4.8.23-gettext-test.patch 2061 BLAKE2B a4381f4919cc48750994037daad17a3772684a54744e290f379e86cae4e1669499ba56229359b987d8e59a5673033bb11496898377642a246fc380e83eae5ef9 SHA512 eab959879de062301c6ebd04fbd2addb655a369c5cfc5104226f6cdeac6e55439e5769caf62387898fc6a6971fb7261f1e3090c950db47bc6c74671e65898339
 AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851b58471354c48d9c8289a4e4b4f3feb275b6c40e46d66a51a374e4a0712cbbce0d3e4f010b256c59930525a96f SHA512 60db8df34ff93d0ed30604bba1969b4b9832417b0b09fb0d0e86b53669c8349e9ab992d6b84cbe7f0c2d8d8a5ffc6ab9cef0a88a86066f36c0c5e45da79c57e5
+AUX mc-4.8.23-vfs-gc-SEGV.patch 1249 BLAKE2B 8620f1f9dda92ea431ed31d82e72b9e81e2687d2f7ec454f11a8e7e39a05677e2ba317bc989b26258f58596da609869b902c596e9f47346cdbf9f003189a2cbe SHA512 32edbd42eeb4de93fc472ed864cf091d55b0a4c5643aa12224f8fa6068c2037a32c348b7b1aafa7bb3bee75ddec8deb571ff16010d9182c19d4c763e9d94b220
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
 EBUILD mc-4.8.22.ebuild 2860 BLAKE2B 89f2efd1f31ff3b4c50ff7d4e7c21db6605845cf668fa129e8e9a555d3cf1cbe24dce05b50b13141f310a4d16df5f51211acf8940fc46e31591fbade21eeda05 SHA512 3b458fc317e1a3e26e073ea3effb02c7b525cc9ba1ce19211453bb4b10b48ba94b4aefd0faafba42bb941b24f9e5b6ffefe155e1b8c857f2706ea2745978bd41
 EBUILD mc-4.8.23-r1.ebuild 3045 BLAKE2B ab1d575bb42bff712cd9b2bdb6e5308999005bd6dcb8ddb6bbd8d98cb03910755197cdea17a15246099e2127ec5e3382443b851cd7fcc6e8b890fcd40df5e805 SHA512 0f0e3d52d10ed69b27c73c51ea785d09b26c5124a552a48354cb9ff199ad719454148bdb5790fecebd0f558d0c0c416b495e7b9fc9e54d1450477348424a6d1d
+EBUILD mc-4.8.23-r2.ebuild 3100 BLAKE2B 22a5a111d492041e2d82838d900f191722cbe68c5a9b36ad6f0b518ca265fb537a32f8b1aa3d0cdc8ef405009b9b8ce4bde1a65b12a7e93508bd56a5f0736d21 SHA512 9a868752d33fe61f01aed711d392f067bb7308b26ea3ba94e13783e102b3c59f7ea4ccd856f447a747c5b9fb801bce2c0156275ea2141ba66a0755107a21fe38
 EBUILD mc-9999.ebuild 3129 BLAKE2B 86eecca3b1675bfcfaaa8c36f2ca937541b9ab6bcc96d693cc686c5dcbd4e93bfd209e2b425c9d5edcb7b2db353d007a1b04ae94d04742fcf3cb3e789db4dbf0 SHA512 9815a1a8bec31b5d4e1ab03fa25aba3c8c75232c23fbeab0322a39317a46a355c5feb94fe37f4c5ff17661fcfec8fc786ada179559e4cd92153764f3166a3c40
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch b/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
new file mode 100644
index 000000000000..e72d641a5c3b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/700708
+
+From 8411b93ff7cc955b0acf1541207977c52201bbfc Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Wed, 11 Sep 2019 09:17:18 +0300
+Subject: [PATCH] (vfs_stamp_compare): fix NULL dereference.
+
+(vfs_stamp): likewise.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ lib/vfs/gc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/lib/vfs/gc.c
++++ b/lib/vfs/gc.c
+@@ -127,7 +127,7 @@ vfs_stamp_compare (gconstpointer a, gconstpointer b)
+     const struct vfs_stamping *vsa = (const struct vfs_stamping *) a;
+     const struct vfs_stamping *vsb = (const struct vfs_stamping *) b;
+ 
+-    return (vsa->v == vsb->v && vsa->id == vsb->id) ? 0 : 1;
++    return (vsa == NULL || vsb == NULL || (vsa->v == vsb->v && vsa->id == vsb->id)) ? 0 : 1;
+ }
+ 
+ /* --------------------------------------------------------------------------------------------- */
+@@ -163,7 +163,7 @@ vfs_stamp (struct vfs_class *v, vfsid id)
+     gboolean ret = FALSE;
+ 
+     stamp = g_slist_find_custom (stamps, &what, vfs_stamp_compare);
+-    if (stamp != NULL)
++    if (stamp != NULL && stamp->data != NULL)
+     {
+         gettimeofday (&(VFS_STAMPING (stamp->data)->time), NULL);
+         ret = TRUE;
+-- 
+2.24.0
+
diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
new file mode 100644
index 000000000000..856331ef9aa1
--- /dev/null
+++ b/app-misc/mc/mc-4.8.23-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 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 ~sh ~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}"/${P}-3933-iso9660-1.patch
+	"${FILESDIR}"/${P}-3933-iso9660-2.patch
+	"${FILESDIR}"/${PN}-4.8.23-gettext.patch
+	"${FILESDIR}"/${PN}-4.8.23-gettext-test.patch
+	"${FILESDIR}"/${PN}-4.8.23-vfs-gc-SEGV.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=(
+		--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)
+		# 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"
+}