Skip to content

Commit 0ee8cb7

Browse files
[AUTO-CHERRYPICK] [3.0 fasttrack] glibc: add pthread_cond_wait patch - branch 3.0-dev (#13778)
Co-authored-by: Andrew Phelps <anphel31@users.noreply.github.com> Co-authored-by: Andrew Phelps <anphel@microsoft.com>
1 parent d17f363 commit 0ee8cb7

20 files changed

Lines changed: 129 additions & 80 deletions

File tree

SPECS-EXTENDED/buildah/buildah.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Summary: A command line tool used for creating OCI Images
2222
Name: buildah
2323
Version: 1.18.0
24-
Release: 29%{?dist}
24+
Release: 30%{?dist}
2525
License: ASL 2.0
2626
Vendor: Microsoft Corporation
2727
Distribution: Azure Linux
@@ -32,7 +32,7 @@ BuildRequires: btrfs-progs-devel
3232
BuildRequires: device-mapper-devel
3333
BuildRequires: git
3434
BuildRequires: glib2-devel
35-
BuildRequires: glibc-static >= 2.38-9%{?dist}
35+
BuildRequires: glibc-static >= 2.38-10%{?dist}
3636
BuildRequires: go-md2man
3737
BuildRequires: go-rpm-macros
3838
BuildRequires: golang
@@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
123123
%{_datadir}/%{name}/test
124124

125125
%changelog
126+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 1.18.0-30
127+
- Bump to rebuild with updated glibc
128+
126129
* Tue Feb 25 2025 Chris Co <chrco@microsoft.com> - 1.18.0-29
127130
- Bump to rebuild with updated glibc
128131

SPECS-EXTENDED/catatonit/catatonit.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Distribution: Azure Linux
33

44
Name: catatonit
55
Version: 0.1.7
6-
Release: 17%{?dist}
6+
Release: 18%{?dist}
77
Summary: A signal-forwarding process manager for containers
88
License: GPLv3+
99
URL: https://github.com/openSUSE/catatonit
@@ -13,7 +13,7 @@ BuildRequires: automake
1313
BuildRequires: file
1414
BuildRequires: gcc
1515
BuildRequires: git
16-
BuildRequires: glibc-static >= 2.38-9%{?dist}
16+
BuildRequires: glibc-static >= 2.38-10%{?dist}
1717
BuildRequires: libtool
1818
BuildRequires: make
1919

@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
6161
%{_libexecdir}/podman/%{name}
6262

6363
%changelog
64+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 0.1.7-18
65+
- Bump to rebuild with updated glibc
66+
6467
* Tue Feb 25 2025 Chris Co <chrco@microsoft.com> - 0.1.7-17
6568
- Bump to rebuild with updated glibc
6669

SPECS-EXTENDED/dyninst/dyninst.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: An API for Run-time Code Generation
22
License: LGPLv2+
33
Name: dyninst
4-
Release: 19%{?dist}
4+
Release: 20%{?dist}
55
Vendor: Microsoft Corporation
66
Distribution: Azure Linux
77
URL: http://www.dyninst.org
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
3131

3232
# Extra requires just for the testsuite
3333
BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
34-
BuildRequires: glibc-static >= 2.38-9%{?dist}
34+
BuildRequires: glibc-static >= 2.38-10%{?dist}
3535

3636
# Testsuite files should not provide/require anything
3737
%{?filter_setup:
@@ -194,6 +194,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
194194
%attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
195195

196196
%changelog
197+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 10.1.0-20
198+
- Bump to rebuild with updated glibc
199+
197200
* Tue Feb 25 2025 Chris Co <chrco@microsoft.com> - 10.1.0-19
198201
- Bump to rebuild with updated glibc
199202

SPECS-EXTENDED/podman/podman.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
Name: podman
3737
Version: 4.1.1
38-
Release: 27%{?dist}
38+
Release: 28%{?dist}
3939
License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0
4040
Summary: Manage Pods, Containers and Container Images
4141
Vendor: Microsoft Corporation
@@ -50,7 +50,7 @@ BuildRequires: go-md2man
5050
BuildRequires: golang
5151
BuildRequires: gcc
5252
BuildRequires: glib2-devel
53-
BuildRequires: glibc-static >= 2.38-9%{?dist}
53+
BuildRequires: glibc-static >= 2.38-10%{?dist}
5454
BuildRequires: git
5555
BuildRequires: go-rpm-macros
5656
BuildRequires: gpgme-devel
@@ -386,6 +386,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
386386

387387
# rhcontainerbot account currently managed by lsm5
388388
%changelog
389+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 4.1.1-28
390+
- Bump to rebuild with updated glibc
391+
389392
* Tue Feb 25 2025 Chris Co <chrco@microsoft.com> - 4.1.1-27
390393
- Bump to rebuild with updated glibc
391394

SPECS/busybox/busybox.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Statically linked binary providing simplified versions of system commands
22
Name: busybox
33
Version: 1.36.1
4-
Release: 11%{?dist}
4+
Release: 12%{?dist}
55
License: GPLv2
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
@@ -18,7 +18,7 @@ Patch4: CVE-2023-42365.patch
1818
Patch5: CVE-2023-42366.patch
1919
Patch6: CVE-2023-39810.patch
2020
BuildRequires: gcc
21-
BuildRequires: glibc-static >= 2.38-9%{?dist}
21+
BuildRequires: glibc-static >= 2.38-10%{?dist}
2222
BuildRequires: libselinux-devel >= 1.27.7-2
2323
BuildRequires: libsepol-devel
2424
%if 0%{?with_check}
@@ -105,6 +105,9 @@ SKIP_KNOWN_BUGS=1 ./runtest
105105
%{_mandir}/man1/busybox.petitboot.1.gz
106106

107107
%changelog
108+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 1.36.1-12
109+
- Bump to rebuild with updated glibc
110+
108111
* Thu May 01 2025 Kshitiz Godara <kgodara@microsoft.com> - 1.36.1-11
109112
- Added patch for CVE-2023-39810
110113

SPECS/flannel/flannel.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: Simple and easy way to configure a layer 3 network fabric designed for Kubernetes
44
Name: flannel
55
Version: 0.24.2
6-
Release: 13%{?dist}
6+
Release: 14%{?dist}
77
License: ASL 2.0
88
Vendor: Microsoft Corporation
99
Distribution: Azure Linux
@@ -18,7 +18,7 @@ Patch3: CVE-2025-30204.patch
1818
Patch4: CVE-2024-51744.patch
1919
BuildRequires: gcc
2020
BuildRequires: glibc-devel
21-
BuildRequires: glibc-static >= 2.38-9%{?dist}
21+
BuildRequires: glibc-static >= 2.38-10%{?dist}
2222
BuildRequires: golang >= 1.20
2323
BuildRequires: kernel-headers
2424

@@ -52,6 +52,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} ./dist/flanneld
5252
%{_bindir}/flanneld
5353

5454
%changelog
55+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 0.24.2-14
56+
- Bump to rebuild with updated glibc
57+
5558
* Wed Mar 31 2025 Jyoti Kanase <v-jykanase@microsoft.com> - 0.24.2-13
5659
- patch for CVE-2024-51744
5760

SPECS/glibc/glibc.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Main C library
1111
Name: glibc
1212
Version: 2.38
13-
Release: 9%{?dist}
13+
Release: 10%{?dist}
1414
License: BSD AND GPLv2+ AND Inner-Net AND ISC AND LGPLv2+ AND MIT
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -37,6 +37,7 @@ Patch9: CVE-2023-6779.patch
3737
Patch10: CVE-2023-6780.patch
3838
# Upstream backport for fixing: nscd fails to build with cleanup handler if built with -fexceptions
3939
Patch11: nscd-Do-not-rebuild-getaddrinfo-bug-30709.patch
40+
Patch12: glibc-2.34_pthread_cond_wait.patch
4041
# Patches for testing
4142
Patch100: 0001-Remove-Wno-format-cflag-from-tests.patch
4243

@@ -358,6 +359,9 @@ grep "^FAIL: nptl/tst-mutex10" tests.sum >/dev/null && n=$((n+1)) ||:
358359
%exclude %{_libdir}/locale/C.utf8
359360

360361
%changelog
362+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 2.38-10
363+
- Add glibc-2.34_pthread_cond_wait.patch
364+
361365
* Wed Feb 19 2025 Chris Co <chrco@microsoft.com> - 2.38-9
362366
- Re-enable nscd build and packaging
363367

SPECS/kubernetes/kubernetes.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Microsoft Kubernetes
1111
Name: kubernetes
1212
Version: 1.30.10
13-
Release: 6%{?dist}
13+
Release: 7%{?dist}
1414
License: ASL 2.0
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -27,7 +27,7 @@ Patch5: CVE-2024-51744.patch
2727
Patch6: CVE-2025-30204.patch
2828
Patch7: CVE-2025-22872.patch
2929
BuildRequires: flex-devel
30-
BuildRequires: glibc-static >= 2.38-9%{?dist}
30+
BuildRequires: glibc-static >= 2.38-10%{?dist}
3131
BuildRequires: golang
3232
BuildRequires: rsync
3333
BuildRequires: systemd-devel
@@ -277,9 +277,12 @@ fi
277277
%{_exec_prefix}/local/bin/pause
278278

279279
%changelog
280-
* Wed Apr 23 2025 Sreeniavsulu Malavathula <v-smalavathu@microsoft.com> - 1.30-10-6
280+
* Tue May 13 2025 Sreeniavsulu Malavathula <v-smalavathu@microsoft.com> - 1.30-10-7
281281
- Patch CVE-2025-22872
282282

283+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 1.30-10-6
284+
- Bump to rebuild with updated glibc
285+
283286
* Wed Apr 16 2025 Sreeniavsulu Malavathula <v-smalavathu@microsoft.com> - 1.30.10-5
284287
- Fix CVE-2024-51744 with an upstream patch
285288

SPECS/kubevirt/kubevirt.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Summary: Container native virtualization
2121
Name: kubevirt
2222
Version: 1.2.0
23-
Release: 16%{?dist}
23+
Release: 17%{?dist}
2424
License: ASL 2.0
2525
Vendor: Microsoft Corporation
2626
Distribution: Azure Linux
@@ -43,7 +43,7 @@ Patch8: CVE-2025-22872.patch
4343
%global debug_package %{nil}
4444
BuildRequires: swtpm-tools
4545
BuildRequires: glibc-devel
46-
BuildRequires: glibc-static >= 2.38-9%{?dist}
46+
BuildRequires: glibc-static >= 2.38-10%{?dist}
4747
BuildRequires: golang >= 1.21
4848
BuildRequires: golang-packaging
4949
BuildRequires: pkgconfig
@@ -280,9 +280,12 @@ install -p -m 0644 cmd/virt-launcher/qemu.conf %{buildroot}%{_datadir}/kube-virt
280280
%{_bindir}/virt-tests
281281

282282
%changelog
283-
* Thu Apr 24 2025 Sreeniavsulu Malavathula <v-smalavathu@microsoft.com> - 1.2.0-16
283+
* Tue May 13 2025 Sreeniavsulu Malavathula <v-smalavathu@microsoft.com> - 1.2.0-17
284284
- Patch CVE-2025-22872
285285

286+
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 1.2.0-16
287+
- Bump to rebuild with updated glibc
288+
286289
* Mon Mar 03 2025 corvus-callidus <108946721+corvus-callidus@users.noreply.github.com> - 1.2.0-15
287290
- Address CVE-2023-44487
288291

SPECS/libcap/libcap.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Summary: Libcap
22
Name: libcap
33
Version: 2.69
4-
Release: 3%{?dist}
4+
Release: 4%{?dist}
55
License: GPLv2+
66
Group: System Environment/Security
77
URL: https://www.gnu.org/software/hurd/community/gsoc/project_ideas/libcap.html
88
Source0: https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz
99
Patch0: CVE-2025-1390.patch
1010
Vendor: Microsoft Corporation
1111
Distribution: Azure Linux
12-
BuildRequires: glibc-static >= 2.38-9%{?dist}
12+
BuildRequires: glibc-static >= 2.38-10%{?dist}
1313

1414
%description
1515
The libcap package implements the user-space interfaces to the POSIX 1003.1e capabilities available
@@ -62,6 +62,9 @@ sed -i '/echo "attempt to exploit kernel bug"/,/^fi$/d' quicktest.sh
6262
%{_mandir}/man3/*
6363

6464
%changelog
65+
* Mon May 12 2025 Andrew Phelps anphel@microsoft.com - 2.69-4
66+
- Bump to rebuild with updated glibc
67+
6568
* Wed Feb 26 2025 Kanishk Bansal <kanbansal@microsoft.com> - 2.69-3
6669
- Modify check section to fix ptest
6770

0 commit comments

Comments
 (0)