diff --git a/SPECS-EXTENDED/buildah/buildah.spec b/SPECS-EXTENDED/buildah/buildah.spec index 8aa4946c73..52b9ddac34 100644 --- a/SPECS-EXTENDED/buildah/buildah.spec +++ b/SPECS-EXTENDED/buildah/buildah.spec @@ -19,9 +19,9 @@ %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url https://%{import_path}/archive/%{built_tag}.tar.gz Summary: A command line tool used for creating OCI Images -Name: %{repo} +Name: buildah Version: 1.18.0 -Release: 14%{?dist} +Release: 15%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -31,7 +31,7 @@ BuildRequires: btrfs-progs-devel BuildRequires: device-mapper-devel BuildRequires: git BuildRequires: glib2-devel -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: go-md2man BuildRequires: go-rpm-macros BuildRequires: golang @@ -122,6 +122,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %{_datadir}/%{name}/test %changelog +* Wed Jul 14 2023 Andrew Phelps - 1.18.0-15 +- Bump release to rebuild against glibc 2.35-4 + * Thu Jul 13 2023 CBL-Mariner Servicing Account - 1.18.0-14 - Bump release to rebuild with go 1.19.11 diff --git a/SPECS-EXTENDED/catatonit/catatonit.spec b/SPECS-EXTENDED/catatonit/catatonit.spec index 1975d7a153..8dedeaaebe 100644 --- a/SPECS-EXTENDED/catatonit/catatonit.spec +++ b/SPECS-EXTENDED/catatonit/catatonit.spec @@ -3,7 +3,7 @@ Distribution: Mariner Name: catatonit Version: 0.1.7 -Release: 6%{?dist} +Release: 7%{?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.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: libtool BuildRequires: make @@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name} %{_libexecdir}/podman/%{name} %changelog +* Wed Jul 05 2023 Andrew Phelps - 0.1.7-7 +- Bump release to rebuild against glibc 2.35-4 + * Tue Sep 13 2022 Andy Caldwell - 0.1.7-6 - Rebuilt for glibc-static 2.35-3 diff --git a/SPECS-EXTENDED/dyninst/dyninst.spec b/SPECS-EXTENDED/dyninst/dyninst.spec index 980177de85..d5de5ee96d 100644 --- a/SPECS-EXTENDED/dyninst/dyninst.spec +++ b/SPECS-EXTENDED/dyninst/dyninst.spec @@ -1,7 +1,7 @@ Summary: An API for Run-time Code Generation License: LGPLv2+ Name: dyninst -Release: 8%{?dist} +Release: 9%{?dist} Vendor: Microsoft Corporation Distribution: Mariner 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.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} # Testsuite files should not provide/require anything %{?filter_setup: @@ -194,6 +194,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a %changelog +* Wed Jul 05 2023 Andrew Phelps - 10.1.0-9 +- Bump release to rebuild against glibc 2.35-4 + * Tue Sep 13 2022 Andy Caldwell - 10.1.0-8 - Rebuilt for glibc-static 2.35-3 diff --git a/SPECS-EXTENDED/podman/podman.spec b/SPECS-EXTENDED/podman/podman.spec index 742b45663d..305cf264a1 100644 --- a/SPECS-EXTENDED/podman/podman.spec +++ b/SPECS-EXTENDED/podman/podman.spec @@ -36,7 +36,7 @@ Name: podman Version: 4.1.1 -Release: 12%{?dist} +Release: 13%{?dist} License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0 Summary: Manage Pods, Containers and Container Images Vendor: Microsoft Corporation @@ -51,7 +51,7 @@ BuildRequires: go-md2man BuildRequires: golang BuildRequires: gcc BuildRequires: glib2-devel -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: git BuildRequires: go-rpm-macros BuildRequires: gpgme-devel @@ -387,6 +387,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Jul 14 2023 Andrew Phelps - 4.1.1-13 +- Bump release to rebuild against glibc 2.35-4 + * Thu Jul 13 2023 CBL-Mariner Servicing Account - 4.1.1-12 - Bump release to rebuild with go 1.19.11 diff --git a/SPECS/busybox/busybox.spec b/SPECS/busybox/busybox.spec index 2f89d8cd9a..369cd442ea 100644 --- a/SPECS/busybox/busybox.spec +++ b/SPECS/busybox/busybox.spec @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.35.0 -Release: 3%{?dist} +Release: 5%{?dist} License: GPLv2 Vendor: Microsoft Corporation Distribution: Mariner @@ -16,7 +16,7 @@ Patch3: CVE-2022-30065.patch Patch4: ash-fix-use-after-free-in-pattern-substituon-code.patch Patch5: ash-fix-use-after-free-in-bash-pattern-substitution.patch BuildRequires: gcc -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: libselinux-devel >= 1.27.7-2 BuildRequires: libsepol-devel # libbb/hash_md5_sha.c @@ -94,6 +94,9 @@ install -m 644 docs/busybox.petitboot.1 %{buildroot}/%{_mandir}/man1/busybox.pet %{_mandir}/man1/busybox.petitboot.1.gz %changelog +* Wed Jul 05 2023 Andrew Phelps - 1.35.0-5 +- Bump release to rebuild against glibc 2.35-4 + * Fri Oct 07 2022 Andy Caldwell - 1.35.0-4 - Build with `glibc-static` on all platforms diff --git a/SPECS/flannel/flannel.spec b/SPECS/flannel/flannel.spec index e31f0a15c1..4e4179efaf 100644 --- a/SPECS/flannel/flannel.spec +++ b/SPECS/flannel/flannel.spec @@ -4,7 +4,7 @@ Summary: Simple and easy way to configure a layer 3 network fabric designed for Kubernetes Name: flannel Version: 0.14.0 -Release: 14%{?dist} +Release: 15%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -15,7 +15,7 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: glibc-devel -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: golang >= 1.18.5 BuildRequires: kernel-headers @@ -48,6 +48,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} ./dist/flanneld %{_bindir}/flanneld %changelog +* Wed Jul 14 2023 Andrew Phelps - 0.14.0-15 +- Bump release to rebuild against glibc 2.35-4 + * Thu Jul 13 2023 CBL-Mariner Servicing Account - 0.14.0-14 - Bump release to rebuild with go 1.19.11 diff --git a/SPECS/glibc/glibc.spec b/SPECS/glibc/glibc.spec index b2be322e36..6c5fc3bea5 100644 --- a/SPECS/glibc/glibc.spec +++ b/SPECS/glibc/glibc.spec @@ -1,13 +1,13 @@ %global security_hardening nonow %define glibc_target_cpu %{_build} -%define debug_package %{nil} + # Don't depend on bash by default %define __requires_exclude ^/(bin|usr/bin).*$ Summary: Main C library Name: glibc Version: 2.35 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD AND GPLv2+ AND Inner-Net AND ISC AND LGPLv2+ AND MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -28,6 +28,7 @@ Patch3: CVE-2020-1751.nopatch Patch4: CVE-2018-20796.nopatch Patch5: glibc-2.34_pthread_cond_wait.patch BuildRequires: bison +BuildRequires: gawk BuildRequires: gettext BuildRequires: kernel-headers BuildRequires: texinfo @@ -318,6 +319,9 @@ grep "^FAIL: nptl/tst-eintr1" tests.sum >/dev/null && n=$((n+1)) ||: %defattr(-,root,root) %changelog +* Fri Jun 30 2023 Andrew Phelps - 2.35-4 +- Restore glibc-debuginfo package + * Fri Sep 30 2022 Andy Caldwell - 2.35-3 - Split `glibc-static` into an actual package containing static libraries and runtime diff --git a/SPECS/kubevirt/kubevirt.spec b/SPECS/kubevirt/kubevirt.spec index 03fa48a17a..ee9b240215 100644 --- a/SPECS/kubevirt/kubevirt.spec +++ b/SPECS/kubevirt/kubevirt.spec @@ -19,7 +19,7 @@ Summary: Container native virtualization Name: kubevirt Version: 0.59.0 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -34,7 +34,7 @@ Patch1: Allocate-2-cpu-for-the-emulator-thread.patch Patch2: Hotplug_detach_grace_period.patch %global debug_package %{nil} BuildRequires: glibc-devel -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: golang BuildRequires: golang-packaging BuildRequires: pkgconfig @@ -211,6 +211,9 @@ install -p -m 0644 cmd/virt-handler/nsswitch.conf %{buildroot}%{_datadir}/kube-v %{_bindir}/virt-tests %changelog +* Wed Jul 14 2023 Andrew Phelps - 0.59.0-6 +- Bump release to rebuild against glibc 2.35-4 + * Thu Jul 13 2023 CBL-Mariner Servicing Account - 0.59.0-5 - Bump release to rebuild with go 1.19.11 diff --git a/SPECS/libguestfs/libguestfs.spec b/SPECS/libguestfs/libguestfs.spec index b0a3599b66..2eb1c8a41a 100644 --- a/SPECS/libguestfs/libguestfs.spec +++ b/SPECS/libguestfs/libguestfs.spec @@ -25,7 +25,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Version: 1.44.0 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ Vendor: Microsoft Corporation Distribution: Mariner @@ -89,7 +89,7 @@ BuildRequires: gcc-c++ BuildRequires: gdisk BuildRequires: genisoimage BuildRequires: gfs2-utils -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: gobject-introspection-devel BuildRequires: gperf BuildRequires: grep @@ -1234,6 +1234,9 @@ rm ocaml/html/.gitignore %endif %changelog +* Wed Jul 05 2023 Andrew Phelps - 1.44.0-13 +- Bump release to rebuild against glibc 2.35-4 + * Wed Apr 12 2023 Sam Meluch - 1.44.0-12 - Update tdnf download to tdnf install --downloadonly diff --git a/SPECS/rust/rust.spec b/SPECS/rust/rust.spec index e904c40878..211e1df9fe 100644 --- a/SPECS/rust/rust.spec +++ b/SPECS/rust/rust.spec @@ -9,7 +9,7 @@ Summary: Rust Programming Language Name: rust Version: 1.68.2 -Release: 3%{?dist} +Release: 4%{?dist} License: (ASL 2.0 OR MIT) AND BSD AND CC-BY-3.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -55,7 +55,7 @@ BuildRequires: ninja-build BuildRequires: openssl-devel BuildRequires: python3 %if %{with_check} -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} %endif # rustc uses a C compiler to invoke the linker, and links to glibc in most cases Requires: binutils @@ -165,6 +165,9 @@ rm %{buildroot}%{_docdir}/%{name}/*.old %{_mandir}/man1/* %changelog +* Wed Jul 05 2023 Andrew Phelps - 1.68.2-4 +- Bump release to rebuild against glibc 2.35-4 + * Wed Jun 21 2023 Jonathan Behrens - 1.68.2-3 - Include "cargo-clippy" tool in the package. diff --git a/SPECS/supermin/supermin.spec b/SPECS/supermin/supermin.spec index d9b92d5d54..df3f36c9f1 100644 --- a/SPECS/supermin/supermin.spec +++ b/SPECS/supermin/supermin.spec @@ -21,7 +21,7 @@ Summary: Tool for creating supermin appliances Name: supermin Version: 5.2.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner @@ -54,7 +54,7 @@ BuildRequires: systemd-udev %if %{with dietlibc} BuildRequires: dietlibc-devel %else -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} %endif %if %{with_check} @@ -129,6 +129,9 @@ make check || { %{_rpmconfigdir}/supermin-find-requires %changelog +* Wed Jul 05 2023 Andrew Phelps - 5.2.1-5 +- Bump release to rebuild against glibc 2.35-4 + * Tue Sep 13 2022 Andy Caldwell - 5.2.1-4 - Rebuilt for glibc-static 2.35-3 diff --git a/SPECS/tini/tini.spec b/SPECS/tini/tini.spec index 49ee58f3e4..3fa0b8233d 100644 --- a/SPECS/tini/tini.spec +++ b/SPECS/tini/tini.spec @@ -1,7 +1,7 @@ Summary: A tiny but valid init for containers Name: tini Version: 0.19.0 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -13,7 +13,7 @@ BuildRequires: diffutils BuildRequires: file BuildRequires: gcc BuildRequires: glibc-devel -BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: glibc-static >= 2.35-4%{?dist} BuildRequires: kernel-headers BuildRequires: make BuildRequires: sed @@ -66,6 +66,9 @@ ln -s %{_bindir}/tini-static %{buildroot}%{_bindir}/docker-init %{_bindir}/docker-init %changelog +* Wed Jul 05 2023 Andrew Phelps - 0.19.0-9 +- Bump release to rebuild against glibc 2.35-4 + * Tue Sep 13 2022 Andy Caldwell - 0.19.0-8 - Rebuilt for glibc-static 2.35-3 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 18545a89fe..279bdd3abf 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -1,12 +1,12 @@ filesystem-1.1-15.cm2.aarch64.rpm kernel-headers-5.15.118.1-2.cm2.noarch.rpm -glibc-2.35-3.cm2.aarch64.rpm -glibc-devel-2.35-3.cm2.aarch64.rpm -glibc-i18n-2.35-3.cm2.aarch64.rpm -glibc-iconv-2.35-3.cm2.aarch64.rpm -glibc-lang-2.35-3.cm2.aarch64.rpm -glibc-nscd-2.35-3.cm2.aarch64.rpm -glibc-tools-2.35-3.cm2.aarch64.rpm +glibc-2.35-4.cm2.aarch64.rpm +glibc-devel-2.35-4.cm2.aarch64.rpm +glibc-i18n-2.35-4.cm2.aarch64.rpm +glibc-iconv-2.35-4.cm2.aarch64.rpm +glibc-lang-2.35-4.cm2.aarch64.rpm +glibc-nscd-2.35-4.cm2.aarch64.rpm +glibc-tools-2.35-4.cm2.aarch64.rpm zlib-1.2.13-1.cm2.aarch64.rpm zlib-devel-1.2.13-1.cm2.aarch64.rpm file-5.40-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index bf59e1101a..ff9eedf9c4 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -1,12 +1,12 @@ filesystem-1.1-15.cm2.x86_64.rpm kernel-headers-5.15.118.1-2.cm2.noarch.rpm -glibc-2.35-3.cm2.x86_64.rpm -glibc-devel-2.35-3.cm2.x86_64.rpm -glibc-i18n-2.35-3.cm2.x86_64.rpm -glibc-iconv-2.35-3.cm2.x86_64.rpm -glibc-lang-2.35-3.cm2.x86_64.rpm -glibc-nscd-2.35-3.cm2.x86_64.rpm -glibc-tools-2.35-3.cm2.x86_64.rpm +glibc-2.35-4.cm2.x86_64.rpm +glibc-devel-2.35-4.cm2.x86_64.rpm +glibc-i18n-2.35-4.cm2.x86_64.rpm +glibc-iconv-2.35-4.cm2.x86_64.rpm +glibc-lang-2.35-4.cm2.x86_64.rpm +glibc-nscd-2.35-4.cm2.x86_64.rpm +glibc-tools-2.35-4.cm2.x86_64.rpm zlib-1.2.13-1.cm2.x86_64.rpm zlib-devel-1.2.13-1.cm2.x86_64.rpm file-5.40-2.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 2e3dd23ca4..d7a2b0e6ab 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -106,14 +106,15 @@ glib-debuginfo-2.71.0-1.cm2.aarch64.rpm glib-devel-2.71.0-1.cm2.aarch64.rpm glib-doc-2.71.0-1.cm2.noarch.rpm glib-schemas-2.71.0-1.cm2.aarch64.rpm -glibc-2.35-3.cm2.aarch64.rpm -glibc-devel-2.35-3.cm2.aarch64.rpm -glibc-i18n-2.35-3.cm2.aarch64.rpm -glibc-iconv-2.35-3.cm2.aarch64.rpm -glibc-lang-2.35-3.cm2.aarch64.rpm -glibc-nscd-2.35-3.cm2.aarch64.rpm -glibc-static-2.35-3.cm2.aarch64.rpm -glibc-tools-2.35-3.cm2.aarch64.rpm +glibc-2.35-4.cm2.aarch64.rpm +glibc-debuginfo-2.35-4.cm2.aarch64.rpm +glibc-devel-2.35-4.cm2.aarch64.rpm +glibc-i18n-2.35-4.cm2.aarch64.rpm +glibc-iconv-2.35-4.cm2.aarch64.rpm +glibc-lang-2.35-4.cm2.aarch64.rpm +glibc-nscd-2.35-4.cm2.aarch64.rpm +glibc-static-2.35-4.cm2.aarch64.rpm +glibc-tools-2.35-4.cm2.aarch64.rpm gmp-6.2.1-2.cm2.aarch64.rpm gmp-debuginfo-6.2.1-2.cm2.aarch64.rpm gmp-devel-6.2.1-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 2ff5a7f04c..71ff1cb7ae 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -106,14 +106,15 @@ glib-debuginfo-2.71.0-1.cm2.x86_64.rpm glib-devel-2.71.0-1.cm2.x86_64.rpm glib-doc-2.71.0-1.cm2.noarch.rpm glib-schemas-2.71.0-1.cm2.x86_64.rpm -glibc-2.35-3.cm2.x86_64.rpm -glibc-devel-2.35-3.cm2.x86_64.rpm -glibc-i18n-2.35-3.cm2.x86_64.rpm -glibc-iconv-2.35-3.cm2.x86_64.rpm -glibc-lang-2.35-3.cm2.x86_64.rpm -glibc-nscd-2.35-3.cm2.x86_64.rpm -glibc-static-2.35-3.cm2.x86_64.rpm -glibc-tools-2.35-3.cm2.x86_64.rpm +glibc-2.35-4.cm2.x86_64.rpm +glibc-debuginfo-2.35-4.cm2.x86_64.rpm +glibc-devel-2.35-4.cm2.x86_64.rpm +glibc-i18n-2.35-4.cm2.x86_64.rpm +glibc-iconv-2.35-4.cm2.x86_64.rpm +glibc-lang-2.35-4.cm2.x86_64.rpm +glibc-nscd-2.35-4.cm2.x86_64.rpm +glibc-static-2.35-4.cm2.x86_64.rpm +glibc-tools-2.35-4.cm2.x86_64.rpm gmp-6.2.1-2.cm2.x86_64.rpm gmp-debuginfo-6.2.1-2.cm2.x86_64.rpm gmp-devel-6.2.1-2.cm2.x86_64.rpm