From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-misc/mc/Manifest | 14 +-- app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch | 85 --------------- app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch | 29 ------ app-misc/mc/files/mc-4.8.23-gcc-10.patch | 79 -------------- app-misc/mc/files/mc-4.8.23-gettext-test.patch | 54 ---------- app-misc/mc/files/mc-4.8.23-gettext.patch | 56 ---------- app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch | 37 ------- .../mc/files/mc-4.8.24-mc-lib-twice-4070.patch | 84 +++++++++++++++ app-misc/mc/mc-4.8.23-r1.ebuild | 113 -------------------- app-misc/mc/mc-4.8.23-r2.ebuild | 115 --------------------- app-misc/mc/mc-4.8.24.ebuild | 4 +- app-misc/mc/mc-9999.ebuild | 2 +- 12 files changed, 91 insertions(+), 581 deletions(-) delete mode 100644 app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch delete mode 100644 app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch delete mode 100644 app-misc/mc/files/mc-4.8.23-gcc-10.patch delete mode 100644 app-misc/mc/files/mc-4.8.23-gettext-test.patch delete mode 100644 app-misc/mc/files/mc-4.8.23-gettext.patch delete mode 100644 app-misc/mc/files/mc-4.8.23-vfs-gc-SEGV.patch create mode 100644 app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch delete mode 100644 app-misc/mc/mc-4.8.23-r1.ebuild delete mode 100644 app-misc/mc/mc-4.8.23-r2.ebuild (limited to 'app-misc/mc') diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index ae3779d04be6..511cee474bf6 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,13 +1,5 @@ -AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961cc2dc2414942ad2fbd62ef7a2d9d6a58416787cd7811bcc33822c3a3407c65f86886117372a3f6828ad2eb83ca516c49 SHA512 3b5e6ee0422a860efd7ec3768746bf3b0a81b4f55d775ac165946ffa5f00507fb1a0d4344d213867088e7152c0f0c12b3bb583b1d247368300b7b9cf2d8f8dd6 -AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99 -AUX mc-4.8.23-gcc-10.patch 2634 BLAKE2B 5c79655526ffb8768600bf000585bd753a8ef966cc0ce82307efaec26afcc478d1311c141ed4447d3c85541e305929ffd5fee6f3a5dc105385f45eb7a88b1f0e SHA512 31fc37caec884b324a138987ff192bd1fc77a482011fbcf5a2109bd1ccaaa87960b423e83f39b6c7113564602f8134cf8a6004ea0923d95eaf424153a9a09ce8 -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.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6 +AUX mc-4.8.24-mc-lib-twice-4070.patch 1962 BLAKE2B db6f627507fd94443ea0fe13ebd026cd71fbf23d88d6c441d379ae15d19e509a5874bf894e88c3a91e608b34bf39f83bbfc6e4c4f7db2c46bdac80f1d8d688ee SHA512 35765acf211b9519958505e36c3aa30f87575ab904dcd59c7d0feae0afbdaaf83250f73a6e14fc4e9902dc9f4e5b216ffb4c365e1000e767759592048f48c48d DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc -EBUILD mc-4.8.23-r1.ebuild 2988 BLAKE2B 2bdf15061eb42b0fccae2665c897ba90c920b35f39fa894387d9f3dd1c98fd2830e9d613461203dec31e0b11bfc8c52ec06a6421bc0b9e649d854fb91f5336ef SHA512 c8294e20915ffee373bdc52f5a69b46e21c41751ad40b41bf883bc9d3304396681bc18593be9dac37344582a28736519b6ab3c58d2cc1744fca6677ebaea2c62 -EBUILD mc-4.8.23-r2.ebuild 3076 BLAKE2B 5e4913c549a67ccd042586e9bcdecdc5e6e6bf4e01e96c8ce7ce16db0bed52d41e2b468bdfe6b6a32f5e8c4040c7b94cb0859b8842acc623a1da618be784a342 SHA512 3525a814ac3605f47c83182a576d26d016b77a5fcabe03ebf7942b923b230c9b2bbc1c8b559e2a819842b71f86958a2da4dcd59c85ff85c791f6a4dbffcf4a7f -EBUILD mc-4.8.24.ebuild 2813 BLAKE2B 3d54ce8cb639f1e90bd82572f85fd3ae390eea4d58a4769d33c58589fdce02141d755d23e32f963025576560d56cda83c38837f7fa0c59e1775f7c1712cf8d3b SHA512 69db600b74c8523fd9c6f3736271c397c2858ba6f7c3c8ab2578f73d798301ca08e5b3c8506c1263c9c1b0ffeaafbdb7e1b6b72ee214269d231653c181e377bd -EBUILD mc-9999.ebuild 3072 BLAKE2B 48eaec7ceff05561dc1ce593fedff0127a34b1ae49d04b6cd31b495f32d0400f0353b7ff7f6da374c1b57b291634a449fbf24d1020ba49e5d1b1a7868bc4832d SHA512 13824093eabdf4a1162870895a4034c1ba1e1894eab646ee4e1f5b0cd24dafbc8c37f6329d56da23b8fc6c4b8696d7da966afb25f6f3e3c38a00ddf600ddd62d +EBUILD mc-4.8.24.ebuild 2855 BLAKE2B 74fdf3aac3459a98b10520e036f3c752866b105c81c875245341960c28d77981cf6cdd3bfd7cc4b244689feb7008f9297f6028e394bfba60693f593c9021176e SHA512 457dd712e0ecc24c8a6d1ea180b49ff53b56ba8cbd27b74cf63041c47cf5671e6fa5b934ef37a3ad57fca74502c249100337a46b28d91956e755aae9405f3ea8 +EBUILD mc-9999.ebuild 3068 BLAKE2B 30ec8da6226e9cacda2aa1d758160b94fe4e147b27a2fbf47e121efe9eceacc6202a9b2b3407912c6950875df15228a43708620e9d4424dafd5fddcb78cce961 SHA512 da76c190a27ad94fd8b204a9a52d8e6d4f5e6fc2d7f0352839758a81241898e6ba56b60262f13d8de8eab6b115ab3fbeb8f1bcdf48777e0e92e27be912c1c047 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec 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 -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 ---- - 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 -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 ---- - 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 -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 ---- - 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 - - #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 -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 ---- - 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 -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 ---- - 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 +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 +--- + 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.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild deleted file mode 100644 index b904bd1d2cc6..000000000000 --- a/app-misc/mc/mc-4.8.23-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# 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 ~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 -) - -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" -} diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild deleted file mode 100644 index 8de901785a39..000000000000 --- a/app-misc/mc/mc-4.8.23-r2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# 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 ~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 - "${FILESDIR}"/${PN}-4.8.23-gcc-10.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" -} diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild index 2fff74e2efc5..de7e49b86895 100644 --- a/app-misc/mc/mc-4.8.24.ebuild +++ b/app-misc/mc/mc-4.8.24.ebuild @@ -13,7 +13,7 @@ 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" +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 )" @@ -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." diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild index 8366ea02b85e..35e12355b85a 100644 --- a/app-misc/mc/mc-9999.ebuild +++ b/app-misc/mc/mc-9999.ebuild @@ -15,7 +15,7 @@ MY_P=${P/_/-} if [[ -z ${LIVE_EBUILD} ]]; then SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" - 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" + 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" fi DESCRIPTION="GNU Midnight Commander is a text based file manager" -- cgit v1.2.3