From e41707d995a0d3bd47c425ace415ce69f78487f0 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 18:52:57 +0100 Subject: [PATCH] add Require(pre) to try to fix glibc/libxcrypt crash on update [release 2.39.2-2mamba;Fri Aug 18 2023] --- util-linux.spec | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/util-linux.spec b/util-linux.spec index 88c27dc..6bda2ce 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -7,8 +7,8 @@ %define uuidd_userid 65052 Name: util-linux -Version: 2.39.1 -Release: 1mamba +Version: 2.39.2 +Release: 2mamba Epoch: 1 Summary: Miscellaneous utilities for Linux Group: System/Tools @@ -48,6 +48,7 @@ BuildRequires: libreadline-devel BuildRequires: libselinux-devel BuildRequires: libsystemd-devel BuildRequires: libudev-devel +BuildRequires: libxcrypt-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: bash @@ -90,6 +91,11 @@ Among others, Util-linux contains the fdisk configuration tool and the login pro Summary: Block device identification library Group: System/Libraries Requires: libmount = %{?epoch:%epoch:}%{version}-%{release} +%ifarch x86_64 aarch64 +Requires(pre): libc.so.6(GLIBC_2.38)(64bit) +%else +Requires(pre): libc.so.6(GLIBC_2.38) +%endif %description -n libblkid Block device identification library. @@ -106,6 +112,11 @@ This package provides the development file for application which use libblkid. %package -n libsmartcols Summary: Pretty output library Group: System/Libraries +%ifarch x86_64 aarch64 +Requires(pre): libc.so.6(GLIBC_2.38)(64bit) +%else +Requires(pre): libc.so.6(GLIBC_2.38) +%endif %description -n libsmartcols Pretty output library. @@ -122,6 +133,11 @@ This package provides the development file for application which use libsmartcol %package -n libuuid Summary: Universal unique id library Group: System/Libraries +%ifarch x86_64 aarch64 +Requires(pre): libc.so.6(GLIBC_2.38)(64bit) +%else +Requires(pre): libc.so.6(GLIBC_2.38) +%endif %description -n libuuid Universal unique id library. @@ -139,6 +155,11 @@ This package provides the development file for application which use libuuid. Summary: Mount library Group: System/Libraries Requires: libblkid = %{?epoch:%epoch:}%{version}-%{release} +%ifarch x86_64 aarch64 +Requires(pre): libc.so.6(GLIBC_2.38)(64bit) +%else +Requires(pre): libc.so.6(GLIBC_2.38) +%endif %description -n libmount Mount library. @@ -155,6 +176,11 @@ This package provides the development file for application which use libmount. %package -n libfdisk Summary: Fdisk library Group: System/Libraries +%ifarch x86_64 aarch64 +Requires(pre): libc.so.6(GLIBC_2.38)(64bit) +%else +Requires(pre): libc.so.6(GLIBC_2.38) +%endif %description -n libfdisk Fdisk library. @@ -415,6 +441,12 @@ exit 0 %{_libdir}/pkgconfig/fdisk.pc %changelog +* Fri Aug 18 2023 Silvan Calarco 2.39.2-2mamba +- add Require(pre) to try to fix glibc/libxcrypt crash on update + +* Fri Aug 18 2023 Silvan Calarco 2.39.2-1mamba +- update to 2.39.2 + * Mon Jul 10 2023 Automatic Build System 2.39.1-1mamba - automatic version update by autodist