Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

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

 libs/glibc/DETAILS                                     |    6 -
 libs/glibc/HISTORY                                     |    6 +
 libs/glibc/PRE_BUILD                                   |    1 
 libs/glibc/patches/glibc-2.35-make-4.4-MAKEFLAGS.patch |  102 
-----------------
 4 files changed, 9 insertions(+), 106 deletions(-)

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

    libs/glibc: version 2.37, SECURITY_PATCH++

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 36588cc..1f988fd 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -9,8 +9,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
       SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
    SOURCE_IGNORE=volatile
   else
-         VERSION=2.36
-  SECURITY_PATCH=18
+         VERSION=2.37
+  SECURITY_PATCH=19
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          SOURCE2=$SOURCE.sig
@@ -20,7 +20,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   SOURCE2_IGNORE=signature
   fi
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=6.0
+ HEADERS_VERSION=6.1.9
  HEADERS_MAJOR_VERSION=$(echo $HEADERS_VERSION|cut -f1 -d.)
          SOURCE3=linux-${HEADERS_VERSION}.tar.xz
          SOURCE6=linux-${HEADERS_VERSION}.tar.sign
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 3da12c6..9b4f407 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,9 @@
+2023-02-02 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 2.37, SECURITY_PATCH++, (CVE-2022-39046),
+         HEADERS_VERSION=6.1.9
+       * PRE_BUILD: dropped sed script on nonexistant file
+       * patches/glibc-2.35-make-4.4-MAKEFLAGS.patch: removed, not needed 
anymore
+
 2022-11-24 Pavel Vinogradov <public AT sourcemage.org>
        * patches/glibc-2.35-make-4.4-MAKEFLAGS.patch: added to fix make 4.4 
tmpfile
          bug
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index a5a5fba..965ea1a 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -82,7 +82,6 @@ mkdir $test_path &&
 sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl &&
 sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile &&
 # install x86_64 linker to lib instead of lib64
-sed -i "s/lib64/lib/"  sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
 sed -i "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed &&
 
 # manual creation seems broken
diff --git a/libs/glibc/patches/glibc-2.35-make-4.4-MAKEFLAGS.patch 
b/libs/glibc/patches/glibc-2.35-make-4.4-MAKEFLAGS.patch
deleted file mode 100644
index 51fbe5f..0000000
--- a/libs/glibc/patches/glibc-2.35-make-4.4-MAKEFLAGS.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2d7ed98add14f75041499ac189696c9bd3d757fe
-https://bugs.gentoo.org/869263
-
-From 2d7ed98add14f75041499ac189696c9bd3d757fe Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich AT gmail.com>
-Date: Tue, 13 Sep 2022 13:39:13 -0400
-Subject: [PATCH] Makerules: fix MAKEFLAGS assignment for upcoming make-4.4
- [BZ# 29564]
-
-make-4.4 will add long flags to MAKEFLAGS variable:
-
-    * WARNING: Backward-incompatibility!
-      Previously only simple (one-letter) options were added to the MAKEFLAGS
-      variable that was visible while parsing makefiles.  Now, all options
-      are available in MAKEFLAGS.
-
-This causes locale builds to fail when long options are used:
-
-    $ make --shuffle
-    ...
-    make  -C localedata install-locales
-    make: invalid shuffle mode: '1662724426r'
-
-The change fixes it by passing eash option via whitespace and dashes.
-That way option is appended to both single-word form and whitespace
-separated form.
-
-While at it fixed --silent mode detection in $(MAKEFLAGS) by filtering
-out --long-options. Otherwise options like --shuffle flag enable silent
-mode unintentionally. $(silent-make) variable consolidates the checks.
-
-Resolves: BZ# 29564
-
-CC: Paul Smith <psmith AT gnu.org>
-CC: Siddhesh Poyarekar <siddhesh AT gotplt.org>
-Signed-off-by: Sergei Trofimovich <slyich AT gmail.com>
-Reviewed-by: Siddhesh Poyarekar <siddhesh AT sourceware.org>
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -43,6 +43,22 @@ else
- $(error objdir must be defined by the build-directory Makefile)
- endif
- 
-+# Did we request 'make -s' run? "yes" or "no".
-+# Starting from make-4.4 MAKEFLAGS now contains long
-+# options like '--shuffle'. To detect presence of 's'
-+# we pick first word with short options. Long options
-+# are guaranteed to come after whitespace. We use '-'
-+# prefix to always have a word before long options
-+# even if no short options were passed.
-+# Typical MAKEFLAGS values to watch for:
-+#   "rs --shuffle=42" (silent)
-+#   " --shuffle" (not silent)
-+ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),)
-+silent-make := no
-+else
-+silent-make := yes
-+endif
-+
- # Root of the sysdeps tree.
- sysdep_dir := $(..)sysdeps
- export sysdep_dir := $(sysdep_dir)
-@@ -917,7 +933,7 @@ endif
- # umpteen zillion filenames along with it (we use `...' instead)
- # but we don't want this echoing done when the user has said
- # he doesn't want to see commands echoed by using -s.
--ifneq "$(findstring s,$(MAKEFLAGS))" ""       # if -s
-+ifeq ($(silent-make),yes)                     # if -s
- +cmdecho      := echo >/dev/null
- else                                          # not -s
- +cmdecho      := echo
---- a/Makerules
-+++ b/Makerules
-@@ -794,7 +794,7 @@ endif
- # Maximize efficiency by minimizing the number of rules.
- .SUFFIXES:    # Clear the suffix list.  We don't use suffix rules.
- # Don't define any builtin rules.
--MAKEFLAGS := $(MAKEFLAGS)r
-+MAKEFLAGS := $(MAKEFLAGS) -r
- 
- # Generic rule for making directories.
- %/:
-@@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r
- .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))
- 
- # Use the verbose option of ar and tar when not running silently.
--ifeq  "$(findstring s,$(MAKEFLAGS))" ""       # if not -s
-+ifeq ($(silent-make),no)                      # if not -s
- verbose := v
- else                                          # -s
- verbose       :=
---- a/elf/rtld-Rules
-+++ b/elf/rtld-Rules
-@@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs),\
-       mv -f $@T $@
- 
- # Use the verbose option of ar and tar when not running silently.
--ifeq  "$(findstring s,$(MAKEFLAGS))" ""       # if not -s
-+ifeq ($(silent-make),no)                      # if not -s
- verbose := v
- else                                          # -s
- verbose       :=