upgrade to upstream release v2.41.1
... https://www.kernel.org/pub/linux/utils/util-linux/v2.41/v2.41-ReleaseNotes - add lastlog2 library and PAM module - add new utils bits, coresched and lastlog2
This commit is contained in:
Karel Zak
parent
8e9f6cee44
commit
bf8d5779df
5 changed files with 66 additions and 47 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -99,3 +99,5 @@
|
|||
/util-linux-2.40.1.tar.xz
|
||||
/util-linux-2.40.2.tar.xz
|
||||
/util-linux-2.40.4.tar.xz
|
||||
/util-linux-2.41.tar.xz
|
||||
/util-linux-2.41.1.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
From ff0ac0f27dc3de7d250b2a69f6452bfeec104f8c Mon Sep 17 00:00:00 2001
|
||||
From: Eric Sandeen <sandeen@redhat.com>
|
||||
Date: Fri, 24 Jan 2025 08:37:12 -0600
|
||||
Subject: [PATCH] blkid: allow up to 64k erofs block sizes
|
||||
|
||||
Today, mkfs.erofs defaults to page size for block size, but blkid
|
||||
does not recognize this. Increase the limit to 64k.
|
||||
|
||||
Reviewed-by: Gao Xiang <xiang@kernel.org>
|
||||
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
libblkid/src/superblocks/erofs.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libblkid/src/superblocks/erofs.c b/libblkid/src/superblocks/erofs.c
|
||||
index 05822460b..57fd80220 100644
|
||||
--- a/libblkid/src/superblocks/erofs.c
|
||||
+++ b/libblkid/src/superblocks/erofs.c
|
||||
@@ -73,8 +73,8 @@ static int probe_erofs(blkid_probe pr, const struct blkid_idmag *mag)
|
||||
if (!sb)
|
||||
return errno ? -errno : BLKID_PROBE_NONE;
|
||||
|
||||
- /* EROFS is restricted to 4KiB block size */
|
||||
- if (sb->blkszbits > 31 || (1U << sb->blkszbits) > 4096)
|
||||
+ /* block size must be between 512 and 64k */
|
||||
+ if (sb->blkszbits < 9 || sb->blkszbits > 16)
|
||||
return BLKID_PROBE_NONE;
|
||||
|
||||
if (!erofs_verify_checksum(pr, mag, sb))
|
||||
--
|
||||
2.48.1
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (util-linux-2.40.4.tar.xz) = 0024955056ba7b4c54040a917f9919f49692e57ba6d42d17a6c29c1eefe88bf48b1214a545072b71c468829a63a8f15237f49733e9127c134e11126d1e435124
|
||||
SHA512 (util-linux-2.41.1.tar.xz) = 12cf37ab2d62d0378b16a40e0194ef7131ef1ad06737cca3f169cfc04b9da08a4233076c819b30705e8fb2c3b8d91a1d83aac4f036ce58b9cf5928f545e511a2
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
u uuidd - "UUID generator helper daemon" /var/lib/libuuid
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
### Header
|
||||
Summary: Collection of basic system utilities
|
||||
Name: util-linux
|
||||
Version: 2.40.4
|
||||
Version: 2.41.1
|
||||
# -p -e rc1
|
||||
Release: %autorelease -b7
|
||||
License: GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-Fedora-Public-Domain
|
||||
|
|
@ -35,6 +35,7 @@ BuildRequires: %{pypkg}-devel
|
|||
BuildRequires: gcc
|
||||
BuildRequires: rubygem-asciidoctor
|
||||
BuildRequires: po4a
|
||||
BuildRequires: sqlite-devel
|
||||
%ifarch ppc64le
|
||||
BuildRequires: librtas-devel
|
||||
%endif
|
||||
|
|
@ -56,9 +57,6 @@ Source13: util-linux-su-l.pamd
|
|||
Source14: util-linux-runuser.pamd
|
||||
Source15: util-linux-runuser-l.pamd
|
||||
|
||||
# temporary, will be in upstream >= v2.41
|
||||
Source16: util-linux-uuidd-sysusers.conf
|
||||
|
||||
### Obsoletes & Conflicts & Provides
|
||||
Conflicts: initscripts < 9.79-4
|
||||
Conflicts: bash-completion < 1:2.1-1
|
||||
|
|
@ -93,6 +91,7 @@ Requires: libblkid = %{version}-%{release}
|
|||
Requires: libmount = %{version}-%{release}
|
||||
Requires: libsmartcols = %{version}-%{release}
|
||||
Requires: libfdisk = %{version}-%{release}
|
||||
Requires: liblastlog2 = %{version}-%{release}
|
||||
Requires: util-linux-core = %{version}-%{release}
|
||||
|
||||
%if "%{_sbindir}" == "%{_bindir}"
|
||||
|
|
@ -111,9 +110,6 @@ Patch0: login-lastlog-create.patch
|
|||
# https://github.com/coreos/console-login-helper-messages/issues/60
|
||||
Patch1: login-default-motd-file.patch
|
||||
|
||||
# Backport better support for erofs on ppc64le
|
||||
Patch2: 0001-blkid-allow-up-to-64k-erofs-block-sizes.patch
|
||||
|
||||
%description
|
||||
The util-linux package contains a large variety of low-level system
|
||||
utilities that are necessary for a Linux system to function. Among
|
||||
|
|
@ -215,6 +211,25 @@ This is the device mounting development library and headers,
|
|||
part of util-linux.
|
||||
|
||||
|
||||
%package -n liblastlog2
|
||||
Summary: lastlog database library and PAM module
|
||||
License: BSD-2-Clause
|
||||
|
||||
%description -n liblastlog2
|
||||
This is the lastlog database library and PAM module, part of util-linux.
|
||||
|
||||
|
||||
%package -n liblastlog2-devel
|
||||
Summary: lastlog database library
|
||||
License: BSD-2-Clause
|
||||
Requires: liblastlog2%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description -n liblastlog2-devel
|
||||
This is the lastlog database development library and headers,
|
||||
part of util-linux.
|
||||
|
||||
|
||||
%package -n libblkid
|
||||
Summary: Block device ID library
|
||||
License: LGPL-2.1-or-later
|
||||
|
|
@ -335,7 +350,6 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
|
|||
--disable-silent-rules \
|
||||
--disable-bfs \
|
||||
--disable-pg \
|
||||
--disable-liblastlog2 \
|
||||
--enable-chfn-chsh \
|
||||
--enable-usrdir-path \
|
||||
--enable-write \
|
||||
|
|
@ -378,8 +392,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/{pam.d,security/console.apps}
|
|||
install -d %{buildroot}/run/uuidd
|
||||
install -d %{buildroot}/var/lib/libuuid
|
||||
|
||||
install -m 644 -D %{SOURCE16} %{buildroot}%{_sysusersdir}/uuidd.conf
|
||||
|
||||
# /etc/adjtime
|
||||
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/adjtime
|
||||
|
||||
|
|
@ -440,7 +452,7 @@ rm -f %{buildroot}/sbin/sfdisk \
|
|||
ln -sf ../proc/self/mounts %{buildroot}/etc/mtab
|
||||
|
||||
# remove static libs
|
||||
rm -f %{buildroot}%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk}.a
|
||||
rm -f %{buildroot}%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk,lastlog2}.a
|
||||
|
||||
# temporary remove to avoid conflicts with bash-completion pkg
|
||||
rm -f %{buildroot}%{compldir}/{mount,umount}
|
||||
|
|
@ -473,6 +485,14 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}/usr/bin/
|
|||
%post
|
||||
%systemd_post fstrim.{service,timer}
|
||||
|
||||
### Enable after completing migration to lastlog2
|
||||
# %post -n liblastlog2
|
||||
# %systemd_post lastlog2-import.service
|
||||
#
|
||||
# %postun -n liblastlog2
|
||||
# %systemd_postun lastlog2-import.service
|
||||
###
|
||||
|
||||
%preun
|
||||
%systemd_preun fstrim.{service,timer}
|
||||
|
||||
|
|
@ -525,6 +545,7 @@ fi
|
|||
|
||||
%{_unitdir}/fstrim.*
|
||||
|
||||
%{_bindir}/bits
|
||||
%{_bindir}/cal
|
||||
%{_bindir}/chmem
|
||||
%{_bindir}/choom
|
||||
|
|
@ -532,6 +553,7 @@ fi
|
|||
%{_bindir}/colcrt
|
||||
%{_bindir}/colrm
|
||||
%{_bindir}/column
|
||||
%{_bindir}/coresched
|
||||
%{_bindir}/eject
|
||||
%{_bindir}/enosys
|
||||
%{_bindir}/exch
|
||||
|
|
@ -544,6 +566,7 @@ fi
|
|||
%{_bindir}/isosize
|
||||
%{_bindir}/last
|
||||
%{_bindir}/lastb
|
||||
%{_bindir}/lastlog2
|
||||
%{_bindir}/look
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
|
|
@ -576,6 +599,8 @@ fi
|
|||
%{_bindir}/wdctl
|
||||
%{_bindir}/whereis
|
||||
%{_bindir}/write
|
||||
|
||||
%{_mandir}/man1/bits.1*
|
||||
%{_mandir}/man1/cal.1*
|
||||
%{_mandir}/man1/chfn.1*
|
||||
%{_mandir}/man1/choom.1*
|
||||
|
|
@ -584,6 +609,7 @@ fi
|
|||
%{_mandir}/man1/colcrt.1*
|
||||
%{_mandir}/man1/colrm.1*
|
||||
%{_mandir}/man1/column.1*
|
||||
%{_mandir}/man1/coresched.1.*
|
||||
%{_mandir}/man1/eject.1*
|
||||
%{_mandir}/man1/enosys.1*
|
||||
%{_mandir}/man1/exch.1*
|
||||
|
|
@ -643,6 +669,7 @@ fi
|
|||
%{_mandir}/man8/fsfreeze.8*
|
||||
%{_mandir}/man8/fstrim.8*
|
||||
%{_mandir}/man8/isosize.8*
|
||||
%{_mandir}/man8/lastlog2.8*
|
||||
%{_mandir}/man8/ldattach.8*
|
||||
%{_mandir}/man8/lsblk.8*
|
||||
%{_mandir}/man8/lslocks.8*
|
||||
|
|
@ -721,6 +748,7 @@ fi
|
|||
%{compldir}/isosize
|
||||
%{compldir}/last
|
||||
%{compldir}/lastb
|
||||
%{compldir}/lastlog2
|
||||
%{compldir}/ldattach
|
||||
%{compldir}/look
|
||||
%{compldir}/lsblk
|
||||
|
|
@ -894,7 +922,7 @@ fi
|
|||
%dir %attr(2775, uuidd, uuidd) /run/uuidd
|
||||
%{compldir}/uuidd
|
||||
%{_tmpfilesdir}/uuidd-tmpfiles.conf
|
||||
%{_sysusersdir}/uuidd.conf
|
||||
%{_sysusersdir}/uuidd-sysusers.conf
|
||||
|
||||
|
||||
%files -n libfdisk
|
||||
|
|
@ -930,6 +958,29 @@ fi
|
|||
%{_libdir}/pkgconfig/mount.pc
|
||||
|
||||
|
||||
%files -n liblastlog2
|
||||
%license Documentation/licenses/COPYING.BSD-2-Clause
|
||||
%{_libdir}/liblastlog2.so.*
|
||||
%{_pam_moduledir}/pam_lastlog2.so
|
||||
%{_tmpfilesdir}/lastlog2-tmpfiles.conf
|
||||
%{_unitdir}/lastlog2*
|
||||
%{_mandir}/man8/pam_lastlog2.8*
|
||||
|
||||
%files -n liblastlog2-devel
|
||||
%license Documentation/licenses/COPYING.BSD-2-Clause
|
||||
%{_libdir}/liblastlog2.so
|
||||
%{_includedir}/liblastlog2
|
||||
%{_libdir}/pkgconfig/lastlog2.pc
|
||||
%{_mandir}/man3/lastlog2.3.*
|
||||
%{_mandir}/man3/ll2_import_lastlog.3*
|
||||
%{_mandir}/man3/ll2_read_all.3*
|
||||
%{_mandir}/man3/ll2_read_entry.3*
|
||||
%{_mandir}/man3/ll2_remove_entry.3*
|
||||
%{_mandir}/man3/ll2_rename_user.3*
|
||||
%{_mandir}/man3/ll2_update_login_time.3*
|
||||
%{_mandir}/man3/ll2_write_entry.3*
|
||||
|
||||
|
||||
%files -n libblkid
|
||||
%license Documentation/licenses/COPYING.LGPL-2.1-or-later
|
||||
%{_libdir}/libblkid.so.*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue