gentoo resync : 03.12.2017

3 files changed, 33 insertions, 1 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 0e896bd88aed..5bbacafdef88 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,7 @@
 AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b83638f4e72379f8756e62376c61ef3375c9ede50deb52619ead78a39d49280f9a654e0d8877158b6ef4b8117556 SHA512 7714d42ece73fe6f044f5cc0f59ab5c23bedb820122291d1af581f5f7dd94d4410072868205e94419be459ed9769c8ed75dfb8ad5b945c8df820901f756e7c3c
 AUX mc-4.8.16-makedev.patch 901 BLAKE2B 5980e0bc05ce34c6e33ade84bd0dd32816298d34c108cb6b603cb84c5a458f7d50f05c61a584bdda3991a4ae9274068f954ec4ea5a768f51600a32c0e9123f3f SHA512 dcc77b50bb6a23ca7c1ef3f4fd0dec4defd3b46b120d38cbb9737e9a1464cda4e7c972b6d74a50ae41fc6df845feaad6b865f3aecfc1195f6413baff157504a5
 AUX mc-4.8.18-html.patch 969 BLAKE2B dca7823453e5c85471ca2e2f7020920b4da2bc992f5fe238a0f86dd51d7a6486b368ba7cd28da866107631f8e542a70d1ac4dba53ceca836335c328fac638bcd SHA512 d3e97e0d5e5260cf1dfce8700aaf44c2f6998bbc37defe38f4fd18b5a28160d61b51fa8185e5cde257655d088b7b474604e4a7cd570c6982b3e7af5ef95f8cde
+AUX mc-4.8.19-selected-size.patch 988 BLAKE2B de407c64d1d7e2460f165ace967f6b83c50e45c6842a1d174928c872d4f6a9aff31939942f2896bb2f3d34f656fb2c1e262c35a7c72f1cb58256472d5cac7c19 SHA512 f7740ec01e38857b1e365737cc4e1cd41397e41aea9ef5aa121c6db2f11955980df949a440cce7bbf810b7b8a6f0c1c5e5090de3c5008dd6390ecee4c659d80c
 DIST mc-4.8.15.tar.xz 2304812 BLAKE2B 33d8055316b4ae9d8b2385c3a439339fa635e3f145c9599ce937c596c6ae18225451568a2387074af8d9afc702a0ec8528e07b00b7805dd86af459612d7fd187 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
 DIST mc-4.8.18.tar.xz 2462080 BLAKE2B 10cd93cea439290922c0dc19e85b6c9456ce4266f35eeecbf2f40d99e3aae64465d9c427fa01d7d2c542e8bae9d2926e8ce42766c4c1656373905c3d871d71c0 SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8
 DIST mc-4.8.19.tar.xz 2521808 BLAKE2B b4712d833e8562b0f760b4558533ac338cf8875dc9034cbec2160444bbe3e9f4dc7fcec16835cabdd5cde6b02a7020162b3cd1693863775ee3494c9b4659a7aa SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531
@@ -8,6 +9,6 @@ DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3
 EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c2009e149136ecda8b03cd1d9433ea8dcd1a3194e61e5380c81b905072f7c3e1688920e4dc57ceb3c270d41f SHA512 906e1842f664cff03939a0fed27aaa447abf92553916bedcdbe7c23aa65f704c2538ca5be666086dbe2ce3204bbdfc87854346f3894293ccef8ef5d8a2ae6e7f
 EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
 EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
-EBUILD mc-4.8.20.ebuild 2443 BLAKE2B 501f3dbc62c1240f96ab39fd8888d50b6b1d28fe92f7714c059ef00024c9aaeb6ff99d3779e34fdc06e22f32e1c9a33354a224803063d8bf9fc972a09d43c785 SHA512 543f234ea9221f28063fc88677e2035de99661605c78aab88ba60bcd175930529dce4191f52e2edcb9fba56aaedc59ecc1322572fa546e4ba222f3ea3bc25e09
+EBUILD mc-4.8.20-r1.ebuild 2491 BLAKE2B 68f4143f4eb084d352cb0280eb1e39c7ffd411c241561240806a96f86bbf03b1d252f08c2e7683dc0641ba244e810665d564ce3526343b19c8739aa07d427109 SHA512 d614abf0d2d8294ef31964d99a5f81d4444c1efb321ded4cfb9ec8c3cb8ef894d7754c1ec824a4675ed129e413701eeb245fb919abe50099a58fa903b8f68922
 EBUILD mc-9999.ebuild 2585 BLAKE2B c226f71fd8a9ea6abfa2c0b3cf9c731f1271e64d257d34797635738cf634b9159c693ef312cfcbda43f0aa2207b79bbb0d2071f41c3393372da44c547c6fcdd3 SHA512 bab03c4a246785495ff69deaba2c97268ec95449b5887a941dbc54513d0f00d193fec63c26a69f1d95c45612a81c5c8818f12dcf0b0ede5f4e7afa81595d6d91
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
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 000000000000..06d6f46ff325
--- /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
index cb720f326c5f..1a2e5e3918ae 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}