util-linux: Upgrade to 2.40.2

microsoft · Sep 18, 2024 · c4526cf · c4526cf
1 parent 8d99129
commit c4526cf
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 42 deletions.
diff --git a/SPECS/util-linux/CVE-2024-28085.patch b/SPECS/util-linux/CVE-2024-28085.patch
diff --git a/SPECS/util-linux/util-linux.signatures.json b/SPECS/util-linux/util-linux.signatures.json
@@ -4,6 +4,6 @@
   "runuser-l": "406d5056ad272301d0523c35c0b4608dfd388db895656fa1a04e20d13fff9340",
   "su": "95d3c92017809b11a24f456cc5bc16bf2174380f97942d435314ef24fab75885",
   "su-l": "4d10241676e97e5e8d8935e5c8e8f6cb2f871afb881059715f155909be9ebd77",
-  "util-linux-2.39.2.tar.xz": "87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f"
+  "util-linux-2.40.2.tar.xz": "d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3"
  }
 }
diff --git a/SPECS/util-linux/util-linux.spec b/SPECS/util-linux/util-linux.spec
@@ -1,8 +1,8 @@
 %define majminorver %(echo %{version} | cut -d. -f1-2)
 Summary:        Utilities for file systems, consoles, partitions, and messages
 Name:           util-linux
-Version:        2.39.2
-Release:        2%{?dist}
+Version:        2.40.2
+Release:        1%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -13,7 +13,6 @@ Source1:        runuser
 Source2:        runuser-l
 Source3:        su
 Source4:        su-l
-Patch0:         CVE-2024-28085.patch
 BuildRequires:  audit-devel
 BuildRequires:  libcap-ng-devel
 BuildRequires:  libselinux-devel
@@ -78,6 +77,7 @@ autoreconf -fi
     --disable-silent-rules \
     --disable-static \
     --disable-use-tty-group \
+    --disable-liblastlog2 \
     --without-python \
     --with-selinux \
     --with-audit
@@ -152,6 +152,11 @@ rm -rf %{buildroot}/lib/systemd/system
 %{_mandir}/man3/*
 
 %changelog
+* Wed Sep 18 2024 Vince Perri <[email protected]> - 2.40.2-1
+- Upgrade to 2.40.2:
+-   Added --disable-liblastlog2 to avoid building new liblastlog2 libraries
+-   Removed CVE-2024-28085 patch as it is fixed in 2.40.2
+
 * Mon Sep 09 2024 Harshit Gupta <[email protected]> - 2.39.2-2
 - Fix CVE-2024-28085 by adding patch
 

diff --git a/cgmanifest.json b/cgmanifest.json
@@ -16723,8 +16723,8 @@
         "type": "other",
         "other": {
           "name": "perl-DateTime-TimeZone",
-          "version": "2.39",
-          "downloadUrl": "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.39.tar.gz"
+          "version": "2.40",
+          "downloadUrl": "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.40.tar.gz"
         }
       }
     },
@@ -29156,8 +29156,8 @@
         "type": "other",
         "other": {
           "name": "util-linux",
-          "version": "2.39.2",
-          "downloadUrl": "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.xz"
+          "version": "2.40.2",
+          "downloadUrl": "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.2.tar.xz"
         }
       }
     },

diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -70,7 +70,7 @@ make-4.4.1-2.azl3.aarch64.rpm
 patch-2.7.6-9.azl3.aarch64.rpm
 libcap-ng-0.8.4-1.azl3.aarch64.rpm
 libcap-ng-devel-0.8.4-1.azl3.aarch64.rpm
-util-linux-2.39.2-2.azl3.aarch64.rpm
+util-linux-2.40.2-1.azl3.aarch64.rpm
 util-linux-devel-2.39.2-2.azl3.aarch64.rpm
 util-linux-libs-2.39.2-2.azl3.aarch64.rpm
 tar-1.35-1.azl3.aarch64.rpm

diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@@ -70,7 +70,7 @@ make-4.4.1-2.azl3.x86_64.rpm
 patch-2.7.6-9.azl3.x86_64.rpm
 libcap-ng-0.8.4-1.azl3.x86_64.rpm
 libcap-ng-devel-0.8.4-1.azl3.x86_64.rpm
-util-linux-2.39.2-2.azl3.x86_64.rpm
+util-linux-2.40.2-1.azl3.x86_64.rpm
 util-linux-devel-2.39.2-2.azl3.x86_64.rpm
 util-linux-libs-2.39.2-2.azl3.x86_64.rpm
 tar-1.35-1.azl3.x86_64.rpm

diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -596,7 +596,7 @@ texinfo-7.0.3-1.azl3.aarch64.rpm
 texinfo-debuginfo-7.0.3-1.azl3.aarch64.rpm
 unzip-6.0-20.azl3.aarch64.rpm
 unzip-debuginfo-6.0-20.azl3.aarch64.rpm
-util-linux-2.39.2-2.azl3.aarch64.rpm
+util-linux-2.40.2-1.azl3.aarch64.rpm
 util-linux-debuginfo-2.39.2-2.azl3.aarch64.rpm
 util-linux-devel-2.39.2-2.azl3.aarch64.rpm
 util-linux-lang-2.39.2-2.azl3.aarch64.rpm

diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -602,7 +602,7 @@ texinfo-7.0.3-1.azl3.x86_64.rpm
 texinfo-debuginfo-7.0.3-1.azl3.x86_64.rpm
 unzip-6.0-20.azl3.x86_64.rpm
 unzip-debuginfo-6.0-20.azl3.x86_64.rpm
-util-linux-2.39.2-2.azl3.x86_64.rpm
+util-linux-2.40.2-1.azl3.x86_64.rpm
 util-linux-debuginfo-2.39.2-2.azl3.x86_64.rpm
 util-linux-devel-2.39.2-2.azl3.x86_64.rpm
 util-linux-lang-2.39.2-2.azl3.x86_64.rpm