Revert "Fix : patch application of CVE-2025-4802 in glibc (microsoft#14582)" (microsoft#14668)

Author: PawelWMS

SPECS-EXTENDED/buildah/buildah.spec

@@ -21,7 +21,7 @@
 Summary:        A command line tool used for creating OCI Images
 Name:           buildah
 Version:        1.18.0
-Release:        32%{?dist}
+Release:        31%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -32,7 +32,7 @@ BuildRequires:  btrfs-progs-devel
 BuildRequires:  device-mapper-devel
 BuildRequires:  git
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-12%{?dist}
+BuildRequires:  glibc-static >= 2.38-11%{?dist}
 BuildRequires:  go-md2man
 BuildRequires:  go-rpm-macros
 BuildRequires:  golang
@@ -123,9 +123,6 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 %{_datadir}/%{name}/test
 
 %changelog
-* Thu Aug 28 2025 Kanishk Bansal <[email protected]> - 1.18.0-32
-- Bump to rebuild with updated glibc
-
 * Thu May 22 2025 Kanishk Bansal <[email protected]> - 1.18.0-31
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/catatonit/catatonit.spec

@@ -3,7 +3,7 @@ Distribution:   Azure Linux
 
 Name: catatonit
 Version: 0.1.7
-Release: 20%{?dist}
+Release: 19%{?dist}
 Summary: A signal-forwarding process manager for containers
 License: GPLv3+
 URL: https://github.com/openSUSE/catatonit
@@ -13,7 +13,7 @@ BuildRequires: automake
 BuildRequires: file
 BuildRequires: gcc
 BuildRequires: git
-BuildRequires: glibc-static >= 2.38-12%{?dist}
+BuildRequires: glibc-static >= 2.38-11%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 
@@ -61,9 +61,6 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
-* Thu Aug 28 2025 Kanishk Bansal <[email protected]> - 0.1.7-20
-- Bump to rebuild with updated glibc
-
 * Thu May 22 2025 Kanishk Bansal <[email protected]> - 0.1.7-19
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/dyninst/dyninst.spec

@@ -1,7 +1,7 @@
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
-Release: 22%{?dist}
+Release: 21%{?dist}
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL: http://www.dyninst.org
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
 
 # Extra requires just for the testsuite
 BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
-BuildRequires: glibc-static >= 2.38-12%{?dist}
+BuildRequires: glibc-static >= 2.38-11%{?dist}
 
 # Testsuite files should not provide/require anything
 %{?filter_setup:
@@ -194,9 +194,6 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
-* Thu Aug 28 2025 Kanishk Bansal <[email protected]> - 10.1.0-22
-- Bump to rebuild with updated glibc
-
 * Thu May 22 2025 Kanishk Bansal <[email protected]> - 10.1.0-21
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/podman/podman.spec

@@ -35,7 +35,7 @@
 
 Name:           podman
 Version:        4.1.1
-Release:        30%{?dist}
+Release:        29%{?dist}
 License:        ASL 2.0 and BSD and ISC and MIT and MPLv2.0
 Summary:        Manage Pods, Containers and Container Images
 Vendor:         Microsoft Corporation
@@ -50,7 +50,7 @@ BuildRequires:  go-md2man
 BuildRequires:  golang
 BuildRequires:  gcc
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-12%{?dist}
+BuildRequires:  glibc-static >= 2.38-11%{?dist}
 BuildRequires:  git
 BuildRequires:  go-rpm-macros
 BuildRequires:  gpgme-devel
@@ -386,9 +386,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 
 # rhcontainerbot account currently managed by lsm5
 %changelog
-* Thu Aug 28 2025 Kanishk Bansal <[email protected]> - 4.1.1-30
-- Bump to rebuild with updated glibc
-
 * Thu May 22 2025 Kanishk Bansal <[email protected]> - 4.1.1-29
 - Bump to rebuild with updated glibc
 

SPECS/busybox/busybox.spec

@@ -1,7 +1,7 @@
 Summary:        Statically linked binary providing simplified versions of system commands
 Name:           busybox
 Version:        1.36.1
-Release:        15%{?dist}
+Release:        14%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -19,7 +19,7 @@ Patch5:         CVE-2023-42366.patch
 Patch6:         CVE-2023-39810.patch
 Patch7:         CVE-2022-48174.patch
 BuildRequires:  gcc
-BuildRequires:  glibc-static >= 2.38-12%{?dist}
+BuildRequires:  glibc-static >= 2.38-11%{?dist}
 BuildRequires:  libselinux-devel >= 1.27.7-2
 BuildRequires:  libsepol-devel
 %if 0%{?with_check}
@@ -106,9 +106,6 @@ SKIP_KNOWN_BUGS=1 ./runtest
 %{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
-* Thu Aug 28 2025 Kanishk Bansal <[email protected]> - 1.36.1-15
-- Bump to rebuild with updated glibc
-
 * Mon Jul 07 2025 Kanishk Bansal <[email protected]> - 1.36.1-14
 - Patch CVE-2022-48174
 

SPECS/flannel/flannel.spec

@@ -3,7 +3,7 @@
 Summary:        Simple and easy way to configure a layer 3 network fabric designed for Kubernetes
 Name:           flannel
 Version:        0.24.2
-Release:        17%{?dist}
+Release:        16%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -18,7 +18,7 @@ Patch3:         CVE-2025-30204.patch
 Patch4:         CVE-2024-51744.patch
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
-BuildRequires:  glibc-static >= 2.38-12%{?dist}
+BuildRequires:  glibc-static >= 2.38-11%{?dist}
 BuildRequires:  golang < 1.25
 BuildRequires:  kernel-headers
 
@@ -52,9 +52,6 @@ install -p -m 755 -t %{buildroot}%{_bindir} ./dist/flanneld
 %{_bindir}/flanneld
 
 %changelog
-* Thu Aug 28 2025 Kanishk Bansal <[email protected]> - 0.24.2-17
-- Bump to rebuild with updated glibc
-
 * Sun Aug 31 2025 Andrew Phelps <[email protected]> - 0.24.2-16
 - Set BR for golang to < 1.25
 

SPECS/glibc/add_support_record_failure_barrier.patch

@@ -10,7 +10,7 @@
 Summary:        Main C library
 Name:           glibc
 Version:        2.38
-Release:        12%{?dist}
+Release:        11%{?dist}
 License:        BSD AND GPLv2+ AND Inner-Net AND ISC AND LGPLv2+ AND MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -45,10 +45,6 @@ Patch16:        CVE-2024-33600.patch
 # Patch of CVE-2024-33601 fixes CVE-2024-33602 also
 Patch17:        CVE-2024-33601.patch
 Patch18:        CVE-2025-0395.patch
-Patch19:        CVE-2025-4802.patch
-# Add test for CVE-2025-4802. Requires additional patch for a support function
-Patch20:        add_support_record_failure_barrier.patch
-Patch21:        test-CVE-2025-4802.patch
 
 # Patches for testing
 Patch100:       0001-Remove-Wno-format-cflag-from-tests.patch
@@ -371,10 +367,6 @@ grep "^FAIL: nptl/tst-mutex10" tests.sum >/dev/null && n=$((n+1)) ||:
 %exclude %{_libdir}/locale/C.utf8
 
 %changelog
-* Thu Aug 28 2025 Kanishk Bansal <[email protected]> - 2.38-12
-- Fix Patch application of CVE-2025-4802
-- Add test for CVE-2025-4802
-
 * Thu May 22 2025 Kanishk Bansal <[email protected]> - 2.38-11
 - Patch CVE-2023-4527, CVE-2023-4806, CVE-2024-33599, CVE-2024-33600, CVE-2024-33601, CVE-2025-0395, CVE-2025-4802
 - Fix CVE-2023-5156