gentoo Easter resync : 12.04.2020

7 files changed, 84 insertions, 340 deletions

diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
deleted file mode 100644
index be08e68b296c..000000000000
--- a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From afdc9719f3e37921b621046f01f23fe6b705f059 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sun, 7 Jul 2019 14:44:10 +0300
-Subject: [PATCH 1/2] Ticket #3933: report iso9660  listing errors.
-
-Variation 1:
-
-Steps to reproduce:
-
-    * create empty .iso file (touch foo.iso)
-    * run 'mc' and press enter on empty .iso
-
-Expected result: some error about invalid file format (sililar to what
-F3 view would yield).
-Actual result: mc elters a file as if it would be empty valid file.
-
-Variation 2:
-Steps to reproduce:
-
-    * pick valid .iso file
-    * deinstall all helper tools that handle .sio (isoinfo, xorriso, etc.)
-    * run 'mc' and press enter on empty .iso
-
-Expected result: some error about invalid file format (sililar to what
-F3 view would yield)
-Actual result: mc enters a file as if it would be empty valid file
-
-Variation 2 is especially confusing for users as it does not hint them
-that they should install a tool to get it working. They just observe
-silently broken behaviour.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- src/vfs/extfs/helpers/iso9660.in | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
-index 8c2240e8e..76273522e 100644
---- a/src/vfs/extfs/helpers/iso9660.in
-+++ b/src/vfs/extfs/helpers/iso9660.in
-@@ -93,6 +93,8 @@ xorriso_rm() {
- 
- # tested to comply with isoinfo 2.0's output
- test_iso () {
-+    which isoinfo 2>/dev/null || (echo "isoinfo not found" >&2;  return 1)
-+
-     CHARSET=$(locale charmap 2>/dev/null)
-     if test -z "$CHARSET"; then
-         CHARSET=$(locale 2>/dev/null | @GREP@ LC_CTYPE | sed -n -e 's/.*\.\(.*\)"$/\1/p')
-@@ -119,6 +121,8 @@ test_iso () {
- }
- 
- mcisofs_list () {
-+    local lsl r
-+
-     # left as a reminder to implement compressed image support =)
-     case "$1" in
-       *.lz)  MYCAT="lzip -dc";;
-@@ -133,7 +137,11 @@ mcisofs_list () {
-       *)     MYCAT="cat";;
-     esac
- 
--    $ISOINFO -l -i "$1" 2>/dev/null | @AWK@ -v SEMICOLON=$SEMICOLON '
-+    lsl=$($ISOINFO -l -i "$1"  2>/dev/null)
-+    r=$?
-+    test $r -gt 0 && return $r
-+
-+    echo "$lsl" | @AWK@ -v SEMICOLON=$SEMICOLON '
- BEGIN {
-   dir="";
-   # Pattern to match 8 first fields.
-@@ -183,8 +191,8 @@ shift
- case "$cmd" in
-   list)
-     xorriso_list "$@" || {
--        test_iso "$@";
--        mcisofs_list "$@";
-+        test_iso "$@" || exit 1
-+        mcisofs_list "$@" || exit 1
-     }
-     exit 0
-     ;;
--- 
-2.22.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
deleted file mode 100644
index 173def62eb0b..000000000000
--- a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c1b6d29b95a373108e8d03ac629dcb03fcec854c Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sun, 7 Jul 2019 15:51:28 +0300
-Subject: [PATCH 2/2] iso9660: report errors in copyout in case of isoinfo
- usage.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- src/vfs/extfs/helpers/iso9660.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
-index 76273522e..f9c6e50ef 100644
---- a/src/vfs/extfs/helpers/iso9660.in
-+++ b/src/vfs/extfs/helpers/iso9660.in
-@@ -222,8 +222,8 @@ case "$cmd" in
-     ;;
-   copyout)
-     xorriso_copyout "$@" || {
--        test_iso "$@";
--        mcisofs_copyout "$@";
-+        test_iso "$@" || exit 1
-+        mcisofs_copyout "$@" || exit 1
-     }
-     exit 0
-     ;;
--- 
-2.22.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-gcc-10.patch b/app-misc/mc/files/mc-4.8.23-gcc-10.patch
deleted file mode 100644
index b7cc3ee71a99..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gcc-10.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 093571938a6c31706f918b011335b8ab30602336 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sat, 23 Nov 2019 17:41:58 +0300
-Subject: [PATCH] Ticket #4035: fix compile failure on OS X 10.9.
-
-Fix duplication of menu_map definition.
-
-Move menu_map definition to lib/widget/menu.c.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/widget/menu.c      | 2 +-
- lib/widget/menu.h      | 2 ++
- src/keybind-defaults.c | 3 +--
- src/keybind-defaults.h | 1 -
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/widget/menu.c b/lib/widget/menu.c
-index b7476b62b..68ae6f6ce 100644
---- a/lib/widget/menu.c
-+++ b/lib/widget/menu.c
-@@ -46,7 +46,7 @@
- 
- /*** global variables ****************************************************************************/
- 
--const global_keymap_t *menu_map;
-+const global_keymap_t *menu_map = NULL;
- 
- /*** file scope macro definitions ****************************************************************/
- 
-diff --git a/lib/widget/menu.h b/lib/widget/menu.h
-index c522a16c8..fad6fa639 100644
---- a/lib/widget/menu.h
-+++ b/lib/widget/menu.h
-@@ -39,6 +39,8 @@ typedef struct WMenuBar
- 
- /*** global variables defined in .c file *********************************************************/
- 
-+extern const global_keymap_t *menu_map;
-+
- /*** declarations of public functions ************************************************************/
- 
- menu_entry_t *menu_entry_create (const char *name, long command);
-diff --git a/src/keybind-defaults.c b/src/keybind-defaults.c
-index 10ba341ee..0ba4840df 100644
---- a/src/keybind-defaults.c
-+++ b/src/keybind-defaults.c
-@@ -28,7 +28,7 @@
- #include <config.h>
- 
- #include "lib/global.h"
--#include "lib/widget.h"         /* dialog_map, input_map, listbox_map */
-+#include "lib/widget.h"         /* dialog_map, input_map, listbox_map, menu_map */
- 
- #include "keybind-defaults.h"
- 
-@@ -56,7 +56,6 @@ GArray *diff_keymap = NULL;
- const global_keymap_t *main_map = NULL;
- const global_keymap_t *main_x_map = NULL;
- const global_keymap_t *panel_map = NULL;
--const global_keymap_t *menu_map = NULL;
- const global_keymap_t *tree_map = NULL;
- const global_keymap_t *help_map = NULL;
- 
-diff --git a/src/keybind-defaults.h b/src/keybind-defaults.h
-index edb05c67f..6b7266589 100644
---- a/src/keybind-defaults.h
-+++ b/src/keybind-defaults.h
-@@ -35,7 +35,6 @@ extern GArray *diff_keymap;
- extern const global_keymap_t *main_map;
- extern const global_keymap_t *main_x_map;
- extern const global_keymap_t *panel_map;
--extern const global_keymap_t *menu_map;
- extern const global_keymap_t *tree_map;
- extern const global_keymap_t *help_map;
- 
--- 
-2.25.0
-
diff --git a/app-misc/mc/files/mc-4.8.23-gettext-test.patch b/app-misc/mc/files/mc-4.8.23-gettext-test.patch
deleted file mode 100644
index 7e19cd7fa119..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-Test change counterpart.
-
---- a/tests/lib/Makefile.am
-+++ b/tests/lib/Makefile.am
-@@ -9,3 +9,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la $(LIBINTL)
- 
---- a/tests/lib/mcconfig/Makefile.am
-+++ b/tests/lib/mcconfig/Makefile.am
-@@ -11,3 +11,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la $(LIBINTL)
- 
---- a/tests/lib/search/Makefile.am
-+++ b/tests/lib/search/Makefile.am
-@@ -10,3 +10,3 @@ AM_CPPFLAGS = \
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la @PCRE_LIBS@
-+	$(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL)
- 
---- a/tests/lib/vfs/Makefile.am
-+++ b/tests/lib/vfs/Makefile.am
-@@ -14,3 +14,3 @@ EXTRA_DIST = mc.charsets
- LIBS = @CHECK_LIBS@ \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la $(LIBINTL)
- 
---- a/tests/lib/Makefile.in
-+++ b/tests/lib/Makefile.in
-@@ -636 +636 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/mcconfig/Makefile.in
-+++ b/tests/lib/mcconfig/Makefile.in
-@@ -542 +542 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
---- a/tests/lib/search/Makefile.in
-+++ b/tests/lib/search/Makefile.in
-@@ -584,2 +584 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ \
--	$(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL) $(am__append_1)
---- a/tests/lib/vfs/Makefile.in
-+++ b/tests/lib/vfs/Makefile.in
-@@ -641 +641 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
-+LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
diff --git a/app-misc/mc/files/mc-4.8.23-gettext.patch b/app-misc/mc/files/mc-4.8.23-gettext.patch
deleted file mode 100644
index 3ad67dbe5d40..000000000000
--- a/app-misc/mc/files/mc-4.8.23-gettext.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugs.gentoo.org/693850
-https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
-
-From 2a97524b42eeececd2ecd928a1154da1f5b7378a Mon Sep 17 00:00:00 2001
-From: Andreas Mohr <and@gmx.li>
-Date: Fri, 1 Apr 2016 06:44:22 +0000
-Subject: [PATCH] Linking fix for non-default gettext package
-
-mc lost the linking game if gettext package pulled from outside of system paths.
-(Pulling can be done by suitable C-/CPP/LDFLAGS settings)
-
-Furthermore gettext package depends on libintl (if system lib
-don't provide needed functions) then gettext prepare INITLIBS/LIBINTL variable
-for working libintl pull in from gettext libdir.
-
-https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined
-
-Let respect LIBINTL variable at linking (it is empty if not needed).
-
-Failure example for Solaris 10 with non-system-default gettext package:
-
-Undefined                       first referenced
- symbol                             in file
- libintl_bind_textdomain_codeset     ./.libs/libinternal.a(args.o)
- libintl_gettext                     main.o
- libintl_textdomain                  main.o
- libintl_bindtextdomain              main.o
- libintl_ngettext                    ./.libs/libinternal.a(midnight.o)
-
-Signed-off-by: Andreas Mohr <and@gmx.li>
----
- src/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -53,7 +53,8 @@ libinternal_la_LIBADD = \
- 
- mc_LDADD = \
- 	libinternal.la \
--	$(top_builddir)/lib/libmc.la
-+	$(top_builddir)/lib/libmc.la \
-+	$(LIBINTL)
- 
- if ENABLE_VFS_SMB
- # this is a hack for linking with own samba library in simple way
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -556,7 +557,7 @@ libinternal_la_LIBADD = \
- 	viewer/libmcviewer.la \
- 	$(DIFFLIB) $(EDITLIB) $(SUBSHELLLIB)
- 
--mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(am__append_6)
-+mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_6)
- SRC_mc_conssaver = \
- 	cons.handler.c consaver/cons.saver.h
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
deleted file mode 100644
index e72d641a5c3b..000000000000
--- a/app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/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 000000000000..8db6fdfb2ea3
--- /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
+