Accepting request 1179681 from home:dirkmueller:Factory

- disable libmagic in more(1) for binary detection (bsc#1225197)

- Suppress error messages for grep command where the input file
- clean up spec file slightly
- Fix tests not passing when '@' character is in build path:
  This release fixes two security mount(8) and umount(8) issues:
  * libuuid: Improved to match
  util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
  util-linux-losetup-Add-support-for-setting-logical-blocksize.patch

OBS-URL: https://build.opensuse.org/request/show/1179681
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=566

util-linux.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 10 10:44:55 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- disable libmagic in more(1) for binary detection (bsc#1225197)
+
 -------------------------------------------------------------------
 Thu May 16 07:12:22 UTC 2024 - Jiri Slaby <jslaby@suse.cz>
 
@@ -300,7 +305,7 @@ Fri Jun  9 13:35:33 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>
 -------------------------------------------------------------------
 Tue May  9 19:46:41 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>
 
-- Suppress error messages for grep command where the input file 
+- Suppress error messages for grep command where the input file
   might not exist (boo#1169835)
 
 -------------------------------------------------------------------
@@ -429,7 +434,7 @@ Mon Jan  9 16:13:18 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 Fri Jan  6 09:27:26 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
 - restore man and info pages
-- clean up spec file slightly 
+- clean up spec file slightly
 
 -------------------------------------------------------------------
 Tue Dec 27 13:23:29 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
@@ -454,7 +459,7 @@ Wed Dec 14 22:57:15 UTC 2022 - Goldwyn Rodrigues <rgoldwyn@suse.com>
 -------------------------------------------------------------------
 Fri Dec  9 17:23:28 UTC 2022 - David Anes <david.anes@suse.com>
 
-- Fix tests not passing when '@' character is in build path: 
+- Fix tests not passing when '@' character is in build path:
   Fixes rpmbuild %checks fail when @ in the directory path (bsc#1194038).
 - Add util-linux-fix-tests-when-at-symbol-in-path.patch
 
@@ -579,7 +584,7 @@ Thu Mar  3 03:22:45 UTC 2022 - Stanislav Brabec <sbrabec@suse.com>
 Mon Jan 24 21:57:01 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
 - update to 2.37.3 (bsc#1194976):
-  This release fixes two security mount(8) and umount(8) issues: 
+  This release fixes two security mount(8) and umount(8) issues:
   * CVE-2021-3996
     Improper UID check in libmount allows an unprivileged user to unmount FUSE
     filesystems of users with similar UID.
@@ -1308,7 +1313,7 @@ Mon Nov 20 17:29:11 CET 2017 - sbrabec@suse.com
     (new option --pty, CVE-2016-2779, bsc#968674). This new
     EXPERIMENTAL feature provides better isolation between root's
     terminal and an unprivileged su.
-  * libuuid: Improved to match 
+  * libuuid: Improved to match
   * libuuid, uuidgen: support hash-based UUIDs v3 (md5) and v5
     (sha1) as specified by RFC-4122. Provide UUID templates for
     dns, url, oid, or x500.
@@ -1362,7 +1367,7 @@ Thu Jul 20 13:51:20 UTC 2017 - sweet_f_a@gmx.de
   Bugfix release, more details at:
   https://www.kernel.org/pub/linux/utils/util-linux/v2.30/v2.30.1-ReleaseNotes
 - Drop upstreamed patch
-  util-linux-lscpu-cleanup-DMI-detection-return-codes.patch 
+  util-linux-lscpu-cleanup-DMI-detection-return-codes.patch
 
 -------------------------------------------------------------------
 Mon Jul  3 12:38:36 UTC 2017 - schwab@suse.de
@@ -1407,7 +1412,7 @@ Thu Jun  8 21:21:12 UTC 2017 - sweet_f_a@gmx.de
 - Drop upstreamed patch
   arm64-lscpu-use-sysfs-for-table-access-if-available.patch
 - Refreshed patch
-  util-linux-losetup-Add-support-for-setting-logical-blocksize.patch 
+  util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
 - fix compiler warnings for mkzimage_cmdline
 
 -------------------------------------------------------------------

util-linux.spec

@@ -119,7 +119,6 @@ BuildRequires:  audit-devel
 BuildRequires:  bc
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
-BuildRequires:  file-devel
 BuildRequires:  gettext-devel
 BuildRequires:  libcap-ng-devel
 BuildRequires:  libeconf-devel-static
@@ -483,6 +482,10 @@ function configure_and_build() {
 
 # configure options depending on ulbuild and ulsubset values
 configure_options=""
+# libmagic is only used for determining in more(1) whether or not a file
+# is binary. but it has builtin code that is doing the same with a simpler
+# check and the libmagic database dependency is rather large (9MB+)
+configure_options+="--without-libmagic"
 
 %if "%ulbuild" == "python"
 %define _configure ../configure
@@ -1038,7 +1041,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %core %{_bindir}/irqtop
 %core %{_bindir}/isosize
 
-%if 0%{?suse_version} >= 1599
+%if 0%{?suse_version} >= 1600
 # last provided by wtmpdb, btmp support dropped
 %exclude %{_bindir}/last
 %exclude %{_bindir}/lastb
@@ -1046,7 +1049,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %core %{_bindir}/last
 %core %{_bindir}/lastb
 %endif
-# 0%{?suse_version} >= 1599
 
 %core %{_bindir}/line
 %core %{_bindir}/look
@@ -1147,7 +1149,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %exclude %{_datadir}/bash-completion/completions/uuidd
 
 # wtmpdb
-%if 0%{?suse_version} >= 1599
+%if 0%{?suse_version} >= 1600
 %exclude %{_datadir}/bash-completion/completions/last
 %exclude %{_datadir}/bash-completion/completions/lastb
 %endif
@@ -1246,14 +1248,13 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %core %{_mandir}/man1/ipcrm.1.gz
 %core %{_mandir}/man1/ipcs.1.gz
 
-%if 0%{?suse_version} >= 1599
+%if 0%{?suse_version} >= 1600
 %exclude %{_mandir}/man1/last.1.gz
 %exclude %{_mandir}/man1/lastb.1.gz
 %else
 %core %{_mandir}/man1/last.1.gz
 %core %{_mandir}/man1/lastb.1.gz
 %endif
-# 0%{?suse_version} >= 1599
 
 %core %{_mandir}/man1/line.1.gz
 %core %{_mandir}/man1/login.1.gz