From 7f3c7992e8cd75842183e239ce342877736a9b17 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Wed, 29 Jan 2025 13:05:34 -0700
Subject: [PATCH 1/3] Withdraw glibc-2.41-r0

Signed-off-by: dann frazier <dann.frazier@chainguard.dev>
---
 withdrawn-packages.txt | 319 +++++++++++++++++++++++++++++------------
 1 file changed, 227 insertions(+), 92 deletions(-)

diff --git a/withdrawn-packages.txt b/withdrawn-packages.txt
index 94a77e3f73b..5fd5c322f6c 100644
--- a/withdrawn-packages.txt
+++ b/withdrawn-packages.txt
@@ -1,92 +1,227 @@
-libmamba-2024.03.25-r0
-libmamba-2024.03.25-r1
-libmamba-2024.03.25-r2
-libmamba-2024.03.25-r3
-libmamba-2024.03.25-r4
-libmamba-2024.03.25-r5
-libmamba-2024.08.31-r0
-libmamba-2024.08.31-r1
-libmamba-2024.09.30-r0
-libmamba-2024.10.02-r0
-libmamba-2024.10.02-r1
-libmamba-2024.10.02-r2
-libmamba-2024.10.02-r3
-libmamba-dev-2024.03.25-r0
-libmamba-dev-2024.03.25-r1
-libmamba-dev-2024.03.25-r2
-libmamba-dev-2024.03.25-r3
-libmamba-dev-2024.03.25-r4
-libmamba-dev-2024.03.25-r5
-libmamba-dev-2024.08.31-r0
-libmamba-dev-2024.08.31-r1
-libmamba-dev-2024.09.30-r0
-libmamba-dev-2024.10.02-r0
-libmamba-dev-2024.10.02-r1
-libmamba-dev-2024.10.02-r2
-libmamba-dev-2024.10.02-r3
-mamba-package-2024.03.25-r1
-mamba-package-2024.03.25-r2
-mamba-package-2024.03.25-r3
-mamba-package-2024.03.25-r4
-mamba-package-2024.03.25-r5
-mamba-package-2024.08.31-r0
-mamba-package-2024.08.31-r1
-mamba-package-2024.09.30-r0
-mamba-package-2024.10.02-r0
-mamba-package-2024.10.02-r1
-mamba-package-2024.10.02-r2
-mamba-package-2024.10.02-r3
-micromamba-2024.03.25-r1
-micromamba-2024.03.25-r2
-micromamba-2024.03.25-r3
-micromamba-2024.03.25-r4
-micromamba-2024.03.25-r5
-micromamba-2024.08.31-r0
-micromamba-2024.08.31-r1
-micromamba-2024.09.30-r0
-micromamba-2024.10.02-r0
-micromamba-2024.10.02-r1
-micromamba-2024.10.02-r2
-micromamba-2024.10.02-r3
-py3-libmambapy-2024.03.25-r0
-py3-libmambapy-2024.03.25-r1
-py3-libmambapy-2024.03.25-r2
-py3-libmambapy-2024.03.25-r3
-py3-libmambapy-2024.03.25-r4
-py3-libmambapy-2024.03.25-r5
-py3-libmambapy-2024.08.31-r0
-py3-libmambapy-2024.08.31-r1
-py3-libmambapy-2024.09.30-r0
-py3-libmambapy-2024.10.02-r0
-py3-supported-libmambapy-2024.10.02-r1
-py3.10-libmambapy-2024.10.02-r1
-py3.11-libmambapy-2024.10.02-r1
-py3.12-libmambapy-2024.10.02-r1
-py3.13-libmambapy-2024.10.02-r1
-py3-supported-libmambapy-2024.10.02-r2
-py3.10-libmambapy-2024.10.02-r2
-py3.11-libmambapy-2024.10.02-r2
-py3.12-libmambapy-2024.10.02-r2
-py3.13-libmambapy-2024.10.02-r2
-py3-supported-libmambapy-2024.10.02-r3
-py3.10-libmambapy-2024.10.02-r3
-py3.11-libmambapy-2024.10.02-r3
-py3.12-libmambapy-2024.10.02-r3
-py3.13-libmambapy-2024.10.02-r3
-py3-google-cloud-pubsub-2.25.0-r0.apk
-py3-google-cloud-pubsub-2.25.1-r0.apk
-py3-google-cloud-pubsub-2.25.2-r0.apk
-py3-google-cloud-pubsub-2.26.0-r0.apk
-py3-google-cloud-pubsub-2.26.1-r0.apk
-py3-google-cloud-pubsub-2.27.0-r0.apk
-py3-google-cloud-pubsub-2.27.1-r0.apk
-py3-google-cloud-pubsub-2.27.2-r0.apk
-mockery-3-r0.apk
-mockery-3-r1.apk
-mockery-3-r2.apk
-mockery-3-r3.apk
-mockery-3-r4.apk
-mockery-3-r5.apk
-mockery-3-r6.apk
-tensorflow-cpu-0_git20250108-r0.apk
-tensorflow-cpu-2.18.0-r0.apk
+glibc-2.41-r0.apk
+glibc-dev-2.41-r0.apk
+glibc-iconv-2.41-r0.apk
+glibc-locale-aa-2.41-r0.apk
+glibc-locale-af-2.41-r0.apk
+glibc-locale-agr-2.41-r0.apk
+glibc-locale-ak-2.41-r0.apk
+glibc-locale-am-2.41-r0.apk
+glibc-locale-an-2.41-r0.apk
+glibc-locale-anp-2.41-r0.apk
+glibc-locale-ar-2.41-r0.apk
+glibc-locale-as-2.41-r0.apk
+glibc-locale-ast-2.41-r0.apk
+glibc-locale-ayc-2.41-r0.apk
+glibc-locale-az-2.41-r0.apk
+glibc-locale-be-2.41-r0.apk
+glibc-locale-bem-2.41-r0.apk
+glibc-locale-ber-2.41-r0.apk
+glibc-locale-bg-2.41-r0.apk
+glibc-locale-bhb-2.41-r0.apk
+glibc-locale-bho-2.41-r0.apk
+glibc-locale-bi-2.41-r0.apk
+glibc-locale-bn-2.41-r0.apk
+glibc-locale-bo-2.41-r0.apk
+glibc-locale-br-2.41-r0.apk
+glibc-locale-brx-2.41-r0.apk
+glibc-locale-bs-2.41-r0.apk
+glibc-locale-byn-2.41-r0.apk
+glibc-locale-ca-2.41-r0.apk
+glibc-locale-ce-2.41-r0.apk
+glibc-locale-chr-2.41-r0.apk
+glibc-locale-ckb-2.41-r0.apk
+glibc-locale-cmn-2.41-r0.apk
+glibc-locale-crh-2.41-r0.apk
+glibc-locale-cs-2.41-r0.apk
+glibc-locale-csb-2.41-r0.apk
+glibc-locale-cv-2.41-r0.apk
+glibc-locale-cy-2.41-r0.apk
+glibc-locale-da-2.41-r0.apk
+glibc-locale-de-2.41-r0.apk
+glibc-locale-doi-2.41-r0.apk
+glibc-locale-dsb-2.41-r0.apk
+glibc-locale-dv-2.41-r0.apk
+glibc-locale-dz-2.41-r0.apk
+glibc-locale-el-2.41-r0.apk
+glibc-locale-en-2.41-r0.apk
+glibc-locale-eo-2.41-r0.apk
+glibc-locale-es-2.41-r0.apk
+glibc-locale-et-2.41-r0.apk
+glibc-locale-eu-2.41-r0.apk
+glibc-locale-fa-2.41-r0.apk
+glibc-locale-ff-2.41-r0.apk
+glibc-locale-fi-2.41-r0.apk
+glibc-locale-fil-2.41-r0.apk
+glibc-locale-fo-2.41-r0.apk
+glibc-locale-fr-2.41-r0.apk
+glibc-locale-fur-2.41-r0.apk
+glibc-locale-fy-2.41-r0.apk
+glibc-locale-ga-2.41-r0.apk
+glibc-locale-gbm-2.41-r0.apk
+glibc-locale-gd-2.41-r0.apk
+glibc-locale-gez-2.41-r0.apk
+glibc-locale-gl-2.41-r0.apk
+glibc-locale-gu-2.41-r0.apk
+glibc-locale-gv-2.41-r0.apk
+glibc-locale-ha-2.41-r0.apk
+glibc-locale-hak-2.41-r0.apk
+glibc-locale-he-2.41-r0.apk
+glibc-locale-hi-2.41-r0.apk
+glibc-locale-hif-2.41-r0.apk
+glibc-locale-hne-2.41-r0.apk
+glibc-locale-hr-2.41-r0.apk
+glibc-locale-hsb-2.41-r0.apk
+glibc-locale-ht-2.41-r0.apk
+glibc-locale-hu-2.41-r0.apk
+glibc-locale-hy-2.41-r0.apk
+glibc-locale-ia-2.41-r0.apk
+glibc-locale-id-2.41-r0.apk
+glibc-locale-ig-2.41-r0.apk
+glibc-locale-ik-2.41-r0.apk
+glibc-locale-is-2.41-r0.apk
+glibc-locale-it-2.41-r0.apk
+glibc-locale-iu-2.41-r0.apk
+glibc-locale-ja-2.41-r0.apk
+glibc-locale-ka-2.41-r0.apk
+glibc-locale-kab-2.41-r0.apk
+glibc-locale-kk-2.41-r0.apk
+glibc-locale-kl-2.41-r0.apk
+glibc-locale-km-2.41-r0.apk
+glibc-locale-kn-2.41-r0.apk
+glibc-locale-ko-2.41-r0.apk
+glibc-locale-kok-2.41-r0.apk
+glibc-locale-ks-2.41-r0.apk
+glibc-locale-ku-2.41-r0.apk
+glibc-locale-kv-2.41-r0.apk
+glibc-locale-kw-2.41-r0.apk
+glibc-locale-ky-2.41-r0.apk
+glibc-locale-lb-2.41-r0.apk
+glibc-locale-lg-2.41-r0.apk
+glibc-locale-li-2.41-r0.apk
+glibc-locale-lij-2.41-r0.apk
+glibc-locale-ln-2.41-r0.apk
+glibc-locale-lo-2.41-r0.apk
+glibc-locale-lt-2.41-r0.apk
+glibc-locale-ltg-2.41-r0.apk
+glibc-locale-lv-2.41-r0.apk
+glibc-locale-lzh-2.41-r0.apk
+glibc-locale-mag-2.41-r0.apk
+glibc-locale-mai-2.41-r0.apk
+glibc-locale-mdf-2.41-r0.apk
+glibc-locale-mfe-2.41-r0.apk
+glibc-locale-mg-2.41-r0.apk
+glibc-locale-mhr-2.41-r0.apk
+glibc-locale-mi-2.41-r0.apk
+glibc-locale-miq-2.41-r0.apk
+glibc-locale-mjw-2.41-r0.apk
+glibc-locale-mk-2.41-r0.apk
+glibc-locale-ml-2.41-r0.apk
+glibc-locale-mn-2.41-r0.apk
+glibc-locale-mni-2.41-r0.apk
+glibc-locale-mnw-2.41-r0.apk
+glibc-locale-mr-2.41-r0.apk
+glibc-locale-ms-2.41-r0.apk
+glibc-locale-mt-2.41-r0.apk
+glibc-locale-my-2.41-r0.apk
+glibc-locale-nan-2.41-r0.apk
+glibc-locale-nb-2.41-r0.apk
+glibc-locale-nds-2.41-r0.apk
+glibc-locale-ne-2.41-r0.apk
+glibc-locale-nhn-2.41-r0.apk
+glibc-locale-niu-2.41-r0.apk
+glibc-locale-nl-2.41-r0.apk
+glibc-locale-nn-2.41-r0.apk
+glibc-locale-nr-2.41-r0.apk
+glibc-locale-nso-2.41-r0.apk
+glibc-locale-oc-2.41-r0.apk
+glibc-locale-om-2.41-r0.apk
+glibc-locale-or-2.41-r0.apk
+glibc-locale-os-2.41-r0.apk
+glibc-locale-pa-2.41-r0.apk
+glibc-locale-pap-2.41-r0.apk
+glibc-locale-pl-2.41-r0.apk
+glibc-locale-posix-2.41-r0.apk
+glibc-locale-ps-2.41-r0.apk
+glibc-locale-pt-2.41-r0.apk
+glibc-locale-quz-2.41-r0.apk
+glibc-locale-raj-2.41-r0.apk
+glibc-locale-rif-2.41-r0.apk
+glibc-locale-ro-2.41-r0.apk
+glibc-locale-ru-2.41-r0.apk
+glibc-locale-rw-2.41-r0.apk
+glibc-locales-2.41-r0.apk
+glibc-locale-sa-2.41-r0.apk
+glibc-locale-sah-2.41-r0.apk
+glibc-locale-sat-2.41-r0.apk
+glibc-locale-sc-2.41-r0.apk
+glibc-locale-scn-2.41-r0.apk
+glibc-locale-sd-2.41-r0.apk
+glibc-locale-se-2.41-r0.apk
+glibc-locale-sgs-2.41-r0.apk
+glibc-locale-shn-2.41-r0.apk
+glibc-locale-shs-2.41-r0.apk
+glibc-locale-si-2.41-r0.apk
+glibc-locale-sid-2.41-r0.apk
+glibc-locale-sk-2.41-r0.apk
+glibc-locale-sl-2.41-r0.apk
+glibc-locale-sm-2.41-r0.apk
+glibc-locale-so-2.41-r0.apk
+glibc-locale-sq-2.41-r0.apk
+glibc-locale-sr-2.41-r0.apk
+glibc-locale-ss-2.41-r0.apk
+glibc-locale-ssy-2.41-r0.apk
+glibc-locale-st-2.41-r0.apk
+glibc-locale-su-2.41-r0.apk
+glibc-locale-sv-2.41-r0.apk
+glibc-locale-sw-2.41-r0.apk
+glibc-locale-syr-2.41-r0.apk
+glibc-locale-szl-2.41-r0.apk
+glibc-locale-ta-2.41-r0.apk
+glibc-locale-tcy-2.41-r0.apk
+glibc-locale-te-2.41-r0.apk
+glibc-locale-tg-2.41-r0.apk
+glibc-locale-th-2.41-r0.apk
+glibc-locale-the-2.41-r0.apk
+glibc-locale-ti-2.41-r0.apk
+glibc-locale-tig-2.41-r0.apk
+glibc-locale-tk-2.41-r0.apk
+glibc-locale-tl-2.41-r0.apk
+glibc-locale-tn-2.41-r0.apk
+glibc-locale-to-2.41-r0.apk
+glibc-locale-tok-2.41-r0.apk
+glibc-locale-tpi-2.41-r0.apk
+glibc-locale-tr-2.41-r0.apk
+glibc-locale-ts-2.41-r0.apk
+glibc-locale-tt-2.41-r0.apk
+glibc-locale-ug-2.41-r0.apk
+glibc-locale-uk-2.41-r0.apk
+glibc-locale-unm-2.41-r0.apk
+glibc-locale-ur-2.41-r0.apk
+glibc-locale-uz-2.41-r0.apk
+glibc-locale-ve-2.41-r0.apk
+glibc-locale-vi-2.41-r0.apk
+glibc-locale-wa-2.41-r0.apk
+glibc-locale-wae-2.41-r0.apk
+glibc-locale-wal-2.41-r0.apk
+glibc-locale-wo-2.41-r0.apk
+glibc-locale-xh-2.41-r0.apk
+glibc-locale-yi-2.41-r0.apk
+glibc-locale-yo-2.41-r0.apk
+glibc-locale-yue-2.41-r0.apk
+glibc-locale-yuw-2.41-r0.apk
+glibc-locale-zgh-2.41-r0.apk
+glibc-locale-zh-2.41-r0.apk
+glibc-locale-zu-2.41-r0.apk
+glibc-tracing-2.41-r0.apk
+ld-linux-2.41-r0.apk
+libc-bin-2.41-r0.apk
+libcrypt1-2.41-r0.apk
+localedef-2.41-r0.apk
+nscd-2.41-r0.apk
+nss-db-2.41-r0.apk
+nss-hesiod-2.41-r0.apk
+pcprofiledump-2.41-r0.apk
+posix-libc-utils-2.41-r0.apk
+sln-2.41-r0.apk
+sotruss-2.41-r0.apk
+tzutils-2.41-r0.apk

From 170fa554502bfa6addfe85629d2eced5fa5d65f6 Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Wed, 29 Jan 2025 13:11:04 -0700
Subject: [PATCH 2/3] Revert "glibc: remove now-in-history cherry-pick"

This reverts commit 30af7d39ca711e696fd70843082fda19867925cd.
---
 glibc.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/glibc.yaml b/glibc.yaml
index d3fc899224a..5b3d8d9874f 100644
--- a/glibc.yaml
+++ b/glibc.yaml
@@ -62,6 +62,8 @@ pipeline:
       expected-commit: 74f59e9271cbb4071671e5a474e7d4f1622b186f
       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:

From c3757bbbf1eed125c945d9692465cf61d5b9b8bd Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@chainguard.dev>
Date: Wed, 29 Jan 2025 13:11:06 -0700
Subject: [PATCH 3/3] Revert "glibc/2.41 package update"

This reverts commit 9a220beea4e7b2c825ccfac01cb195e9d3507100.
---
 glibc.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/glibc.yaml b/glibc.yaml
index 5b3d8d9874f..8bae0a8a901 100644
--- a/glibc.yaml
+++ b/glibc.yaml
@@ -1,7 +1,7 @@
 package:
   name: glibc
-  version: "2.41"
-  epoch: 0
+  version: 2.40
+  epoch: 8
   description: "the GNU C library"
   copyright:
     - license: LGPL-2.1-or-later
@@ -59,7 +59,7 @@ environment:
 pipeline:
   - uses: git-checkout
     with:
-      expected-commit: 74f59e9271cbb4071671e5a474e7d4f1622b186f
+      expected-commit: 3d1aed874918c466a4477af1da35983ab036690e
       repository: https://sourceware.org/git/glibc.git
       tag: glibc-${{package.version}}
       cherry-picks: |