From 4b1a80c01c21a0e838ca82882e8f00767fbfc96d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@chainguard.dev>
Date: Thu, 23 Jan 2025 13:27:40 +0100
Subject: [PATCH] glibc: switch to git and cherry-pick fix for CVE-2025-0395
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Łukasz 'sil2100' Zemczak <lukasz.zemczak@chainguard.dev>
---
 glibc.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/glibc.yaml b/glibc.yaml
index 1fd9f154c18..40e41b278dd 100644
--- a/glibc.yaml
+++ b/glibc.yaml
@@ -1,7 +1,7 @@
 package:
   name: glibc
   version: 2.40
-  epoch: 4
+  epoch: 5
   description: "the GNU C library"
   copyright:
     - license: LGPL-2.1-or-later
@@ -57,10 +57,13 @@ environment:
     GCC_SPEC_FILE: /dev/null
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      uri: https://ftp.gnu.org/gnu/libc/glibc-${{package.version}}.tar.xz
-      expected-sha256: 19a890175e9263d748f627993de6f4b1af9cd21e03f080e4bfb3a1fac10205a2
+      expected-commit: 3d1aed874918c466a4477af1da35983ab036690e
+      repository: https://sourceware.org/git/glibc.git
+      tag: glibc-${{package.version}}
+      cherry-picks: |
+        release/2.40/master/7d4b6bcae91f29d7b4daf15bab06b66cf1d2217c: Fix underallocation of abort_msg_s struct (CVE-2025-0395)
 
   - uses: patch
     with: