Merge branch '3.0-dev' into 3.0

microsoft · Jul 16, 2024 · b096270 · b096270
2 parents 1a81cc4 + 519fc6e
commit b096270
Show file tree

Hide file tree

Showing 140 changed files with 13,420 additions and 326 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
@@ -607,6 +607,7 @@
                 "libdbi",
                 "libdbusmenu",
                 "libdc1394",
+		"libdecor",
                 "libdeflate",
                 "libdmx",
                 "libdnf",
@@ -617,6 +618,7 @@
                 "libeasyfc",
                 "libecap",
                 "libecb",
+		"libei",
                 "libell",
                 "libEMF",
                 "libeot",
@@ -802,6 +804,7 @@
                 "libXcomposite",
                 "libxcrypt",
                 "libXcursor",
+		"libxcvt",
                 "libXdamage",
                 "libXdmcp",
                 "libXext",

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
@@ -11,8 +11,8 @@
 %endif
 Summary:        Signed GRand Unified Bootloader for %{buildarch} systems
 Name:           grub2-efi-binary-signed-%{buildarch}
-Version:        2.12
-Release:        1%{?dist}
+Version:        2.06
+Release:        19%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -79,9 +79,6 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname}
 /boot/efi/EFI/BOOT/%{grubpxeefiname}
 
 %changelog
-* Fri Jun 14 2024 Gary Swalling <[email protected]> - 2.12-1
-- Match grub2 version and release numbers
-
 * Wed Jun 12 2024 George Mileka <[email protected]> - 2.06-19
 - disable code optimization for ip checksum calculation
 

diff --git a/SPECS/blobfuse2/CVE-2023-44487.patch b/SPECS/blobfuse2/CVE-2023-44487.patch
diff --git a/SPECS/blobfuse2/blobfuse2.signatures.json b/SPECS/blobfuse2/blobfuse2.signatures.json
@@ -1,6 +1,6 @@
 {
     "Signatures": {
-     "blobfuse2-2.1.0.tar.gz": "cf51a427d32083a49721d92b35e7fdb76c8f1887b14c0e0e7a5744c470b1653e",
-     "blobfuse2-2.1.0-vendor.tar.gz": "338bd84bd65012b408330077e163ddab2c5362b379e50263e589500ec6d283a2"
+     "blobfuse2-2.3.0.tar.gz": "9e7c3b98c4967d45405a4b9450fb3e90e329ffefaef1ffa0e6cedfd66991881b",
+     "blobfuse2-2.3.0-vendor.tar.gz": "fea87a77eb3ee28883c1e24de6213c5db1288387b9f9162f4fc57cfdffe97ddb"
     }
-}
+}
diff --git a/SPECS/blobfuse2/blobfuse2.spec b/SPECS/blobfuse2/blobfuse2.spec
@@ -5,8 +5,8 @@
 
 Summary:        FUSE adapter - Azure Storage
 Name:           blobfuse2
-Version:        2.1.0
-Release:        4%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -15,7 +15,6 @@ URL:            https://github.com/Azure/azure-storage-fuse/
 Source0:        https://github.com/Azure/azure-storage-fuse/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Leverage the `generate_source_tarball.sh` to create the vendor sources.
 Source1:        %{name}-%{version}-vendor.tar.gz
-Patch0:         CVE-2023-44487.patch
 BuildRequires:  cmake
 BuildRequires:  fuse3-devel
 BuildRequires:  gcc
@@ -60,6 +59,9 @@ install -D -m 0644 ./setup/blobfuse2-logrotate %{buildroot}%{_sysconfdir}/logrot
 %{_sysconfdir}/logrotate.d/blobfuse2
 
 %changelog
+* Tue Jul 09 2024 Pawel Winogrodzki <[email protected]> - 2.3.0-1
+- Update to version 2.3.0.
+
 * Mon Jul 08 2024 Pawel Winogrodzki <[email protected]> - 2.1.0-4
 - Adding a patch for CVE-2023-44487.
 - Switched to building the vendor tarball with the generate_source_tarball.sh script.