Merge branch '3.0-dev' into 3.0

microsoft · Nov 1, 2024 · ec7cffe · ec7cffe
2 parents 977ae86 + f52c8e6
commit ec7cffe
Show file tree

Hide file tree

Showing 32 changed files with 500 additions and 56 deletions.
diff --git a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md
diff --git a/LICENSES-AND-NOTICES/SPECS/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json
@@ -2713,6 +2713,7 @@
                 "gnutls",
                 "gobject-introspection",
                 "golang",
+                "golang-1.22",
                 "gperf",
                 "gperftools",
                 "gpgme",

diff --git a/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec b/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec
@@ -12,7 +12,7 @@
 Summary:        Signed GRand Unified Bootloader for %{buildarch} systems
 Name:           grub2-efi-binary-signed-%{buildarch}
 Version:        2.06
-Release:        20%{?dist}
+Release:        21%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -79,6 +79,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname}
 /boot/efi/EFI/BOOT/%{grubpxeefiname}
 
 %changelog
+* Mon Oct 28 2024 Chris Co <[email protected]> - 2.06-21
+- Bump release number to match grub release
+
 * Tue Aug 13 2024 Daniel McIlvaney <[email protected]> - 2.06-20
 - Move grub2-rpm-macros to the azurelinux-rpm-macros package
 

diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec
@@ -10,7 +10,7 @@
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
 Version:        6.6.57.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %exclude /module_info.ld
 
 %changelog
+* Wed Oct 30 2024 Thien Trung Vuong <[email protected]> - 6.6.57.1-2
+- Bump release to match kernel
+
 * Tue Oct 29 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.57.1-1
 - Auto-upgrade to 6.6.57.1
 

diff --git a/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec b/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
@@ -6,7 +6,7 @@
 Summary:        Signed Unified Kernel Image for %{buildarch} systems
 Name:           kernel-uki-signed-%{buildarch}
 Version:        6.6.57.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -68,6 +68,9 @@ popd
 /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
 
 %changelog
+* Wed Oct 30 2024 Thien Trung Vuong <[email protected]> - 6.6.57.1-2
+- Bump release to match kernel
+
 * Tue Oct 29 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.57.1-1
 - Auto-upgrade to 6.6.57.1
 

diff --git a/SPECS/containerd/containerd.spec b/SPECS/containerd/containerd.spec
@@ -4,7 +4,7 @@
 Summary: Industry-standard container runtime
 Name: containerd
 Version: 1.7.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: ASL 2.0
 Group: Tools/Container
 URL: https://www.containerd.io
@@ -22,7 +22,7 @@ Patch3:  CVE-2023-47108.patch
 %{?systemd_requires}
 
 BuildRequires: git
-BuildRequires: golang
+BuildRequires: golang < 1.23
 BuildRequires: go-md2man
 BuildRequires: make
 BuildRequires: systemd-rpm-macros
@@ -87,6 +87,9 @@ fi
 %dir /opt/containerd/lib
 
 %changelog
+* Tue Oct 15 2024 Muhammad Falak <[email protected]> - 1.7.13-4
+- Pin golang version to <= 1.22
+
 * Wed Jun 26 2024 Nicolas Guibourge <[email protected]> - 1.7.13-3
 - Address CVE-2023-44487 and CVE-2023-47108
 

diff --git a/SPECS/gh/gh.spec b/SPECS/gh/gh.spec
@@ -1,7 +1,7 @@
 Summary:        GitHub official command line tool
 Name:           gh
 Version:        2.43.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -28,7 +28,7 @@ Source0:        https://github.com/cli/cli/archive/refs/tags/v%{version}.tar.gz#
 #       - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
 Source1:        %{name}-%{version}-vendor.tar.gz
 
-BuildRequires:  golang >= 1.21.1
+BuildRequires:  golang < 1.23
 BuildRequires:  git
 Requires:       git
 %global debug_package %{nil}
@@ -70,6 +70,9 @@ make test
 %{_datadir}/zsh/site-functions/_gh
 
 %changelog
+* Tue Oct 15 2024 Muhammad Falak <[email protected]> - 2.43.1-2
+- Pin golang version to <= 1.22
+
 * Mon Feb 26 2024 Neha Agarwal <[email protected]> - 2.43.1-1
 - Update to v2.43.1
 

diff --git a/SPECS/golang/golang-1.22.signatures.json b/SPECS/golang/golang-1.22.signatures.json
@@ -0,0 +1,8 @@
+{
+ "Signatures": {
+  "go.20230802.5.src.tar.gz": "56b9e0e0c3c13ca95d5efa6de4e7d49a9d190eca77919beff99d33cd3fa74e95",
+  "go.20240206.2.src.tar.gz": "7982e0011aa9ab95fd0530404060410af4ba57326d26818690f334fdcb6451cd",
+  "go1.22.7-20240925.5.src.tar.gz": "6577057080f0d61f9b7b1c5e3a029c8a24f8c4b38a91a497115ecd259bd987ab",
+  "go1.4-bootstrap-20171003.tar.gz": "f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52"
+ }
+}