Thu Jun 15 18:59:33 UTC 202320230615185933

a/btrfs-progs-6.3.2-x86_64-1.txz:  Upgraded.
l/a52dec-0.8.0-x86_64-1.txz:  Upgraded.
l/gjs-1.76.2-x86_64-1.txz:  Upgraded.
x/libX11-1.8.6-x86_64-1.txz:  Upgraded.
  This update fixes buffer overflows in InitExt.c that could at least cause
  the client to crash due to memory corruption.
  For more information, see:
    https://www.cve.org/CVERecord?id=CVE-2023-3138
  (* Security fix *)

2 files changed, 1 insertions, 57 deletions

diff --git a/source/ap/mc/mc-3605-extfs.c-fix-buffer-overflow.patch b/source/ap/mc/mc-3605-extfs.c-fix-buffer-overflow.patch
deleted file mode 100644
index bf0761f39..000000000
--- a/source/ap/mc/mc-3605-extfs.c-fix-buffer-overflow.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5cb89fd2150ac91d791b0360631d3fd08c5fb1d4 Mon Sep 17 00:00:00 2001
-From: Andreas Mohr <and@gmx.li>
-Date: Sat, 12 Mar 2016 16:20:43 +0000
-Subject: [PATCH] extfs.c: fix buffer overflow
-
-When handling with copy/move commands inside of archive we can lead into buffer overflow
-steps to roproduce:
-    create simple 7z archive
-    open it
-    rename single filename
-    hit buffer overflow
-
-found by clang/AddressSanitizer
-
-==17794==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x602000273593 at pc 0x00000045f2a9 bp 0x7ffc94aa8e20 sp 0x7ffc94aa85d0
-READ of size 2 at 0x602000273593 thread T0
-    #0 0x45f2a8 in __interceptor_strchr.part.44 (/usr/bin/mc+0x45f2a8)
-    #1 0x70fb72 in extfs_find_entry_int /tmp/portage/app-misc/mc-9999/work/mc-9999/src/vfs/extfs/extfs.c:312:13
-    #2 0x70f562 in extfs_find_entry /tmp/portage/app-misc/mc-9999/work/mc-9999/src/vfs/extfs/extfs.c:331:11
-    #3 0x712131 in extfs_internal_stat /tmp/portage/app-misc/mc-9999/work/mc-9999/src/vfs/extfs/extfs.c:1117:13
-    #4 0x7f3de308ab59 in mc_stat /tmp/portage/app-misc/mc-9999/work/mc-9999/lib/vfs/interface.c:556:46
-    #5 0x538575 in file_mask_dialog /tmp/portage/app-misc/mc-9999/work/mc-9999/src/filemanager/filegui.c:1340:25
-    #6 0x6e0753 in panel_operate /tmp/portage/app-misc/mc-9999/work/mc-9999/src/filemanager/file.c:2718:13
-    #7 0x6bdabd in rename_cmd /tmp/portage/app-misc/mc-9999/work/mc-9999/src/filemanager/cmd.c:811:9
-    #8 0x551ef4 in midnight_execute_cmd /tmp/portage/app-misc/mc-9999/work/mc-9999/src/filemanager/midnight.c:1307:9
-    #9 0x7f3de30a49e7 in buttonbar_callback /tmp/portage/app-misc/mc-9999/work/mc-9999/lib/widget/buttonbar.c:172:42
-    #10 0x7f3de30b2305 in dlg_try_hotkey /tmp/portage/app-misc/mc-9999/work/mc-9999/lib/widget/dialog.c:464:23
-    #11 0x7f3de30b199a in dlg_key_event /tmp/portage/app-misc/mc-9999/work/mc-9999/lib/widget/dialog.c:509:19
-    #12 0x7f3de30b2ef9 in frontend_dlg_run /tmp/portage/app-misc/mc-9999/work/mc-9999/lib/widget/dialog.c:570:9
-    #13 0x7f3de30b2af5 in dlg_run /tmp/portage/app-misc/mc-9999/work/mc-9999/lib/widget/dialog.c:1267:5
-    #14 0x5507bb in do_nc /tmp/portage/app-misc/mc-9999/work/mc-9999/src/filemanager/midnight.c:1827:9
-    #15 0x50b874 in main /tmp/portage/app-misc/mc-9999/work/mc-9999/src/main.c:403:21
-    #16 0x7f3de1ec78fb in __libc_start_main (/lib64/libc.so.6+0x208fb)
-    #17 0x427f48 in _start (/usr/bin/mc+0x427f48)
-
-Signed-off-by: Andreas Mohr <and@gmx.li>
----
- src/vfs/extfs/extfs.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/vfs/extfs/extfs.c b/src/vfs/extfs/extfs.c
-index 2e7c87b..f7cdaee 100644
---- a/src/vfs/extfs/extfs.c
-+++ b/src/vfs/extfs/extfs.c
-@@ -307,6 +307,8 @@ extfs_find_entry_int (struct entry *dir, const char *name, GSList * list,
-             }
-         }
-         /* Next iteration */
-+        if (c == '\0')
-+            break;
-         *q = c;
-         p = q + 1;
-         q = strchr (p, PATH_SEP);
diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild
index f4f74a83f..f39c73d37 100755
--- a/source/ap/mc/mc.SlackBuild
+++ b/source/ap/mc/mc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018, 2019, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -73,9 +73,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Upstream fixes:
-zcat $CWD/mc-3605-extfs.c-fix-buffer-overflow.patch.gz | patch -p1 --verbose || exit 1
-
 if [ ! -x ./configure ]; then
   ./autogen.sh
 fi