Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 utils/coreutils/DETAILS                     |    2 -
 utils/coreutils/HISTORY                     |    6 ++++-
 utils/coreutils/PRE_BUILD                   |    8 ++++---
 utils/coreutils/patches/CVE-2024-0684.patch |   31 
++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit 8f91d70aaf6feb59ffc7652d0b4432a4407037cb
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    utils/coreutiols: SECURITY_PATCH++ for CVE-2024-0684

diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index ce57d4d..3aa8e63 100755
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,7 +1,7 @@
 # Watch: https://ftp.gnu.org/gnu/coreutils/
            SPELL=coreutils
          VERSION=9.4
-  SECURITY_PATCH=1
+  SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 06cd29d..ef24249 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,4 +1,8 @@
-2023-08-29 Pavel Vinogradov <public AT sorcemage.org>
+2024-01-25 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: SECURITY_PATCH++, (CVE-2024-0684)
+       * PRE_BUILD, patches/CVE-2024-0684.patch: added security fix
+
+2023-08-29 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 9.4
 
 2023-04-18 Pavel Vinogradov <public AT sourcemage.org>
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index c486703..d501907 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+cd "${SOURCE_DIRECTORY}" &&
 
-if [[ $SMACK == y ]]; then
+if [[ "${SMACK}" == "y" ]]; then
   patch -p1 < "$SPELL_DIRECTORY/coreutils-smack.patch"
-fi
+fi &&
+
+apply_patch_dir patches
diff --git a/utils/coreutils/patches/CVE-2024-0684.patch 
b/utils/coreutils/patches/CVE-2024-0684.patch
new file mode 100644
index 0000000..64583af
--- /dev/null
+++ b/utils/coreutils/patches/CVE-2024-0684.patch
@@ -0,0 +1,31 @@
+From c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert AT cs.ucla.edu>
+Date: Tue, 16 Jan 2024 13:48:32 -0800
+Subject: [PATCH] split: do not shrink hold buffer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* src/split.c (line_bytes_split): Do not shrink hold buffer.
+If it’s large for this batch it’s likely to be large for the next
+batch, and for ‘split’ it’s not worth the complexity/CPU hassle to
+shrink it.  Do not assume hold_size can be bufsize.
+---
+ src/split.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/split.c b/src/split.c
+index 64020c859..037960a59 100644
+--- a/src/split.c
++++ b/src/split.c
+@@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t 
bufsize)
+             {
+               cwrite (n_out == 0, hold, n_hold);
+               n_out += n_hold;
+-              if (n_hold > bufsize)
+-                hold = xirealloc (hold, bufsize);
+               n_hold = 0;
+-              hold_size = bufsize;
+             }
+ 
+           /* Output to eol if present.  */