gentoo auto-resync : 28:09:2023 - 11:34:30

3 files changed, 39 insertions, 1 deletions

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index a273a99c5de8..676c4e739a7b 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,8 +1,9 @@
 AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
 AUX mc-4.8.29-autoconf-c99.patch 849 BLAKE2B 7d9eb9b7f046dac592dee09e3598620c61167365aefb41186f4d60b803f17cf151280b9bf5facef7101f5297d9faa3b269c9b759095ad6bd01f79b4a8ee38211 SHA512 983de54aa05b09c9510945f4c3b83231779ee24808ec2cbbb2ce0e2b5743bb120d85edf0e9bd0d78e5aafb42601272997c2bcef9fb606de9e043d9619eba4485
 AUX mc-4.8.29-gentoo-tools.patch 413 BLAKE2B 53e3f8e5e711374bbc5e3bb868df5e3345eed8f8de4ec3cac486b63c210bb10e6832b60292c614b4bd5c65ae750c5b2c38430ac1da2c9f6febb2b686199463ff SHA512 38598f57f4905659bc5d69f4ae19510ce35e76c8e33fc5262c5c8d17742483ebd5aa61ddac29a5811e111fe8ca66e6418fa4d48567e3a4e7ec4406916834c6fa
+AUX mc-4.8.30-mcdiff-segfault.patch 1534 BLAKE2B ff3904f22a3f46251833f259255abd15015d47fed685447fb7f42b4d8adc042adb3104b4e41c2bedc0552335e681ca5df7404cd9cd0e4066a8a84714faa718c2 SHA512 41aa773416a3bd2f035ed584b6179f237b216010bd541b1a881f95f25eb5d05abbe721af2ae3c64dc39916525ff284cf0c5bf2ddde89e4bcf3647f7c5cad4e2d
 DIST mc-4.8.29.tar.xz 2368164 BLAKE2B 0ecddf33b4b7b32918484bc7efe15ef1c9dda094814c85ceabf1b4bd9343507a33932b8cd050fdae2e683f9815ab6dd802ff8eb8e2215c6264be073bc5ac7e4d SHA512 c7e219eda34197d0294748cf5fd1a5dcfedfc17c20cfcf94c4dad5170f87095845f4fc0065e2868342125039c13cc3ba617804df74186816828e93ed71c1e9a3
 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 EBUILD mc-4.8.29.ebuild 3169 BLAKE2B 45799991a3957bcfbce629af833b917cce30b72e8a1cdea82109f2277db5decc2d834b514917daccc0732409fb39fc9ae99f4a7200e8aa984ee2ea00d2d7fa77 SHA512 de440cd97097d9e0d90fb6756da921e51ddf56f682991bd49a5b4ec966bf230f7d0d4cdbb3d302d2621b801c2b8cc6328524fe5002dc4df13d35cbcafaab78c7
-EBUILD mc-4.8.30.ebuild 3130 BLAKE2B 24786f5731c6e065f8f5abe9f1b971ac929dcc1eca66a8bdaebdc1e018a179506397f2d579e24bc50cb9a94d443cfa9cec80bd9ecdccef8c7a8eecf0132fe11b SHA512 51afba7b677296aa2ad847331512be954f555c2da01dc6269863873026c4a151f895ea5d35ee4b1902065e9e4a48707b62fa42140fe83d7331f43d4bbf11d01f
+EBUILD mc-4.8.30-r1.ebuild 3180 BLAKE2B 8aa77b8e6084923136d7c88de69257853d40ff23b8fa8eeaa910f66f7a129b7399dc67d39fff1006a4d7f2e36394ee15be42e79d9f8a537173112950e3251418 SHA512 cf06a6bd310c7bb8ab5a39fba3ecf82fd974722c4ebc2492a01583049b7fd41345d683d25917a5ecd26a68582da0b6d46cdb853bbdce8e62e7b70dd54299fea5
 MISC metadata.xml 623 BLAKE2B 780b4f47a79d96cfe18308032aedcf02040eb3b2b90a3241dc1a26d03c1fa6e801144b9a343731b96c9cde2554a34ed52235859851025fd074675fdb1f7c91d9 SHA512 85ab83892b0ad219dfc1112e1d3f2141c186c8cc1b274fd397a34bf68345a0821d3cf5a5421f9d6053e7e99178aa45724e1057a9386e4bdf9c5136d69232e776
diff --git a/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch b/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch
new file mode 100644
index 000000000000..ad752a11816f
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.30-mcdiff-segfault.patch
@@ -0,0 +1,36 @@
+From dfe3279a365d629ba848f0265108d98d9f12348f Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Sun, 27 Aug 2023 19:32:53 +0300
+Subject: [PATCH] Ticket 4500: mcdiff: segfault when display of line numbers is
+ enabled.
+
+The bug was introduced in 00f84fbf24b5f65381f41c5d6333182bc7921700.
+
+  * (dview_load_options): avoid NULL dereference: don't caclulate the
+    width of line numbers field here because dview->a isn't created yet.
+  * (dview_update): caclulate the width of line numbers field using an
+    actual length of diff lines array.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+--- a/src/diffviewer/ydiff.c
++++ b/src/diffviewer/ydiff.c
+@@ -2366,7 +2366,7 @@ dview_load_options (WDiff * dview)
+         dview->display_symbols = 1;
+     show_numbers = mc_config_get_bool (mc_global.main_config, "DiffView", "show_numbers", FALSE);
+     if (show_numbers)
+-        dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a);
++        dview->display_numbers = 1;
+     tab_size = mc_config_get_int (mc_global.main_config, "DiffView", "tab_size", 8);
+     if (tab_size > 0 && tab_size < 9)
+         dview->tab_size = tab_size;
+@@ -2885,6 +2885,10 @@ dview_update (WDiff * dview)
+     if (height < 2)
+         return;
+ 
++    /* use an actual length of dview->a */
++    if (dview->display_numbers != 0)
++        dview->display_numbers = calc_nwidth ((const GArray * const *) dview->a);
++
+     width1 = dview->half1 + dview->bias;
+     width2 = dview->half2 - dview->bias;
+     if (dview->full)
diff --git a/app-misc/mc/mc-4.8.30.ebuild b/app-misc/mc/mc-4.8.30-r1.ebuild
index e1576c254b12..8bd59fa87beb 100644
--- a/app-misc/mc/mc-4.8.30.ebuild
+++ b/app-misc/mc/mc-4.8.30-r1.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.30-mcdiff-segfault.patch
 )
 
 src_prepare() {