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

8 files changed, 43 insertions, 5 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1f36d8af0666..63f1ad301f06 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
index 250a652fe383..0866da2f80c2 100644
--- a/app-misc/detachtty/Manifest
+++ b/app-misc/detachtty/Manifest
@@ -1,6 +1,6 @@
 AUX detachtty-11.0.0-clang16-build-fix.patch 810 BLAKE2B 9583e3c87803b78ffba6d86cf3786be0eacca2a186d6e5fd612157355ae22003d28139b541ef96de3342c7560ca4accda9ea62fd4f40a0f63bca97404993e4c9 SHA512 6ba2ba204097e756609c2c9af17b53a49d87cc45ab2a79d3fa775367ffc6920acba8c4c5f5760a3bf567dd961f1b41b79abefaad8db238dbab69fc812727babe
 AUX detachtty-11.0.0-sparc.patch 2669 BLAKE2B c1912520e5e7388bd905059a0d3f0d28726533884c4eafa89b1f6800feb2e05740dd96ee0b501f76d4f2329cf0e49b7b349d6990e12c359be13615f84e77670b SHA512 b62b7f809d79ba8f391f4f3b0c84eb969884b9de1f8ef27a50e1af84f6fe6f699c17321a6f4b225ae8c64d463c090a1bb5d105bf450a01aec4ccf8bb189449f5
 DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10
-EBUILD detachtty-11.0.0-r1.ebuild 678 BLAKE2B c2a4e7f977da9de594290994792e6550db0fdea55dd53481835f138bc77ca08368b5c6f7d9b68b899a036ac3e7a2da233873dcadf96370398b81b7b486e666e3 SHA512 2ff24a50bed3afb16a454a9952e0e7d7122d15020980d443c16f37d2cedcc36dbcf79a14f31476c58f300837a4ec1384872c58e10cc7e9c80271dcf7282b8f2a
+EBUILD detachtty-11.0.0-r1.ebuild 677 BLAKE2B dc4dcd52cb3634fed6a9489bd60de61ecbe49c0625307a77b1cb4881dbf34c5b85bb7f5bd59f2f140f95eaf0617903d1b1c5c0f255f806535060eaeefe0a448e SHA512 adb1b025831635b05b214d464ac64099e458d497cc5b41590a84498d91f6ec833d3ed9482d3d8ae24122df7164e02b9a675cc5d9e479be19c780a877a3e394fd
 EBUILD detachtty-11.0.0.ebuild 632 BLAKE2B 0a118db31a6f4dc05bb848f53d1949728deaa4956458bd9ca0848f16e49516605bc0a7e2ed494d090a16c3b6f6d6a6096ff0533059cb69df6fb4b9d83108a1c8 SHA512 6cdbf7fcfb37ec030344cf6ac68b544bbe8f68bad4fefde6f565c85a7ccc9cea6c825a09c0cd96bf7c6539c4019c665548d4a9971a81e2a00ea504417ca55b2f
 MISC metadata.xml 805 BLAKE2B 7414ac0367f4111cd0e453909bcc8ea89b921f0ef5c4bed76bf8751f2965eff639c1d0122605fe9e1383d16df8002f5235f0196cec6b8fe879c36e65c25a2a23 SHA512 311aec96e3feda42a65a924c56107f6e0b303e8bd1f702ca73557dbaeb6499cdc5bc062c5794a89c618312e558e66e4b0e9ff42d0667ccdd13389d92a353906f
diff --git a/app-misc/detachtty/detachtty-11.0.0-r1.ebuild b/app-misc/detachtty/detachtty-11.0.0-r1.ebuild
index 6f533242a1f4..43b37f31bee9 100644
--- a/app-misc/detachtty/detachtty-11.0.0-r1.ebuild
+++ b/app-misc/detachtty/detachtty-11.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cosmos72/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-sparc.patch"
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() {
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index b4751914fc97..37df3efd745b 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -8,6 +8,6 @@ AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b
 DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
 EBUILD screen-4.9.0-r1.ebuild 3799 BLAKE2B 9122bd6fe28ed527d67e39ff496ea5250160aeb434339c40a61ab247474574c46d837af4104e5708bfbef5e293647e0a407ac4b4d6ab0ec34a0b0430b4bb4385 SHA512 b47d14da8ff0ff3daf772dbfcc3820d40e5bb38be6445912e460e0f61cb615adffc174e03f52b69337c7a710cfe60275e636f0d882e350ef723712531ac9f2a9
 EBUILD screen-4.9.0-r2.ebuild 3853 BLAKE2B 80cb85fffcb64598b4fa69753b72e460e47e953bcef070b35d2e34ac851cfd5e51f2d5cac74a73598abf3d967866e1306a7db81f64c7cc3a12813d95dde54ac0 SHA512 fb77ebc81eee36b71b7667ff2bac1d6e132eebeebd5b127c467ae9cf0c1a2237601ff4140b2ff96fd457b4cdc9144cf89d30b4efdd23874c8e45f4c42aaa89b7
-EBUILD screen-4.9.0-r3.ebuild 3903 BLAKE2B 2849943b964842050c78a5cfccfc451a7475b32b7b84269ca45bb52aad74f3bfc1dbe031f564dd993c6f4faecea934c52494b20d2c8656c2b4bf1cad1f7e854a SHA512 bd4545e18436de7f6435f5ba2325fcfa59940b84fbcb62b7e6bbb119bed0cb3ac72bac153ae27100287c2f3335e67d2346230384b91e32866e1ebcfd5619e7f7
+EBUILD screen-4.9.0-r3.ebuild 3901 BLAKE2B d5c5fe9fd6c067c8fae97a01e6782b004c8428c132f70376dd9f1610fbb81338fd62bd1586ecaea927b5b9e386bd5262a38a46cb5f7aa06b635ffcedf956c652 SHA512 95a156eaef7b913784a38dacbd1bd96b4eb75201f33dc7dbadb8a0f6028cc69d4ba49fe3279797a2ce971d82eee891ce452f4e24fc6830b4d87eece4b98bc1b7
 EBUILD screen-9999.ebuild 3737 BLAKE2B 2baafb117eaf022530aa430d7b9ba7b810e7995dcad916ee4d96cf4ff5933aa437119621a7a8b984148f74277f089fe6b7ab7fbe244411d89f66781bee76f9b8 SHA512 95259ccf47b3f934857cd166b4c8ca9cdef1578d2e130590d60cf72e8be6928998eaa6595a566168c7b976662f4b2507a264414036c13572d845c2f388af9b58
 MISC metadata.xml 1894 BLAKE2B 2312aa5911bfd18b3f9202ccb52afa84f2a29462c8282d36a84fb9624f5ff9bcf3d96e06cace55d542ff7c8182eed5560483717265ecc3fc9218e43bdf9d9094 SHA512 a7c331d1614b5bf139d61a72ad27c070184c208039da97c218b55e07a699d635c0db20ec3792c87d93affa2cb038ae834adcf3dc7c37a4b5c2f8aa36b081cfca
diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild
index 740f2d8205f2..cc49fcec0d9e 100644
--- a/app-misc/screen/screen-4.9.0-r3.ebuild
+++ b/app-misc/screen/screen-4.9.0-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"