Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

util-linux: Upgrade from 2.39.2 to 2.40.2 #10497

Open
wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
+41 −66
Open

util-linux: Upgrade from 2.39.2 to 2.40.2 #10497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions SPECS/util-linux/CVE-2024-28085.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion SPECS/util-linux/util-linux.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
11 changes: 8 additions & 3 deletions SPECS/util-linux/util-linux.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -78,6 +77,7 @@ autoreconf -fi
--disable-silent-rules \
--disable-static \
--disable-use-tty-group \
--disable-liblastlog2 \
--without-python \
--with-selinux \
--with-audit
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ 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-devel-2.39.2-2.azl3.aarch64.rpm
util-linux-libs-2.39.2-2.azl3.aarch64.rpm
util-linux-2.40.2-1.azl3.aarch64.rpm
util-linux-devel-2.40.2-1.azl3.aarch64.rpm
util-linux-libs-2.40.2-1.azl3.aarch64.rpm
tar-1.35-1.azl3.aarch64.rpm
xz-5.4.4-1.azl3.aarch64.rpm
xz-devel-5.4.4-1.azl3.aarch64.rpm
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ 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-devel-2.39.2-2.azl3.x86_64.rpm
util-linux-libs-2.39.2-2.azl3.x86_64.rpm
util-linux-2.40.2-1.azl3.x86_64.rpm
util-linux-devel-2.40.2-1.azl3.x86_64.rpm
util-linux-libs-2.40.2-1.azl3.x86_64.rpm
tar-1.35-1.azl3.x86_64.rpm
xz-5.4.4-1.azl3.x86_64.rpm
xz-devel-5.4.4-1.azl3.x86_64.rpm
Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,11 +596,11 @@ 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-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
util-linux-libs-2.39.2-2.azl3.aarch64.rpm
util-linux-2.40.2-1.azl3.aarch64.rpm
util-linux-debuginfo-2.40.2-1.azl3.aarch64.rpm
util-linux-devel-2.40.2-1.azl3.aarch64.rpm
util-linux-lang-2.40.2-1.azl3.aarch64.rpm
util-linux-libs-2.40.2-1.azl3.aarch64.rpm
which-2.21-8.azl3.aarch64.rpm
which-debuginfo-2.21-8.azl3.aarch64.rpm
xz-5.4.4-1.azl3.aarch64.rpm
Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,11 +602,11 @@ 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-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
util-linux-libs-2.39.2-2.azl3.x86_64.rpm
util-linux-2.40.2-1.azl3.x86_64.rpm
util-linux-debuginfo-2.40.2-1.azl3.x86_64.rpm
util-linux-devel-2.40.2-1.azl3.x86_64.rpm
util-linux-lang-2.40.2-1.azl3.x86_64.rpm
util-linux-libs-2.40.2-1.azl3.x86_64.rpm
which-2.21-8.azl3.x86_64.rpm
which-debuginfo-2.21-8.azl3.x86_64.rpm
xz-5.4.4-1.azl3.x86_64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/scripts/toolchain/container/toolchain-remote-wget-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ https://pypi.org/packages/source/w/wheel/wheel-0.42.0.tar.gz
https://pypi.org/packages/source/f/flit-core/flit_core-3.9.0.tar.gz
https://ftp.gnu.org/gnu/sed/sed-4.9.tar.xz
https://www.sqlite.org/2023/sqlite-autoconf-3440000.tar.gz
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.xz
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.2.tar.xz
https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz
2 changes: 1 addition & 1 deletion toolkit/scripts/toolchain/container/toolchain-sha256sums
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.
b9cd386e7cd22af6e0d2a0f06d0404951e1bef109e42ea06cc0450e10cd15550 sqlite-autoconf-3440000.tar.gz
4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16 tar-1.35.tar.xz
74b420d09d7f528e84f97aa330f0dd69a98a6053e7a4e01767eed115038807bf texinfo-7.0.3.tar.xz
87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz
d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 util-linux-2.40.2.tar.xz
c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8 wheel-0.42.0.tar.gz
705d0d96e94e1840e64dec75fc8d5832d34f6649833bec1ced9c3e08cf88132e xz-5.4.4.tar.xz
38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 zlib-1.3.1.tar.xz
Expand Down
20 changes: 10 additions & 10 deletions toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ popd
rm -rf texinfo-7.0.3
touch /logs/status_texinfo_complete

echo util-linux-2.39.2
tar xf util-linux-2.39.2.tar.xz
pushd util-linux-2.39.2
echo util-linux-2.40.2
tar xf util-linux-2.40.2.tar.xz
pushd util-linux-2.40.2
mkdir -pv /var/lib/hwclock
./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
--libdir=/usr/lib \
--runstatedir=/run \
--docdir=/usr/share/doc/util-linux-2.39.2 \
--docdir=/usr/share/doc/util-linux-2.40.2 \
--disable-chfn-chsh \
--disable-login \
--disable-nologin \
Expand All @@ -118,7 +118,7 @@ mkdir -pv /var/lib/hwclock
make -j$(nproc)
make install
popd
rm -rf util-linux-2.39.2
rm -rf util-linux-2.40.2
touch /logs/status_util-linux_complete

# 7.13. Cleaning up and Saving the Temporary System
Expand Down Expand Up @@ -822,9 +822,9 @@ popd
rm -rf procps-ng-4.0.4
touch /logs/status_procpsng_complete

echo util-linux-2.39.2
tar xf util-linux-2.39.2.tar.xz
pushd util-linux-2.39.2
echo util-linux-2.40.2
tar xf util-linux-2.40.2.tar.xz
pushd util-linux-2.40.2
./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
--bindir=/usr/bin \
--libdir=/usr/lib \
Expand All @@ -841,11 +841,11 @@ pushd util-linux-2.39.2
--without-python \
--without-systemd \
--without-systemdsystemunitdir \
--docdir=/usr/share/doc/util-linux-2.39.2
--docdir=/usr/share/doc/util-linux-2.40.2
make -j$(nproc)
make install
popd
rm -rf util-linux-2.39.2
rm -rf util-linux-2.40.2
touch /logs/status_util-linux_complete

#
Expand Down
Loading