Skip to content

Commit

Permalink
[util-linux] Update to 2.40.2. Contributes to JB#58868
Browse files Browse the repository at this point in the history
- Add flex build dependency
- Add missing binaries
- Disable year 2038 support (requires kernel 5.1)
- Disable lsfd (requires kernel 4.15)
- Disable lastlog2 for now
- Regenerate patch

Fix for CVE-2024-28085 is included, but we were not affected,
because we are not building 'wall' binary.
  • Loading branch information
direc85 committed Nov 15, 2024
1 parent 08a6ac9 commit 0ce2127
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH] libblkid: (probe) Disable CD-ROM probing in
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 5acd2732c026d6b5635b966b7c7a469bf65047f2..6437c393203c196999eae5291ee609ea42754a1b 100644
index 76905e197..43e2adcb1 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -1011,7 +1011,7 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
@@ -1128,7 +1128,7 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
pr->flags |= BLKID_FL_NOSCAN_DEV;
}

Expand Down
15 changes: 13 additions & 2 deletions rpm/util-linux.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### Header
Name: util-linux
Version: 2.38.1
Version: 2.40.2
Release: 1
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
Summary: A collection of basic system utilities
Expand All @@ -16,6 +16,7 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(libcrypt)
BuildRequires: libutempter-devel
BuildRequires: bison
BuildRequires: flex

### Sources
Source0: %{name}-%{version}.tar.xz
Expand Down Expand Up @@ -206,7 +207,11 @@ export SUID_LDFLAGS="-pie"
--with-utempter \
--without-python \
--disable-bash-completion \
--disable-makeinstall-chown
--disable-makeinstall-chown \
--disable-year2038 \
--disable-liblastlog2 \
--disable-pam-lastlog2 \
--disable-lsfd

# build util-linux
%make_build
Expand Down Expand Up @@ -349,6 +354,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l

%{_bindir}/dmesg
%{_bindir}/enosys
%{_bindir}/exch
%{_bindir}/fadvise
%attr(4755,root,root) %{_bindir}/mount
# FIXME: Remove after UsrMove
%attr(4755,root,root) %{_bindir}/umount
Expand Down Expand Up @@ -379,6 +387,7 @@ exit 0
%{_bindir}/taskset
%{_bindir}/findmnt
%{_bindir}/lsblk
%{_bindir}/lsclocks
%{_bindir}/lscpu
%{_bindir}/lsipc
%{_bindir}/lsirq
Expand All @@ -388,6 +397,7 @@ exit 0
%{_bindir}/mountpoint
%{_bindir}/mesg
%{_bindir}/nsenter
%{_bindir}/pipesz
%{_bindir}/prlimit
%{_bindir}/uname26

Expand Down Expand Up @@ -455,6 +465,7 @@ exit 0
%{_bindir}/scriptlive
%{_bindir}/scriptreplay
%{_bindir}/setarch
%{_bindir}/setpgid
%{_bindir}/setsid
%{_bindir}/setterm
%{_bindir}/uclampset
Expand Down
2 changes: 1 addition & 1 deletion util-linux
Submodule util-linux updated 1607 files

0 comments on commit 0ce2127

Please sign in to comment.