Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (736958d392ddbce15e8e4fe46da2e3f68d1d5a74)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (736958d392ddbce15e8e4fe46da2e3f68d1d5a74)
  • Date: Thu, 30 Jan 2025 17:54:38 +0000

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

dev/null |binary
libs/glibc/DETAILS | 34 ++++++++++++++++------------------
libs/glibc/HISTORY | 7 +++++++
libs/glibc/PRE_BUILD | 27 ++++++++++++++-------------
4 files changed, 37 insertions(+), 31 deletions(-)

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

libs/glibc: version 2.41, SECURITY_PATCH++

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index aa13d4e..8db5055 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -6,29 +6,23 @@
VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
SOURCE=$SPELL-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git"
SOURCE_IGNORE=volatile
else
- VERSION=2.40
- SECURITY_PATCH=24
+ VERSION=2.41
+
SOURCE_HASH="sha512:894a3e5a796bc13df30c26a5bfbe4d60b5dbdaac54e7763432235124b547070c7dda88c50584536870cab79183d8cad73a3ac6ed09bfe54fa8482aad07253169"
+ SECURITY_PATCH=25
SOURCE=$SPELL-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=6.10
+ HEADERS_VERSION=6.13
+
SOURCE3_HASH="sha512:1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957"
HEADERS_MAJOR_VERSION=$(echo $HEADERS_VERSION|cut -f1 -d.)
SOURCE3=linux-${HEADERS_VERSION}.tar.xz
- SOURCE6=linux-${HEADERS_VERSION}.tar.sign
- SOURCE6_IGNORE=signature
- SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"

SOURCE3_URL[0]="$KERNEL_URL/pub/linux/kernel/v${HEADERS_MAJOR_VERSION}.x/$SOURCE3"
-
SOURCE6_URL[0]="$KERNEL_URL/pub/linux/kernel/v${HEADERS_MAJOR_VERSION}.x/$SOURCE6"
else
local LINUX_DIRECTORY
LINUX_DIRECTORY=$(gaze -q where -path linux)
@@ -40,6 +34,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_4}
SOURCE3=linux-${LATEST_4}.tar.xz
SOURCE6="linux-${LATEST_4}.tar.sign"
+ SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+ SOURCE6_IGNORE=signature
+ SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE6}"
HEADERS_VDIR=v4.x
if [[ ${HEADERS_VERSION} != *.0 ]]; then
SOURCE7=patch-${HEADERS_VERSION}.xz
@@ -56,6 +53,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_5}
SOURCE3=linux-${LATEST_5}.tar.xz
SOURCE6="linux-${LATEST_5}.tar.sign"
+ SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+ SOURCE6_IGNORE=signature
+ SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE6}"
HEADERS_VDIR=v5.x
if [[ ${HEADERS_VERSION} != *.0 ]]; then
.
"${LINUX_DIRECTORY}/info/patches/maintenance_patches_5/${LATEST_maintenance_patches_5}"
@@ -64,22 +64,20 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
;;
6.*)
+ . "${LINUX_DIRECTORY}/info/kernels/${LATEST_6}"
+ .
"${LINUX_DIRECTORY}/info/patches/maintenance_patches_6/${LATEST_maintenance_patches_6}"
HEADERS_VERSION=$(echo $LATEST_maintenance_patches_6 | sed "s/patch-//")
HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_6}
SOURCE3=linux-${LATEST_6}.tar.xz
- SOURCE6="linux-${LATEST_6}.tar.sign"
+ SOURCE3_HASH="${source_hash}"
HEADERS_VDIR=v6.x
if [[ ${HEADERS_VERSION} != *.0 ]]; then
- .
"${LINUX_DIRECTORY}/info/patches/maintenance_patches_6/${LATEST_maintenance_patches_6}"
SOURCE7=patch-${HEADERS_VERSION}.xz
SOURCE7_HASH="sha512:${sha512sum}"
fi
esac

- SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE3}"
- SOURCE6_IGNORE=signature
- SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE6}"

if [[ -n $SOURCE7 ]]; then
SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/$HEADERS_VDIR/${SOURCE7}"
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 0900fa1..a8660e2 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,10 @@
+2025-01-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 2.41, SECURITY_PATCH++, (CVE-2025-039),
+ HEADERS_VERSION=6.13.0, quoting++, switched to hashsum checking
where
+ possible
+ * PRE_BUILD: simplified unpaking logic for linux kernel headers,
quoting++
+ * glibc.gpg: removed
+
2024-07-22 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.40, SECURITY_PATCH++, (CVE-2024-33599,
CVE-2024-33600,
CVE-2024-33601, CVE-2024-33602), HEADERS_VERSION=6.10.0, corrected
the
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 965ea1a..ccbdac1 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -12,19 +12,20 @@ sed -i 's:CC="$(CC)" $(PERL) scripts/test-installation.pl
$(common-objpfx)::' $S
#
persistent_add GLIBC_HEADERS_DIR &&

- case ${HEADERS_VERSION} in
- *)
- GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.xz}
- message "${MESSAGE_COLOR}xz -d
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
- xz -d -k $SOURCE_CACHE/$SOURCE3
- SOURCE3_ORI=$SOURCE3
- SOURCE3=${SOURCE3/.xz}
- unpack_file 3 || return 1
- message "${MESSAGE_COLOR}rm
$SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
- rm $SOURCE_CACHE/$SOURCE3
- SOURCE3=$SOURCE3_ORI
- ;;
- esac
+GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.xz} &&
+if [[ "${HEADERS_VERSION}" < 6.0 ]]; then
+ message "${MESSAGE_COLOR}xz -d $SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}" &&
+ xz -d -k "$SOURCE_CACHE/$SOURCE3" &&
+ SOURCE3_ORI=$SOURCE3 &&
+ SOURCE3=${SOURCE3/.xz} &&
+ unpack_file 3 &&
+ message "${MESSAGE_COLOR}rm $SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}" &&
+ rm "$SOURCE_CACHE/$SOURCE3" &&
+ SOURCE3=$SOURCE3_ORI
+else
+ unpack_file 3
+ fi &&
+
cd $GLIBC_HEADERS_DIR &&
if [[ -n $SOURCE7 ]]; then
if [[ ${HEADERS_VERSION} > 3.0.4 ]] &&
diff --git a/libs/glibc/glibc.gpg b/libs/glibc/glibc.gpg
deleted file mode 100644
index 94ba371..0000000
Binary files a/libs/glibc/glibc.gpg and /dev/null differ


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (736958d392ddbce15e8e4fe46da2e3f68d1d5a74), Pavel Vinogradov, 01/30/2025

Archive powered by MHonArc 2.6.24.

Top of Page